diff --git a/javascript/frameworks/ui5/ext/ui5.model.yml b/javascript/frameworks/ui5/ext/ui5.model.yml
index 62bd90241..11da5231b 100644
--- a/javascript/frameworks/ui5/ext/ui5.model.yml
+++ b/javascript/frameworks/ui5/ext/ui5.model.yml
@@ -46,6 +46,12 @@ extensions:
       - ["UI5Control", "sap/m/Input", ""]
       - ["UI5Control", "sap/ui/webc/main/Input", ""]
       - ["UI5Control", "sap/ui/commons/TextField", ""]
+      - ["UI5Control", "sap/ui/commons/PasswordField", ""]
+      - ["UI5Control", "sap/ui/commons/ValueHelpField", ""]
+      - ["UI5Control", "sap/ui/commons/SearchField", ""]
+      - ["UI5Control", "sap/ui/commons/ComboBox", ""]
+      - ["UI5Control", "sap/ui/commons/TextArea", ""]
+      - ["UI5Control", "sap/ui/webc/main/TextArea", ""]
       - ["UI5Control", "sap/m/ComboBoxTextField", ""]
       - ["UI5Control", "sap/m/MaskEnabler", ""]
       - ["UI5Control", "sap/m/MaskInput", ""]
diff --git a/javascript/frameworks/ui5/test/models/source/source.js b/javascript/frameworks/ui5/test/models/source/source.js
index 6e499123c..120fcf92f 100644
--- a/javascript/frameworks/ui5/test/models/source/source.js
+++ b/javascript/frameworks/ui5/test/models/source/source.js
@@ -9,6 +9,13 @@ sap.ui.require(
     "sap/ui/webc/main/MultiInput",
     "sap/m/SearchField",
     "sap/ui/webc/main/Input",
+    "sap/ui/commons/TextField",
+    "sap/ui/commons/PasswordField",
+    "sap/ui/commons/ValueHelpField",
+    "sap/ui/commons/SearchField",
+    "sap/ui/commons/ComboBox",
+    "sap/ui/commons/TextArea",
+    "sap/ui/webc/main/TextArea"
   ],
   function (
     CodeEditor,
@@ -20,6 +27,13 @@ sap.ui.require(
     MultiInput,
     SearchField,
     Input,
+    TextField,
+    PasswordField,
+    ValueHelpField,
+    SearchField,
+    ComboBox,
+    TextAreaCommons,
+    TextAreaWebc
   ) {
     var obj = new TextField();
     var value = obj.value;
@@ -54,6 +68,31 @@ sap.ui.require(
     var obj = new RichTextEditor();
     var value = obj.getValue();
 
+    var obj = new PasswordField();
+    var value = obj.value;
+    var obj = new PasswordField();
+    var value = obj.getValue();
+    var obj = new ValueHelpField();
+    var value = obj.value;
+    var obj = new ValueHelpField();
+    var value = obj.getValue();
+    var obj = new SearchField();
+    var value = obj.value;
+    var obj = new SearchField();
+    var value = obj.getValue();
+    var obj = new ComboBox();
+    var value = obj.value;
+    var obj = new ComboBox();
+    var value = obj.getValue();
+    var obj = new TextAreaCommons();
+    var value = obj.value;
+    var obj = new TextAreaCommons();
+    var value = obj.getValue();
+    var obj = new TextAreaWebc();
+    var value = obj.value;
+    var obj = new TextAreaWebc();
+    var value = obj.getValue();
+
     var value = jQuery.sap.getUriParameters().get();
 
     var value = jQuery.sap.syncHead();
diff --git a/javascript/frameworks/ui5/test/models/source/sourceTest.expected b/javascript/frameworks/ui5/test/models/source/sourceTest.expected
index 179664dc2..c3539750e 100644
--- a/javascript/frameworks/ui5/test/models/source/sourceTest.expected
+++ b/javascript/frameworks/ui5/test/models/source/sourceTest.expected
@@ -1,56 +1,80 @@
-| source.js:25:17:25:25 | obj.value | Remote flow source of type: Remote flow |
-| source.js:25:17:25:25 | obj.value | Remote flow source of type: Source node (remote) [from data-extension] |
-| source.js:27:17:27:30 | obj.getValue() | Remote flow source of type: Remote flow |
-| source.js:27:17:27:30 | obj.getValue() | Remote flow source of type: Source node (remote) [from data-extension] |
-| source.js:29:17:29:25 | obj.value | Remote flow source of type: Remote flow |
-| source.js:29:17:29:25 | obj.value | Remote flow source of type: Source node (remote) [from data-extension] |
-| source.js:31:17:31:30 | obj.getValue() | Remote flow source of type: Remote flow |
-| source.js:31:17:31:30 | obj.getValue() | Remote flow source of type: Source node (remote) [from data-extension] |
-| source.js:33:17:33:25 | obj.value | Remote flow source of type: Remote flow |
-| source.js:33:17:33:25 | obj.value | Remote flow source of type: Source node (remote) [from data-extension] |
-| source.js:35:17:35:30 | obj.getValue() | Remote flow source of type: Remote flow |
-| source.js:35:17:35:30 | obj.getValue() | Remote flow source of type: Source node (remote) [from data-extension] |
-| source.js:37:17:37:25 | obj.value | Remote flow source of type: Remote flow |
-| source.js:37:17:37:25 | obj.value | Remote flow source of type: Source node (remote) [from data-extension] |
-| source.js:39:17:39:30 | obj.getValue() | Remote flow source of type: Remote flow |
-| source.js:39:17:39:30 | obj.getValue() | Remote flow source of type: Source node (remote) [from data-extension] |
-| source.js:41:17:41:25 | obj.value | Remote flow source of type: Remote flow |
-| source.js:41:17:41:25 | obj.value | Remote flow source of type: Source node (remote) [from data-extension] |
-| source.js:43:17:43:30 | obj.getValue() | Remote flow source of type: Remote flow |
-| source.js:43:17:43:30 | obj.getValue() | Remote flow source of type: Source node (remote) [from data-extension] |
-| source.js:45:17:45:25 | obj.value | Remote flow source of type: Remote flow |
-| source.js:45:17:45:25 | obj.value | Remote flow source of type: Source node (remote) [from data-extension] |
-| source.js:47:17:47:30 | obj.getValue() | Remote flow source of type: Remote flow |
-| source.js:47:17:47:30 | obj.getValue() | Remote flow source of type: Source node (remote) [from data-extension] |
-| source.js:49:17:49:25 | obj.value | Remote flow source of type: Remote flow |
-| source.js:49:17:49:25 | obj.value | Remote flow source of type: Source node (remote) [from data-extension] |
-| source.js:51:17:51:37 | obj.get ... Value() | Remote flow source of type: Remote flow |
-| source.js:51:17:51:37 | obj.get ... Value() | Remote flow source of type: Source node (remote) [from data-extension] |
-| source.js:53:17:53:25 | obj.value | Remote flow source of type: Remote flow |
-| source.js:53:17:53:25 | obj.value | Remote flow source of type: Source node (remote) [from data-extension] |
-| source.js:55:17:55:30 | obj.getValue() | Remote flow source of type: Remote flow |
-| source.js:55:17:55:30 | obj.getValue() | Remote flow source of type: Source node (remote) [from data-extension] |
-| source.js:57:17:57:51 | jQuery. ... ).get() | Remote flow source of type: Remote flow |
-| source.js:57:17:57:51 | jQuery. ... ).get() | Remote flow source of type: Source node (remote) [from data-extension] |
-| source.js:59:17:59:37 | jQuery. ... cHead() | Remote flow source of type: Remote flow |
-| source.js:59:17:59:37 | jQuery. ... cHead() | Remote flow source of type: Source node (remote) [from data-extension] |
-| source.js:61:17:61:36 | jQuery.sap.syncGet() | Remote flow source of type: Remote flow |
-| source.js:61:17:61:36 | jQuery.sap.syncGet() | Remote flow source of type: Source node (remote) [from data-extension] |
-| source.js:63:17:63:40 | jQuery. ... tText() | Remote flow source of type: Remote flow |
-| source.js:63:17:63:40 | jQuery. ... tText() | Remote flow source of type: Source node (remote) [from data-extension] |
-| source.js:65:17:65:37 | jQuery. ... cPost() | Remote flow source of type: Remote flow |
-| source.js:65:17:65:37 | jQuery. ... cPost() | Remote flow source of type: Source node (remote) [from data-extension] |
-| source.js:67:17:67:41 | jQuery. ... tText() | Remote flow source of type: Remote flow |
-| source.js:67:17:67:41 | jQuery. ... tText() | Remote flow source of type: Source node (remote) [from data-extension] |
-| source.js:69:17:69:52 | UriPara ... ).get() | Remote flow source of type: Remote flow |
-| source.js:69:17:69:52 | UriPara ... ).get() | Remote flow source of type: Source node (remote) [from data-extension] |
-| source.js:70:17:70:55 | UriPara ... etAll() | Remote flow source of type: Remote flow |
-| source.js:70:17:70:55 | UriPara ... etAll() | Remote flow source of type: Source node (remote) [from data-extension] |
-| source.js:73:17:73:25 | obj.get() | Remote flow source of type: Remote flow |
-| source.js:73:17:73:25 | obj.get() | Remote flow source of type: Source node (remote) [from data-extension] |
-| source.js:74:17:74:28 | obj.getAll() | Remote flow source of type: Remote flow |
-| source.js:74:17:74:28 | obj.getAll() | Remote flow source of type: Source node (remote) [from data-extension] |
-| source.js:76:17:76:28 | obj.getAll() | Remote flow source of type: Remote flow |
-| source.js:76:17:76:28 | obj.getAll() | Remote flow source of type: Source node (remote) [from data-extension] |
-| source.js:78:17:78:25 | obj.get() | Remote flow source of type: Remote flow |
-| source.js:78:17:78:25 | obj.get() | Remote flow source of type: Source node (remote) [from data-extension] |
+| source.js:39:17:39:25 | obj.value | Remote flow source of type: Remote flow |
+| source.js:39:17:39:25 | obj.value | Remote flow source of type: Source node (remote) [from data-extension] |
+| source.js:41:17:41:30 | obj.getValue() | Remote flow source of type: Remote flow |
+| source.js:41:17:41:30 | obj.getValue() | Remote flow source of type: Source node (remote) [from data-extension] |
+| source.js:43:17:43:25 | obj.value | Remote flow source of type: Remote flow |
+| source.js:43:17:43:25 | obj.value | Remote flow source of type: Source node (remote) [from data-extension] |
+| source.js:45:17:45:30 | obj.getValue() | Remote flow source of type: Remote flow |
+| source.js:45:17:45:30 | obj.getValue() | Remote flow source of type: Source node (remote) [from data-extension] |
+| source.js:47:17:47:25 | obj.value | Remote flow source of type: Remote flow |
+| source.js:47:17:47:25 | obj.value | Remote flow source of type: Source node (remote) [from data-extension] |
+| source.js:49:17:49:30 | obj.getValue() | Remote flow source of type: Remote flow |
+| source.js:49:17:49:30 | obj.getValue() | Remote flow source of type: Source node (remote) [from data-extension] |
+| source.js:51:17:51:25 | obj.value | Remote flow source of type: Remote flow |
+| source.js:51:17:51:25 | obj.value | Remote flow source of type: Source node (remote) [from data-extension] |
+| source.js:53:17:53:30 | obj.getValue() | Remote flow source of type: Remote flow |
+| source.js:53:17:53:30 | obj.getValue() | Remote flow source of type: Source node (remote) [from data-extension] |
+| source.js:55:17:55:25 | obj.value | Remote flow source of type: Remote flow |
+| source.js:55:17:55:25 | obj.value | Remote flow source of type: Source node (remote) [from data-extension] |
+| source.js:57:17:57:30 | obj.getValue() | Remote flow source of type: Remote flow |
+| source.js:57:17:57:30 | obj.getValue() | Remote flow source of type: Source node (remote) [from data-extension] |
+| source.js:59:17:59:25 | obj.value | Remote flow source of type: Remote flow |
+| source.js:59:17:59:25 | obj.value | Remote flow source of type: Source node (remote) [from data-extension] |
+| source.js:61:17:61:30 | obj.getValue() | Remote flow source of type: Remote flow |
+| source.js:61:17:61:30 | obj.getValue() | Remote flow source of type: Source node (remote) [from data-extension] |
+| source.js:63:17:63:25 | obj.value | Remote flow source of type: Remote flow |
+| source.js:63:17:63:25 | obj.value | Remote flow source of type: Source node (remote) [from data-extension] |
+| source.js:65:17:65:37 | obj.get ... Value() | Remote flow source of type: Remote flow |
+| source.js:65:17:65:37 | obj.get ... Value() | Remote flow source of type: Source node (remote) [from data-extension] |
+| source.js:67:17:67:25 | obj.value | Remote flow source of type: Remote flow |
+| source.js:67:17:67:25 | obj.value | Remote flow source of type: Source node (remote) [from data-extension] |
+| source.js:69:17:69:30 | obj.getValue() | Remote flow source of type: Remote flow |
+| source.js:69:17:69:30 | obj.getValue() | Remote flow source of type: Source node (remote) [from data-extension] |
+| source.js:72:17:72:25 | obj.value | Remote flow source of type: Remote flow |
+| source.js:72:17:72:25 | obj.value | Remote flow source of type: Source node (remote) [from data-extension] |
+| source.js:74:17:74:30 | obj.getValue() | Remote flow source of type: Remote flow |
+| source.js:74:17:74:30 | obj.getValue() | Remote flow source of type: Source node (remote) [from data-extension] |
+| source.js:76:17:76:25 | obj.value | Remote flow source of type: Remote flow |
+| source.js:76:17:76:25 | obj.value | Remote flow source of type: Source node (remote) [from data-extension] |
+| source.js:78:17:78:30 | obj.getValue() | Remote flow source of type: Remote flow |
+| source.js:78:17:78:30 | obj.getValue() | Remote flow source of type: Source node (remote) [from data-extension] |
+| source.js:80:17:80:25 | obj.value | Remote flow source of type: Remote flow |
+| source.js:80:17:80:25 | obj.value | Remote flow source of type: Source node (remote) [from data-extension] |
+| source.js:82:17:82:30 | obj.getValue() | Remote flow source of type: Remote flow |
+| source.js:82:17:82:30 | obj.getValue() | Remote flow source of type: Source node (remote) [from data-extension] |
+| source.js:84:17:84:25 | obj.value | Remote flow source of type: Remote flow |
+| source.js:84:17:84:25 | obj.value | Remote flow source of type: Source node (remote) [from data-extension] |
+| source.js:86:17:86:30 | obj.getValue() | Remote flow source of type: Remote flow |
+| source.js:86:17:86:30 | obj.getValue() | Remote flow source of type: Source node (remote) [from data-extension] |
+| source.js:88:17:88:25 | obj.value | Remote flow source of type: Remote flow |
+| source.js:88:17:88:25 | obj.value | Remote flow source of type: Source node (remote) [from data-extension] |
+| source.js:90:17:90:30 | obj.getValue() | Remote flow source of type: Remote flow |
+| source.js:90:17:90:30 | obj.getValue() | Remote flow source of type: Source node (remote) [from data-extension] |
+| source.js:92:17:92:25 | obj.value | Remote flow source of type: Remote flow |
+| source.js:92:17:92:25 | obj.value | Remote flow source of type: Source node (remote) [from data-extension] |
+| source.js:94:17:94:30 | obj.getValue() | Remote flow source of type: Remote flow |
+| source.js:94:17:94:30 | obj.getValue() | Remote flow source of type: Source node (remote) [from data-extension] |
+| source.js:96:17:96:51 | jQuery. ... ).get() | Remote flow source of type: Remote flow |
+| source.js:96:17:96:51 | jQuery. ... ).get() | Remote flow source of type: Source node (remote) [from data-extension] |
+| source.js:98:17:98:37 | jQuery. ... cHead() | Remote flow source of type: Remote flow |
+| source.js:98:17:98:37 | jQuery. ... cHead() | Remote flow source of type: Source node (remote) [from data-extension] |
+| source.js:100:17:100:36 | jQuery.sap.syncGet() | Remote flow source of type: Remote flow |
+| source.js:100:17:100:36 | jQuery.sap.syncGet() | Remote flow source of type: Source node (remote) [from data-extension] |
+| source.js:102:17:102:40 | jQuery. ... tText() | Remote flow source of type: Remote flow |
+| source.js:102:17:102:40 | jQuery. ... tText() | Remote flow source of type: Source node (remote) [from data-extension] |
+| source.js:104:17:104:37 | jQuery. ... cPost() | Remote flow source of type: Remote flow |
+| source.js:104:17:104:37 | jQuery. ... cPost() | Remote flow source of type: Source node (remote) [from data-extension] |
+| source.js:106:17:106:41 | jQuery. ... tText() | Remote flow source of type: Remote flow |
+| source.js:106:17:106:41 | jQuery. ... tText() | Remote flow source of type: Source node (remote) [from data-extension] |
+| source.js:108:17:108:52 | UriPara ... ).get() | Remote flow source of type: Remote flow |
+| source.js:108:17:108:52 | UriPara ... ).get() | Remote flow source of type: Source node (remote) [from data-extension] |
+| source.js:109:17:109:55 | UriPara ... etAll() | Remote flow source of type: Remote flow |
+| source.js:109:17:109:55 | UriPara ... etAll() | Remote flow source of type: Source node (remote) [from data-extension] |
+| source.js:112:17:112:25 | obj.get() | Remote flow source of type: Remote flow |
+| source.js:112:17:112:25 | obj.get() | Remote flow source of type: Source node (remote) [from data-extension] |
+| source.js:113:17:113:28 | obj.getAll() | Remote flow source of type: Remote flow |
+| source.js:113:17:113:28 | obj.getAll() | Remote flow source of type: Source node (remote) [from data-extension] |
+| source.js:115:17:115:28 | obj.getAll() | Remote flow source of type: Remote flow |
+| source.js:115:17:115:28 | obj.getAll() | Remote flow source of type: Source node (remote) [from data-extension] |
+| source.js:117:17:117:25 | obj.get() | Remote flow source of type: Remote flow |
+| source.js:117:17:117:25 | obj.get() | Remote flow source of type: Source node (remote) [from data-extension] |