diff --git a/includes/admin.inc b/includes/admin.inc
index a768557..555910c 100644
--- a/includes/admin.inc
+++ b/includes/admin.inc
@@ -326,7 +326,7 @@ function views_ui_add_form($form, &$form_state) {
 
   // Create the "Show" dropdown, which allows the base table of the view to be
   // selected.
-  $wizard_plugins = views_ui_get_wizards();
+  $wizard_plugins = drupal_container()->get('plugin.manager.views.wizard')->getDefinitions();
   $options = array();
   foreach ($wizard_plugins as $key => $wizard) {
     $options[$key] = $wizard['title'];
@@ -653,7 +653,8 @@ function views_ui_nojs_submit($form, &$form_state) {
  * Validate the add view form.
  */
 function views_ui_wizard_form_validate($form, &$form_state) {
-  $wizard = views_ui_get_wizard($form_state['values']['show']['wizard_key']);
+  $wizard_type = $form_state['values']['show']['wizard_key'];
+  $wizard = drupal_container()->get('plugin.manager.views.wizard')->getDefinition($wizard_type);
   $form_state['wizard'] = $wizard;
   $form_state['wizard_instance'] = views_get_plugin('wizard', $wizard['id']);
   $errors = $form_state['wizard_instance']->validateView($form, $form_state);
diff --git a/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php b/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php
index b8f00a1..94f5848 100644
--- a/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php
@@ -303,7 +303,7 @@ public function buildOptionsForm(&$form, &$form_state) {
     );
 
     $validate_types = array('none' => t('- Basic validation -'));
-    $plugins = views_get_plugin_definitions('argument_validator');
+    $plugins = drupal_container()->get('plugin.manager.views.argument_validator')->getDefinitions();
     foreach ($plugins as $id => $info) {
       if (!empty($info['no_ui'])) {
         continue;
@@ -498,7 +498,7 @@ function default_actions($which = NULL) {
    * default action is set to provide default argument.
    */
   function default_argument_form(&$form, &$form_state) {
-    $plugins = views_get_plugin_definitions('argument_default');
+    $plugins = drupal_container()->get('plugin.manager.views.argument_default')->getDefinitions();
     $options = array();
 
     $form['default_argument_skip_url'] = array(
@@ -562,7 +562,7 @@ function default_argument_form(&$form, &$form_state) {
    * default action is set to display one.
    */
   function default_summary_form(&$form, &$form_state) {
-    $style_plugins = views_get_plugin_definitions('style');
+    $style_plugins = drupal_container()->get('plugin.manager.views.style')->getDefinitions();
     $summary_plugins = array();
     $format_options = array();
     foreach ($style_plugins as $key => $plugin) {
@@ -1083,7 +1083,7 @@ function get_plugin($type = 'argument_default', $name = NULL) {
       $options = $this->options[$options_name];
     }
 
-    $plugin = views_get_plugin($type, $name);
+    $plugin = drupal_container()->get("plugin.manager.views.$type")->createInstance($name);
     if ($plugin) {
       // Style plugins expects different parameters as argument related plugins.
       if ($type == 'style') {
diff --git a/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php b/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
index 03618c9..7b50445 100644
--- a/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
@@ -94,8 +94,9 @@ public function init(&$view, &$display, $options = NULL) {
     $this->extender = array();
     $extenders = views_get_enabled_display_extenders();
     if (!empty($extenders)) {
+      $container = drupal_container();
       foreach ($extenders as $extender) {
-        $plugin = views_get_plugin('display_extender', $extender);
+        $plugin = $container->get('plugin.manager.views.display_extender')->createInstance($extender);
         if ($plugin) {
           $plugin->init($this->view, $this);
           $this->extender[$extender] = $plugin;
@@ -789,13 +790,7 @@ public function getPlugin($type = 'style', $name = NULL) {
           }
       }
 
-      if ($type != 'query') {
-        $plugin = views_get_plugin($type, $name);
-      }
-      else {
-        $plugin = views_get_plugin('query', $name);
-      }
-
+      $plugin = drupal_container()->get("plugin.manager.views.$type")->createInstance($name);
       if (!$plugin) {
         return;
       }
@@ -1089,8 +1084,9 @@ public function optionsSummary(&$categories, &$options) {
       'desc' => t('Change the title that this display will use.'),
     );
 
+    $container = drupal_container();
     $name = $this->getOption('style_plugin');
-    $style_plugin = views_get_plugin_definition('style', $name);
+    $style_plugin = $container->get('plugin.manager.views.style')->getDefinition($name);
     $style_plugin_instance = $this->getPlugin('style', $name);
     $style_summary = empty($style_plugin['title']) ? t('Missing style plugin') : $style_plugin_instance->summaryTitle();
     $style_title = empty($style_plugin['title']) ? t('Missing style plugin') : $style_plugin_instance->pluginTitle();
@@ -1112,7 +1108,7 @@ public function optionsSummary(&$categories, &$options) {
 
     if ($style_plugin_instance->usesRowPlugin()) {
       $name = $this->getOption('row_plugin');
-      $row_plugin = views_get_plugin_definition('row', $name);
+      $row_plugin = $container->get('plugin.manager.views.row')->getDefinition($name);
       $row_plugin_instance = $this->getPlugin('row', $name);
       $row_summary = empty($row_plugin['title']) ? t('Missing style plugin') : $row_plugin_instance->summaryTitle();
       $row_title = empty($row_plugin['title']) ? t('Missing style plugin') : $row_plugin_instance->pluginTitle();
diff --git a/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php b/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
index 829fa0b..21c6438 100644
--- a/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
@@ -738,7 +738,7 @@ protected function default_display_filters_user($form, $form_state) {
       $table_data = views_fetch_data($table);
       // If the 'in' operator is being used, map the values to an array.
       $handler = $table_data[$bundle_key]['filter']['id'];
-      $handler_definition = views_get_plugin_definition('filter', $handler);
+      $handler_definition = drupal_container()->get('plugin.manager.views.filter')->getDefinition($handler);
       if ($handler == 'in_operator' || is_subclass_of($handler_definition['class'], 'Drupal\\views\\Plugin\\views\\filter\\InOperator')) {
         $value = drupal_map_assoc(array($form_state['values']['show']['type']));
       }
diff --git a/lib/Drupal/views/ViewStorage.php b/lib/Drupal/views/ViewStorage.php
index f2367df..6773f84 100644
--- a/lib/Drupal/views/ViewStorage.php
+++ b/lib/Drupal/views/ViewStorage.php
@@ -65,7 +65,7 @@ public function addDisplay($plugin_id = 'page', $title = NULL, $id = NULL) {
       return FALSE;
     }
 
-    $plugin = views_get_plugin_definition('display', $plugin_id);
+    $plugin = drupal_container()->get('plugin.manager.views.display')->getDefinition($plugin_id);
     if (empty($plugin)) {
       $plugin['title'] = t('Broken');
     }
diff --git a/lib/Views/system/Plugin/views/wizard/System.php b/lib/Views/system/Plugin/views/wizard/System.php
new file mode 100644
index 0000000..3c7b6bd
--- /dev/null
+++ b/lib/Views/system/Plugin/views/wizard/System.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * @file
+ * Definition of Views\system\Plugin\views\wizard\System.
+ */
+
+namespace Views\system\Plugin\views\wizard;
+
+use Drupal\views\Plugin\views\wizard\WizardPluginBase;
+use Drupal\Core\Annotation\Plugin;
+use Drupal\Core\Annotation\Translation;
+
+/**
+ * Provides a very generic Wizard that can be constructed for any base table.
+ *
+ * @Plugin(
+ *   id = "system",
+ *   base_table = "system",
+ *   title = @Translation("Module/Theme/Theme engine"),
+ *   description = @Translation("Modules/Themes/Theme engines in your codebase.")
+ * )
+ */
+class System extends WizardPluginBase {
+
+}
diff --git a/views.module b/views.module
index fb49705..e557a3f 100644
--- a/views.module
+++ b/views.module
@@ -905,7 +905,8 @@ function views_add_contextual_links(&$render_element, $location, $view, $display
     // Also do not do anything if the display plugin has not defined any
     // contextual links that are intended to be displayed in the requested
     // location.
-    $plugin = views_get_plugin_definition('display', $view->display[$display_id]->display_plugin);
+    $plugin_id = $view->display[$display_id]->display_plugin;
+    $plugin = drupal_container()->get('plugin.manager.views.display')->getDefinition($plugin_id);
     // If contextual_links_locations are not set, provide a sane default. (To
     // avoid displaying any contextual links at all, a display plugin can still
     // set 'contextual_links_locations' to, e.g., {""}.)
@@ -1255,6 +1256,7 @@ function views_include_handlers($reset = FALSE) {
  */
 function views_get_handler($table, $field, $type, $override = NULL) {
   static $recursion_protection = array();
+  $manager = drupal_container()->get("plugin.manager.views.$type");
 
   $data = views_fetch_data($table, FALSE);
   $handler = NULL;
@@ -1323,7 +1325,6 @@ function views_get_handler($table, $field, $type, $override = NULL) {
     }
 
     // @todo This is crazy. Find a way to remove the override functionality.
-    $manager = drupal_container()->get("plugin.manager.views.$type");
     $plugin_id = !empty($definition['override handler']) ? $definition['override handler'] : $definition['id'];
     // Try to use the overridden handler.
     try {
@@ -1342,7 +1343,7 @@ function views_get_handler($table, $field, $type, $override = NULL) {
 
   // Finally, use the 'broken' handler.
   debug(t("Missing handler: @table @field @type", array('@table' => $table, '@field' => $field, '@type' => $type)));
-  return views_get_plugin($type, 'broken');
+  return $manager->createInstance('broken');
 }
 
 /**
@@ -1371,7 +1372,7 @@ function views_fetch_data($table = NULL, $move = TRUE, $reset = FALSE) {
  *   A keyed array of in the form of 'base_table' => 'Description'.
  */
 function views_fetch_plugin_names($type, $key = NULL, $base = array()) {
-  $definitions = views_get_plugin_definitions($type);
+  $definitions = drupal_container()->get("plugin.manager.views.$type")->getDefinitions();
   $plugins = array();
 
   foreach ($definitions as $id => $plugin) {
@@ -1424,35 +1425,17 @@ function views_get_plugin($type, $plugin_id) {
  *   An array of plugin definitions for a single type, or an associative array
  *   of plugin definitions keyed by plugin type.
  */
-function views_get_plugin_definitions($type = FALSE) {
-  $plugins = array();
-  $plugin_types = $type ? array($type) : View::getPluginTypes();
+function views_get_plugin_definitions() {
   $container = drupal_container();
-  foreach ($plugin_types as $plugin_type) {
+
+  $plugins = array();
+  foreach (View::getPluginTypes() as $plugin_type) {
     $plugins[$plugin_type] = $container->get("plugin.manager.views.$plugin_type")->getDefinitions();
   }
-  if ($type) {
-    return $plugins[$type];
-  }
   return $plugins;
 }
 
 /**
- * Gets the plugin definition from a plugin type with a specific ID.
- *
- * @param string $type
- *   The plugin type, e.g., 'access' or 'display'.
- * @param string $plugin_id
- *   The name of the plugin, e.g., 'standard'.
- *
- * @return array
- *   A plugin definition.
- */
-function views_get_plugin_definition($type, $plugin_id) {
-  return drupal_container()->get("plugin.manager.views.$type")->getDefinition($plugin_id);
-}
-
-/**
  * Get enabled display extenders.
  */
 function views_get_enabled_display_extenders() {
@@ -1533,8 +1516,9 @@ function views_get_applicable_views($type) {
 
     // Loop on array keys because something seems to muck with $view->display
     // a bit in PHP4.
+    $manager = drupal_container()->get('plugin.manager.views.display');
     foreach (array_keys($view->display) as $id) {
-      $plugin = views_get_plugin_definition('display', $view->display[$id]->display_plugin);
+      $plugin = $manager->getDefinition($view->display[$id]->display_plugin);
       if (!empty($plugin[$type])) {
         // This view uses_hook_menu. Clone it so that different handlers
         // don't trip over each other, and add it to the list.
diff --git a/views_ui.module b/views_ui.module
index dc8246c..5fbd72d 100644
--- a/views_ui.module
+++ b/views_ui.module
@@ -521,57 +521,6 @@ function views_ui_view_preview_section_rows_links($view) {
 }
 
 /**
- * Fetch metadata on a specific views ui wizard plugin.
- *
- * @param $wizard_type
- *   Name of a wizard, or name of a base table.
- *
- * @return
- *   An array with information about the requested wizard type.
- */
-function views_ui_get_wizard($wizard_type) {
-  $wizard = views_get_plugin_definition('wizard', $wizard_type);
-  // @todo - handle this via an alter hook instead.
-  if (!$wizard) {
-    // Must be a base table using the default wizard plugin.
-    $base_tables = views_fetch_base_tables();
-    if (!empty($base_tables[$wizard_type])) {
-      $wizard = views_ui_views_wizard_defaults();
-      $wizard['base_table'] = $wizard_type;
-      $wizard['title'] = $base_tables[$wizard_type]['title'];
-    }
-  }
-  return $wizard;
-}
-
-/**
- * Fetch metadata for all content_type plugins.
- *
- * @return
- *   An array of arrays with information about all available views wizards.
- */
-function views_ui_get_wizards() {
-  $wizard_plugins = views_get_plugin_definitions('wizard');
-  $wizard_tables = array();
-  foreach ($wizard_plugins as $name => $info) {
-    $wizard_tables[$info['base_table']] = TRUE;
-  }
-  $base_tables = views_fetch_base_tables();
-  $default_wizard = views_ui_views_wizard_defaults();
-  // Find base tables with no wizard.
-  // @todo - handle this via an alter hook for plugins?
-  foreach ($base_tables as $table => $info) {
-    if (!isset($wizard_tables[$table])) {
-      $wizard = $default_wizard;
-      $wizard['title'] = $info['title'];
-      $wizard['base_table'] = $table;
-      $wizard_plugins[$table] = $wizard;
-    }
-  }
-  return $wizard_plugins;
-}
-
-/**
  * Helper function to define the default values for a Views wizard plugin.
  *
  * @return