diff --git a/codbex-employees/codbex-employees.edm b/codbex-employees/codbex-employees.edm
index 0140d52..d2fa42e 100644
--- a/codbex-employees/codbex-employees.edm
+++ b/codbex-employees/codbex-employees.edm
@@ -27,19 +27,19 @@
     <property name="Name" description="" tooltip="" dataName="CITY_NAME" dataType="VARCHAR" dataLength="100" dataNullable="true" isRequiredProperty="true" auditType="NONE" widgetType="TEXTBOX" widgetSize="" widgetLength="100" widgetIsMajor="true"></property>
     <property name="Country" description="" tooltip="" dataName="CITY_COUNTRY" dataType="INTEGER" dataNullable="true" isRequiredProperty="true" auditType="NONE" relationshipName="City_Country" widgetType="DROPDOWN" widgetSize="" widgetLength="20" widgetIsMajor="true" widgetDropDownKey="Id" widgetDropDownValue="Name" relationshipEntityPerspectiveName="Settings" relationshipEntityPerspectiveLabel="Entities"></property>
   </entity>
-  <entity name="Gender" dataName="GENDER" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}GENDER&quot;" dataQuery="" type="SETTING" title="Gender" caption="Manage entity Gender" description="Manage entity Gender" tooltip="Gender" icon="/services/web/resources/unicons/file.svg" menuKey="gender" menuLabel="Gender" menuIndex="100" layoutType="MANAGE" perspectiveName="Settings" perspectiveLabel="Entities" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/copy.svg" perspectiveOrder="100" perspectiveNavId="" perspectiveRole="" generateReport="false" multilingual="false" generateDefaultRoles="true" feedUsername="YWRtaW4=" feedPassword="YWRtaW4=" roleRead="codbex-employees.EmployeesSettings.GenderReadOnly" roleWrite="codbex-employees.EmployeesSettings.GenderFullAccess">
+  <entity name="Gender" dataName="GENDER" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}GENDER&quot;" dataQuery="" type="SETTING" title="Gender" caption="Manage entity Gender" description="Manage entity Gender" tooltip="Gender" icon="/services/web/resources/unicons/file.svg" menuKey="gender" menuLabel="Gender" menuIndex="100" layoutType="MANAGE" perspectiveName="Settings" perspectiveLabel="Settings" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/copy.svg" perspectiveOrder="100" perspectiveNavId="" perspectiveRole="" generateReport="false" multilingual="false" generateDefaultRoles="true" feedUsername="YWRtaW4=" feedPassword="YWRtaW4=" roleRead="codbex-employees.EmployeesSettings.GenderReadOnly" roleWrite="codbex-employees.EmployeesSettings.GenderFullAccess">
     <property name="Id" description="" tooltip="" dataName="GENDER_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="GENDER_NAME" dataType="VARCHAR" dataLength="7" dataNullable="true" isRequiredProperty="true" auditType="NONE" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
   </entity>
-  <entity name="MartialStatus" dataName="MARTIALSTATUS" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}MARTIALSTATUS&quot;" dataQuery="" type="SETTING" title="MartialStatus" caption="Manage entity MartialStatus" description="Manage entity MartialStatus" tooltip="MartialStatus" icon="/services/web/resources/unicons/file.svg" menuKey="martialstatus" menuLabel="MartialStatus" menuIndex="100" layoutType="MANAGE" perspectiveName="Settings" perspectiveLabel="Entities" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/copy.svg" perspectiveOrder="100" perspectiveNavId="" perspectiveRole="" generateReport="false" multilingual="false" generateDefaultRoles="true" feedUsername="YWRtaW4=" feedPassword="YWRtaW4=" roleRead="codbex-employees.EmployeesSettings.MartialStatusReadOnly" roleWrite="codbex-employees.EmployeesSettings.MartialStatusFullAccess">
+  <entity name="MartialStatus" dataName="MARTIALSTATUS" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}MARTIALSTATUS&quot;" dataQuery="" type="SETTING" title="MartialStatus" caption="Manage entity MartialStatus" description="Manage entity MartialStatus" tooltip="MartialStatus" icon="/services/web/resources/unicons/file.svg" menuKey="martialstatus" menuLabel="MartialStatus" menuIndex="100" layoutType="MANAGE" perspectiveName="Settings" perspectiveLabel="Settings" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/copy.svg" perspectiveOrder="100" perspectiveNavId="" perspectiveRole="" generateReport="false" multilingual="false" generateDefaultRoles="true" feedUsername="YWRtaW4=" feedPassword="YWRtaW4=" roleRead="codbex-employees.EmployeesSettings.MartialStatusReadOnly" roleWrite="codbex-employees.EmployeesSettings.MartialStatusFullAccess">
     <property name="Id" description="" tooltip="" dataName="MARTIALSTATUS_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="MARTIALSTATUS_NAME" dataType="VARCHAR" dataLength="20" dataNullable="true" isRequiredProperty="true" auditType="NONE" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
   </entity>
-  <relation name="Employee_Gender" type="relation" entity="Employee" relationName="Employee_Gender" relationshipEntityPerspectiveName="Settings" relationshipEntityPerspectiveLabel="Entities" property="Gender" referenced="Gender" referencedProperty="Id">
+  <relation name="Employee_Gender" type="relation" entity="Employee" relationName="Employee_Gender" relationshipEntityPerspectiveName="Settings" relationshipEntityPerspectiveLabel="Settings" property="Gender" referenced="Gender" referencedProperty="Id">
   </relation>
   <relation name="Employee_Country" type="relation" entity="Employee" relationName="Employee_Country" relationshipEntityPerspectiveName="Settings" relationshipEntityPerspectiveLabel="Settings" property="Nationality" referenced="Country" referencedProperty="Id">
   </relation>
-  <relation name="Employee_MartialStatus" type="relation" entity="Employee" relationName="Employee_MartialStatus" relationshipEntityPerspectiveName="Settings" relationshipEntityPerspectiveLabel="Entities" property="MartialStatus" referenced="MartialStatus" referencedProperty="Id">
+  <relation name="Employee_MartialStatus" type="relation" entity="Employee" relationName="Employee_MartialStatus" relationshipEntityPerspectiveName="Settings" relationshipEntityPerspectiveLabel="Settings" property="MartialStatus" referenced="MartialStatus" referencedProperty="Id">
   </relation>
   <entity name="Contact" dataName="CONTACT" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}CONTACT&quot;" dataQuery="" type="DEPENDENT" title="Contact" caption="Manage entity Contact" description="Manage entity Contact" tooltip="Contact" icon="/services/web/resources/unicons/file.svg" menuKey="contact" menuLabel="Contact" menuIndex="100" layoutType="MANAGE_DETAILS" perspectiveName="Employees" perspectiveLabel="Employees" perspectiveHeader="" perspectiveIcon="/services/web/resources/unicons/user.svg" perspectiveOrder="100" perspectiveNavId="employees-navigation-group" perspectiveRole="" generateReport="false" multilingual="false" generateDefaultRoles="true" roleRead="codbex-employees.Employees.ContactReadOnly" roleWrite="codbex-employees.Employees.ContactFullAccess">
     <property name="Id" description="" tooltip="" dataName="CONTACT_ID" dataType="INTEGER" dataNullable="true" dataPrimaryKey="true" dataAutoIncrement="true" auditType="NONE" widgetType="TEXTBOX" widgetSize="" widgetLength="20" widgetIsMajor="true"></property>
@@ -71,5 +71,5 @@
  </perspectives>
  <navigations>
  </navigations>
- <mxGraphModel><root><mxCell id="0"/><mxCell id="1" parent="0"/><mxCell id="6" style="entity" parent="1" vertex="1"><Entity name="Employee" dataName="EMPLOYEE" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}_EMPLOYEE&quot;" title="Employee" caption="Manage entity Employee" tooltip="Employee" menuLabel="Employee" type="Entity" menuKey="employee" perspectiveName="Employees" disableGeneration="false" layoutType="MANAGE_MASTER" description="Manage entity Employee" generateDefaultRoles="true" roleRead="codbex-employees.Employees.EmployeeReadOnly" roleWrite="codbex-employees.Employees.EmployeeFullAccess" as="value"/><mxGeometry x="20" y="50" width="200" height="366" as="geometry"><mxRectangle width="200" height="28" as="alternateBounds"/></mxGeometry></mxCell><mxCell id="7" parent="6" vertex="1" connectable="0"><Property name="Id" dataName="EMPLOYEE_ID" dataType="INTEGER" dataLength="0" dataPrimaryKey="true" dataAutoIncrement="true" as="value"/><mxGeometry y="28" width="200" height="26" as="geometry"/></mxCell><mxCell id="8" parent="6" vertex="1" connectable="0"><Property name="FirstName" dataName="EMPLOYEE_FIRSTNAME" dataLength="50" widgetLength="50" widgetLabel="First Name" widgetShortLabel="First Name" widgetSize="fd-col-md--4 fd-col--6" isRequiredProperty="true" dataNotNull="true" as="value"/><mxGeometry y="54" width="200" height="26" as="geometry"/></mxCell><mxCell id="9" parent="6" vertex="1" connectable="0"><Property name="MiddleName" dataName="EMPLOYEE_MIDDLENAME" dataLength="50" widgetLength="50" widgetLabel="Middle Name" widgetShortLabel="Middle Name" widgetSize="fd-col-md--4 fd-col--6" as="value"/><mxGeometry y="80" width="200" height="26" as="geometry"/></mxCell><mxCell id="10" parent="6" vertex="1" connectable="0"><Property name="LastName" dataName="EMPLOYEE_LASTNAME" dataLength="50" widgetLength="50" widgetLabel="Last Name" widgetShortLabel="Last Name" widgetSize="fd-col-md--4 fd-col--6" isRequiredProperty="true" dataNotNull="true" as="value"/><mxGeometry y="106" width="200" height="26" as="geometry"/></mxCell><mxCell id="9f482816-bac0-cf7a-fc98-05b284f43d85" parent="6" vertex="1" connectable="0"><Property name="Name" isCalculatedProperty="true" calculatedPropertyExpressionCreate="entity[&quot;FirstName&quot;] + &quot; &quot; + entity[&quot;LastName&quot;]" dataName="EMPLOYEE_NAME" dataLength="70" widgetLength="70" calculatedPropertyExpressionUpdate="entity[&quot;FirstName&quot;] + &quot; &quot; + entity[&quot;LastName&quot;]" widgetSize="fd-col-md--4 fd-col--6" as="value"/><mxGeometry y="132" width="200" height="26" as="geometry"/></mxCell><mxCell id="c7fc14cd-949a-b858-70e4-f047fe4d6634" parent="6" vertex="1" connectable="0"><Property name="Email" isRequiredProperty="true" dataName="EMPLOYEE_EMAIL" dataLength="40" widgetType="EMAIL" widgetLength="40" dataNotNull="true" dataUnique="true" widgetSize="fd-col-md--4 fd-col--6" as="value"/><mxGeometry y="158" width="200" height="26" as="geometry"/></mxCell><mxCell id="080df62c-c26a-9128-bc24-3ff359da38c0" parent="6" vertex="1" connectable="0"><Property name="PhoneNumber" isRequiredProperty="true" dataName="EMPLOYEE_PHONENUMBER" dataNotNull="true" dataUnique="true" widgetType="TEL" widgetSize="fd-col-md--4 fd-col--6" as="value"/><mxGeometry y="184" width="200" height="26" as="geometry"/></mxCell><mxCell id="7d3b730e-f8b5-9cbe-b646-ba67a19919de" parent="6" vertex="1" connectable="0"><Property name="BirthDate" isRequiredProperty="true" dataName="EMPLOYEE_BIRTHDATE" dataType="DATE" widgetType="DATE" dataNotNull="true" widgetSize="fd-col-md--4 fd-col--6" as="value"/><mxGeometry y="210" width="200" height="26" as="geometry"/></mxCell><mxCell id="f3da8460-b61b-c600-5f54-5635ac1b3c8a" parent="6" vertex="1" connectable="0"><Property name="PersonalNumber" isRequiredProperty="true" dataName="EMPLOYEE_PERSONALNUMBER" dataLength="10" widgetLength="10" dataNotNull="true" dataUnique="true" widgetSize="fd-col-md--4 fd-col--6" as="value"/><mxGeometry y="236" width="200" height="26" as="geometry"/></mxCell><mxCell id="27944ab4-7234-45c7-d232-230f051bf34a" parent="6" vertex="1" connectable="0"><Property name="Nationality" isRequiredProperty="true" dataName="EMPLOYEE_NATIONALITY" dataType="INTEGER" widgetType="DROPDOWN" widgetDropDownKey="Id" widgetDropDownValue="Name" dataNotNull="true" widgetSize="fd-col-md--4 fd-col--6" as="value"/><mxGeometry y="262" width="200" height="26" as="geometry"/></mxCell><mxCell id="d5559b85-05c2-e2e2-5eca-ef1c51368214" parent="6" vertex="1" connectable="0"><Property name="Gender" isRequiredProperty="true" dataName="EMPLOYEE_GENDER" dataType="INTEGER" dataLength="0" widgetType="DROPDOWN" widgetDropDownKey="Id" widgetDropDownValue="Name" dataNotNull="true" widgetSize="fd-col-md--4 fd-col--6" as="value"/><mxGeometry y="288" width="200" height="26" as="geometry"/></mxCell><mxCell id="b3193ae6-5785-37d0-3cd4-0db0047f54de" parent="6" vertex="1" connectable="0"><Property name="MartialStatus" isRequiredProperty="true" dataName="EMPLOYEE_MARTIALSTATUS" dataType="INTEGER" dataLength="0" widgetType="DROPDOWN" widgetDropDownKey="Id" widgetDropDownValue="Name" dataNotNull="true" widgetSize="fd-col-md--4 fd-col--6" as="value"/><mxGeometry y="314" width="200" height="26" as="geometry"/></mxCell><mxCell id="ef643cbe-696c-af14-1862-c73cd323df44" parent="6" vertex="1" connectable="0"><Property name="IBAN" isRequiredProperty="true" dataName="EMPLOYEE_IBAN" dataLength="34" widgetLength="34" dataNotNull="true" dataUnique="true" widgetSize="fd-col-md--4 fd-col--6" as="value"/><mxGeometry y="340" width="200" height="26" as="geometry"/></mxCell><mxCell id="fbe00c44-0fb5-1b5e-b471-d680fd0d9c8d" style="projection" parent="1" vertex="1" collapsed="1"><Entity name="Country" entityType="PROJECTION" dataName="COUNTRY" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}COUNTRY&quot;" title="Country" caption="Manage entity Country" tooltip="Country" menuLabel="Country" perspectiveName="Settings" perspectiveLabel="Settings" perspectiveIcon="/services/web/resources/unicons/globe.svg" projectionReferencedModel="/workspace/codbex-countries/codbex-countries.model" projectionReferencedEntity="Country" type="Entity" menuKey="country" description="Manage entity Country" as="value"/><mxGeometry x="340" y="410" width="200" height="28" as="geometry"><mxRectangle width="200" height="28" as="alternateBounds"/></mxGeometry></mxCell><mxCell id="c5b10919-b407-7d19-b9a5-0d90ed9e3fc0" style="projectionproperty" parent="fbe00c44-0fb5-1b5e-b471-d680fd0d9c8d" vertex="1" connectable="0"><Property name="Id" dataAutoIncrement="true" dataName="COUNTRY_ID" dataNullable="true" dataPrimaryKey="true" dataType="INTEGER" widgetSize="" as="value"/><mxGeometry y="28" width="200" height="26" as="geometry"/></mxCell><mxCell id="2d990af3-1503-21aa-8244-7175c1fbb0ad" style="projectionproperty" parent="fbe00c44-0fb5-1b5e-b471-d680fd0d9c8d" vertex="1" connectable="0"><Property name="Name" dataLength="255" dataName="COUNTRY_NAME" dataNullable="false" dataUnique="true" widgetSize="fd-col-md--4 fd-col--6" as="value"/><mxGeometry y="54" width="200" height="26" as="geometry"/></mxCell><mxCell id="71153665-3603-ad0d-d4f9-53271d8ba5fe" style="projectionproperty" parent="fbe00c44-0fb5-1b5e-b471-d680fd0d9c8d" vertex="1" connectable="0"><Property name="Code2" dataLength="2" dataName="COUNTRY_CODE2" dataNullable="false" dataType="CHAR" dataUnique="true" widgetSize="fd-col-md--2 fd-col--3" as="value"/><mxGeometry y="80" width="200" height="26" as="geometry"/></mxCell><mxCell id="ed55fe48-e1cd-a222-109d-8438de2b9c5e" style="projectionproperty" parent="fbe00c44-0fb5-1b5e-b471-d680fd0d9c8d" vertex="1" connectable="0"><Property name="Code3" dataLength="3" dataName="COUNTRY_CODE3" dataNullable="false" dataType="CHAR" dataUnique="true" widgetSize="fd-col-md--2 fd-col--3" as="value"/><mxGeometry y="106" width="200" height="26" as="geometry"/></mxCell><mxCell id="a02152dd-ce7d-1f60-4881-b24db309ae6b" style="projectionproperty" parent="fbe00c44-0fb5-1b5e-b471-d680fd0d9c8d" vertex="1" connectable="0"><Property name="Numeric" dataLength="3" dataName="COUNTRY_NUMERIC" dataNullable="false" dataType="CHAR" dataUnique="true" widgetSize="fd-col-md--2 fd-col--3" as="value"/><mxGeometry y="132" width="200" height="26" as="geometry"/></mxCell><mxCell id="ac9ee8a4-ba56-e8b6-a326-096b63d762f5" style="projection" parent="1" vertex="1" collapsed="1"><Entity name="City" entityType="PROJECTION" dataName="CITY" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}CITY&quot;" title="City" caption="Manage entity City" tooltip="City" menuLabel="City" perspectiveName="Settings" perspectiveLabel="Settings" perspectiveIcon="/services/web/resources/unicons/building.svg" projectionReferencedModel="/workspace/codbex-cities/codbex-cities.model" projectionReferencedEntity="City" type="Entity" menuKey="city" description="Manage entity City" as="value"/><mxGeometry x="330" y="360" width="200" height="28" as="geometry"><mxRectangle width="200" height="28" as="alternateBounds"/></mxGeometry></mxCell><mxCell id="09189593-bfc5-81aa-e017-bcad11e4a09c" style="projectionproperty" parent="ac9ee8a4-ba56-e8b6-a326-096b63d762f5" vertex="1" connectable="0"><Property name="Id" dataAutoIncrement="true" dataName="CITY_ID" dataNullable="true" dataPrimaryKey="true" dataType="INTEGER" widgetSize="" as="value"/><mxGeometry y="28" width="200" height="26" as="geometry"/></mxCell><mxCell id="d7a7c24c-f045-5c6c-3d8c-2634a84a42cb" style="projectionproperty" parent="ac9ee8a4-ba56-e8b6-a326-096b63d762f5" vertex="1" connectable="0"><Property name="Name" dataLength="100" dataName="CITY_NAME" dataNullable="false" isRequiredProperty="true" widgetLength="100" widgetSize="" as="value"/><mxGeometry y="54" width="200" height="26" as="geometry"/></mxCell><mxCell id="a95fde79-a1af-4d41-ea0a-05c5c8137507" style="projectionproperty" parent="ac9ee8a4-ba56-e8b6-a326-096b63d762f5" vertex="1" connectable="0"><Property name="Country" dataName="CITY_COUNTRY" dataNullable="false" dataType="INTEGER" isRequiredProperty="true" widgetDropDownKey="Id" widgetDropDownValue="Name" widgetSize="" widgetType="DROPDOWN" relationshipName="City_Country" relationshipEntityName="Country" relationshipEntityPerspectiveName="Settings" relationshipEntityPerspectiveLabel="Entities" as="value"/><mxGeometry y="80" width="200" height="26" as="geometry"/></mxCell><mxCell id="0a869de5-f0a4-778d-d380-e25330838627" style="entity" parent="1" vertex="1"><Entity name="Gender" dataName="GENDER" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}GENDER&quot;" title="Gender" caption="Manage entity Gender" tooltip="Gender" menuLabel="Gender" type="Entity" menuKey="gender" entityType="SETTING" perspectiveName="Settings" description="Manage entity Gender" generateDefaultRoles="true" roleRead="codbex-employees.EmployeesSettings.GenderReadOnly" roleWrite="codbex-employees.EmployeesSettings.GenderFullAccess" feedUsername="YWRtaW4=" feedPassword="YWRtaW4=" as="value"/><mxGeometry x="30" y="540" width="200" height="80" as="geometry"><mxRectangle width="200" height="28" as="alternateBounds"/></mxGeometry></mxCell><mxCell id="ed3bac1c-2568-3df1-3bcd-01e7788d0ccc" parent="0a869de5-f0a4-778d-d380-e25330838627" vertex="1" connectable="0"><Property name="Id" dataType="INTEGER" dataLength="0" dataPrimaryKey="true" dataAutoIncrement="true" dataName="GENDER_ID" as="value"/><mxGeometry y="28" width="200" height="26" as="geometry"/></mxCell><mxCell id="b84f23f6-98ac-46b0-ba45-bf35b00bab25" parent="0a869de5-f0a4-778d-d380-e25330838627" vertex="1" connectable="0"><Property name="Name" isRequiredProperty="true" dataName="GENDER_NAME" dataLength="7" dataPrecision="NaN" dataScale="NaN" as="value"/><mxGeometry y="54" width="200" height="26" as="geometry"/></mxCell><mxCell id="39ac7e46-e1fd-f8e5-f8e1-ee412daec269" style="entity" parent="1" vertex="1"><Entity name="MartialStatus" dataName="MARTIALSTATUS" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}MARTIALSTATUS&quot;" title="MartialStatus" caption="Manage entity MartialStatus" tooltip="MartialStatus" menuLabel="MartialStatus" type="Entity" menuKey="martialstatus" entityType="SETTING" perspectiveName="Settings" description="Manage entity MartialStatus" generateDefaultRoles="true" roleRead="codbex-employees.EmployeesSettings.MartialStatusReadOnly" roleWrite="codbex-employees.EmployeesSettings.MartialStatusFullAccess" feedUsername="YWRtaW4=" feedPassword="YWRtaW4=" as="value"/><mxGeometry x="20" y="440" width="200" height="80" as="geometry"><mxRectangle width="200" height="28" as="alternateBounds"/></mxGeometry></mxCell><mxCell id="6ff62375-d7aa-732b-7fd5-858f4dae89cb" parent="39ac7e46-e1fd-f8e5-f8e1-ee412daec269" vertex="1" connectable="0"><Property name="Id" dataType="INTEGER" dataLength="0" dataPrimaryKey="true" dataAutoIncrement="true" dataName="MARTIALSTATUS_ID" as="value"/><mxGeometry y="28" width="200" height="26" as="geometry"/></mxCell><mxCell id="136f7c42-683c-8c6d-20fc-c4b7dac80724" parent="39ac7e46-e1fd-f8e5-f8e1-ee412daec269" vertex="1" connectable="0"><Property name="Name" isRequiredProperty="true" dataName="MARTIALSTATUS_NAME" dataPrecision="NaN" dataScale="NaN" as="value"/><mxGeometry y="54" width="200" height="26" as="geometry"/></mxCell><mxCell id="2c305e47-e996-c929-cbc1-921cb653ff28" parent="1" source="d5559b85-05c2-e2e2-5eca-ef1c51368214" target="ed3bac1c-2568-3df1-3bcd-01e7788d0ccc" edge="1"><mxGeometry relative="1" as="geometry"/></mxCell><mxCell id="99c5f29d-d0f5-da98-ccff-47610ca70b62" parent="1" source="27944ab4-7234-45c7-d232-230f051bf34a" target="c5b10919-b407-7d19-b9a5-0d90ed9e3fc0" edge="1"><mxGeometry relative="1" as="geometry"/></mxCell><mxCell id="440c08f9-50ce-e821-98f2-c518f4b0aa79" parent="1" source="b3193ae6-5785-37d0-3cd4-0db0047f54de" target="6ff62375-d7aa-732b-7fd5-858f4dae89cb" edge="1"><mxGeometry relative="1" as="geometry"/></mxCell><mxCell id="ce9f3f4c-d8d7-67c2-1753-2e02158289b4" style="entity" parent="1" vertex="1"><Entity name="Contact" dataName="CONTACT" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}CONTACT&quot;" title="Contact" caption="Manage entity Contact" tooltip="Contact" menuLabel="Contact" type="Entity" menuKey="contact" entityType="DEPENDENT" layoutType="MANAGE_DETAILS" perspectiveName="Employees" description="Manage entity Contact" generateDefaultRoles="true" roleRead="codbex-employees.Employees.ContactReadOnly" roleWrite="codbex-employees.Employees.ContactFullAccess" as="value"/><mxGeometry x="330" y="210" width="200" height="132" as="geometry"><mxRectangle width="200" height="28" as="alternateBounds"/></mxGeometry></mxCell><mxCell id="93905b22-a899-6e5d-9d12-b34cb5ea8900" parent="ce9f3f4c-d8d7-67c2-1753-2e02158289b4" vertex="1" connectable="0"><Property name="Id" dataType="INTEGER" dataLength="0" dataPrimaryKey="true" dataAutoIncrement="true" dataName="CONTACT_ID" as="value"/><mxGeometry y="28" width="200" height="26" as="geometry"/></mxCell><mxCell id="7e27a592-f6fb-7a50-94cb-99ecc5299f4e" parent="ce9f3f4c-d8d7-67c2-1753-2e02158289b4" vertex="1" connectable="0"><Property name="PhoneNumber" isRequiredProperty="true" dataName="CONTACT_PHONENUMBER" dataNotNull="true" widgetType="TEL" widgetSize="fd-col-md--4 fd-col--6" as="value"/><mxGeometry y="54" width="200" height="26" as="geometry"/></mxCell><mxCell id="ae4252b7-5048-97a8-bf4a-b242e1726f19" parent="ce9f3f4c-d8d7-67c2-1753-2e02158289b4" vertex="1" connectable="0"><Property name="Email" isRequiredProperty="true" dataName="CONTACT_EMAIL" dataLength="255" dataNotNull="true" dataUnique="true" widgetType="EMAIL" widgetLength="255" widgetSize="fd-col-md--4 fd-col--6" as="value"/><mxGeometry y="80" width="200" height="26" as="geometry"/></mxCell><mxCell id="def2223e-0e2c-8b1b-20f8-d223751c76bf" parent="ce9f3f4c-d8d7-67c2-1753-2e02158289b4" vertex="1" connectable="0"><Property name="Employee" dataName="CONTACT_EMPLOYEE" dataType="INTEGER" dataLength="0" relationshipType="COMPOSITION" relationshipCardinality="1_n" relationshipName="Contact" as="value"/><mxGeometry y="106" width="200" height="26" as="geometry"/></mxCell><mxCell id="37dc84bc-a9c6-1a18-0756-4e6db5b6ad70" style="entity" parent="1" vertex="1"><Entity name="Address" entityType="DEPENDENT" dataName="ADDRESS" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}ADDRESS&quot;" title="Address" caption="Manage entity Address" description="Manage entity Address" tooltip="Address" menuLabel="Address" layoutType="MANAGE_DETAILS" perspectiveName="Employees" type="Entity" menuKey="address" as="value"/><mxGeometry x="320" y="10" width="200" height="184" as="geometry"><mxRectangle width="200" height="28" as="alternateBounds"/></mxGeometry></mxCell><mxCell id="1ec50866-4469-1dc9-d1c4-b3694cb7ec81" parent="37dc84bc-a9c6-1a18-0756-4e6db5b6ad70" vertex="1" connectable="0"><Property name="Id" dataType="INTEGER" dataLength="0" dataPrimaryKey="true" dataAutoIncrement="true" dataName="ADDRESS_ID" as="value"/><mxGeometry y="28" width="200" height="26" as="geometry"/></mxCell><mxCell id="1cdbf06c-6538-3b48-2d01-a3c8d0efd431" parent="37dc84bc-a9c6-1a18-0756-4e6db5b6ad70" vertex="1" connectable="0"><Property name="Country" dataName="ADDRESS_COUNTRY" dataType="INTEGER" widgetType="DROPDOWN" widgetDropDownKey="Id" widgetDropDownValue="Name" widgetSize="fd-col-md--4 fd-col--6" isRequiredProperty="true" dataNotNull="true" as="value"/><mxGeometry y="54" width="200" height="26" as="geometry"/></mxCell><mxCell id="10c69f65-657f-9fa0-66e0-b3452177b540" parent="37dc84bc-a9c6-1a18-0756-4e6db5b6ad70" vertex="1" connectable="0"><Property name="City" dataName="ADDRESS_CITY" dataType="INTEGER" widgetType="DROPDOWN" widgetDropDownKey="Id" widgetDropDownValue="Name" widgetDependsOnProperty="Country" widgetDependsOnEntity="Country" widgetDependsOnValueFrom="Id" widgetDependsOnFilterBy="Country" widgetSize="fd-col-md--4 fd-col--6" isRequiredProperty="true" dataNotNull="true" as="value"/><mxGeometry y="80" width="200" height="26" as="geometry"/></mxCell><mxCell id="86a2851d-cb8d-d33d-e744-0c4832c45731" parent="37dc84bc-a9c6-1a18-0756-4e6db5b6ad70" vertex="1" connectable="0"><Property name="Address" isRequiredProperty="true" dataName="ADDRESS_ADDRESS" dataLength="255" widgetLength="255" widgetSize="fd-col-md--4 fd-col--6" dataNotNull="true" as="value"/><mxGeometry y="106" width="200" height="26" as="geometry"/></mxCell><mxCell id="b5887ab3-7e4d-9dd6-e774-f739ea2f8cfe" parent="37dc84bc-a9c6-1a18-0756-4e6db5b6ad70" vertex="1" connectable="0"><Property name="PostalCode" isRequiredProperty="true" dataName="ADDRESS_POSTALCODE" dataLength="12" widgetLength="12" widgetSize="fd-col-md--4 fd-col--6" dataNotNull="true" as="value"/><mxGeometry y="132" width="200" height="26" as="geometry"/></mxCell><mxCell id="ab1d4816-c7f2-0cae-d0f3-2e97b7f0d15e" parent="37dc84bc-a9c6-1a18-0756-4e6db5b6ad70" vertex="1" connectable="0"><Property name="Employee" dataName="ADDRESS_EMPLOYEE" dataType="INTEGER" dataLength="0" relationshipType="COMPOSITION" relationshipCardinality="1_n" relationshipName="Address" as="value"/><mxGeometry y="158" width="200" height="26" as="geometry"/></mxCell><mxCell id="e8f01ab9-f63a-abc3-bf74-44a27cbaa196" parent="1" source="1cdbf06c-6538-3b48-2d01-a3c8d0efd431" target="c5b10919-b407-7d19-b9a5-0d90ed9e3fc0" edge="1"><mxGeometry relative="1" as="geometry"/></mxCell><mxCell id="04b81893-6294-b8fe-4399-81aa599bcf0c" parent="1" source="10c69f65-657f-9fa0-66e0-b3452177b540" target="09189593-bfc5-81aa-e017-bcad11e4a09c" edge="1"><mxGeometry relative="1" as="geometry"/></mxCell><mxCell id="9c19ddb6-2df8-b46c-2074-4f1b5d242cac" parent="1" source="ab1d4816-c7f2-0cae-d0f3-2e97b7f0d15e" target="7" edge="1"><Connector name="Address" as="value"/><mxGeometry relative="1" as="geometry"/></mxCell><mxCell id="f6a05cbf-0b6e-90d2-a3f3-d32e7d99803a" parent="1" source="def2223e-0e2c-8b1b-20f8-d223751c76bf" target="7" edge="1"><Connector name="Contact" as="value"/><mxGeometry relative="1" as="geometry"/></mxCell></root></mxGraphModel>
+ <mxGraphModel><root><mxCell id="0"/><mxCell id="1" parent="0"/><mxCell id="6" style="entity" parent="1" vertex="1"><Entity name="Employee" dataName="EMPLOYEE" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}_EMPLOYEE&quot;" title="Employee" caption="Manage entity Employee" tooltip="Employee" menuLabel="Employee" type="Entity" menuKey="employee" perspectiveName="Employees" disableGeneration="false" layoutType="MANAGE_MASTER" description="Manage entity Employee" generateDefaultRoles="true" roleRead="codbex-employees.Employees.EmployeeReadOnly" roleWrite="codbex-employees.Employees.EmployeeFullAccess" as="value"/><mxGeometry x="20" y="50" width="200" height="366" as="geometry"><mxRectangle width="200" height="28" as="alternateBounds"/></mxGeometry></mxCell><mxCell id="7" parent="6" vertex="1" connectable="0"><Property name="Id" dataName="EMPLOYEE_ID" dataType="INTEGER" dataLength="0" dataPrimaryKey="true" dataAutoIncrement="true" as="value"/><mxGeometry y="28" width="200" height="26" as="geometry"/></mxCell><mxCell id="8" parent="6" vertex="1" connectable="0"><Property name="FirstName" dataName="EMPLOYEE_FIRSTNAME" dataLength="50" widgetLength="50" widgetLabel="First Name" widgetShortLabel="First Name" widgetSize="fd-col-md--4 fd-col--6" isRequiredProperty="true" dataNotNull="true" as="value"/><mxGeometry y="54" width="200" height="26" as="geometry"/></mxCell><mxCell id="9" parent="6" vertex="1" connectable="0"><Property name="MiddleName" dataName="EMPLOYEE_MIDDLENAME" dataLength="50" widgetLength="50" widgetLabel="Middle Name" widgetShortLabel="Middle Name" widgetSize="fd-col-md--4 fd-col--6" as="value"/><mxGeometry y="80" width="200" height="26" as="geometry"/></mxCell><mxCell id="10" parent="6" vertex="1" connectable="0"><Property name="LastName" dataName="EMPLOYEE_LASTNAME" dataLength="50" widgetLength="50" widgetLabel="Last Name" widgetShortLabel="Last Name" widgetSize="fd-col-md--4 fd-col--6" isRequiredProperty="true" dataNotNull="true" as="value"/><mxGeometry y="106" width="200" height="26" as="geometry"/></mxCell><mxCell id="9f482816-bac0-cf7a-fc98-05b284f43d85" parent="6" vertex="1" connectable="0"><Property name="Name" isCalculatedProperty="true" calculatedPropertyExpressionCreate="entity[&quot;FirstName&quot;] + &quot; &quot; + entity[&quot;LastName&quot;]" dataName="EMPLOYEE_NAME" dataLength="70" widgetLength="70" calculatedPropertyExpressionUpdate="entity[&quot;FirstName&quot;] + &quot; &quot; + entity[&quot;LastName&quot;]" widgetSize="fd-col-md--4 fd-col--6" as="value"/><mxGeometry y="132" width="200" height="26" as="geometry"/></mxCell><mxCell id="c7fc14cd-949a-b858-70e4-f047fe4d6634" parent="6" vertex="1" connectable="0"><Property name="Email" isRequiredProperty="true" dataName="EMPLOYEE_EMAIL" dataLength="40" widgetType="EMAIL" widgetLength="40" dataNotNull="true" dataUnique="true" widgetSize="fd-col-md--4 fd-col--6" as="value"/><mxGeometry y="158" width="200" height="26" as="geometry"/></mxCell><mxCell id="080df62c-c26a-9128-bc24-3ff359da38c0" parent="6" vertex="1" connectable="0"><Property name="PhoneNumber" isRequiredProperty="true" dataName="EMPLOYEE_PHONENUMBER" dataNotNull="true" dataUnique="true" widgetType="TEL" widgetSize="fd-col-md--4 fd-col--6" as="value"/><mxGeometry y="184" width="200" height="26" as="geometry"/></mxCell><mxCell id="7d3b730e-f8b5-9cbe-b646-ba67a19919de" parent="6" vertex="1" connectable="0"><Property name="BirthDate" isRequiredProperty="true" dataName="EMPLOYEE_BIRTHDATE" dataType="DATE" widgetType="DATE" dataNotNull="true" widgetSize="fd-col-md--4 fd-col--6" as="value"/><mxGeometry y="210" width="200" height="26" as="geometry"/></mxCell><mxCell id="f3da8460-b61b-c600-5f54-5635ac1b3c8a" parent="6" vertex="1" connectable="0"><Property name="PersonalNumber" isRequiredProperty="true" dataName="EMPLOYEE_PERSONALNUMBER" dataLength="10" widgetLength="10" dataNotNull="true" dataUnique="true" widgetSize="fd-col-md--4 fd-col--6" as="value"/><mxGeometry y="236" width="200" height="26" as="geometry"/></mxCell><mxCell id="27944ab4-7234-45c7-d232-230f051bf34a" parent="6" vertex="1" connectable="0"><Property name="Nationality" isRequiredProperty="true" dataName="EMPLOYEE_NATIONALITY" dataType="INTEGER" widgetType="DROPDOWN" widgetDropDownKey="Id" widgetDropDownValue="Name" dataNotNull="true" widgetSize="fd-col-md--4 fd-col--6" as="value"/><mxGeometry y="262" width="200" height="26" as="geometry"/></mxCell><mxCell id="d5559b85-05c2-e2e2-5eca-ef1c51368214" parent="6" vertex="1" connectable="0"><Property name="Gender" isRequiredProperty="true" dataName="EMPLOYEE_GENDER" dataType="INTEGER" dataLength="0" widgetType="DROPDOWN" widgetDropDownKey="Id" widgetDropDownValue="Name" dataNotNull="true" widgetSize="fd-col-md--4 fd-col--6" as="value"/><mxGeometry y="288" width="200" height="26" as="geometry"/></mxCell><mxCell id="b3193ae6-5785-37d0-3cd4-0db0047f54de" parent="6" vertex="1" connectable="0"><Property name="MartialStatus" isRequiredProperty="true" dataName="EMPLOYEE_MARTIALSTATUS" dataType="INTEGER" dataLength="0" widgetType="DROPDOWN" widgetDropDownKey="Id" widgetDropDownValue="Name" dataNotNull="true" widgetSize="fd-col-md--4 fd-col--6" as="value"/><mxGeometry y="314" width="200" height="26" as="geometry"/></mxCell><mxCell id="ef643cbe-696c-af14-1862-c73cd323df44" parent="6" vertex="1" connectable="0"><Property name="IBAN" isRequiredProperty="true" dataName="EMPLOYEE_IBAN" dataLength="34" widgetLength="34" dataNotNull="true" dataUnique="true" widgetSize="fd-col-md--4 fd-col--6" as="value"/><mxGeometry y="340" width="200" height="26" as="geometry"/></mxCell><mxCell id="fbe00c44-0fb5-1b5e-b471-d680fd0d9c8d" style="projection" parent="1" vertex="1" collapsed="1"><Entity name="Country" entityType="PROJECTION" dataName="COUNTRY" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}COUNTRY&quot;" title="Country" caption="Manage entity Country" tooltip="Country" menuLabel="Country" perspectiveName="Settings" perspectiveLabel="Settings" perspectiveIcon="/services/web/resources/unicons/globe.svg" projectionReferencedModel="/workspace/codbex-countries/codbex-countries.model" projectionReferencedEntity="Country" type="Entity" menuKey="country" description="Manage entity Country" as="value"/><mxGeometry x="340" y="410" width="200" height="28" as="geometry"><mxRectangle width="200" height="28" as="alternateBounds"/></mxGeometry></mxCell><mxCell id="c5b10919-b407-7d19-b9a5-0d90ed9e3fc0" style="projectionproperty" parent="fbe00c44-0fb5-1b5e-b471-d680fd0d9c8d" vertex="1" connectable="0"><Property name="Id" dataAutoIncrement="true" dataName="COUNTRY_ID" dataNullable="true" dataPrimaryKey="true" dataType="INTEGER" widgetSize="" as="value"/><mxGeometry y="28" width="200" height="26" as="geometry"/></mxCell><mxCell id="2d990af3-1503-21aa-8244-7175c1fbb0ad" style="projectionproperty" parent="fbe00c44-0fb5-1b5e-b471-d680fd0d9c8d" vertex="1" connectable="0"><Property name="Name" dataLength="255" dataName="COUNTRY_NAME" dataNullable="false" dataUnique="true" widgetSize="fd-col-md--4 fd-col--6" as="value"/><mxGeometry y="54" width="200" height="26" as="geometry"/></mxCell><mxCell id="71153665-3603-ad0d-d4f9-53271d8ba5fe" style="projectionproperty" parent="fbe00c44-0fb5-1b5e-b471-d680fd0d9c8d" vertex="1" connectable="0"><Property name="Code2" dataLength="2" dataName="COUNTRY_CODE2" dataNullable="false" dataType="CHAR" dataUnique="true" widgetSize="fd-col-md--2 fd-col--3" as="value"/><mxGeometry y="80" width="200" height="26" as="geometry"/></mxCell><mxCell id="ed55fe48-e1cd-a222-109d-8438de2b9c5e" style="projectionproperty" parent="fbe00c44-0fb5-1b5e-b471-d680fd0d9c8d" vertex="1" connectable="0"><Property name="Code3" dataLength="3" dataName="COUNTRY_CODE3" dataNullable="false" dataType="CHAR" dataUnique="true" widgetSize="fd-col-md--2 fd-col--3" as="value"/><mxGeometry y="106" width="200" height="26" as="geometry"/></mxCell><mxCell id="a02152dd-ce7d-1f60-4881-b24db309ae6b" style="projectionproperty" parent="fbe00c44-0fb5-1b5e-b471-d680fd0d9c8d" vertex="1" connectable="0"><Property name="Numeric" dataLength="3" dataName="COUNTRY_NUMERIC" dataNullable="false" dataType="CHAR" dataUnique="true" widgetSize="fd-col-md--2 fd-col--3" as="value"/><mxGeometry y="132" width="200" height="26" as="geometry"/></mxCell><mxCell id="ac9ee8a4-ba56-e8b6-a326-096b63d762f5" style="projection" parent="1" vertex="1" collapsed="1"><Entity name="City" entityType="PROJECTION" dataName="CITY" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}CITY&quot;" title="City" caption="Manage entity City" tooltip="City" menuLabel="City" perspectiveName="Settings" perspectiveLabel="Settings" perspectiveIcon="/services/web/resources/unicons/building.svg" projectionReferencedModel="/workspace/codbex-cities/codbex-cities.model" projectionReferencedEntity="City" type="Entity" menuKey="city" description="Manage entity City" as="value"/><mxGeometry x="330" y="360" width="200" height="28" as="geometry"><mxRectangle width="200" height="28" as="alternateBounds"/></mxGeometry></mxCell><mxCell id="09189593-bfc5-81aa-e017-bcad11e4a09c" style="projectionproperty" parent="ac9ee8a4-ba56-e8b6-a326-096b63d762f5" vertex="1" connectable="0"><Property name="Id" dataAutoIncrement="true" dataName="CITY_ID" dataNullable="true" dataPrimaryKey="true" dataType="INTEGER" widgetSize="" as="value"/><mxGeometry y="28" width="200" height="26" as="geometry"/></mxCell><mxCell id="d7a7c24c-f045-5c6c-3d8c-2634a84a42cb" style="projectionproperty" parent="ac9ee8a4-ba56-e8b6-a326-096b63d762f5" vertex="1" connectable="0"><Property name="Name" dataLength="100" dataName="CITY_NAME" dataNullable="false" isRequiredProperty="true" widgetLength="100" widgetSize="" as="value"/><mxGeometry y="54" width="200" height="26" as="geometry"/></mxCell><mxCell id="a95fde79-a1af-4d41-ea0a-05c5c8137507" style="projectionproperty" parent="ac9ee8a4-ba56-e8b6-a326-096b63d762f5" vertex="1" connectable="0"><Property name="Country" dataName="CITY_COUNTRY" dataNullable="false" dataType="INTEGER" isRequiredProperty="true" widgetDropDownKey="Id" widgetDropDownValue="Name" widgetSize="" widgetType="DROPDOWN" relationshipName="City_Country" relationshipEntityName="Country" relationshipEntityPerspectiveName="Settings" relationshipEntityPerspectiveLabel="Entities" as="value"/><mxGeometry y="80" width="200" height="26" as="geometry"/></mxCell><mxCell id="0a869de5-f0a4-778d-d380-e25330838627" style="entity" parent="1" vertex="1"><Entity name="Gender" dataName="GENDER" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}GENDER&quot;" title="Gender" caption="Manage entity Gender" tooltip="Gender" menuLabel="Gender" type="Entity" menuKey="gender" entityType="SETTING" perspectiveName="Settings" description="Manage entity Gender" generateDefaultRoles="true" roleRead="codbex-employees.EmployeesSettings.GenderReadOnly" roleWrite="codbex-employees.EmployeesSettings.GenderFullAccess" feedUsername="YWRtaW4=" feedPassword="YWRtaW4=" perspectiveLabel="Settings" as="value"/><mxGeometry x="30" y="540" width="200" height="80" as="geometry"><mxRectangle width="200" height="28" as="alternateBounds"/></mxGeometry></mxCell><mxCell id="ed3bac1c-2568-3df1-3bcd-01e7788d0ccc" parent="0a869de5-f0a4-778d-d380-e25330838627" vertex="1" connectable="0"><Property name="Id" dataType="INTEGER" dataLength="0" dataPrimaryKey="true" dataAutoIncrement="true" dataName="GENDER_ID" as="value"/><mxGeometry y="28" width="200" height="26" as="geometry"/></mxCell><mxCell id="b84f23f6-98ac-46b0-ba45-bf35b00bab25" parent="0a869de5-f0a4-778d-d380-e25330838627" vertex="1" connectable="0"><Property name="Name" isRequiredProperty="true" dataName="GENDER_NAME" dataLength="7" dataPrecision="NaN" dataScale="NaN" as="value"/><mxGeometry y="54" width="200" height="26" as="geometry"/></mxCell><mxCell id="39ac7e46-e1fd-f8e5-f8e1-ee412daec269" style="entity" parent="1" vertex="1"><Entity name="MartialStatus" dataName="MARTIALSTATUS" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}MARTIALSTATUS&quot;" title="MartialStatus" caption="Manage entity MartialStatus" tooltip="MartialStatus" menuLabel="MartialStatus" type="Entity" menuKey="martialstatus" entityType="SETTING" perspectiveName="Settings" description="Manage entity MartialStatus" generateDefaultRoles="true" roleRead="codbex-employees.EmployeesSettings.MartialStatusReadOnly" roleWrite="codbex-employees.EmployeesSettings.MartialStatusFullAccess" feedUsername="YWRtaW4=" feedPassword="YWRtaW4=" perspectiveLabel="Settings" as="value"/><mxGeometry x="20" y="440" width="200" height="80" as="geometry"><mxRectangle width="200" height="28" as="alternateBounds"/></mxGeometry></mxCell><mxCell id="6ff62375-d7aa-732b-7fd5-858f4dae89cb" parent="39ac7e46-e1fd-f8e5-f8e1-ee412daec269" vertex="1" connectable="0"><Property name="Id" dataType="INTEGER" dataLength="0" dataPrimaryKey="true" dataAutoIncrement="true" dataName="MARTIALSTATUS_ID" as="value"/><mxGeometry y="28" width="200" height="26" as="geometry"/></mxCell><mxCell id="136f7c42-683c-8c6d-20fc-c4b7dac80724" parent="39ac7e46-e1fd-f8e5-f8e1-ee412daec269" vertex="1" connectable="0"><Property name="Name" isRequiredProperty="true" dataName="MARTIALSTATUS_NAME" dataPrecision="NaN" dataScale="NaN" as="value"/><mxGeometry y="54" width="200" height="26" as="geometry"/></mxCell><mxCell id="2c305e47-e996-c929-cbc1-921cb653ff28" parent="1" source="d5559b85-05c2-e2e2-5eca-ef1c51368214" target="ed3bac1c-2568-3df1-3bcd-01e7788d0ccc" edge="1"><mxGeometry relative="1" as="geometry"/></mxCell><mxCell id="99c5f29d-d0f5-da98-ccff-47610ca70b62" parent="1" source="27944ab4-7234-45c7-d232-230f051bf34a" target="c5b10919-b407-7d19-b9a5-0d90ed9e3fc0" edge="1"><mxGeometry relative="1" as="geometry"/></mxCell><mxCell id="440c08f9-50ce-e821-98f2-c518f4b0aa79" parent="1" source="b3193ae6-5785-37d0-3cd4-0db0047f54de" target="6ff62375-d7aa-732b-7fd5-858f4dae89cb" edge="1"><mxGeometry relative="1" as="geometry"/></mxCell><mxCell id="ce9f3f4c-d8d7-67c2-1753-2e02158289b4" style="entity" parent="1" vertex="1"><Entity name="Contact" dataName="CONTACT" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}CONTACT&quot;" title="Contact" caption="Manage entity Contact" tooltip="Contact" menuLabel="Contact" type="Entity" menuKey="contact" entityType="DEPENDENT" layoutType="MANAGE_DETAILS" perspectiveName="Employees" description="Manage entity Contact" generateDefaultRoles="true" roleRead="codbex-employees.Employees.ContactReadOnly" roleWrite="codbex-employees.Employees.ContactFullAccess" as="value"/><mxGeometry x="330" y="210" width="200" height="132" as="geometry"><mxRectangle width="200" height="28" as="alternateBounds"/></mxGeometry></mxCell><mxCell id="93905b22-a899-6e5d-9d12-b34cb5ea8900" parent="ce9f3f4c-d8d7-67c2-1753-2e02158289b4" vertex="1" connectable="0"><Property name="Id" dataType="INTEGER" dataLength="0" dataPrimaryKey="true" dataAutoIncrement="true" dataName="CONTACT_ID" as="value"/><mxGeometry y="28" width="200" height="26" as="geometry"/></mxCell><mxCell id="7e27a592-f6fb-7a50-94cb-99ecc5299f4e" parent="ce9f3f4c-d8d7-67c2-1753-2e02158289b4" vertex="1" connectable="0"><Property name="PhoneNumber" isRequiredProperty="true" dataName="CONTACT_PHONENUMBER" dataNotNull="true" widgetType="TEL" widgetSize="fd-col-md--4 fd-col--6" as="value"/><mxGeometry y="54" width="200" height="26" as="geometry"/></mxCell><mxCell id="ae4252b7-5048-97a8-bf4a-b242e1726f19" parent="ce9f3f4c-d8d7-67c2-1753-2e02158289b4" vertex="1" connectable="0"><Property name="Email" isRequiredProperty="true" dataName="CONTACT_EMAIL" dataLength="255" dataNotNull="true" dataUnique="true" widgetType="EMAIL" widgetLength="255" widgetSize="fd-col-md--4 fd-col--6" as="value"/><mxGeometry y="80" width="200" height="26" as="geometry"/></mxCell><mxCell id="def2223e-0e2c-8b1b-20f8-d223751c76bf" parent="ce9f3f4c-d8d7-67c2-1753-2e02158289b4" vertex="1" connectable="0"><Property name="Employee" dataName="CONTACT_EMPLOYEE" dataType="INTEGER" dataLength="0" relationshipType="COMPOSITION" relationshipCardinality="1_n" relationshipName="Contact" as="value"/><mxGeometry y="106" width="200" height="26" as="geometry"/></mxCell><mxCell id="37dc84bc-a9c6-1a18-0756-4e6db5b6ad70" style="entity" parent="1" vertex="1"><Entity name="Address" entityType="DEPENDENT" dataName="ADDRESS" dataCount="SELECT COUNT(*) AS COUNT FROM &quot;${tablePrefix}ADDRESS&quot;" title="Address" caption="Manage entity Address" description="Manage entity Address" tooltip="Address" menuLabel="Address" layoutType="MANAGE_DETAILS" perspectiveName="Employees" type="Entity" menuKey="address" as="value"/><mxGeometry x="320" y="10" width="200" height="184" as="geometry"><mxRectangle width="200" height="28" as="alternateBounds"/></mxGeometry></mxCell><mxCell id="1ec50866-4469-1dc9-d1c4-b3694cb7ec81" parent="37dc84bc-a9c6-1a18-0756-4e6db5b6ad70" vertex="1" connectable="0"><Property name="Id" dataType="INTEGER" dataLength="0" dataPrimaryKey="true" dataAutoIncrement="true" dataName="ADDRESS_ID" as="value"/><mxGeometry y="28" width="200" height="26" as="geometry"/></mxCell><mxCell id="1cdbf06c-6538-3b48-2d01-a3c8d0efd431" parent="37dc84bc-a9c6-1a18-0756-4e6db5b6ad70" vertex="1" connectable="0"><Property name="Country" dataName="ADDRESS_COUNTRY" dataType="INTEGER" widgetType="DROPDOWN" widgetDropDownKey="Id" widgetDropDownValue="Name" widgetSize="fd-col-md--4 fd-col--6" isRequiredProperty="true" dataNotNull="true" as="value"/><mxGeometry y="54" width="200" height="26" as="geometry"/></mxCell><mxCell id="10c69f65-657f-9fa0-66e0-b3452177b540" parent="37dc84bc-a9c6-1a18-0756-4e6db5b6ad70" vertex="1" connectable="0"><Property name="City" dataName="ADDRESS_CITY" dataType="INTEGER" widgetType="DROPDOWN" widgetDropDownKey="Id" widgetDropDownValue="Name" widgetDependsOnProperty="Country" widgetDependsOnEntity="Country" widgetDependsOnValueFrom="Id" widgetDependsOnFilterBy="Country" widgetSize="fd-col-md--4 fd-col--6" isRequiredProperty="true" dataNotNull="true" as="value"/><mxGeometry y="80" width="200" height="26" as="geometry"/></mxCell><mxCell id="86a2851d-cb8d-d33d-e744-0c4832c45731" parent="37dc84bc-a9c6-1a18-0756-4e6db5b6ad70" vertex="1" connectable="0"><Property name="Address" isRequiredProperty="true" dataName="ADDRESS_ADDRESS" dataLength="255" widgetLength="255" widgetSize="fd-col-md--4 fd-col--6" dataNotNull="true" as="value"/><mxGeometry y="106" width="200" height="26" as="geometry"/></mxCell><mxCell id="b5887ab3-7e4d-9dd6-e774-f739ea2f8cfe" parent="37dc84bc-a9c6-1a18-0756-4e6db5b6ad70" vertex="1" connectable="0"><Property name="PostalCode" isRequiredProperty="true" dataName="ADDRESS_POSTALCODE" dataLength="12" widgetLength="12" widgetSize="fd-col-md--4 fd-col--6" dataNotNull="true" as="value"/><mxGeometry y="132" width="200" height="26" as="geometry"/></mxCell><mxCell id="ab1d4816-c7f2-0cae-d0f3-2e97b7f0d15e" parent="37dc84bc-a9c6-1a18-0756-4e6db5b6ad70" vertex="1" connectable="0"><Property name="Employee" dataName="ADDRESS_EMPLOYEE" dataType="INTEGER" dataLength="0" relationshipType="COMPOSITION" relationshipCardinality="1_n" relationshipName="Address" as="value"/><mxGeometry y="158" width="200" height="26" as="geometry"/></mxCell><mxCell id="e8f01ab9-f63a-abc3-bf74-44a27cbaa196" parent="1" source="1cdbf06c-6538-3b48-2d01-a3c8d0efd431" target="c5b10919-b407-7d19-b9a5-0d90ed9e3fc0" edge="1"><mxGeometry relative="1" as="geometry"/></mxCell><mxCell id="04b81893-6294-b8fe-4399-81aa599bcf0c" parent="1" source="10c69f65-657f-9fa0-66e0-b3452177b540" target="09189593-bfc5-81aa-e017-bcad11e4a09c" edge="1"><mxGeometry relative="1" as="geometry"/></mxCell><mxCell id="9c19ddb6-2df8-b46c-2074-4f1b5d242cac" parent="1" source="ab1d4816-c7f2-0cae-d0f3-2e97b7f0d15e" target="7" edge="1"><Connector name="Address" as="value"/><mxGeometry relative="1" as="geometry"/></mxCell><mxCell id="f6a05cbf-0b6e-90d2-a3f3-d32e7d99803a" parent="1" source="def2223e-0e2c-8b1b-20f8-d223751c76bf" target="7" edge="1"><Connector name="Contact" as="value"/><mxGeometry relative="1" as="geometry"/></mxCell></root></mxGraphModel>
 </model>
\ No newline at end of file
diff --git a/codbex-employees/codbex-employees.gen b/codbex-employees/codbex-employees.gen
index a93ef4e..d784342 100644
--- a/codbex-employees/codbex-employees.gen
+++ b/codbex-employees/codbex-employees.gen
@@ -4,13 +4,36 @@
   "brandUrl": "https://www.codbex.com/",
   "title": "Employees Management Module",
   "description": "Managing Employees Data",
+  "fileName": "codbex-employees",
+  "genFolderName": "codbex-employees",
+  "dataSource": "DefaultDB",
+  "roles": [
+    {
+      "entityName": "Employee",
+      "roleRead": "codbex-employees.Employees.EmployeeReadOnly",
+      "roleWrite": "codbex-employees.Employees.EmployeeFullAccess"
+    },
+    {
+      "entityName": "Gender",
+      "roleRead": "codbex-employees.EmployeesSettings.GenderReadOnly",
+      "roleWrite": "codbex-employees.EmployeesSettings.GenderFullAccess"
+    },
+    {
+      "entityName": "MartialStatus",
+      "roleRead": "codbex-employees.EmployeesSettings.MartialStatusReadOnly",
+      "roleWrite": "codbex-employees.EmployeesSettings.MartialStatusFullAccess"
+    },
+    {
+      "entityName": "Contact",
+      "roleRead": "codbex-employees.Employees.ContactReadOnly",
+      "roleWrite": "codbex-employees.Employees.ContactFullAccess"
+    }
+  ],
+  "tprefix": "codbex-employees-model",
   "projectName": "codbex-employees",
   "workspaceName": "workspace",
   "filePath": "codbex-employees.model",
   "templateId": "template-application-angular-v2/template/template.js",
-  "fileName": "codbex-employees",
-  "genFolderName": "codbex-employees",
-  "dataSource": "DefaultDB",
   "perspectives": {
     "Employees": {
       "views": [
@@ -61,29 +84,6 @@
       "role": ""
     }
   },
-  "roles": [
-    {
-      "entityName": "Employee",
-      "roleRead": "codbex-employees.Employees.EmployeeReadOnly",
-      "roleWrite": "codbex-employees.Employees.EmployeeFullAccess"
-    },
-    {
-      "entityName": "Gender",
-      "roleRead": "codbex-employees.EmployeesSettings.GenderReadOnly",
-      "roleWrite": "codbex-employees.EmployeesSettings.GenderFullAccess"
-    },
-    {
-      "entityName": "MartialStatus",
-      "roleRead": "codbex-employees.EmployeesSettings.MartialStatusReadOnly",
-      "roleWrite": "codbex-employees.EmployeesSettings.MartialStatusFullAccess"
-    },
-    {
-      "entityName": "Contact",
-      "roleRead": "codbex-employees.Employees.ContactReadOnly",
-      "roleWrite": "codbex-employees.Employees.ContactFullAccess"
-    }
-  ],
-  "tprefix": "codbex-employees-model",
   "models": [
     {
       "properties": [
diff --git a/codbex-employees/codbex-employees.model b/codbex-employees/codbex-employees.model
index e0e14f7..e67a0cf 100644
--- a/codbex-employees/codbex-employees.model
+++ b/codbex-employees/codbex-employees.model
@@ -185,7 +185,7 @@
                         "relationshipName": "Employee_Gender",
                         "relationshipEntityName": "Gender",
                         "relationshipEntityPerspectiveName": "Settings",
-                        "relationshipEntityPerspectiveLabel": "Entities"
+                        "relationshipEntityPerspectiveLabel": "Settings"
                     },
                     {
                         "auditType": "NONE",
@@ -205,7 +205,7 @@
                         "relationshipName": "Employee_MartialStatus",
                         "relationshipEntityName": "MartialStatus",
                         "relationshipEntityPerspectiveName": "Settings",
-                        "relationshipEntityPerspectiveLabel": "Entities"
+                        "relationshipEntityPerspectiveLabel": "Settings"
                     },
                     {
                         "auditType": "NONE",
@@ -486,7 +486,7 @@
                 "name": "Gender",
                 "perspectiveHeader": "",
                 "perspectiveIcon": "/services/web/resources/unicons/copy.svg",
-                "perspectiveLabel": "Entities",
+                "perspectiveLabel": "Settings",
                 "perspectiveName": "Settings",
                 "perspectiveNavId": "",
                 "perspectiveOrder": "100",
@@ -548,7 +548,7 @@
                 "name": "MartialStatus",
                 "perspectiveHeader": "",
                 "perspectiveIcon": "/services/web/resources/unicons/copy.svg",
-                "perspectiveLabel": "Entities",
+                "perspectiveLabel": "Settings",
                 "perspectiveName": "Settings",
                 "perspectiveNavId": "",
                 "perspectiveOrder": "100",
diff --git a/codbex-employees/gen/codbex-employees/api/Employees/AddressController.ts b/codbex-employees/gen/codbex-employees/api/Employees/AddressController.ts
index 3e5c8f8..5bec98f 100644
--- a/codbex-employees/gen/codbex-employees/api/Employees/AddressController.ts
+++ b/codbex-employees/gen/codbex-employees/api/Employees/AddressController.ts
@@ -51,7 +51,7 @@ class AddressController {
         try {
             this.validateEntity(entity);
             entity.Id = this.repository.create(entity) as any;
-            response.setHeader('Content-Location', '/services/ts/codbex-employees/gen/codbex-employees/api/Employees/AddressService.ts/' + entity.Id);
+            response.setHeader('Content-Location', '/services/ts/codbex-employees/gen/codbex-employees/api/Employees/AddressController.ts/' + entity.Id);
             response.setStatus(response.CREATED);
             return entity;
         } catch (error: any) {
diff --git a/codbex-employees/gen/codbex-employees/api/Employees/ContactController.ts b/codbex-employees/gen/codbex-employees/api/Employees/ContactController.ts
index f7d6dd5..dd83c29 100644
--- a/codbex-employees/gen/codbex-employees/api/Employees/ContactController.ts
+++ b/codbex-employees/gen/codbex-employees/api/Employees/ContactController.ts
@@ -55,7 +55,7 @@ class ContactController {
             this.checkPermissions('write');
             this.validateEntity(entity);
             entity.Id = this.repository.create(entity) as any;
-            response.setHeader('Content-Location', '/services/ts/codbex-employees/gen/codbex-employees/api/Employees/ContactService.ts/' + entity.Id);
+            response.setHeader('Content-Location', '/services/ts/codbex-employees/gen/codbex-employees/api/Employees/ContactController.ts/' + entity.Id);
             response.setStatus(response.CREATED);
             return entity;
         } catch (error: any) {
diff --git a/codbex-employees/gen/codbex-employees/api/Employees/EmployeeController.ts b/codbex-employees/gen/codbex-employees/api/Employees/EmployeeController.ts
index c21a083..22f1ea8 100644
--- a/codbex-employees/gen/codbex-employees/api/Employees/EmployeeController.ts
+++ b/codbex-employees/gen/codbex-employees/api/Employees/EmployeeController.ts
@@ -44,7 +44,7 @@ class EmployeeController {
             this.checkPermissions('write');
             this.validateEntity(entity);
             entity.Id = this.repository.create(entity) as any;
-            response.setHeader('Content-Location', '/services/ts/codbex-employees/gen/codbex-employees/api/Employees/EmployeeService.ts/' + entity.Id);
+            response.setHeader('Content-Location', '/services/ts/codbex-employees/gen/codbex-employees/api/Employees/EmployeeController.ts/' + entity.Id);
             response.setStatus(response.CREATED);
             return entity;
         } catch (error: any) {
diff --git a/codbex-employees/gen/codbex-employees/api/Settings/GenderController.ts b/codbex-employees/gen/codbex-employees/api/Settings/GenderController.ts
index c132b4c..9e18024 100644
--- a/codbex-employees/gen/codbex-employees/api/Settings/GenderController.ts
+++ b/codbex-employees/gen/codbex-employees/api/Settings/GenderController.ts
@@ -44,7 +44,7 @@ class GenderController {
             this.checkPermissions('write');
             this.validateEntity(entity);
             entity.Id = this.repository.create(entity) as any;
-            response.setHeader('Content-Location', '/services/ts/codbex-employees/gen/codbex-employees/api/Settings/GenderService.ts/' + entity.Id);
+            response.setHeader('Content-Location', '/services/ts/codbex-employees/gen/codbex-employees/api/Settings/GenderController.ts/' + entity.Id);
             response.setStatus(response.CREATED);
             return entity;
         } catch (error: any) {
diff --git a/codbex-employees/gen/codbex-employees/api/Settings/MartialStatusController.ts b/codbex-employees/gen/codbex-employees/api/Settings/MartialStatusController.ts
index 6fb9c52..61aef4c 100644
--- a/codbex-employees/gen/codbex-employees/api/Settings/MartialStatusController.ts
+++ b/codbex-employees/gen/codbex-employees/api/Settings/MartialStatusController.ts
@@ -44,7 +44,7 @@ class MartialStatusController {
             this.checkPermissions('write');
             this.validateEntity(entity);
             entity.Id = this.repository.create(entity) as any;
-            response.setHeader('Content-Location', '/services/ts/codbex-employees/gen/codbex-employees/api/Settings/MartialStatusService.ts/' + entity.Id);
+            response.setHeader('Content-Location', '/services/ts/codbex-employees/gen/codbex-employees/api/Settings/MartialStatusController.ts/' + entity.Id);
             response.setStatus(response.CREATED);
             return entity;
         } catch (error: any) {
diff --git a/codbex-employees/package.json b/codbex-employees/package.json
index 9e8625a..ee7aa0e 100644
--- a/codbex-employees/package.json
+++ b/codbex-employees/package.json
@@ -12,7 +12,7 @@
         "build": "tsc"
     },
     "dependencies": {
-        "@codbex/codbex-countries": "^1.0.0",
-        "@codbex/codbex-cities": "^1.0.1"
+        "@codbex/codbex-countries": "^1.2.0",
+        "@codbex/codbex-cities": "^1.1.0"
     }
-}
+}
\ No newline at end of file
diff --git a/codbex-employees/project.json b/codbex-employees/project.json
index f2ce704..b3028c4 100644
--- a/codbex-employees/project.json
+++ b/codbex-employees/project.json
@@ -1,33 +1,3 @@
 {
-    "guid": "codbex-employees",
-    "dependencies": [
-        {
-            "guid": "codbex-countries",
-            "type": "git",
-            "url": "https://github.com/codbex/codbex-countries.git",
-            "branch": "main"
-        },
-        {
-            "guid": "codbex-cities",
-            "type": "git",
-            "url": "https://github.com/codbex/codbex-cities.git",
-            "branch": "main"
-        }
-    ],
-    "actions": [
-        {
-            "name": "Build TypeScript",
-            "commands": [
-                {
-                    "os": "unix",
-                    "command": "tsc"
-                },
-                {
-                    "os": "windows",
-                    "command": "cmd /c tsc"
-                }
-            ],
-            "registry": "true"
-        }
-    ]
+    "guid": "codbex-employees"
 }
\ No newline at end of file
diff --git a/codbex-employees/tsconfig.json b/codbex-employees/tsconfig.json
deleted file mode 100644
index 9b957e3..0000000
--- a/codbex-employees/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "ESNext",
-        "target": "ES6",
-        "moduleResolution": "Node",
-        "baseUrl": "../",
-        "lib": [
-            "ESNext",
-            "DOM"
-        ],
-        "paths": {
-            "sdk/*": [
-                "./modules/src/*"
-            ],
-            "/*": [
-                "./*"
-            ]
-        },
-        "types": [
-            "../modules/types"
-        ]
-    }
-}
\ No newline at end of file