diff --git a/src/layouts/schema.json b/src/layouts/schema.json
index 0adc1c3b..c6bd3332 100644
--- a/src/layouts/schema.json
+++ b/src/layouts/schema.json
@@ -4,98 +4,95 @@
   "description": "JSON Schema of the dynamic form definition with visibility rules, validation criteria, etc",
   "type": "array",
   "items": {
-    "type": "object",
-    "properties": {
-      "rules": {
-        "type": "array",
-        "items": {
-          "type": "object",
-          "properties": {
-            "field": {
-              "type": "string"
-            },
-            "op": {
-              "type": "string",
-              "enum": [
-                "eq", "gt", "gte", "lt", "lte", "in", "contains"
-              ]
-            },
-            "value": {
-              "type": ["string", "number", "boolean"]
-            }
-          },
-          "required": ["field", "op", "value"]
+    "$ref": "#/definitions/WelcomeElement"
+  },
+  "definitions": {
+    "WelcomeElement": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "rules": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Rule"
+          }
+        },
+        "fields": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Field"
+          }
         }
       },
-      "fields": {
-        "type": "array",
-        "items": {
-          "type": "object",
-          "properties": {
-            "name": {
-              "type": "string"
-            },
-            "label": {
-              "type": "string"
-            },
-            "description": {
-              "type": "string"
-            },
-            "type": {
-              "type": "string",
-              "enum": [
-                "choice", "text", "password", "numeric", "date", "datetime", "checkbox", "radio", "file", "textarea", "multichoice"
-              ]
-            },
-            "default_value": {
-              "type": ["string", "number", "object", "boolean"]
-            },
-            "validation": {
-              "type": "array",
-              "items": {
-                "type": "string"
-              },
-              "uniqueItems": true
-            }
-          },
-          "required": [
-            "name", "label", "type"
-          ],
-          "if": {
-            "properties": {
-              "type": {
-                "enum": [
-                  "choice", "checkbox", "radio", "multichoice"
-                ]
-              }
-            }
-          },
-          "then": {
-            "properties": {
-              "options": {
-                "type": "array",
-                "items": {
-                  "$ref": "#/definitions/optionItem"
-                },
-                "minItems": 1
-              }
-            },
-            "required": ["options"]
+      "required": [
+        "fields"
+      ],
+      "title": "WelcomeElement"
+    },
+    "Field": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "label": {
+          "type": "string"
+        },
+        "type": {
+          "type": "string"
+        },
+        "dataSource": {
+          "$ref": "#/definitions/DataSource"
+        },
+        "defaultValue": {
+          "$ref": "#/definitions/DefaultValue"
+        },
+        "options": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Option"
           }
         },
-        "minItems": 1
-      }
-    }
-  },
-  "required": [
-    "fields"
-  ],
-  "definitions": {
-    "optionItem": {
+        "description": {
+          "type": "string"
+        },
+        "validation": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      },
+      "required": [
+        "label",
+        "name",
+        "type"
+      ],
+      "title": "Field"
+    },
+    "DataSource": {
       "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "getOptions": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/GetOption"
+          }
+        }
+      },
+      "required": [
+        "getOptions"
+      ],
+      "title": "DataSource"
+    },
+    "GetOption": {
+      "type": "object",
+      "additionalProperties": false,
       "properties": {
         "value": {
-          "type": ["string", "number"]
+          "type": "integer"
         },
         "label": {
           "type": "string"
@@ -103,11 +100,90 @@
         "children": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/optionItem"
+            "$ref": "#/definitions/Child"
           }
         }
       },
-      "required": ["value", "label"]
+      "required": [
+        "label",
+        "value"
+      ],
+      "title": "GetOption"
+    },
+    "Child": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "value": {
+          "type": "integer"
+        },
+        "label": {
+          "type": "string"
+        },
+        "children": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Option"
+          }
+        }
+      },
+      "required": [
+        "label",
+        "value"
+      ],
+      "title": "Child"
+    },
+    "Option": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "value": {
+          "type": "integer"
+        },
+        "label": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "label",
+        "value"
+      ],
+      "title": "Option"
+    },
+    "Rule": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "field": {
+          "type": "string"
+        },
+        "op": {
+          "type": "string"
+        },
+        "value": {
+          "type": "integer"
+        }
+      },
+      "required": [
+        "field",
+        "op",
+        "value"
+      ],
+      "title": "Rule"
+    },
+    "DefaultValue": {
+      "anyOf": [
+        {
+          "type": "array",
+          "items": {
+            "type": "integer"
+          }
+        },
+        {
+          "type": "string"
+        }
+      ],
+      "title": "DefaultValue"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/tests/jest/Components/Choices/__snapshots__/testDropDown.jsx.snap b/tests/jest/Components/Choices/__snapshots__/testDropDown.jsx.snap
index c6ee6368..8fa0101b 100644
--- a/tests/jest/Components/Choices/__snapshots__/testDropDown.jsx.snap
+++ b/tests/jest/Components/Choices/__snapshots__/testDropDown.jsx.snap
@@ -9,119 +9,134 @@ exports[`>>> DropDown --- Snapshot +++capturing Snapshot of DropDown 1`] = `
     className="dp-pc_field"
   >
     <div
-      className="Select has-value is-clearable is-searchable Select--single"
-      style={undefined}
+      className="css-10nd86i"
+      id={undefined}
+      onKeyDown={[Function]}
     >
-      <input
-        disabled={false}
-        name="dropDown"
-        type="hidden"
-        value="first"
-      />
       <div
-        className="Select-control"
-        onKeyDown={[Function]}
+        className="css-1aya2g8 react-select__control"
         onMouseDown={[Function]}
         onTouchEnd={[Function]}
-        onTouchMove={[Function]}
-        onTouchStart={[Function]}
-        style={undefined}
       >
-        <span
-          className="Select-multi-value-wrapper"
-          id="react-select-2--value"
+        <div
+          className="css-1rtrksz react-select__value-container react-select__value-container--has-value"
         >
           <div
-            className="Select-value"
-            style={undefined}
-            title={undefined}
+            className="css-va7pk8 react-select__single-value"
           >
-            <span
-              aria-selected="true"
-              className="Select-value-label"
-              id="react-select-2--value-item"
-              role="option"
-            >
-              First
-            </span>
+            First
           </div>
           <div
-            className="Select-input"
-            style={
-              Object {
-                "display": "inline-block",
-              }
-            }
+            className="css-rsyb7x"
           >
-            <input
-              aria-activedescendant="react-select-2--value"
-              aria-describedby={undefined}
-              aria-expanded="false"
-              aria-haspopup="false"
-              aria-label={undefined}
-              aria-labelledby={undefined}
-              aria-owns=""
-              className={undefined}
-              id={undefined}
-              onBlur={[Function]}
-              onChange={[Function]}
-              onFocus={[Function]}
-              required={false}
-              role="combobox"
-              style={
-                Object {
-                  "boxSizing": "content-box",
-                  "width": "5px",
-                }
-              }
-              tabIndex={undefined}
-              value=""
-            />
             <div
+              className="react-select__input"
               style={
                 Object {
-                  "height": 0,
-                  "left": 0,
-                  "overflow": "scroll",
-                  "position": "absolute",
-                  "top": 0,
-                  "visibility": "hidden",
-                  "whiteSpace": "pre",
+                  "display": "inline-block",
                 }
               }
             >
-              
+              <input
+                aria-autocomplete="list"
+                aria-label={undefined}
+                aria-labelledby={undefined}
+                autoCapitalize="none"
+                autoComplete="off"
+                autoCorrect="off"
+                className={undefined}
+                disabled={false}
+                id="react-select-2-input"
+                onBlur={[Function]}
+                onChange={[Function]}
+                onFocus={[Function]}
+                spellCheck="false"
+                style={
+                  Object {
+                    "background": 0,
+                    "border": 0,
+                    "boxSizing": "content-box",
+                    "color": "inherit",
+                    "fontSize": "inherit",
+                    "opacity": 1,
+                    "outline": 0,
+                    "padding": 0,
+                    "width": "1px",
+                  }
+                }
+                tabIndex="0"
+                type="text"
+                value=""
+              />
+              <div
+                style={
+                  Object {
+                    "height": 0,
+                    "left": 0,
+                    "overflow": "scroll",
+                    "position": "absolute",
+                    "top": 0,
+                    "visibility": "hidden",
+                    "whiteSpace": "pre",
+                  }
+                }
+              >
+                
+              </div>
             </div>
           </div>
-        </span>
-        <span
-          aria-label="Clear value"
-          className="Select-clear-zone"
-          onMouseDown={[Function]}
-          onTouchEnd={[Function]}
-          onTouchMove={[Function]}
-          onTouchStart={[Function]}
-          title="Clear value"
+        </div>
+        <div
+          className="css-1wy0on6 react-select__indicators"
         >
+          <div
+            aria-hidden="true"
+            className="css-1ep9fjw react-select__indicator react-select__clear-indicator"
+            onMouseDown={[Function]}
+            onTouchEnd={[Function]}
+          >
+            <svg
+              aria-hidden="true"
+              className="css-19bqh2r"
+              focusable="false"
+              height={20}
+              viewBox="0 0 20 20"
+              width={20}
+            >
+              <path
+                d="M14.348 14.849c-0.469 0.469-1.229 0.469-1.697 0l-2.651-3.030-2.651 3.029c-0.469 0.469-1.229 0.469-1.697 0-0.469-0.469-0.469-1.229 0-1.697l2.758-3.15-2.759-3.152c-0.469-0.469-0.469-1.228 0-1.697s1.228-0.469 1.697 0l2.652 3.031 2.651-3.031c0.469-0.469 1.228-0.469 1.697 0s0.469 1.229 0 1.697l-2.758 3.152 2.758 3.15c0.469 0.469 0.469 1.229 0 1.698z"
+              />
+            </svg>
+          </div>
           <span
-            className="Select-clear"
-            dangerouslySetInnerHTML={
-              Object {
-                "__html": "&times;",
-              }
-            }
+            className="css-d8oujb react-select__indicator-separator"
           />
-        </span>
-        <span
-          className="Select-arrow-zone"
-          onMouseDown={[Function]}
-        >
-          <span
-            className="Select-arrow"
+          <div
+            aria-hidden="true"
+            className="css-1ep9fjw react-select__indicator react-select__dropdown-indicator"
             onMouseDown={[Function]}
-          />
-        </span>
+            onTouchEnd={[Function]}
+          >
+            <svg
+              aria-hidden="true"
+              className="css-19bqh2r"
+              focusable="false"
+              height={20}
+              viewBox="0 0 20 20"
+              width={20}
+            >
+              <path
+                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+              />
+            </svg>
+          </div>
+        </div>
       </div>
+      <input
+        name="dropDown"
+        type="hidden"
+        value="first"
+      />
     </div>
     <span
       className="indicator"
diff --git a/tests/jest/Components/Choices/testDropDown.jsx b/tests/jest/Components/Choices/testDropDown.jsx
index d5fd99ef..e32bea36 100644
--- a/tests/jest/Components/Choices/testDropDown.jsx
+++ b/tests/jest/Components/Choices/testDropDown.jsx
@@ -12,7 +12,7 @@ describe('>>> DropDown --- Snapshot', () => {
     ];
     const App = () => (
       <Form>
-        <DropDown name="dropDown" options={options} />
+        <DropDown name="dropDown" dataSource={{ getOptions: options }} />
       </Form>
     );
     const FormikApp = withFormik({
diff --git a/tests/jest/Layouts/layout.js b/tests/jest/Layouts/layout.js
index 9974fee9..73c5696f 100644
--- a/tests/jest/Layouts/layout.js
+++ b/tests/jest/Layouts/layout.js
@@ -1,6 +1,6 @@
 import Ajv from 'ajv';
 
-import ticketFormLayout from '../../../src/layouts/ticketFormLayout';
+import ticketFormLayout from '../../DemoState/ticketFormLayout';
 import layoutSchema from '../../../src/layouts/schema.json';
 import { LayoutConfig, LayoutField } from '../../../src/layouts/Layout';
 
@@ -33,7 +33,7 @@ describe('>>> Layout helper class', () => {
 
   it('should get property of the field by path', () => {
     const match = layouts.getMatchingLayout({ department: 7 });
-    expect(match.fields[1].get('options[0].label')).toEqual('Support');
+    expect(match.fields[1].get('dataSource.getOptions[0].label')).toEqual('Support');
   });
 });