diff --git a/codbex-uoms/api/ConverterController.ts b/codbex-uoms/api/ConverterController.ts
index 8359f97..c03cefd 100644
--- a/codbex-uoms/api/ConverterController.ts
+++ b/codbex-uoms/api/ConverterController.ts
@@ -15,7 +15,7 @@ class ConverterController {
     private readonly repository = new UoMRepository();
 
     @Get("/:source/:target/:value")
-    public convertValue(_: any, ctx: any): number {
+    public convertValue(_: any, ctx: any): number | undefined {
         try {
             const source = ctx.pathParameters.source;
             const target = ctx.pathParameters.target;
@@ -29,6 +29,7 @@ class ConverterController {
                     }
                 ]
             })[0];
+
             const entityTarget = this.repository.findAll({
                 conditions: [
                     {
@@ -38,13 +39,37 @@ class ConverterController {
                     }
                 ]
             })[0];
+
             if (entitySource && entityTarget) {
                 if (entitySource.Dimension !== entityTarget.Dimension) {
-                    HttpUtils.sendResponseBadRequest("Both Source and Target Unit of Measures should have the same Dimension");
+                    HttpUtils.sendResponseBadRequest(
+                        "Both Source and Target Unit of Measures should have the same Dimension"
+                    );
+                    return;
+                }
+
+                if (
+                    entitySource.Numerator == null ||
+                    entitySource.Denominator == null ||
+                    entityTarget.Numerator == null ||
+                    entityTarget.Denominator == null
+                ) {
+                    HttpUtils.sendResponseBadRequest(
+                        "Invalid conversion factors defined"
+                    );
                     return;
                 }
+
+                if (entitySource.Denominator === 0 || entityTarget.Numerator === 0) {
+                    HttpUtils.sendResponseBadRequest(
+                        "Invalid conversion configuration (division by zero)"
+                    );
+                    return;
+                }
+
                 const valueBase = value * entitySource.Numerator / entitySource.Denominator;
                 const valueTarget = valueBase * entityTarget.Denominator / entityTarget.Numerator;
+
                 return valueTarget;
             } else {
                 HttpUtils.sendResponseNotFound("Unit of Measures not found: [" + source + "] and/or [" + target + "]");
diff --git a/codbex-uoms/codbex-uoms.edm b/codbex-uoms/codbex-uoms.edm
index d10907b..0ef370b 100644
--- a/codbex-uoms/codbex-uoms.edm
+++ b/codbex-uoms/codbex-uoms.edm
@@ -1,27 +1,27 @@
 <model>
  <entities>
-  <entity name="Dimension" dataName="DIMENSION" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}_DIMENSION&quot;" dataQuery="" type="SETTING" title="Dimension" caption="Manage entity Dimension" description="Manage entity Dimension" tooltip="Dimension" icon="cube" menuKey="dimension" menuLabel="Dimension" menuIndex="100" layoutType="" perspectiveName="Settings" perspectiveLabel="" perspectiveHeader="" perspectiveIcon="cubes" perspectiveOrder="970" perspectiveNavId="" perspectiveRole="" generateReport="false" multilingual="true" generateDefaultRoles="true" feedUsername="YWRtaW4=" feedPassword="YWRtaW4=" roleRead="codbex-uoms.Dimensions.DimensionReadOnly" roleWrite="codbex-uoms.Dimensions.DimensionFullAccess">
-    <property name="Id" description="" tooltip="" dataName="DIMENSION_ID" dataType="INTEGER" dataNullable="true" dataPrimaryKey="true" dataAutoIncrement="true" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
-    <property name="Name" description="" tooltip="" dataName="DIMENSION_NAME" dataType="VARCHAR" dataLength="100" dataNullable="false" isRequiredProperty="true" widgetType="TEXTBOX" widgetSize="fd-col-md--4 fd-col--6" widgetLength="100" widgetIsMajor="true"></property>
-    <property name="SAP" description="" tooltip="" dataName="DIMENSION_SAP" dataType="VARCHAR" dataLength="20" dataNullable="true" widgetType="TEXTBOX" widgetSize="fd-col-md--4 fd-col--6" widgetLength="20" widgetIsMajor="true"></property>
+  <entity name="Dimension" dataName="DIMENSION" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}_DIMENSION&quot;" dataQuery="" type="SETTING" title="Dimension" caption="Manage entity Dimension" description="Manage entity Dimension" tooltip="Dimension" icon="cube" menuKey="dimension" menuLabel="Dimension" menuIndex="100" layoutType="MANAGE" perspectiveName="Settings" perspectiveLabel="Entities" perspectiveHeader="" perspectiveIcon="cubes" perspectiveOrder="970" perspectiveNavId="" perspectiveRole="" generateReport="false" multilingual="true" generateDefaultRoles="true" feedUsername="YWRtaW4=" feedPassword="YWRtaW4=" roleRead="codbex-uoms.Dimensions.DimensionReadOnly" roleWrite="codbex-uoms.Dimensions.DimensionFullAccess">
+    <property name="Id" description="" tooltip="" dataName="DIMENSION_ID" dataType="INTEGER" dataNullable="true" dataPrimaryKey="true" dataAutoIncrement="true" auditType="NONE" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
+    <property name="Name" description="" tooltip="" dataName="DIMENSION_NAME" dataType="VARCHAR" dataLength="100" dataNullable="false" dataUnique="true" isRequiredProperty="true" auditType="NONE" widgetType="TEXTBOX" widgetSize="fd-col-md--4 fd-col--6" widgetLength="100" widgetIsMajor="true"></property>
+    <property name="SAP" description="" tooltip="" dataName="DIMENSION_SAP" dataType="VARCHAR" dataLength="20" dataNullable="true" dataUnique="true" auditType="NONE" widgetType="TEXTBOX" widgetSize="fd-col-md--4 fd-col--6" widgetLength="20" widgetIsMajor="true"></property>
   </entity>
-  <entity name="UoM" dataName="UOM" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}_UOM&quot;" dataQuery="" type="SETTING" title="Unit of Measures" caption="Manage entity UoM" description="Manage entity UoM" tooltip="Unit of Measures" icon="cubes" menuKey="uom" menuLabel="UoM" menuIndex="100" layoutType="" perspectiveName="Settings" perspectiveLabel="" perspectiveHeader="" perspectiveIcon="cubes" perspectiveOrder="970" perspectiveNavId="" perspectiveRole="" generateReport="false" multilingual="true" generateDefaultRoles="true" feedUsername="YWRtaW4=" feedPassword="YWRtaW4=" roleRead="codbex-uoms.UnitsOfMeasures.UoMReadOnly" roleWrite="codbex-uoms.UnitsOfMeasures.UoMFullAccess">
-    <property name="Id" description="" tooltip="" dataName="UOM_ID" dataType="INTEGER" dataNullable="true" dataPrimaryKey="true" dataAutoIncrement="true" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
-    <property name="Name" description="" tooltip="" dataName="UOM_NAME" dataType="VARCHAR" dataLength="100" dataNullable="true" widgetType="TEXTBOX" widgetSize="fd-col-md--4 fd-col--6" widgetLength="100" widgetIsMajor="true"></property>
-    <property name="ISO" description="" tooltip="" dataName="UOM_ISO" dataType="VARCHAR" dataLength="20" dataNullable="true" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
-    <property name="Dimension" description="" tooltip="" dataName="UOM_DIMENSION" dataType="INTEGER" dataNullable="true" widgetType="DROPDOWN" widgetSize="" widgetLength="20" widgetIsMajor="true" widgetDropDownKey="Id" widgetDropDownValue="Name"></property>
-    <property name="SAP" description="" tooltip="" dataName="UOM_SAP" dataType="VARCHAR" dataLength="20" dataNullable="true" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true" widgetDependsOnProperty="Dimension" widgetDependsOnEntity="Dimension" widgetDependsOnValueFrom="SAP" widgetDependsOnFilterBy="Dimension"></property>
-    <property name="Numerator" description="" tooltip="" dataName="UOM_NUMERATOR" dataType="BIGINT" dataNullable="true" widgetType="NUMBER" widgetSize="fd-col-md--4 fd-col--6" widgetLength="20" widgetIsMajor="true"></property>
-    <property name="Denominator" description="" tooltip="" dataName="UOM_DENOMINATOR" dataType="BIGINT" dataNullable="true" widgetType="NUMBER" widgetSize="fd-col-md--4 fd-col--6" widgetLength="20" widgetIsMajor="true"></property>
-    <property name="Rounding" description="" tooltip="" dataName="UOM_ROUNDING" dataType="INTEGER" dataNullable="true" widgetType="NUMBER" widgetSize="fd-col-md--2 fd-col--3" widgetLength="20" widgetIsMajor="true"></property>
-    <property name="Base" description="" tooltip="" dataName="UOM_BASE" dataType="BOOLEAN" dataNullable="true" widgetType="CHECKBOX" widgetSize="fd-col-md--2 fd-col--3" widgetLength="20" widgetIsMajor="true"></property>
+  <entity name="UoM" dataName="UOM" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}_UOM&quot;" dataQuery="" type="SETTING" title="Unit of Measures" caption="Manage entity UoM" description="Manage entity UoM" tooltip="Unit of Measures" icon="cubes" menuKey="uom" menuLabel="UoM" menuIndex="100" layoutType="MANAGE" perspectiveName="Settings" perspectiveLabel="Entities" perspectiveHeader="" perspectiveIcon="cubes" perspectiveOrder="970" perspectiveNavId="" perspectiveRole="" generateReport="false" multilingual="true" generateDefaultRoles="true" feedUsername="YWRtaW4=" feedPassword="YWRtaW4=" roleRead="codbex-uoms.UnitsOfMeasures.UoMReadOnly" roleWrite="codbex-uoms.UnitsOfMeasures.UoMFullAccess">
+    <property name="Id" description="" tooltip="" dataName="UOM_ID" dataType="INTEGER" dataNullable="true" dataPrimaryKey="true" dataAutoIncrement="true" auditType="NONE" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
+    <property name="Name" description="" tooltip="" dataName="UOM_NAME" dataType="VARCHAR" dataLength="100" dataNullable="false" dataUnique="true" isRequiredProperty="true" auditType="NONE" widgetType="TEXTBOX" widgetSize="fd-col-md--4 fd-col--6" widgetLength="100" widgetIsMajor="true"></property>
+    <property name="ISO" description="" tooltip="" dataName="UOM_ISO" dataType="VARCHAR" dataLength="20" dataNullable="false" dataUnique="true" isRequiredProperty="true" auditType="NONE" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
+    <property name="Dimension" description="" tooltip="" dataName="UOM_DIMENSION" dataType="INTEGER" dataNullable="false" isRequiredProperty="true" auditType="NONE" widgetType="DROPDOWN" widgetSize="" widgetLength="20" widgetIsMajor="true" widgetDropDownKey="Id" widgetDropDownValue="Name"></property>
+    <property name="SAP" description="" tooltip="" dataName="UOM_SAP" dataType="VARCHAR" dataLength="20" dataNullable="true" dataUnique="true" auditType="NONE" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true" widgetDependsOnProperty="Dimension" widgetDependsOnEntity="Dimension" widgetDependsOnValueFrom="SAP" widgetDependsOnFilterBy="Dimension"></property>
+    <property name="Numerator" description="" tooltip="" dataName="UOM_NUMERATOR" dataType="BIGINT" dataNullable="false" isRequiredProperty="true" auditType="NONE" widgetType="NUMBER" widgetSize="fd-col-md--4 fd-col--6" widgetLength="20" widgetIsMajor="true"></property>
+    <property name="Denominator" description="" tooltip="" dataName="UOM_DENOMINATOR" dataType="BIGINT" dataNullable="false" isRequiredProperty="true" auditType="NONE" widgetType="NUMBER" widgetSize="fd-col-md--4 fd-col--6" widgetLength="20" widgetIsMajor="true"></property>
+    <property name="Rounding" description="" tooltip="" dataName="UOM_ROUNDING" dataType="INTEGER" dataNullable="false" dataDefaultValue="0" isRequiredProperty="true" auditType="NONE" widgetType="NUMBER" widgetSize="fd-col-md--2 fd-col--3" widgetLength="20" widgetIsMajor="true"></property>
+    <property name="Base" description="" tooltip="" dataName="UOM_BASE" dataType="BOOLEAN" dataNullable="false" dataDefaultValue="false" auditType="NONE" widgetType="CHECKBOX" widgetSize="fd-col-md--2 fd-col--3" widgetLength="20" widgetIsMajor="true"></property>
   </entity>
-  <relation name="UoM_Dimension" type="relation" entity="UoM" relationName="UoM_Dimension" relationshipEntityPerspectiveName="Settings" relationshipEntityPerspectiveLabel="" property="Dimension" referenced="Dimension" referencedProperty="Id">
+  <relation name="UoM_Dimension" type="relation" entity="UoM" relationName="UoM_Dimension" relationshipEntityPerspectiveName="Settings" relationshipEntityPerspectiveLabel="Entities" property="Dimension" referenced="Dimension" referencedProperty="Id">
   </relation>
  </entities>
  <perspectives>
  </perspectives>
  <navigations>
  </navigations>
- <mxGraphModel><root><mxCell id="0"/><mxCell id="1" parent="0"/><mxCell id="2" style="entity" parent="1" vertex="1"><Entity name="Dimension" dataName="DIMENSION" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}_DIMENSION&quot;" title="Dimension" tooltip="Dimension" menuLabel="Dimension" type="Entity" menuKey="dimension" perspectiveIcon="cubes" perspectiveName="Settings" icon="cube" perspectiveOrder="970" caption="Manage entity Dimension" disableGeneration="false" description="Manage entity Dimension" generateDefaultRoles="true" roleRead="codbex-uoms.Dimensions.DimensionReadOnly" roleWrite="codbex-uoms.Dimensions.DimensionFullAccess" entityType="SETTING" feedUsername="YWRtaW4=" feedPassword="YWRtaW4=" multilingual="true" as="value"><Array as="referenceProjections"/></Entity><mxGeometry x="80" y="60" width="200" height="106" as="geometry"><mxRectangle width="200" height="28" as="alternateBounds"/></mxGeometry></mxCell><mxCell id="3" parent="2" vertex="1" connectable="0"><Property name="Id" dataName="DIMENSION_ID" dataPrimaryKey="true" dataAutoIncrement="true" dataPrecision="NaN" dataScale="NaN" dataType="INTEGER" as="value"/><mxGeometry y="28" width="200" height="26" as="geometry"/></mxCell><mxCell id="4" parent="2" vertex="1" connectable="0"><Property name="Name" dataName="DIMENSION_NAME" dataPrecision="NaN" dataScale="NaN" widgetSize="fd-col-md--4 fd-col--6" dataLength="100" widgetLength="100" isRequiredProperty="true" dataNotNull="true" as="value"/><mxGeometry y="54" width="200" height="26" as="geometry"/></mxCell><mxCell id="41c7d99b-8531-3878-28fe-d7d841e451d8" parent="2" vertex="1" connectable="0"><Property name="SAP" dataName="DIMENSION_SAP" dataPrecision="NaN" dataScale="NaN" widgetSize="fd-col-md--4 fd-col--6" as="value"/><mxGeometry y="80" width="200" height="26" as="geometry"/></mxCell><mxCell id="5" style="entity" parent="1" vertex="1"><Entity name="UoM" dataName="UOM" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}_UOM&quot;" title="Unit of Measures" tooltip="Unit of Measures" menuLabel="UoM" type="Entity" menuKey="uom" perspectiveIcon="cubes" perspectiveName="Settings" icon="cubes" perspectiveOrder="970" caption="Manage entity UoM" disableGeneration="false" entityType="SETTING" description="Manage entity UoM" generateDefaultRoles="true" roleRead="codbex-uoms.UnitsOfMeasures.UoMReadOnly" roleWrite="codbex-uoms.UnitsOfMeasures.UoMFullAccess" feedUsername="YWRtaW4=" feedPassword="YWRtaW4=" multilingual="true" as="value"><Array as="referenceProjections"/></Entity><mxGeometry x="410" y="70" width="200" height="262" as="geometry"><mxRectangle width="200" height="28" as="alternateBounds"/></mxGeometry></mxCell><mxCell id="6" parent="5" vertex="1" connectable="0"><Property name="Id" dataName="UOM_ID" dataPrimaryKey="true" dataAutoIncrement="true" dataPrecision="NaN" dataScale="NaN" dataType="INTEGER" as="value"/><mxGeometry y="28" width="200" height="26" as="geometry"/></mxCell><mxCell id="7" parent="5" vertex="1" connectable="0"><Property name="Name" dataName="UOM_NAME" dataLength="100" dataPrecision="NaN" dataScale="NaN" widgetSize="fd-col-md--4 fd-col--6" widgetLength="100" as="value"/><mxGeometry y="54" width="200" height="26" as="geometry"/></mxCell><mxCell id="c72d63f0-4f92-da59-0d31-710b346852ed" parent="5" vertex="1" connectable="0"><Property name="ISO" dataName="UOM_ISO" dataPrecision="NaN" dataScale="NaN" as="value"/><mxGeometry y="80" width="200" height="26" as="geometry"/></mxCell><mxCell id="ae1a4f7f-bdfa-770b-a8d1-1b766f3ed6f4" parent="5" vertex="1" connectable="0"><Property name="Dimension" dataName="UOM_DIMENSION" dataType="INTEGER" dataPrecision="NaN" dataScale="NaN" widgetType="DROPDOWN" widgetDropDownKey="Id" widgetDropDownValue="Name" as="value"/><mxGeometry y="106" width="200" height="26" as="geometry"/></mxCell><mxCell id="04ee3f0b-0b08-4016-d50d-0db5522ab318" parent="5" vertex="1" connectable="0"><Property name="SAP" dataName="UOM_SAP" dataPrecision="NaN" dataScale="NaN" widgetDependsOnProperty="Dimension" widgetDependsOnEntity="Dimension" widgetDependsOnValueFrom="SAP" widgetDependsOnFilterBy="Dimension" as="value"/><mxGeometry y="132" width="200" height="26" as="geometry"/></mxCell><mxCell id="14" parent="5" vertex="1" connectable="0"><Property name="Numerator" dataName="UOM_NUMERATOR" dataType="BIGINT" dataLength="0" dataPrecision="NaN" dataScale="NaN" widgetType="NUMBER" widgetSize="fd-col-md--4 fd-col--6" as="value"/><mxGeometry y="158" width="200" height="26" as="geometry"/></mxCell><mxCell id="15" parent="5" vertex="1" connectable="0"><Property name="Denominator" dataName="UOM_DENOMINATOR" dataType="BIGINT" dataLength="0" dataPrecision="NaN" dataScale="NaN" widgetType="NUMBER" widgetSize="fd-col-md--4 fd-col--6" as="value"/><mxGeometry y="184" width="200" height="26" as="geometry"/></mxCell><mxCell id="16" parent="5" vertex="1" connectable="0"><Property name="Rounding" dataName="UOM_ROUNDING" dataType="INTEGER" dataLength="0" dataPrecision="NaN" dataScale="NaN" widgetType="NUMBER" widgetSize="fd-col-md--2 fd-col--3" as="value"/><mxGeometry y="210" width="200" height="26" as="geometry"/></mxCell><mxCell id="d92ebcf9-3c6b-948e-85f8-c6c1048d5f7a" parent="5" vertex="1" connectable="0"><Property name="Base" dataName="UOM_BASE" dataType="BOOLEAN" dataPrecision="NaN" dataScale="NaN" widgetType="CHECKBOX" widgetSize="fd-col-md--2 fd-col--3" as="value"/><mxGeometry y="236" width="200" height="26" as="geometry"/></mxCell><mxCell id="201ff5cf-e01d-795e-32fa-cfe50dfe69be" parent="1" source="ae1a4f7f-bdfa-770b-a8d1-1b766f3ed6f4" target="3" edge="1"><mxGeometry relative="1" as="geometry"/></mxCell></root></mxGraphModel>
+ <mxGraphModel><root><mxCell id="0"/><mxCell id="1" parent="0"/><mxCell id="2" style="entity" parent="1" vertex="1"><Entity name="Dimension" dataName="DIMENSION" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}_DIMENSION&quot;" title="Dimension" tooltip="Dimension" menuLabel="Dimension" type="Entity" menuKey="dimension" perspectiveIcon="cubes" perspectiveName="Settings" icon="cube" perspectiveOrder="970" caption="Manage entity Dimension" disableGeneration="false" description="Manage entity Dimension" generateDefaultRoles="true" roleRead="codbex-uoms.Dimensions.DimensionReadOnly" roleWrite="codbex-uoms.Dimensions.DimensionFullAccess" entityType="SETTING" feedUsername="YWRtaW4=" feedPassword="YWRtaW4=" multilingual="true" as="value"/><mxGeometry x="80" y="60" width="200" height="106" as="geometry"><mxRectangle width="200" height="28" as="alternateBounds"/></mxGeometry></mxCell><mxCell id="3" parent="2" vertex="1" connectable="0"><Property name="Id" dataName="DIMENSION_ID" dataPrimaryKey="true" dataAutoIncrement="true" dataPrecision="NaN" dataScale="NaN" dataType="INTEGER" as="value"/><mxGeometry y="28" width="200" height="26" as="geometry"/></mxCell><mxCell id="4" parent="2" vertex="1" connectable="0"><Property name="Name" dataName="DIMENSION_NAME" widgetSize="fd-col-md--4 fd-col--6" dataLength="100" widgetLength="100" isRequiredProperty="true" dataNotNull="true" dataUnique="true" as="value"/><mxGeometry y="54" width="200" height="26" as="geometry"/></mxCell><mxCell id="41c7d99b-8531-3878-28fe-d7d841e451d8" parent="2" vertex="1" connectable="0"><Property name="SAP" dataName="DIMENSION_SAP" widgetSize="fd-col-md--4 fd-col--6" dataUnique="true" as="value"/><mxGeometry y="80" width="200" height="26" as="geometry"/></mxCell><mxCell id="5" style="entity" parent="1" vertex="1"><Entity name="UoM" dataName="UOM" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}_UOM&quot;" title="Unit of Measures" tooltip="Unit of Measures" menuLabel="UoM" type="Entity" menuKey="uom" perspectiveIcon="cubes" perspectiveName="Settings" icon="cubes" perspectiveOrder="970" caption="Manage entity UoM" disableGeneration="false" entityType="SETTING" description="Manage entity UoM" generateDefaultRoles="true" roleRead="codbex-uoms.UnitsOfMeasures.UoMReadOnly" roleWrite="codbex-uoms.UnitsOfMeasures.UoMFullAccess" feedUsername="YWRtaW4=" feedPassword="YWRtaW4=" multilingual="true" as="value"/><mxGeometry x="410" y="70" width="200" height="262" as="geometry"><mxRectangle width="200" height="28" as="alternateBounds"/></mxGeometry></mxCell><mxCell id="6" parent="5" vertex="1" connectable="0"><Property name="Id" dataName="UOM_ID" dataPrimaryKey="true" dataAutoIncrement="true" dataPrecision="NaN" dataScale="NaN" dataType="INTEGER" as="value"/><mxGeometry y="28" width="200" height="26" as="geometry"/></mxCell><mxCell id="7" parent="5" vertex="1" connectable="0"><Property name="Name" dataName="UOM_NAME" dataLength="100" widgetSize="fd-col-md--4 fd-col--6" widgetLength="100" isRequiredProperty="true" dataNotNull="true" dataUnique="true" as="value"/><mxGeometry y="54" width="200" height="26" as="geometry"/></mxCell><mxCell id="c72d63f0-4f92-da59-0d31-710b346852ed" parent="5" vertex="1" connectable="0"><Property name="ISO" dataName="UOM_ISO" isRequiredProperty="true" dataNotNull="true" dataUnique="true" as="value"/><mxGeometry y="80" width="200" height="26" as="geometry"/></mxCell><mxCell id="ae1a4f7f-bdfa-770b-a8d1-1b766f3ed6f4" parent="5" vertex="1" connectable="0"><Property name="Dimension" dataName="UOM_DIMENSION" dataType="INTEGER" widgetType="DROPDOWN" widgetDropDownKey="Id" widgetDropDownValue="Name" isRequiredProperty="true" dataNotNull="true" as="value"/><mxGeometry y="106" width="200" height="26" as="geometry"/></mxCell><mxCell id="04ee3f0b-0b08-4016-d50d-0db5522ab318" parent="5" vertex="1" connectable="0"><Property name="SAP" dataName="UOM_SAP" widgetDependsOnProperty="Dimension" widgetDependsOnEntity="Dimension" widgetDependsOnValueFrom="SAP" widgetDependsOnFilterBy="Dimension" dataUnique="true" as="value"/><mxGeometry y="132" width="200" height="26" as="geometry"/></mxCell><mxCell id="14" parent="5" vertex="1" connectable="0"><Property name="Numerator" dataName="UOM_NUMERATOR" dataType="BIGINT" dataLength="0" widgetType="NUMBER" widgetSize="fd-col-md--4 fd-col--6" isRequiredProperty="true" dataNotNull="true" as="value"/><mxGeometry y="158" width="200" height="26" as="geometry"/></mxCell><mxCell id="15" parent="5" vertex="1" connectable="0"><Property name="Denominator" dataName="UOM_DENOMINATOR" dataType="BIGINT" dataLength="0" widgetType="NUMBER" widgetSize="fd-col-md--4 fd-col--6" isRequiredProperty="true" isCalculatedProperty="false" dataNotNull="true" as="value"/><mxGeometry y="184" width="200" height="26" as="geometry"/></mxCell><mxCell id="16" parent="5" vertex="1" connectable="0"><Property name="Rounding" dataName="UOM_ROUNDING" dataType="INTEGER" dataLength="0" widgetType="NUMBER" widgetSize="fd-col-md--2 fd-col--3" isRequiredProperty="true" isCalculatedProperty="false" dataNotNull="true" dataDefaultValue="0" as="value"/><mxGeometry y="210" width="200" height="26" as="geometry"/></mxCell><mxCell id="d92ebcf9-3c6b-948e-85f8-c6c1048d5f7a" parent="5" vertex="1" connectable="0"><Property name="Base" dataName="UOM_BASE" dataType="BOOLEAN" widgetType="CHECKBOX" widgetSize="fd-col-md--2 fd-col--3" dataNotNull="true" dataDefaultValue="false" as="value"/><mxGeometry y="236" width="200" height="26" as="geometry"/></mxCell><mxCell id="201ff5cf-e01d-795e-32fa-cfe50dfe69be" parent="1" source="ae1a4f7f-bdfa-770b-a8d1-1b766f3ed6f4" target="3" edge="1"><mxGeometry relative="1" as="geometry"/></mxCell></root></mxGraphModel>
 </model>
\ No newline at end of file
diff --git a/codbex-uoms/codbex-uoms.gen b/codbex-uoms/codbex-uoms.gen
index 92421c5..2ef0e21 100644
--- a/codbex-uoms/codbex-uoms.gen
+++ b/codbex-uoms/codbex-uoms.gen
@@ -4,13 +4,26 @@
   "brandUrl": "https://www.codbex.com/",
   "title": "UOMs Management Module",
   "description": "Managing UOMs Data",
+  "fileName": "codbex-uoms",
+  "genFolderName": "codbex-uoms",
+  "dataSource": "DefaultDB",
+  "roles": [
+    {
+      "entityName": "Dimension",
+      "roleRead": "codbex-uoms.Dimensions.DimensionReadOnly",
+      "roleWrite": "codbex-uoms.Dimensions.DimensionFullAccess"
+    },
+    {
+      "entityName": "UoM",
+      "roleRead": "codbex-uoms.UnitsOfMeasures.UoMReadOnly",
+      "roleWrite": "codbex-uoms.UnitsOfMeasures.UoMFullAccess"
+    }
+  ],
+  "tprefix": "codbex-uoms-model",
   "projectName": "codbex-uoms",
   "workspaceName": "workspace",
   "filePath": "codbex-uoms.model",
   "templateId": "template-application-angular-v2/template/template.js",
-  "fileName": "codbex-uoms",
-  "genFolderName": "codbex-uoms",
-  "dataSource": "DefaultDB",
   "perspectives": {
     "Settings": {
       "views": [
@@ -26,19 +39,6 @@
       "role": ""
     }
   },
-  "roles": [
-    {
-      "entityName": "Dimension",
-      "roleRead": "codbex-uoms.Dimensions.DimensionReadOnly",
-      "roleWrite": "codbex-uoms.Dimensions.DimensionFullAccess"
-    },
-    {
-      "entityName": "UoM",
-      "roleRead": "codbex-uoms.UnitsOfMeasures.UoMReadOnly",
-      "roleWrite": "codbex-uoms.UnitsOfMeasures.UoMFullAccess"
-    }
-  ],
-  "tprefix": "codbex-uoms-model",
   "models": [
     {
       "properties": [
@@ -71,6 +71,7 @@
           "dataName": "DIMENSION_NAME",
           "dataNullable": false,
           "dataType": "VARCHAR",
+          "dataUnique": true,
           "description": "",
           "isRequiredProperty": true,
           "name": "Name",
@@ -82,7 +83,6 @@
           "dataNotNull": true,
           "dataAutoIncrement": false,
           "dataPrimaryKey": false,
-          "dataUnique": false,
           "isCalculatedProperty": false,
           "widgetLabel": "Name",
           "widgetDropdownUrl": "",
@@ -98,6 +98,7 @@
           "dataName": "DIMENSION_SAP",
           "dataNullable": true,
           "dataType": "VARCHAR",
+          "dataUnique": true,
           "description": "",
           "name": "SAP",
           "tooltip": "",
@@ -108,7 +109,6 @@
           "dataNotNull": false,
           "dataAutoIncrement": false,
           "dataPrimaryKey": false,
-          "dataUnique": false,
           "isRequiredProperty": false,
           "isCalculatedProperty": false,
           "widgetLabel": "SAP",
@@ -183,20 +183,20 @@
         {
           "dataLength": "100",
           "dataName": "UOM_NAME",
-          "dataNullable": true,
+          "dataNullable": false,
           "dataType": "VARCHAR",
+          "dataUnique": true,
           "description": "",
+          "isRequiredProperty": true,
           "name": "Name",
           "tooltip": "",
           "widgetIsMajor": true,
           "widgetLength": "100",
           "widgetSize": "fd-col-md--4 fd-col--6",
           "widgetType": "TEXTBOX",
-          "dataNotNull": false,
+          "dataNotNull": true,
           "dataAutoIncrement": false,
           "dataPrimaryKey": false,
-          "dataUnique": false,
-          "isRequiredProperty": false,
           "isCalculatedProperty": false,
           "widgetLabel": "Name",
           "widgetDropdownUrl": "",
@@ -210,20 +210,20 @@
         {
           "dataLength": "20",
           "dataName": "UOM_ISO",
-          "dataNullable": true,
+          "dataNullable": false,
           "dataType": "VARCHAR",
+          "dataUnique": true,
           "description": "",
+          "isRequiredProperty": true,
           "name": "ISO",
           "tooltip": "",
           "widgetIsMajor": true,
           "widgetLength": "20",
           "widgetSize": "",
           "widgetType": "TEXTBOX",
-          "dataNotNull": false,
+          "dataNotNull": true,
           "dataAutoIncrement": false,
           "dataPrimaryKey": false,
-          "dataUnique": false,
-          "isRequiredProperty": false,
           "isCalculatedProperty": false,
           "widgetLabel": "ISO",
           "widgetDropdownUrl": "",
@@ -236,9 +236,10 @@
         },
         {
           "dataName": "UOM_DIMENSION",
-          "dataNullable": true,
+          "dataNullable": false,
           "dataType": "INTEGER",
           "description": "",
+          "isRequiredProperty": true,
           "name": "Dimension",
           "tooltip": "",
           "widgetDropDownKey": "Id",
@@ -250,12 +251,11 @@
           "relationshipName": "UoM_Dimension",
           "relationshipEntityName": "Dimension",
           "relationshipEntityPerspectiveName": "Settings",
-          "relationshipEntityPerspectiveLabel": "",
-          "dataNotNull": false,
+          "relationshipEntityPerspectiveLabel": "Entities",
+          "dataNotNull": true,
           "dataAutoIncrement": false,
           "dataPrimaryKey": false,
           "dataUnique": false,
-          "isRequiredProperty": false,
           "isCalculatedProperty": false,
           "widgetLabel": "Dimension",
           "widgetDropdownUrl": "/services/ts/codbex-uoms/gen/codbex-uoms/api/Settings/DimensionService.ts",
@@ -269,6 +269,7 @@
           "dataName": "UOM_SAP",
           "dataNullable": true,
           "dataType": "VARCHAR",
+          "dataUnique": true,
           "description": "",
           "name": "SAP",
           "tooltip": "",
@@ -283,7 +284,6 @@
           "dataNotNull": false,
           "dataAutoIncrement": false,
           "dataPrimaryKey": false,
-          "dataUnique": false,
           "isRequiredProperty": false,
           "isCalculatedProperty": false,
           "widgetLabel": "SAP",
@@ -297,20 +297,20 @@
         },
         {
           "dataName": "UOM_NUMERATOR",
-          "dataNullable": true,
+          "dataNullable": false,
           "dataType": "BIGINT",
           "description": "",
+          "isRequiredProperty": true,
           "name": "Numerator",
           "tooltip": "",
           "widgetIsMajor": true,
           "widgetLength": "20",
           "widgetSize": "fd-col-md--4 fd-col--6",
           "widgetType": "NUMBER",
-          "dataNotNull": false,
+          "dataNotNull": true,
           "dataAutoIncrement": false,
           "dataPrimaryKey": false,
           "dataUnique": false,
-          "isRequiredProperty": false,
           "isCalculatedProperty": false,
           "widgetLabel": "Numerator",
           "widgetDropdownUrl": "",
@@ -321,20 +321,20 @@
         },
         {
           "dataName": "UOM_DENOMINATOR",
-          "dataNullable": true,
+          "dataNullable": false,
           "dataType": "BIGINT",
           "description": "",
+          "isRequiredProperty": true,
           "name": "Denominator",
           "tooltip": "",
           "widgetIsMajor": true,
           "widgetLength": "20",
           "widgetSize": "fd-col-md--4 fd-col--6",
           "widgetType": "NUMBER",
-          "dataNotNull": false,
+          "dataNotNull": true,
           "dataAutoIncrement": false,
           "dataPrimaryKey": false,
           "dataUnique": false,
-          "isRequiredProperty": false,
           "isCalculatedProperty": false,
           "widgetLabel": "Denominator",
           "widgetDropdownUrl": "",
@@ -344,21 +344,22 @@
           "inputRule": ""
         },
         {
+          "dataDefaultValue": "0",
           "dataName": "UOM_ROUNDING",
-          "dataNullable": true,
+          "dataNullable": false,
           "dataType": "INTEGER",
           "description": "",
+          "isRequiredProperty": true,
           "name": "Rounding",
           "tooltip": "",
           "widgetIsMajor": true,
           "widgetLength": "20",
           "widgetSize": "fd-col-md--2 fd-col--3",
           "widgetType": "NUMBER",
-          "dataNotNull": false,
+          "dataNotNull": true,
           "dataAutoIncrement": false,
           "dataPrimaryKey": false,
           "dataUnique": false,
-          "isRequiredProperty": false,
           "isCalculatedProperty": false,
           "widgetLabel": "Rounding",
           "widgetDropdownUrl": "",
@@ -368,8 +369,9 @@
           "inputRule": ""
         },
         {
+          "dataDefaultValue": "false",
           "dataName": "UOM_BASE",
-          "dataNullable": true,
+          "dataNullable": false,
           "dataType": "BOOLEAN",
           "description": "",
           "name": "Base",
@@ -378,7 +380,7 @@
           "widgetLength": "20",
           "widgetSize": "fd-col-md--2 fd-col--3",
           "widgetType": "CHECKBOX",
-          "dataNotNull": false,
+          "dataNotNull": true,
           "dataAutoIncrement": false,
           "dataPrimaryKey": false,
           "dataUnique": false,
diff --git a/codbex-uoms/codbex-uoms.model b/codbex-uoms/codbex-uoms.model
index 79a44fc..222e122 100644
--- a/codbex-uoms/codbex-uoms.model
+++ b/codbex-uoms/codbex-uoms.model
@@ -4,6 +4,7 @@
             {
                 "properties": [
                     {
+                        "auditType": "NONE",
                         "dataAutoIncrement": "true",
                         "dataName": "DIMENSION_ID",
                         "dataNullable": "true",
@@ -18,10 +19,12 @@
                         "widgetType": "TEXTBOX"
                     },
                     {
+                        "auditType": "NONE",
                         "dataLength": "100",
                         "dataName": "DIMENSION_NAME",
                         "dataNullable": "false",
                         "dataType": "VARCHAR",
+                        "dataUnique": "true",
                         "description": "",
                         "isRequiredProperty": "true",
                         "name": "Name",
@@ -32,10 +35,12 @@
                         "widgetType": "TEXTBOX"
                     },
                     {
+                        "auditType": "NONE",
                         "dataLength": "20",
                         "dataName": "DIMENSION_SAP",
                         "dataNullable": "true",
                         "dataType": "VARCHAR",
+                        "dataUnique": "true",
                         "description": "",
                         "name": "SAP",
                         "tooltip": "",
@@ -55,7 +60,7 @@
                 "generateDefaultRoles": "true",
                 "generateReport": "false",
                 "icon": "cube",
-                "layoutType": "",
+                "layoutType": "MANAGE",
                 "menuIndex": "100",
                 "menuKey": "dimension",
                 "menuLabel": "Dimension",
@@ -63,7 +68,7 @@
                 "name": "Dimension",
                 "perspectiveHeader": "",
                 "perspectiveIcon": "cubes",
-                "perspectiveLabel": "",
+                "perspectiveLabel": "Entities",
                 "perspectiveName": "Settings",
                 "perspectiveNavId": "",
                 "perspectiveOrder": "970",
@@ -77,6 +82,7 @@
             {
                 "properties": [
                     {
+                        "auditType": "NONE",
                         "dataAutoIncrement": "true",
                         "dataName": "UOM_ID",
                         "dataNullable": "true",
@@ -91,11 +97,14 @@
                         "widgetType": "TEXTBOX"
                     },
                     {
+                        "auditType": "NONE",
                         "dataLength": "100",
                         "dataName": "UOM_NAME",
-                        "dataNullable": "true",
+                        "dataNullable": "false",
                         "dataType": "VARCHAR",
+                        "dataUnique": "true",
                         "description": "",
+                        "isRequiredProperty": "true",
                         "name": "Name",
                         "tooltip": "",
                         "widgetIsMajor": "true",
@@ -104,11 +113,14 @@
                         "widgetType": "TEXTBOX"
                     },
                     {
+                        "auditType": "NONE",
                         "dataLength": "20",
                         "dataName": "UOM_ISO",
-                        "dataNullable": "true",
+                        "dataNullable": "false",
                         "dataType": "VARCHAR",
+                        "dataUnique": "true",
                         "description": "",
+                        "isRequiredProperty": "true",
                         "name": "ISO",
                         "tooltip": "",
                         "widgetIsMajor": "true",
@@ -117,10 +129,12 @@
                         "widgetType": "TEXTBOX"
                     },
                     {
+                        "auditType": "NONE",
                         "dataName": "UOM_DIMENSION",
-                        "dataNullable": "true",
+                        "dataNullable": "false",
                         "dataType": "INTEGER",
                         "description": "",
+                        "isRequiredProperty": "true",
                         "name": "Dimension",
                         "tooltip": "",
                         "widgetDropDownKey": "Id",
@@ -132,13 +146,15 @@
                         "relationshipName": "UoM_Dimension",
                         "relationshipEntityName": "Dimension",
                         "relationshipEntityPerspectiveName": "Settings",
-                        "relationshipEntityPerspectiveLabel": ""
+                        "relationshipEntityPerspectiveLabel": "Entities"
                     },
                     {
+                        "auditType": "NONE",
                         "dataLength": "20",
                         "dataName": "UOM_SAP",
                         "dataNullable": "true",
                         "dataType": "VARCHAR",
+                        "dataUnique": "true",
                         "description": "",
                         "name": "SAP",
                         "tooltip": "",
@@ -152,10 +168,12 @@
                         "widgetType": "TEXTBOX"
                     },
                     {
+                        "auditType": "NONE",
                         "dataName": "UOM_NUMERATOR",
-                        "dataNullable": "true",
+                        "dataNullable": "false",
                         "dataType": "BIGINT",
                         "description": "",
+                        "isRequiredProperty": "true",
                         "name": "Numerator",
                         "tooltip": "",
                         "widgetIsMajor": "true",
@@ -164,10 +182,12 @@
                         "widgetType": "NUMBER"
                     },
                     {
+                        "auditType": "NONE",
                         "dataName": "UOM_DENOMINATOR",
-                        "dataNullable": "true",
+                        "dataNullable": "false",
                         "dataType": "BIGINT",
                         "description": "",
+                        "isRequiredProperty": "true",
                         "name": "Denominator",
                         "tooltip": "",
                         "widgetIsMajor": "true",
@@ -176,10 +196,13 @@
                         "widgetType": "NUMBER"
                     },
                     {
+                        "auditType": "NONE",
+                        "dataDefaultValue": "0",
                         "dataName": "UOM_ROUNDING",
-                        "dataNullable": "true",
+                        "dataNullable": "false",
                         "dataType": "INTEGER",
                         "description": "",
+                        "isRequiredProperty": "true",
                         "name": "Rounding",
                         "tooltip": "",
                         "widgetIsMajor": "true",
@@ -188,8 +211,10 @@
                         "widgetType": "NUMBER"
                     },
                     {
+                        "auditType": "NONE",
+                        "dataDefaultValue": "false",
                         "dataName": "UOM_BASE",
-                        "dataNullable": "true",
+                        "dataNullable": "false",
                         "dataType": "BOOLEAN",
                         "description": "",
                         "name": "Base",
@@ -210,7 +235,7 @@
                 "generateDefaultRoles": "true",
                 "generateReport": "false",
                 "icon": "cubes",
-                "layoutType": "",
+                "layoutType": "MANAGE",
                 "menuIndex": "100",
                 "menuKey": "uom",
                 "menuLabel": "UoM",
@@ -218,7 +243,7 @@
                 "name": "UoM",
                 "perspectiveHeader": "",
                 "perspectiveIcon": "cubes",
-                "perspectiveLabel": "",
+                "perspectiveLabel": "Entities",
                 "perspectiveName": "Settings",
                 "perspectiveNavId": "",
                 "perspectiveOrder": "970",
diff --git a/codbex-uoms/gen/codbex-uoms/api/Settings/UoMController.ts b/codbex-uoms/gen/codbex-uoms/api/Settings/UoMController.ts
index a50443e..712c4e0 100644
--- a/codbex-uoms/gen/codbex-uoms/api/Settings/UoMController.ts
+++ b/codbex-uoms/gen/codbex-uoms/api/Settings/UoMController.ts
@@ -164,15 +164,33 @@ class UoMController {
     }
 
     private validateEntity(entity: any): void {
+        if (entity.Name === null || entity.Name === undefined) {
+            throw new ValidationError(`The 'Name' property is required, provide a valid value`);
+        }
         if (entity.Name?.length > 100) {
             throw new ValidationError(`The 'Name' exceeds the maximum length of [100] characters`);
         }
+        if (entity.ISO === null || entity.ISO === undefined) {
+            throw new ValidationError(`The 'ISO' property is required, provide a valid value`);
+        }
         if (entity.ISO?.length > 20) {
             throw new ValidationError(`The 'ISO' exceeds the maximum length of [20] characters`);
         }
+        if (entity.Dimension === null || entity.Dimension === undefined) {
+            throw new ValidationError(`The 'Dimension' property is required, provide a valid value`);
+        }
         if (entity.SAP?.length > 20) {
             throw new ValidationError(`The 'SAP' exceeds the maximum length of [20] characters`);
         }
+        if (entity.Numerator === null || entity.Numerator === undefined) {
+            throw new ValidationError(`The 'Numerator' property is required, provide a valid value`);
+        }
+        if (entity.Denominator === null || entity.Denominator === undefined) {
+            throw new ValidationError(`The 'Denominator' property is required, provide a valid value`);
+        }
+        if (entity.Rounding === null || entity.Rounding === undefined) {
+            throw new ValidationError(`The 'Rounding' property is required, provide a valid value`);
+        }
         for (const next of validationModules) {
             next.validate(entity);
         }
diff --git a/codbex-uoms/gen/codbex-uoms/dao/Settings/UoMRepository.ts b/codbex-uoms/gen/codbex-uoms/dao/Settings/UoMRepository.ts
index 250ad1c..ea129a7 100644
--- a/codbex-uoms/gen/codbex-uoms/dao/Settings/UoMRepository.ts
+++ b/codbex-uoms/gen/codbex-uoms/dao/Settings/UoMRepository.ts
@@ -6,25 +6,25 @@ import { EntityUtils } from "../utils/EntityUtils";
 
 export interface UoMEntity {
     readonly Id: number;
-    Name?: string;
-    ISO?: string;
-    Dimension?: number;
+    Name: string;
+    ISO: string;
+    Dimension: number;
     SAP?: string;
-    Numerator?: number;
-    Denominator?: number;
-    Rounding?: number;
-    Base?: boolean;
+    Numerator: number;
+    Denominator: number;
+    Rounding: number;
+    Base: boolean;
 }
 
 export interface UoMCreateEntity {
-    readonly Name?: string;
-    readonly ISO?: string;
-    readonly Dimension?: number;
+    readonly Name: string;
+    readonly ISO: string;
+    readonly Dimension: number;
     readonly SAP?: string;
-    readonly Numerator?: number;
-    readonly Denominator?: number;
-    readonly Rounding?: number;
-    readonly Base?: boolean;
+    readonly Numerator: number;
+    readonly Denominator: number;
+    readonly Rounding: number;
+    readonly Base: boolean;
 }
 
 export interface UoMUpdateEntity extends UoMCreateEntity {
@@ -150,16 +150,19 @@ export class UoMRepository {
                 name: "Name",
                 column: "UOM_NAME",
                 type: "VARCHAR",
+                required: true
             },
             {
                 name: "ISO",
                 column: "UOM_ISO",
                 type: "VARCHAR",
+                required: true
             },
             {
                 name: "Dimension",
                 column: "UOM_DIMENSION",
                 type: "INTEGER",
+                required: true
             },
             {
                 name: "SAP",
@@ -170,21 +173,25 @@ export class UoMRepository {
                 name: "Numerator",
                 column: "UOM_NUMERATOR",
                 type: "BIGINT",
+                required: true
             },
             {
                 name: "Denominator",
                 column: "UOM_DENOMINATOR",
                 type: "BIGINT",
+                required: true
             },
             {
                 name: "Rounding",
                 column: "UOM_ROUNDING",
                 type: "INTEGER",
+                required: true
             },
             {
                 name: "Base",
                 column: "UOM_BASE",
                 type: "BOOLEAN",
+                required: true
             }
         ]
     };
@@ -237,6 +244,12 @@ export class UoMRepository {
 
     public create(entity: UoMCreateEntity): number {
         EntityUtils.setBoolean(entity, "Base");
+        if (entity.Rounding === undefined || entity.Rounding === null) {
+            (entity as UoMEntity).Rounding = 0;
+        }
+        if (entity.Base === undefined || entity.Base === null) {
+            (entity as UoMEntity).Base = false;
+        }
         const id = this.dao.insert(entity);
         this.triggerEvent({
             operation: "create",
diff --git a/codbex-uoms/gen/codbex-uoms/data/Settings/DimensionEntity.ts b/codbex-uoms/gen/codbex-uoms/data/Settings/DimensionEntity.ts
index 80c22bf..6818844 100644
--- a/codbex-uoms/gen/codbex-uoms/data/Settings/DimensionEntity.ts
+++ b/codbex-uoms/gen/codbex-uoms/data/Settings/DimensionEntity.ts
@@ -1,4 +1,4 @@
-import { Entity, Table, Id, Generated, Column, Documentation } from '@aerokit/sdk/db'
+import { Entity, Table, Id, Generated, Column, Documentation, CreatedAt, CreatedBy, UpdatedAt, UpdatedBy} from '@aerokit/sdk/db'
 
 @Entity('DimensionEntity')
 @Table('CODBEX_DIMENSION')
diff --git a/codbex-uoms/gen/codbex-uoms/data/Settings/UoMEntity.ts b/codbex-uoms/gen/codbex-uoms/data/Settings/UoMEntity.ts
index 746d120..164faa3 100644
--- a/codbex-uoms/gen/codbex-uoms/data/Settings/UoMEntity.ts
+++ b/codbex-uoms/gen/codbex-uoms/data/Settings/UoMEntity.ts
@@ -1,4 +1,4 @@
-import { Entity, Table, Id, Generated, Column, Documentation } from '@aerokit/sdk/db'
+import { Entity, Table, Id, Generated, Column, Documentation, CreatedAt, CreatedBy, UpdatedAt, UpdatedBy} from '@aerokit/sdk/db'
 
 @Entity('UoMEntity')
 @Table('CODBEX_UOM')
@@ -19,26 +19,23 @@ export class UoMEntity {
         name: 'UOM_NAME',
         type: 'string',
         length: 100,
-        nullable: true,
     })
-    public Name?: string;
+    public Name!: string;
 
     @Documentation('ISO')
     @Column({
         name: 'UOM_ISO',
         type: 'string',
         length: 20,
-        nullable: true,
     })
-    public ISO?: string;
+    public ISO!: string;
 
     @Documentation('Dimension')
     @Column({
         name: 'UOM_DIMENSION',
         type: 'integer',
-        nullable: true,
     })
-    public Dimension?: number;
+    public Dimension!: number;
 
     @Documentation('SAP')
     @Column({
@@ -53,23 +50,21 @@ export class UoMEntity {
     @Column({
         name: 'UOM_NUMERATOR',
         type: 'long',
-        nullable: true,
     })
-    public Numerator?: number;
+    public Numerator!: number;
 
     @Documentation('Denominator')
     @Column({
         name: 'UOM_DENOMINATOR',
         type: 'long',
-        nullable: true,
     })
-    public Denominator?: number;
+    public Denominator!: number;
 
     @Documentation('Rounding')
     @Column({
         name: 'UOM_ROUNDING',
         type: 'integer',
-        nullable: true,
+        defaultValue: `0`,
     })
     public Rounding?: number;
 
@@ -77,7 +72,7 @@ export class UoMEntity {
     @Column({
         name: 'UOM_BASE',
         type: 'boolean',
-        nullable: true,
+        defaultValue: `false`,
     })
     public Base?: boolean;
 
diff --git a/codbex-uoms/gen/codbex-uoms/schema/codbex-uoms.schema b/codbex-uoms/gen/codbex-uoms/schema/codbex-uoms.schema
index 5024af3..45bc722 100644
--- a/codbex-uoms/gen/codbex-uoms/schema/codbex-uoms.schema
+++ b/codbex-uoms/gen/codbex-uoms/schema/codbex-uoms.schema
@@ -15,12 +15,14 @@
                     {
                         "type": "VARCHAR",
                         "length": 100,
+                        "unique": true,
                         "name": "DIMENSION_NAME"
                     },
                     {
                         "type": "VARCHAR",
                         "length": 20,
                         "nullable": true,
+                        "unique": true,
                         "name": "DIMENSION_SAP"
                     }
                 ]
@@ -39,44 +41,42 @@
                     {
                         "type": "VARCHAR",
                         "length": 100,
-                        "nullable": true,
+                        "unique": true,
                         "name": "UOM_NAME"
                     },
                     {
                         "type": "VARCHAR",
                         "length": 20,
-                        "nullable": true,
+                        "unique": true,
                         "name": "UOM_ISO"
                     },
                     {
                         "type": "INTEGER",
-                        "nullable": true,
                         "name": "UOM_DIMENSION"
                     },
                     {
                         "type": "VARCHAR",
                         "length": 20,
                         "nullable": true,
+                        "unique": true,
                         "name": "UOM_SAP"
                     },
                     {
                         "type": "BIGINT",
-                        "nullable": true,
                         "name": "UOM_NUMERATOR"
                     },
                     {
                         "type": "BIGINT",
-                        "nullable": true,
                         "name": "UOM_DENOMINATOR"
                     },
                     {
                         "type": "INTEGER",
-                        "nullable": true,
+                        "defaultValue": "0",
                         "name": "UOM_ROUNDING"
                     },
                     {
                         "type": "BOOLEAN",
-                        "nullable": true,
+                        "defaultValue": "false",
                         "name": "UOM_BASE"
                     }
                 ]
diff --git a/codbex-uoms/gen/codbex-uoms/ui/Settings/Dimension/dialog-window/index.html b/codbex-uoms/gen/codbex-uoms/ui/Settings/Dimension/dialog-window/index.html
index f38efa7..21d692d 100644
--- a/codbex-uoms/gen/codbex-uoms/ui/Settings/Dimension/dialog-window/index.html
+++ b/codbex-uoms/gen/codbex-uoms/ui/Settings/Dimension/dialog-window/index.html
@@ -29,7 +29,7 @@
 	                                state="{{ forms.details['Name'].$valid ? '' : 'error' }}"
 									ng-required="true"
 	                                ng-model="entity.Name"
-	                                ng-readonly="action === 'select'"
+	                                ng-readonly="true"
 									ng-maxlength="100.0"
 	                                input-rules="{ patterns: [''] }"
 	                                type="text"
@@ -49,7 +49,7 @@
 	                                state="{{ forms.details['SAP'].$valid ? '' : 'error' }}"
 									ng-required="false"
 	                                ng-model="entity.SAP"
-	                                ng-readonly="action === 'select'"
+	                                ng-readonly="true"
 									ng-maxlength="20.0"
 	                                input-rules="{ patterns: [''] }"
 	                                type="text"
diff --git a/codbex-uoms/gen/codbex-uoms/ui/Settings/UoM/dialog-window/index.html b/codbex-uoms/gen/codbex-uoms/ui/Settings/UoM/dialog-window/index.html
index d84607c..f860774 100644
--- a/codbex-uoms/gen/codbex-uoms/ui/Settings/UoM/dialog-window/index.html
+++ b/codbex-uoms/gen/codbex-uoms/ui/Settings/UoM/dialog-window/index.html
@@ -20,16 +20,16 @@
                 <bk-form-group label="{{formHeaders[action]}}" name="entityForm" transclude-classes="fd-container fd-form-layout-grid-container">
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idName" ng-required="false" colon="true">{{ 'codbex-uoms:codbex-uoms-model.t.UOM_NAME' | t }}</bk-form-label>
+                        	<bk-form-label for="idName" ng-required="true" colon="true">{{ 'codbex-uoms:codbex-uoms-model.t.UOM_NAME' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--4 fd-col--6">
 							<bk-form-input-message state="{{ forms.details['Name'].$valid ? '' : 'error' }}" text="{{ 'codbex-uoms:codbex-uoms-model.messages.error.pattern' | t:{'rule':''} }}">
 								<bk-input id="idName"
 	                                name="Name"
 	                                state="{{ forms.details['Name'].$valid ? '' : 'error' }}"
-									ng-required="false"
+									ng-required="true"
 	                                ng-model="entity.Name"
-	                                ng-readonly="action === 'select'"
+	                                ng-readonly="true"
 									ng-maxlength="100.0"
 	                                input-rules="{ patterns: [''] }"
 	                                type="text"
@@ -40,16 +40,16 @@
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idISO" ng-required="false" colon="true">{{ 'codbex-uoms:codbex-uoms-model.t.UOM_ISO' | t }}</bk-form-label>
+                        	<bk-form-label for="idISO" ng-required="true" colon="true">{{ 'codbex-uoms:codbex-uoms-model.t.UOM_ISO' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
 							<bk-form-input-message state="{{ forms.details['ISO'].$valid ? '' : 'error' }}" text="{{ 'codbex-uoms:codbex-uoms-model.messages.error.pattern' | t:{'rule':''} }}">
 								<bk-input id="idISO"
 	                                name="ISO"
 	                                state="{{ forms.details['ISO'].$valid ? '' : 'error' }}"
-									ng-required="false"
+									ng-required="true"
 	                                ng-model="entity.ISO"
-	                                ng-readonly="action === 'select'"
+	                                ng-readonly="true"
 									ng-maxlength="20.0"
 	                                input-rules="{ patterns: [''] }"
 	                                type="text"
@@ -60,15 +60,15 @@
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idDimension" ng-required="false" colon="true">{{ 'codbex-uoms:codbex-uoms-model.t.UOM_DIMENSION' | t }}</bk-form-label>
+                        	<bk-form-label for="idDimension" ng-required="true" colon="true">{{ 'codbex-uoms:codbex-uoms-model.t.UOM_DIMENSION' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col  fd-col-md--8 ">
 	                        <bk-combobox-input input-id="idDimension"
 	                            name="Dimension"
 	                            state="{{ forms.details['Dimension'].$valid ? '' : 'error' }}"
-	                            ng-required="false"
+	                            ng-required="true"
 	                            ng-model="entity.Dimension"
-	                            is-readonly="action === 'select'"
+	                            is-readonly="true"
 	                            dropdown-items="optionsDimension"
 	                            placeholder="{{ 'codbex-uoms:codbex-uoms-model.messages.inputSearch' | t:{'name':'$t(codbex-uoms:codbex-uoms-model.t.UOM_DIMENSION)'} }}"
 								btn-aria-label="{{ 'codbex-uoms:codbex-uoms-model.aria.showHide' | t:{'name':'Dimension'} }}" list-aria-label="{{ 'codbex-uoms:codbex-uoms-model.aria.options' | t:{'name':'Dimension'} }}">
@@ -86,7 +86,7 @@
 	                                state="{{ forms.details['SAP'].$valid ? '' : 'error' }}"
 									ng-required="false"
 	                                ng-model="entity.SAP"
-	                                ng-readonly="action === 'select'"
+	                                ng-readonly="true"
 									ng-maxlength="20.0"
 	                                input-rules="{ patterns: [''] }"
 	                                type="text"
@@ -97,45 +97,45 @@
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idNumerator" ng-required="false" colon="true">{{ 'codbex-uoms:codbex-uoms-model.t.UOM_NUMERATOR' | t }}</bk-form-label>
+                        	<bk-form-label for="idNumerator" ng-required="true" colon="true">{{ 'codbex-uoms:codbex-uoms-model.t.UOM_NUMERATOR' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--4 fd-col--6">
 	                        <bk-step-input input-id="idNumerator"
 								name="Numerator"
 								state="{{ forms.details['Numerator'].$valid ? '' : 'error' }}"
-								ng-required="false"
+								ng-required="true"
 								ng-model="entity.Numerator"
-								is-readonly="action === 'select'"
+								is-readonly="true"
 								placeholder="{{ 'codbex-uoms:codbex-uoms-model.messages.inputEnter' | t:{'name':'$t(codbex-uoms:codbex-uoms-model.t.UOM_NUMERATOR)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idDenominator" ng-required="false" colon="true">{{ 'codbex-uoms:codbex-uoms-model.t.UOM_DENOMINATOR' | t }}</bk-form-label>
+                        	<bk-form-label for="idDenominator" ng-required="true" colon="true">{{ 'codbex-uoms:codbex-uoms-model.t.UOM_DENOMINATOR' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--4 fd-col--6">
 	                        <bk-step-input input-id="idDenominator"
 								name="Denominator"
 								state="{{ forms.details['Denominator'].$valid ? '' : 'error' }}"
-								ng-required="false"
+								ng-required="true"
 								ng-model="entity.Denominator"
-								is-readonly="action === 'select'"
+								is-readonly="true"
 								placeholder="{{ 'codbex-uoms:codbex-uoms-model.messages.inputEnter' | t:{'name':'$t(codbex-uoms:codbex-uoms-model.t.UOM_DENOMINATOR)'} }}">
 							</bk-step-input>
 	                    </div>
                     </bk-form-item>
                     <bk-form-item class="fd-row">
                     	<div class="fd-col fd-col-md--2">
-                        	<bk-form-label for="idRounding" ng-required="false" colon="true">{{ 'codbex-uoms:codbex-uoms-model.t.UOM_ROUNDING' | t }}</bk-form-label>
+                        	<bk-form-label for="idRounding" ng-required="true" colon="true">{{ 'codbex-uoms:codbex-uoms-model.t.UOM_ROUNDING' | t }}</bk-form-label>
                         </div>
                         <div class="fd-col fd-col-md--2 fd-col--3">
 	                        <bk-step-input input-id="idRounding"
 								name="Rounding"
 								state="{{ forms.details['Rounding'].$valid ? '' : 'error' }}"
-								ng-required="false"
+								ng-required="true"
 								ng-model="entity.Rounding"
-								is-readonly="action === 'select'"
+								is-readonly="true"
 								placeholder="{{ 'codbex-uoms:codbex-uoms-model.messages.inputEnter' | t:{'name':'$t(codbex-uoms:codbex-uoms-model.t.UOM_ROUNDING)'} }}">
 							</bk-step-input>
 	                    </div>
@@ -146,7 +146,7 @@
 	                        <bk-checkbox id="idBase"
 	                            compact="false"
 	                            ng-required="false"
-	                            ng-readonly="action === 'select'"
+	                            ng-readonly="true"
 	                            ng-model="entity.Base">
 	                        </bk-checkbox>
                         	<bk-checkbox-label for="idBase" ng-required="false">{{ 'codbex-uoms:codbex-uoms-model.t.UOM_BASE' | t }}</bk-checkbox-label>