diff --git a/lib/Drupal/configuration/Config/ConfigurationManagement.php b/lib/Drupal/configuration/Config/ConfigurationManagement.php
index 8356f50..72016b7 100644
--- a/lib/Drupal/configuration/Config/ConfigurationManagement.php
+++ b/lib/Drupal/configuration/Config/ConfigurationManagement.php
@@ -341,25 +341,59 @@ class ConfigurationManagement {
   /**
    * Returns a list of configurations that are currently being tracked.
    *
+   * @param boolean $tree
+   *   A boolean flag to indicate if the tracked configuration have to be
+   *   organized in a tree structure.
+   *
    * @return array
+   *   If $tree is TRUE the returned array is structured in the this way:
+   *
+   *   @code
+   *     array(
+   *       'content_type' => array(
+   *         'article' => 'c08223610b3eb55161d4539c704e40989dcf3e72',
+   *         'page' => '5161d4539c704e40989dcf3e72c08223610b3eb5'
+   *       ),
+   *       'variable' => array(
+   *         'site_name' =>'539c704e40989dcf35161d4e72c08223610b3eb5'
+   *       )
+   *     );
+   *
+   *     If $tree is FALSE the returned array is structured in the this way:
+   *
+   *     array(
+   *       'content_type.article' => 'c08223610b3eb55161d4539c704e40989dcf3e72',
+   *       'content_type.page' => '5161d4539c704e40989dcf3e72c08223610b3eb5',
+   *       'variable.site_name' =>'539c704e40989dcf35161d4e72c08223610b3eb5'
+   *     );
+   *   @endcode
    */
-  static public function trackedConfigurations() {
+  static public function trackedConfigurations($tree = TRUE) {
     $tracked = db_select('configuration_staging', 'cs')
                   ->fields('cs', array('component', 'identifier', 'hash'))
                   ->execute()
                   ->fetchAll();
 
+    $return = array();
     // Prepare the array to return
     $handlers = static::getConfigurationHandler();
-    $return = array();
-    foreach ($handlers as $component => $handler) {
-      $return[$component] = array();
+
+    if ($tree) {
+      foreach ($handlers as $component => $handler) {
+        $return[$component] = array();
+      }
     }
 
+
     foreach ($tracked as $object) {
       // Only return tracked Configurations for supported components.
-      if (isset($return[$object->component])) {
-        $return[$object->component][$object->identifier] = $object->hash;
+      if (isset($handlers[$object->component])) {
+        if ($tree) {
+          $return[$object->component][$object->identifier] = $object->hash;
+        }
+        else {
+          $return[$object->component . '.' . $object->identifier] = $object->hash;
+        }
       }
     }
     return $return;
diff --git a/tests/test_configs/tracked.inc b/tests/test_configs/tracked.inc
new file mode 100644
index 0000000..ee0bd4b
--- /dev/null
+++ b/tests/test_configs/tracked.inc
@@ -0,0 +1,9 @@
+<?php
+
+// This file contains the current being tracked configurations.
+
+$tracked = array (
+  'content_type.article' => 'ff81b2503f97b8ec6e6ba2eeef572f5e8e64365f',
+  'field.node.body.article' => '78f3cfa393218e9d74a91caf681c6067d9a8ce6a',
+  'vocabulary.tags' => '36a9325f71dc343299f61677a58260d6ce8a8026',
+);
diff --git a/ui/configuration_ui.admin.inc b/ui/configuration_ui.admin.inc
index fe07bd8..cbc536e 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'),
@@ -569,3 +587,46 @@ function configuration_ui_validate_settings($form, &$form_state) {
     }
   }
 }
+
+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');
+    drupal_set_message(t('The following will be enabled: %modules', array('%modules' => implode(', ', $modules_to_install))));
+    if (!empty($modules_to_install)) {
+      module_enable($modules_to_install, FALSE);
+      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 = array_keys(ConfigurationManagement::trackedConfigurations(FALSE));
+
+    $to_untrack = array_diff($being_tracked, $to_track);
+
+    $un_track_results = ConfigurationManagement::stopTracking($to_untrack, 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)));
+  }
+}
diff --git a/ui/tests/configuration_ui.test b/ui/tests/configuration_ui.test
index f7d4842..c1e920f 100644
--- a/ui/tests/configuration_ui.test
+++ b/ui/tests/configuration_ui.test
@@ -219,5 +219,11 @@ class ConfigurationUISettingsTest extends ConfigurationUIWebTestCase {
     );
     $this->drupalPost('admin/config/system/configuration/settings', $edit, t('Save configuration'));
     $this->assertRaw(t('The directory %directory does not exist.', array('%directory' => $directory)));
+
+    $edit = array();
+    $this->drupalPost('admin/config/system/configuration/settings', $edit, t('Syncronize configurations'));
+
+    $this->assertRaw('The following modules have been enabled:', 'Modules enabled');
+    $this->assertRaw(t('Imported %config', array('%config' => 'content_type.article')));
   }
 }
