diff --git a/src/Controller/UserQueueList.php b/src/Controller/UserQueueList.php
index ed763a2..e797e04 100644
--- a/src/Controller/UserQueueList.php
+++ b/src/Controller/UserQueueList.php
@@ -6,7 +6,7 @@
 
 namespace Drupal\userqueue\Controller;
 
-use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Component\Utility\Html;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Url;
 use Drupal\Core\Database\Connection;
diff --git a/src/Controller/UserQueueShowList.php b/src/Controller/UserQueueShowList.php
index d13443d..494504e 100644
--- a/src/Controller/UserQueueShowList.php
+++ b/src/Controller/UserQueueShowList.php
@@ -6,7 +6,7 @@
 
 namespace Drupal\userqueue\Controller;
 
-use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Component\Utility\Html;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Url;
 use Drupal\Core\Database\Connection;
diff --git a/src/Form/UserQueueBottomConfirmForm.php b/src/Form/UserQueueBottomConfirmForm.php
index cbaae29..453819c 100644
--- a/src/Form/UserQueueBottomConfirmForm.php
+++ b/src/Form/UserQueueBottomConfirmForm.php
@@ -91,7 +91,7 @@ class UserQueueBottomConfirmForm extends ConfirmFormBase {
  	
          $queue = userqueue_load($this->uqid);
 
-	$query = db_select('userqueue_user')
+	$query = \Drupal::database()->select('userqueue_user')
 	->fields('userqueue_user',array('weight'))	
 	->condition('uid', $path_args['6'],'=')
         ->condition('uqid', $this->uqid,'=')	
@@ -101,7 +101,7 @@ class UserQueueBottomConfirmForm extends ConfirmFormBase {
 	
 	
 	
-	$results = db_select('userqueue_user')
+	$results = \Drupal::database()->select('userqueue_user')
 		->fields(NULL, array('weight'))
 		->condition('uqid',$this->uqid,'=')
 		->execute()->fetchAll();
@@ -109,13 +109,13 @@ class UserQueueBottomConfirmForm extends ConfirmFormBase {
 	$d = count($results);
 		
 
-	db_update('userqueue_user')    
+	\Drupal::database()->update('userqueue_user')    
 	->expression('weight','weight - :weight',array(':weight' => 1))	
  	->condition('weight', $c,'>')       
 	->condition('uqid', $this->uqid,'=')
         ->execute();
 
-	db_update('userqueue_user')    
+	\Drupal::database()->update('userqueue_user')    
 	->fields(array('weight' => $d))	
         ->condition('uid',$path_args['6'],'=')
         ->condition('uqid', $this->uqid,'=')
diff --git a/src/Form/UserQueueForm.php b/src/Form/UserQueueForm.php
index 73b2bc2..12e7676 100644
--- a/src/Form/UserQueueForm.php
+++ b/src/Form/UserQueueForm.php
@@ -100,7 +100,7 @@ class UserQueueForm extends FormBase {
         $form_state->setRedirect('userqueue.admin_userqueue.uqid.delete', array('uqid' => $uqid));
       }
       elseif ($form_state->getValue('op') == t('Save')) {
-        db_update('userqueue')
+        \Drupal::database()->update('userqueue')
           ->fields(array('title' => $title, 'size' => $size, 'reverse' => $reverse))
           ->condition('uqid', $uqid, '=')
           ->execute();
@@ -110,7 +110,7 @@ class UserQueueForm extends FormBase {
       }
     }
     else {
-      db_insert('userqueue')->fields(array('title' => $title,'size' => $size,'reverse' => $reverse,))->execute();
+      \Drupal::database()->insert('userqueue')->fields(array('title' => $title,'size' => $size,'reverse' => $reverse,))->execute();
       drupal_set_message($this->t('Created user queue %title.', array('%title' => $title)));
       $this->logger('userqueue')->notice('Created new user queue %title.', array('%title' => $title));
       $form_state->setRedirect('userqueue.admin_userqueue.list');
diff --git a/src/Form/UserQueueRemoveConfirmForm.php b/src/Form/UserQueueRemoveConfirmForm.php
index 9328639..0f76b0a 100644
--- a/src/Form/UserQueueRemoveConfirmForm.php
+++ b/src/Form/UserQueueRemoveConfirmForm.php
@@ -89,7 +89,7 @@ class UserQueueRemoveConfirmForm extends ConfirmFormBase {
     	 $path_args = explode('/', $current_path);	    
  	
    	 $queue = userqueue_load($this->uqid);
-	 $query = db_select('userqueue_user')
+	 $query = \Drupal::database()->select('userqueue_user')
 	->fields('userqueue_user',array('weight'))	
 	->condition('uid',$path_args['6'],'=')
         ->condition('uqid', $this->uqid, '=')	
@@ -103,7 +103,7 @@ class UserQueueRemoveConfirmForm extends ConfirmFormBase {
 	->condition('uid',$path_args['6'],'=')	
 	->execute();
 
-	db_update('userqueue_user')    
+	\Drupal::database()->update('userqueue_user')    
 	->expression('weight','weight - :weight',array(':weight' => 1))	
  	->condition('weight', $c,'>')       
 	->condition('uqid', $this->uqid, '=')
diff --git a/src/Form/UserQueueTopConfirmForm.php b/src/Form/UserQueueTopConfirmForm.php
index 1e99be3..8faa8b4 100644
--- a/src/Form/UserQueueTopConfirmForm.php
+++ b/src/Form/UserQueueTopConfirmForm.php
@@ -91,7 +91,7 @@ class UserQueueTopConfirmForm extends ConfirmFormBase {
  	
     $queue = userqueue_load($this->uqid);
 
-	$query = db_select('userqueue_user')
+	$query = \Drupal::database()->select('userqueue_user')
 	->fields('userqueue_user',array('weight'))	
 	->condition('uid',$path_args['6'],'=')
         ->condition('uqid', $this->uqid,'=')	
@@ -99,13 +99,13 @@ class UserQueueTopConfirmForm extends ConfirmFormBase {
 
 	$c = $query['weight'];
 			
-	db_update('userqueue_user')    
+	\Drupal::database()->update('userqueue_user')    
 	->expression('weight','weight + :weight',array(':weight' => '1'))		
  	->condition('weight',$c,'<')       
 	->condition('uqid', $this->uqid,'=')
         ->execute();
 
-	db_update('userqueue_user')    
+	\Drupal::database()->update('userqueue_user')    
 	->fields(array('weight' => '1'))	
         ->condition('uid',$path_args['6'],'=')
         ->condition('uqid', $this->uqid,'=')
diff --git a/src/Form/UserQueueViewForm.php b/src/Form/UserQueueViewForm.php
index 9e422c6..8595689 100644
--- a/src/Form/UserQueueViewForm.php
+++ b/src/Form/UserQueueViewForm.php
@@ -63,14 +63,14 @@ class UserQueueViewForm extends FormBase {
 	
 			   
 		
-		$queryn = db_select('userqueue_user', 'uu');
+		$queryn = \Drupal::database()->select('userqueue_user', 'uu');
 		$queryn->addExpression('MAX(weight)', 'weight');
 		$position = $queryn->condition('uqid',$path_args[4],'=');
   		$position = $queryn->execute()->fetchField();
 
 		
 		
-		db_insert('userqueue_user')
+		\Drupal::database()->insert('userqueue_user')
 		->fields(array(
 		'uqid' => $path_args[4],
 		'uid' => $form_state->getValue('username'),
diff --git a/userqueue.module b/userqueue.module
index cedbb21..bbe98ba 100644
--- a/userqueue.module
+++ b/userqueue.module
@@ -22,7 +22,7 @@ function userqueue_help($route_name, RouteMatchInterface $route_match) {
  */
 function userqueue_load($uqid) {
   //Get the queue data.
-  $userqueue = db_select('userqueue', 'uq')
+  $userqueue = \Drupal::database()->select('userqueue', 'uq')
     ->condition('uq.uqid', $uqid, '=')
     ->fields('uq',array('uqid', 'title', 'size', 'reverse'))
     ->execute()