diff --git a/airbyte-config/config-models/src/main/resources/types/StateType.yaml b/airbyte-config/config-models/src/main/resources/types/StateType.yaml
new file mode 100644
index 0000000000000..6a5534a21bc8a
--- /dev/null
+++ b/airbyte-config/config-models/src/main/resources/types/StateType.yaml
@@ -0,0 +1,10 @@
+---
+"$schema": http://json-schema.org/draft-07/schema#
+"$id": https://github.com/airbytehq/airbyte/blob/master/airbyte-config/models/src/main/resources/types/StateType.yaml
+title: StateType
+description: State Types
+type: string
+enum:
+  - global
+  - stream
+  - legacy
diff --git a/airbyte-config/config-models/src/main/resources/types/StateWrapper.yaml b/airbyte-config/config-models/src/main/resources/types/StateWrapper.yaml
new file mode 100644
index 0000000000000..22a7501d3897d
--- /dev/null
+++ b/airbyte-config/config-models/src/main/resources/types/StateWrapper.yaml
@@ -0,0 +1,26 @@
+---
+"$schema": http://json-schema.org/draft-07/schema#
+"$id": https://github.com/airbytehq/airbyte/blob/master/airbyte-config/models/src/main/resources/types/StateWrapper.yaml
+title: StateWrapper
+description: Wrapper around the different type of States
+type: object
+additionalProperties: false
+required:
+  - stateType
+properties:
+  stateType:
+    description: The type of the state being wrapped
+    "$ref": StateType.yaml
+  legacyState:
+    description: Legacy State for states that haven't been migrated yet
+    type: object
+    existingJavaType: com.fasterxml.jackson.databind.JsonNode
+  global:
+    description: Representation of the shared
+    type: object
+    existingJavaType: io.airbyte.protocol.models.AirbyteStateMessage
+  stateMessages:
+    type: array
+    items:
+      type: object
+      existingJavaType: io.airbyte.protocol.models.AirbyteStateMessage