diff --git a/core/modules/views/config/schema/views.argument_validator.schema.yml b/core/modules/views/config/schema/views.argument_validator.schema.yml
index 3fb0550..5bf1a2d 100644
--- a/core/modules/views/config/schema/views.argument_validator.schema.yml
+++ b/core/modules/views/config/schema/views.argument_validator.schema.yml
@@ -1,8 +1,10 @@
 # Schema for the views argument validators.
 
 views.argument_validator.none:
-  type: boolean
+  type: sequence
   label: 'Basic validation'
+  sequence:
+    - type: string
 
 views.argument_validator.php:
   type: mapping
diff --git a/core/modules/views/config/schema/views.data_types.schema.yml b/core/modules/views/config/schema/views.data_types.schema.yml
index b392e77..f8a2770 100644
--- a/core/modules/views/config/schema/views.data_types.schema.yml
+++ b/core/modules/views/config/schema/views.data_types.schema.yml
@@ -85,14 +85,10 @@ views_display:
       label: 'Query'
       mapping:
         type:
+          type: string
           label: 'Query type'
         options:
-          type: mapping
-          label: 'Query options'
-          mapping:
-            query_comment:
-              type: boolean
-              label: 'Query comment'
+          type: views.query.[%parent.type]
     defaults:
       type: mapping
       label: 'Defaults'
@@ -591,7 +587,7 @@ views_filter:
       type: string
       label: 'Operator'
     value:
-      type: views.filter.[plugin_id]
+      type: views.filter_value.[plugin_id]
       label: 'Value'
     group:
       type: string
@@ -692,3 +688,54 @@ views_filter:
           sequence:
             - type: string
               label: 'Operator'
+
+views_relationship:
+  type: mapping
+  mapping:
+    id:
+      type: string
+      label: 'ID'
+    table:
+      type: string
+      label: 'Table'
+    field:
+      type: string
+      label: 'UID'
+    plugin_id:
+      type: string
+      label: 'Plugin ID'
+    relationship:
+      type: string
+      label: 'Relationship'
+    group_type:
+      type: string
+      label: 'Group type'
+    admin_label:
+      type: string
+      label: 'Administrative title'
+    required:
+      type: boolean
+      label: 'Require this relationship'
+
+views_query:
+  type: mapping
+  label: 'Query options'
+  mapping:
+    query_comment:
+      type: boolean
+      label: 'Query comment'
+    disable_sql_rewrite:
+      type: boolean
+      label: 'Disable SQL rewriting'
+    distinct:
+      type: boolean
+      label: 'Distinct'
+    slave:
+      type: boolean
+      label: 'Use Slave Server'
+    query_tags:
+      type: sequence
+      label: 'Query Tags'
+      sequence:
+        - type: string
+          label: 'Tag'
diff --git a/core/modules/views/config/schema/views.filter_value.schema.yml b/core/modules/views/config/schema/views.filter_value.schema.yml
new file mode 100644
index 0000000..a59fc46
--- /dev/null
+++ b/core/modules/views/config/schema/views.filter_value.schema.yml
@@ -0,0 +1,5 @@
+# Schema for the views filter value.
+
+views.filter_value.boolean:
+  type: boolean
+  label: 'value'
diff --git a/core/modules/views/config/schema/views.query.schema.yml b/core/modules/views/config/schema/views.query.schema.yml
new file mode 100644
index 0000000..47a4461
--- /dev/null
+++ b/core/modules/views/config/schema/views.query.schema.yml
@@ -0,0 +1,5 @@
+# Schema for the views query.
+
+views.query.views_query:
+  type: views_query
+  label: 'Views query'
diff --git a/core/modules/views/config/schema/views.relationship.schema.yml b/core/modules/views/config/schema/views.relationship.schema.yml
new file mode 100644
index 0000000..3629aa5
--- /dev/null
+++ b/core/modules/views/config/schema/views.relationship.schema.yml
@@ -0,0 +1,5 @@
+# Schema for the views relationship.
+
+views.relationship.standard:
+  type: views_relationship
+  label: 'Standard'
diff --git a/core/modules/views/config/schema/views.row.schema.yml b/core/modules/views/config/schema/views.row.schema.yml
index 5aa9195..0f20dc0 100644
--- a/core/modules/views/config/schema/views.row.schema.yml
+++ b/core/modules/views/config/schema/views.row.schema.yml
@@ -6,7 +6,7 @@ views.row.fields:
   mapping:
     default_field_elements:
       type: string
-      label: ''
+      label: 'Provide default field wrapper elements'
     inline:
       type: sequence
       label: 'Inline'