diff --git a/includes/admin.inc b/includes/admin.inc
index a69cb08..4ca2286 100644
--- a/includes/admin.inc
+++ b/includes/admin.inc
@@ -311,7 +311,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);
@@ -2867,45 +2868,6 @@ function views_ui_autocomplete_tag($string = '') {
 // ------------------------------------------------------------------
 // Get information from the Views data
 
-function _views_weight_sort($a, $b) {
-  if ($a['weight'] != $b['weight']) {
-    return $a['weight'] < $b['weight'] ? -1 : 1;
-  }
-  if ($a['title'] != $b['title']) {
-    return $a['title'] < $b['title'] ? -1 : 1;
-  }
-
-  return 0;
-}
-
-/**
- * Fetch a list of all base tables available
- *
- * @return
- *   A keyed array of in the form of 'base_table' => 'Description'.
- */
-function views_fetch_base_tables() {
-  static $base_tables = array();
-  if (empty($base_tables)) {
-    $weights = array();
-    $tables = array();
-    $data = views_fetch_data();
-    foreach ($data as $table => $info) {
-      if (!empty($info['table']['base'])) {
-        $tables[$table] = array(
-          'title' => $info['table']['base']['title'],
-          'description' => !empty($info['table']['base']['help']) ? $info['table']['base']['help'] : '',
-          'weight' => !empty($info['table']['base']['weight']) ? $info['table']['base']['weight'] : 0,
-        );
-      }
-    }
-    uasort($tables, '_views_weight_sort');
-    $base_tables = $tables;
-  }
-
-  return $base_tables;
-}
-
 function _views_sort_types($a, $b) {
   $a_group = drupal_strtolower($a['group']);
   $b_group = drupal_strtolower($b['group']);
diff --git a/lib/Drupal/views/Plugin/Type/DefaultWizardDerivative.php b/lib/Drupal/views/Plugin/Type/DefaultWizardDerivative.php
new file mode 100644
index 0000000..b683d8d
--- /dev/null
+++ b/lib/Drupal/views/Plugin/Type/DefaultWizardDerivative.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * @file
+ * Definition of Drupal\views\Plugin\Type\DefaultWizardDerivative.
+ */
+
+namespace Drupal\views\Plugin\Type;
+
+use Drupal\Component\Plugin\Derivative\DerivativeInterface;
+
+/**
+ * A derivative class which provides automatic wizards for all base tables.
+ */
+class DefaultWizardDerivative implements DerivativeInterface {
+  /**
+   * Stores all base table plugin information.
+   *
+   * @var array
+   */
+  protected $derivatives = array();
+
+  /**
+   * Implements Drupal\Component\Plugin\Derivative\DerivativeInterface::getDerivativeDefinition().
+   */
+  public function getDerivativeDefinition($derivative_id, array $base_plugin_definition) {
+    if (!empty($this->derivatives) && !empty($this->derivatives[$derivative_id])) {
+      return $this->derivatives[$derivative_id];
+    }
+    $this->getDerivativeDefinitions($base_plugin_definition);
+    return $this->derivatives[$derivative_id];
+  }
+
+  /**
+   * Implements Drupal\Component\Plugin\Derivative\DerivativeInterface::getDerivativeDefinitions().
+   */
+  public function getDerivativeDefinitions(array $base_plugin_definition) {
+    $base_tables = array_keys(views_fetch_base_tables());
+    $this->derivatives = array();
+    foreach ($base_tables as $table) {
+      $views_info = views_fetch_data($table);
+      if (empty($views_info['table']['wizard_id'])) {
+        $this->derivatives[$table] = array(
+          'id' => 'standard',
+          'base_table' => $table,
+          'title' => $views_info['table']['base']['title'],
+          'class' => 'Drupal\views\Plugin\views\wizard\Standard'
+        );
+      }
+    }
+    return $this->derivatives;
+
+  }
+
+}
diff --git a/lib/Drupal/views/Plugin/Type/WizardManager.php b/lib/Drupal/views/Plugin/Type/WizardManager.php
index 336c171..e77b399 100644
--- a/lib/Drupal/views/Plugin/Type/WizardManager.php
+++ b/lib/Drupal/views/Plugin/Type/WizardManager.php
@@ -8,6 +8,7 @@
 namespace Drupal\views\Plugin\Type;
 
 use Drupal\Component\Plugin\PluginManagerBase;
+use Drupal\Component\Plugin\Discovery\DerivativeDiscoveryDecorator;
 use Drupal\Component\Plugin\Factory\DefaultFactory;
 use Drupal\Core\Plugin\Discovery\AnnotatedClassDiscovery;
 use Drupal\Core\Plugin\Discovery\CacheDecorator;
@@ -28,7 +29,8 @@ class WizardManager extends PluginManagerBase {
     // @todo Remove this hack in http://drupal.org/node/1708404.
     views_init();
 
-    $this->discovery = new CacheDecorator(new AnnotatedClassDiscovery('views', 'wizard'), 'views:wizard', 'views_info');
+    $this->discovery = new CacheDecorator(new DerivativeDiscoveryDecorator(new AnnotatedClassDiscovery('views', 'wizard')), 'views:wizard', 'views_info');
+
     $this->factory = new DefaultFactory($this);
 
     $this->coreModules = views_core_modules();
diff --git a/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php b/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php
index 2d56925..f6d975f 100644
--- a/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php
@@ -301,7 +301,7 @@ abstract class ArgumentPluginBase extends HandlerBase {
       ),
     );
 
-    $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;
@@ -496,7 +496,7 @@ abstract class ArgumentPluginBase extends HandlerBase {
    * 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(
@@ -560,7 +560,7 @@ abstract class ArgumentPluginBase extends HandlerBase {
    * 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) {
@@ -1053,7 +1053,7 @@ abstract class ArgumentPluginBase extends HandlerBase {
       $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 a92c583..743e162 100644
--- a/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
@@ -94,8 +94,9 @@ abstract class DisplayPluginBase extends PluginBase {
     $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;
@@ -756,13 +757,7 @@ abstract class DisplayPluginBase extends PluginBase {
           $options = $options['options'];
       }
 
-      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;
       }
@@ -1056,9 +1051,10 @@ abstract class DisplayPluginBase extends PluginBase {
       'desc' => t('Change the title that this display will use.'),
     );
 
+    $container = drupal_container();
     $style_options = $this->getOption('style');
     $name = $style_options['type'];
-    $style_plugin = views_get_plugin_definition('style', $name);
+    $style_plugin = $container->get('plugin.manager.views.style')->getDefinition($name);
     $style_plugin_instance = $this->getPlugin('style');
     $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();
@@ -1081,7 +1077,7 @@ abstract class DisplayPluginBase extends PluginBase {
     if ($style_plugin_instance->usesRowPlugin()) {
       $row_options = $this->getOption('row');
       $name = $row_options['type'];
-      $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/Standard.php b/lib/Drupal/views/Plugin/views/wizard/Standard.php
new file mode 100644
index 0000000..ff9c1fe
--- /dev/null
+++ b/lib/Drupal/views/Plugin/views/wizard/Standard.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * @file
+ * Definition of Drupal\views\Plugin\views\wizard\Standard.
+ */
+
+namespace Drupal\views\Plugin\views\wizard;
+
+use Drupal\Core\Annotation\Plugin;
+
+/**
+ * @Plugin(
+ *   id = "standard",
+ *   derivative = "Drupal\views\Plugin\Type\DefaultWizardDerivative"
+ * )
+ */
+class Standard extends WizardPluginBase {
+
+}
diff --git a/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php b/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
index 990a40c..660c90c 100644
--- a/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
@@ -760,7 +760,7 @@ abstract class WizardPluginBase extends PluginBase implements WizardInterface {
       $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 439880c..bccf8d5 100644
--- a/lib/Drupal/views/ViewStorage.php
+++ b/lib/Drupal/views/ViewStorage.php
@@ -259,7 +259,7 @@ class ViewStorage extends ConfigEntityBase implements ViewStorageInterface {
       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/Drupal/views/ViewUI.php b/lib/Drupal/views/ViewUI.php
index 5c7e344..8b30b64 100644
--- a/lib/Drupal/views/ViewUI.php
+++ b/lib/Drupal/views/ViewUI.php
@@ -1203,7 +1203,7 @@ class ViewUI extends ViewExecutable {
 
     // 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'];
diff --git a/modules/comment.views.inc b/modules/comment.views.inc
index acf1d63..16c37d2 100644
--- a/modules/comment.views.inc
+++ b/modules/comment.views.inc
@@ -22,6 +22,7 @@ function comment_views_data() {
     'access query tag' => 'comment_access',
   );
   $data['comment']['table']['entity type'] = 'comment';
+  $data['comment']['table']['wizard_id'] = 'comment';
 
   // Fields
 
diff --git a/modules/file.views.inc b/modules/file.views.inc
index 2871043..ba8b2a5 100644
--- a/modules/file.views.inc
+++ b/modules/file.views.inc
@@ -28,6 +28,7 @@ function file_views_data() {
     ),
   );
   $data['file_managed']['table']['entity type'] = 'file';
+  $data['file_managed']['table']['wizard_id'] = 'file_managed';
 
   // fid
   $data['file_managed']['fid'] = array(
diff --git a/modules/node.views.inc b/modules/node.views.inc
index 8ac6fd6..f5b64f2 100644
--- a/modules/node.views.inc
+++ b/modules/node.views.inc
@@ -31,6 +31,7 @@ function node_views_data() {
     ),
   );
   $data['node']['table']['entity type'] = 'node';
+  $data['node']['table']['wizard_id'] = 'node';
 
   // node table -- fields
 
@@ -425,6 +426,8 @@ function node_views_data() {
   // have a group defined will go into this field by default.
   $data['node_revision']['table']['entity type'] = 'node';
   $data['node_revision']['table']['group']  = t('Content revision');
+  $data['node_revision']['table']['wizard_id'] = 'node_revision';
+
 
   // Advertise this table as a possible base table
   $data['node_revision']['table']['base'] = array(
diff --git a/modules/taxonomy.views.inc b/modules/taxonomy.views.inc
index 1779bf0..3f8f7be 100644
--- a/modules/taxonomy.views.inc
+++ b/modules/taxonomy.views.inc
@@ -107,6 +107,8 @@ function taxonomy_views_data() {
     'access query tag' => 'term_access',
   );
   $data['taxonomy_term_data']['table']['entity type'] = 'taxonomy_term';
+  $data['taxonomy_term_data']['table']['wizard_id'] = 'taxonomy_term';
+
 
   // The term data table
   $data['taxonomy_term_data']['table']['join'] = array(
diff --git a/modules/user.views.inc b/modules/user.views.inc
index 6879370..7626351 100644
--- a/modules/user.views.inc
+++ b/modules/user.views.inc
@@ -25,6 +25,7 @@ function user_views_data() {
     'access query tag' => 'user_access',
   );
   $data['users']['table']['entity type'] = 'user';
+  $data['users']['table']['wizard_id'] = 'user';
 
   // uid
   $data['users']['uid'] = array(
diff --git a/views.module b/views.module
index 52b7674..8341515 100644
--- a/views.module
+++ b/views.module
@@ -901,7 +901,8 @@ function views_add_contextual_links(&$render_element, $location, ViewExecutable
     // 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->displayHandlers[$display_id]->display['display_plugin']);
+    $plugin_id = $view->displayHandlers[$display_id]->getPluginId();
+    $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., {""}.)
@@ -1274,6 +1275,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;
@@ -1339,7 +1341,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 {
@@ -1358,7 +1359,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');
 }
 
 /**
@@ -1369,6 +1370,45 @@ function views_fetch_data($table = NULL, $move = TRUE, $reset = FALSE) {
   return _views_fetch_data($table, $move, $reset);
 }
 
+/**
+ * Fetch a list of all base tables available
+ *
+ * @return array
+ *   A keyed array of in the form of 'base_table' => 'Description'.
+ */
+function views_fetch_base_tables() {
+  static $base_tables = array();
+  if (empty($base_tables)) {
+    $weights = array();
+    $tables = array();
+    $data = views_fetch_data();
+    foreach ($data as $table => $info) {
+      if (!empty($info['table']['base'])) {
+        $tables[$table] = array(
+          'title' => $info['table']['base']['title'],
+          'description' => !empty($info['table']['base']['help']) ? $info['table']['base']['help'] : '',
+          'weight' => !empty($info['table']['base']['weight']) ? $info['table']['base']['weight'] : 0,
+        );
+      }
+    }
+    uasort($tables, '_views_weight_sort');
+    $base_tables = $tables;
+  }
+
+  return $base_tables;
+}
+
+function _views_weight_sort($a, $b) {
+  if ($a['weight'] != $b['weight']) {
+    return $a['weight'] < $b['weight'] ? -1 : 1;
+  }
+  if ($a['title'] != $b['title']) {
+    return $a['title'] < $b['title'] ? -1 : 1;
+  }
+
+  return 0;
+}
+
 // -----------------------------------------------------------------------
 // Views plugin functions
 
@@ -1387,7 +1427,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) {
@@ -1433,23 +1473,16 @@ function views_get_plugin($type, $plugin_id) {
 /**
  * Gets all the views plugin definitions.
  *
- * @param string|false $type
- *   Either the plugin type, or FALSE to load all definitions.
- *
  * @return array
- *   An array of plugin definitions for a single type, or an associative array
- *   of plugin definitions keyed by plugin type.
+ *   An array of plugin definitions for all types.
  */
-function views_get_plugin_definitions($type = FALSE) {
-  $plugins = array();
-  $plugin_types = $type ? array($type) : ViewExecutable::getPluginTypes();
+function views_get_plugin_definitions() {
   $container = drupal_container();
-  foreach ($plugin_types as $plugin_type) {
+  $plugins = array();
+  foreach (ViewExecutable::getPluginTypes() as $plugin_type) {
     $plugins[$plugin_type] = $container->get("plugin.manager.views.$plugin_type")->getDefinitions();
   }
-  if ($type) {
-    return $plugins[$type];
-  }
+
   return $plugins;
 }
 
diff --git a/views_ui.module b/views_ui.module
index d35e538..d9d1b1f 100644
--- a/views_ui.module
+++ b/views_ui.module
@@ -533,75 +533,6 @@ function views_ui_view_preview_section_rows_links(ViewUI $view) {
   return $links;
 }
 
-/**
- * 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
- *   An array of defaults for a views wizard.
- */
-function views_ui_views_wizard_defaults() {
-  return array(
-    // The children may, for example, be a different variant for each node type.
-    'get children' => NULL,
-    'get child' => NULL,
-    // title and base table must be populated.  They are empty here just
-    // so they are documented.
-    'title' => '',
-    'base_table' => NULL,
-  );
-}
-
 function views_ui_get_form_wizard_instance($wizard) {
   return views_get_plugin('wizard', $wizard['name']);
 }