diff --git a/lib/Drupal/configuration/Config/ConfigurationManagement.php b/lib/Drupal/configuration/Config/ConfigurationManagement.php
index bc4ecc1..1ff66a3 100644
--- a/lib/Drupal/configuration/Config/ConfigurationManagement.php
+++ b/lib/Drupal/configuration/Config/ConfigurationManagement.php
@@ -103,8 +103,8 @@ class ConfigurationManagement {
       array(
         'build_callback' => 'loadFromStorage',
         'callback' => 'discoverModules',
-        'process_dependencies' => $import_dependencies,
-        'process_optionals' => $import_optionals,
+        'process_dependencies' => $include_dependencies,
+        'process_optionals' => $include_optionals,
         'info' => array(
           'modules' => array(),
           'modules_missing' => array(),
diff --git a/lib/Drupal/configuration/Config/CtoolsConfiguration.php b/lib/Drupal/configuration/Config/CtoolsConfiguration.php
index 8dece71..d071c0c 100644
--- a/lib/Drupal/configuration/Config/CtoolsConfiguration.php
+++ b/lib/Drupal/configuration/Config/CtoolsConfiguration.php
@@ -86,7 +86,9 @@ class CtoolsConfiguration extends Configuration {
     if ($object && ($object->export_type & EXPORT_IN_DATABASE)) {
       ctools_export_crud_delete($this->getComponent(), $object);
     }
-    ctools_export_crud_save($this->getComponent(), $this->getData());
+    $data = $this->getData();
+    $data->export_type = EXPORT_IN_DATABASE;
+    ctools_export_crud_save($this->getComponent(), $data);
     $settings->addInfo('imported', $this->getUniqueId());
   }
 
diff --git a/ui/configuration_ui.admin.inc b/ui/configuration_ui.admin.inc
index ae01690..ea6a625 100644
--- a/ui/configuration_ui.admin.inc
+++ b/ui/configuration_ui.admin.inc
@@ -527,6 +527,24 @@ function configuration_ui_import_form_submit($form, &$form_state) {
  */
 function configuration_ui_settings_form($form, &$form_state) {
 
+  $form['configuration_ops'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Configuration Operations'),
+    '#collapsible' => TRUE,
+    '#collapsed' => FALSE,
+    '#description' => '<p>' . t('Updates the tracked configurations using the configurations defined in configuration.inc file. You should click on this button every time you update the DataStore and want to see the changes materialized in your site.') . '<p>',
+  );
+  $form['configuration_ops']['sync_configurations'] = array(
+    '#type' => 'submit',
+    '#value' => t('Syncronize configurations'),
+    '#submit' => array('configuration_sync_configurations_submit'),
+  );
+  $form['configuration_ops']['preserve_tracked'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Preserve tracked configurations.'),
+    '#description' => '<p>' . t('If checked, all the configurations current being tracked will still be tracked even if they are not in listed in the configuration.inc file of your DataStore. If not checked, those configurations that are not listed in the configuration.inc file and are currently being tracked will be automatically untracked.') . '<p>',
+  );
+
   $form['general_settings'] = array(
     '#type' => 'fieldset',
     '#title' => t('General Settings'),
@@ -553,3 +571,49 @@ function configuration_ui_settings_form($form, &$form_state) {
 
   return system_settings_form($form);
 }
+
+
+function configuration_sync_configurations_submit($form, &$form_state) {
+  $to_track = array_keys(ConfigurationManagement::readTrackingFile());
+
+  $modules_results = ConfigurationManagement::discoverRequiredModules($to_track, FALSE, FALSE, TRUE);
+
+  $missing_modules = $modules_results->getInfo('missing_modules');
+
+  if (!empty($missing_modules)) {
+    drupal_set_message(t('Configurations cannot be syncronized because the following modules are not available to install: %modules', array('%modules' => implode(', ', $missing_modules))), 'error');
+    $error = TRUE;
+  }
+  else {
+    $modules_to_install = $modules_results->getInfo('modules_to_install');
+    if (!empty($modules_to_install)) {
+      module_install($modules_to_install);
+    }
+
+    drupal_set_message(t('The following modules have been enabled: %modules', array('%modules' => implode(', ', $modules_to_install))));
+  }
+
+  // If we have to stop stracking some configurations, figure out which
+  // configurations have to be untracked.
+  if (empty($form_state['values']['preserve_tracked'])) {
+
+    $being_tracked = ConfigurationManagement::trackedConfigurations();
+    dsm($being_tracked);
+    dsm($to_track);
+    $to_untrack = array_diff($to_track, $being_tracked);
+    dsm($to_untrack);
+
+    $un_track_results = ConfigurationManagement::stopTracking($to_track, TRUE, TRUE);
+
+    if (count($un_track_results->getInfo('untracked'))) {
+      foreach ($un_track_results->getInfo('untracked') as $untracked_config) {
+        drupal_set_message(t('Untracked %config', array('%config' => $untracked_config)));
+      }
+    }
+  }
+
+  $results = ConfigurationManagement::importToActiveStore($to_track, FALSE, FALSE, TRUE);
+  foreach ($results->getInfo('imported') as $imported) {
+    drupal_set_message(t('Imported %config', array('%config' => $imported)));
+  }
+}
