diff --git a/core/modules/field/migration_templates/d7_field_instance.yml b/core/modules/field/migration_templates/d7_field_instance.yml
index f3518c9..03e77cd 100644
--- a/core/modules/field/migration_templates/d7_field_instance.yml
+++ b/core/modules/field/migration_templates/d7_field_instance.yml
@@ -19,15 +19,15 @@ process:
   settings:
     plugin: d7_field_instance_settings
     source:
-      - instance_settings
-      - widget_settings
-      - field_settings
+      - settings
+      - widget
+      - field_definition
   default_value_function: ''
   default_value:
     plugin: d7_field_instance_defaults
     source:
       - default_value
-      - widget_settings
+      - widget
   translatable: translatable
 destination:
   plugin: entity:field_config
diff --git a/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml b/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml
index e2bbcf4..85a67cb 100644
--- a/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml
+++ b/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml
@@ -52,7 +52,7 @@ process:
     plugin: field_instance_widget_settings
     source:
       - 'widget/type'
-      - widget_settings
+      - 'widget/settings'
   'options/third_party_settings': 'constants/third_party_settings'
 destination:
   plugin: component_entity_form_display
diff --git a/core/modules/field/src/Plugin/migrate/process/d7/FieldInstanceDefaults.php b/core/modules/field/src/Plugin/migrate/process/d7/FieldInstanceDefaults.php
index 2a46381..a6707bd 100644
--- a/core/modules/field/src/Plugin/migrate/process/d7/FieldInstanceDefaults.php
+++ b/core/modules/field/src/Plugin/migrate/process/d7/FieldInstanceDefaults.php
@@ -19,6 +19,11 @@ class FieldInstanceDefaults extends ProcessPluginBase {
   public function transform($value, MigrateExecutableInterface $migrate_executable, Row $row, $destination_property) {
     list($default_value, $widget_settings) = $value;
     $widget_type = $widget_settings['type'];
+    $default_value = $default_value ?: [];
+    if ($widget_type == 'email_textfield' && $default_value) {
+      $default_value[0]['value'] = $default_value[0]['email'];
+      unset($default_value[0]['email']);
+    }
 
     $default = [];
 
diff --git a/core/modules/field/src/Plugin/migrate/process/d7/FieldInstanceSettings.php b/core/modules/field/src/Plugin/migrate/process/d7/FieldInstanceSettings.php
index 70a9498..991ce09c 100644
--- a/core/modules/field/src/Plugin/migrate/process/d7/FieldInstanceSettings.php
+++ b/core/modules/field/src/Plugin/migrate/process/d7/FieldInstanceSettings.php
@@ -17,9 +17,12 @@ class FieldInstanceSettings extends ProcessPluginBase {
    * {@inheritdoc}
    */
   public function transform($value, MigrateExecutableInterface $migrate_executable, Row $row, $destination_property) {
-    list($instance_settings, $widget_settings, $field_settings) = $value;
+    list($instance_settings, $widget_settings, $field_definition) = $value;
     $widget_type = $widget_settings['type'];
 
+    $field_data = unserialize($field_definition['data']);
+    $field_settings = $field_data['settings'];
+
     // Get entityreference handler settings from source field configuration.
     if ($row->getSourceProperty('type') == "entityreference") {
       $instance_settings['handler'] = 'default:' . $field_settings['target_type'];
diff --git a/core/modules/field/src/Plugin/migrate/source/d7/FieldInstance.php b/core/modules/field/src/Plugin/migrate/source/d7/FieldInstance.php
index d06336e..a5fb4d4 100644
--- a/core/modules/field/src/Plugin/migrate/source/d7/FieldInstance.php
+++ b/core/modules/field/src/Plugin/migrate/source/d7/FieldInstance.php
@@ -21,14 +21,12 @@ class FieldInstance extends DrupalSqlBase {
   public function query() {
     $query = $this->select('field_config_instance', 'fci')
       ->fields('fci')
-      ->condition('fci.deleted', 0)
+      ->fields('fc', ['type'])
       ->condition('fc.active', 1)
-      ->condition('fc.deleted', 0)
       ->condition('fc.storage_active', 1)
-      ->fields('fc', ['type']);
-
-    $query->innerJoin('field_config', 'fc', 'fci.field_id = fc.id');
-    $query->addField('fc', 'data', 'field_data');
+      ->condition('fc.deleted', 0)
+      ->condition('fci.deleted', 0);
+    $query->join('field_config', 'fc', 'fci.field_id = fc.id');
 
     // Optionally filter by entity type and bundle.
     if (isset($this->configuration['entity_type'])) {
@@ -47,14 +45,14 @@ public function query() {
    */
   public function fields() {
     return [
-      'field_name' => $this->t('The machine name of field.'),
+      'id' => $this->t('The field instance ID.'),
+      'field_id' => $this->t('The field ID.'),
+      'field_name' => $this->t('The field name.'),
       'entity_type' => $this->t('The entity type.'),
       'bundle' => $this->t('The entity bundle.'),
-      'default_value' => $this->t('Default value'),
-      'instance_settings' => $this->t('Field instance settings.'),
-      'widget_settings' => $this->t('Widget settings.'),
-      'display_settings' => $this->t('Display settings.'),
-      'field_settings' => $this->t('Field settings.'),
+      'data' => $this->t('The field instance data.'),
+      'deleted' => $this->t('Deleted'),
+      'field_definition' => $this->t('The field definition.'),
     ];
   }
 
@@ -62,29 +60,16 @@ public function fields() {
    * {@inheritdoc}
    */
   public function prepareRow(Row $row) {
-    $data = unserialize($row->getSourceProperty('data'));
-
-    $row->setSourceProperty('label', $data['label']);
-    $row->setSourceProperty('description', $data['description']);
-    $row->setSourceProperty('required', $data['required']);
-
-    $default_value = !empty($data['default_value']) ? $data['default_value'] : [];
-    if ($data['widget']['type'] == 'email_textfield' && $default_value) {
-      $default_value[0]['value'] = $default_value[0]['email'];
-      unset($default_value[0]['email']);
+    foreach (unserialize($row->getSourceProperty('data')) as $key => $value) {
+      $row->setSourceProperty($key, $value);
     }
-    $row->setSourceProperty('default_value', $default_value);
-
-    // Settings.
-    $row->setSourceProperty('instance_settings', $data['settings']);
-    $row->setSourceProperty('widget_settings', $data['widget']);
-    $row->setSourceProperty('display_settings', $data['display']);
-
-    // This is for parity with the d6_field_instance plugin.
-    $row->setSourceProperty('widget_type', $data['widget']['type']);
 
-    $field_data = unserialize($row->getSourceProperty('field_data'));
-    $row->setSourceProperty('field_settings', $field_data['settings']);
+    $field_definition = $this->select('field_config', 'fc')
+      ->fields('fc')
+      ->condition('id', $row->getSourceProperty('field_id'))
+      ->execute()
+      ->fetch();
+    $row->setSourceProperty('field_definition', $field_definition);
 
     $translatable = FALSE;
     if ($row->getSourceProperty('entity_type') == 'node') {
@@ -100,8 +85,8 @@ public function prepareRow(Row $row) {
     else {
       // This is not a node entity. Get the translatable value from the source
       // field_config table.
-      $data = unserialize($row->getSourceProperty('field_data'));
-      $translatable = $data['translatable'];
+      $field_data = unserialize($field_definition['data']);
+      $translatable = $field_data['translatable'];
     }
     $row->setSourceProperty('translatable', $translatable);
 
diff --git a/core/modules/field/tests/src/Kernel/Plugin/migrate/source/d7/FieldInstanceTest.php b/core/modules/field/tests/src/Kernel/Plugin/migrate/source/d7/FieldInstanceTest.php
index c9e93ef..e08f0b0 100644
--- a/core/modules/field/tests/src/Kernel/Plugin/migrate/source/d7/FieldInstanceTest.php
+++ b/core/modules/field/tests/src/Kernel/Plugin/migrate/source/d7/FieldInstanceTest.php
@@ -61,20 +61,29 @@ public function providerSource() {
     // The expected results.
     $tests[0]['expected_data'] = [
       [
+        'id' => '2',
+        'field_id' => '2',
         'field_name' => 'body',
         'entity_type' => 'node',
         'bundle' => 'page',
+        'data' => 'a:6:{s:5:"label";s:4:"Body";s:6:"widget";a:4:{s:4:"type";s:26:"text_textarea_with_summary";s:8:"settings";a:2:{s:4:"rows";i:20;s:12:"summary_rows";i:5;}s:6:"weight";i:-4;s:6:"module";s:4:"text";}s:8:"settings";a:3:{s:15:"display_summary";b:1;s:15:"text_processing";i:1;s:18:"user_register_form";b:0;}s:7:"display";a:2:{s:7:"default";a:5:{s:5:"label";s:6:"hidden";s:4:"type";s:12:"text_default";s:8:"settings";a:0:{}s:6:"module";s:4:"text";s:6:"weight";i:0;}s:6:"teaser";a:5:{s:5:"label";s:6:"hidden";s:4:"type";s:23:"text_summary_or_trimmed";s:8:"settings";a:1:{s:11:"trim_length";i:600;}s:6:"module";s:4:"text";s:6:"weight";i:0;}}s:8:"required";b:0;s:11:"description";s:0:"";}',
+        'deleted' => '0',
         'label' => 'Body',
-        'widget_settings' => [
-          'module' => 'text',
+        'widget' => [
+          'type' => 'text_textarea_with_summary',
           'settings' => [
             'rows' => 20,
             'summary_rows' => 5,
           ],
-          'type' => 'text_textarea_with_summary',
           'weight' => -4,
+          'module' => 'text',
+        ],
+        'settings' => [
+          'display_summary' => TRUE,
+          'text_processing' => '1',
+          'user_register_form' => FALSE,
         ],
-        'display_settings' => [
+        'display' => [
           'default' => [
             'label' => 'hidden',
             'type' => 'text_default',
@@ -92,9 +101,23 @@ public function providerSource() {
             'weight' => 0,
           ],
         ],
-        'description' => '',
         'required' => FALSE,
-        'field_data' => 'a:6:{s:12:"entity_types";a:1:{i:0;s:4:"node";}s:12:"translatable";b:0;s:8:"settings";a:0:{}s:7:"storage";a:4:{s:4:"type";s:17:"field_sql_storage";s:8:"settings";a:0:{}s:6:"module";s:17:"field_sql_storage";s:6:"active";i:1;}s:12:"foreign keys";a:1:{s:6:"format";a:2:{s:5:"table";s:13:"filter_format";s:7:"columns";a:1:{s:6:"format";s:6:"format";}}}s:7:"indexes";a:1:{s:6:"format";a:1:{i:0;s:6:"format";}}}',
+        'description' => '',
+        'field_definition' => [
+          'id' => '2',
+          'field_name' => 'body',
+          'type' => 'text_with_summary',
+          'module' => 'text',
+          'active' => '1',
+          'storage_type' => 'field_sql_storage',
+          'storage_module' => 'field_sql_storage',
+          'storage_active' => '1',
+          'locked' => '0',
+          'data' => 'a:6:{s:12:"entity_types";a:1:{i:0;s:4:"node";}s:12:"translatable";b:0;s:8:"settings";a:0:{}s:7:"storage";a:4:{s:4:"type";s:17:"field_sql_storage";s:8:"settings";a:0:{}s:6:"module";s:17:"field_sql_storage";s:6:"active";i:1;}s:12:"foreign keys";a:1:{s:6:"format";a:2:{s:5:"table";s:13:"filter_format";s:7:"columns";a:1:{s:6:"format";s:6:"format";}}}s:7:"indexes";a:1:{s:6:"format";a:1:{i:0;s:6:"format";}}}',
+          'cardinality' => '1',
+          'translatable' => '0',
+          'deleted' => '0',
+        ],
       ],
     ];
 
diff --git a/core/modules/link/src/Plugin/migrate/field/d7/LinkField.php b/core/modules/link/src/Plugin/migrate/field/d7/LinkField.php
index 4e78ee5..bb71418 100644
--- a/core/modules/link/src/Plugin/migrate/field/d7/LinkField.php
+++ b/core/modules/link/src/Plugin/migrate/field/d7/LinkField.php
@@ -34,7 +34,7 @@ public function getFieldWidgetMap() {
   public function processFieldInstance(MigrationInterface $migration) {
     $process = [
       'plugin' => 'static_map',
-      'source' => 'instance_settings/title',
+      'source' => 'settings/title',
       'bypass' => TRUE,
       'map' => [
         'disabled' => DRUPAL_DISABLED,
diff --git a/core/modules/text/src/Plugin/migrate/cckfield/TextField.php b/core/modules/text/src/Plugin/migrate/cckfield/TextField.php
index 1d18b30..99619bb 100644
--- a/core/modules/text/src/Plugin/migrate/cckfield/TextField.php
+++ b/core/modules/text/src/Plugin/migrate/cckfield/TextField.php
@@ -43,7 +43,9 @@ public function getFieldFormatterMap() {
    * {@inheritdoc}
    */
   public function processCckFieldValues(MigrationInterface $migration, $field_name, $field_info) {
-    if ($field_info['widget_type'] == 'optionwidgets_onoff') {
+    $widget_type = isset($field_info['widget_type']) ? $field_info['widget_type'] : $field_info['widget']['type'];
+
+    if ($widget_type == 'optionwidgets_onoff') {
       $process = [
         'value' => [
           'plugin' => 'static_map',