diff --git a/disable_field.module b/disable_field.module
index aaca074..77ac510 100755
--- a/disable_field.module
+++ b/disable_field.module
@@ -114,13 +114,14 @@ function disable_field_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $
         ),
       );
       // Default Values.
+
       if(isset($form_state->getBuildInfo()['args'])){
         $args = explode('.',$form_state->getBuildInfo()['args'][0]);
         $entity_type = $args[0];
         $bundle_type = $args[1];
         $field_name = $args[2];
         // Checking DB to set default Values.
-        $connection = \Drupal::database();
+          $connection = \Drupal::database();
         $disable_query = $connection->select('disable_field', 'dt');
         $disable_query->fields('dt', array('page', 'roles'));
         $disable_query->condition('dt.bundle', $bundle_type, '=');
@@ -180,6 +181,7 @@ function disable_field_disable_validate(array &$form, FormStateInterface $form_s
  */
 function disable_field_disable_submit(array &$form, FormStateInterface $form_state) {
   // Get Values.
+    $query=\Drupal::database();
   $values = $form_state->getValues();
   $id = $form_state->getFormObject()->getEntity()->id();
   $entity_type = $form_state->getFormObject()->getEntity()->get('entity_type');
@@ -199,7 +201,8 @@ function disable_field_disable_submit(array &$form, FormStateInterface $form_sta
   }
   // Delete if uncheck For add checkbox;
   if (strlen($add_disable) == 1) {
-    db_delete('disable_field')
+
+    $query->delete('disable_field')
       ->condition('entity_type', $entity_type)
       ->condition('bundle', $bundle_type)
       ->condition('field_name', $field_name)
@@ -208,7 +211,8 @@ function disable_field_disable_submit(array &$form, FormStateInterface $form_sta
   }
   // Delete if uncheck For Edit checkbox.
   if (strlen($edit_disable) == 1) {
-    db_delete('disable_field')
+
+    $query->delete('disable_field')
       ->condition('entity_type', $entity_type)
       ->condition('bundle', $bundle_type)
       ->condition('field_name', $field_name)
@@ -217,7 +221,8 @@ function disable_field_disable_submit(array &$form, FormStateInterface $form_sta
   }
   // For add checkbox;
   if (strlen($add_disable) == 11) {
-    db_merge('disable_field')->key(array(
+
+    $query->merge('disable_field')->key(array(
       'entity_type' => $entity_type,
       'bundle' => $bundle_type,
       'field_name' => $field_name,
@@ -232,7 +237,8 @@ function disable_field_disable_submit(array &$form, FormStateInterface $form_sta
   }
   // For Edit checkbox.
   if (strlen($edit_disable) == 12) {
-    db_merge('disable_field')->key(array(
+
+    $query->merge('disable_field')->key(array(
       'entity_type' => $entity_type,
       'bundle' => $bundle_type,
       'field_name' => $field_name,