diff --git a/gui/admin-gui/src/main/resources/initial-objects/501-role-human.xml b/gui/admin-gui/src/main/resources/initial-objects/501-role-human.xml
index 4b778a98adf..4db5157d9ca 100644
--- a/gui/admin-gui/src/main/resources/initial-objects/501-role-human.xml
+++ b/gui/admin-gui/src/main/resources/initial-objects/501-role-human.xml
@@ -21,4 +21,10 @@
     <inducement>
     	<targetRef oid="00000000-0000-0000-0000-000000000008" type="RoleType"/> <!-- End User -->
     </inducement>
+    <inducement>
+		<targetRef oid="00000000-0000-0000-0000-00000000000a" type="RoleType"/> <!-- Approver -->
+	</inducement>
+    <requestable>false</requestable>
+    <delegable>false</delegable>
+    <riskLevel>medium</riskLevel>
 </role>
\ No newline at end of file
diff --git a/gui/admin-gui/src/main/resources/initial-objects/502-role-pet.xml b/gui/admin-gui/src/main/resources/initial-objects/502-role-pet.xml
index 11878e6217e..67687bdefb1 100644
--- a/gui/admin-gui/src/main/resources/initial-objects/502-role-pet.xml
+++ b/gui/admin-gui/src/main/resources/initial-objects/502-role-pet.xml
@@ -17,4 +17,16 @@
 <role oid="00000000-0000-3333-3333-200000000002"
       xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3">
     <name>Pet</name>
+    <assignment>
+		<policyRule>
+			<policyConstraints>
+				<exclusion>
+					<targetRef oid="00000000-0000-3333-3333-200000000004" type="RoleType"/>	<!-- Pest -->
+				</exclusion>
+			</policyConstraints>
+		</policyRule>
+	</assignment>
+	<requestable>true</requestable>
+    <delegable>false</delegable>
+    <riskLevel>medium</riskLevel>
 </role>
\ No newline at end of file
diff --git a/gui/admin-gui/src/main/resources/initial-objects/503-role-ruler.xml b/gui/admin-gui/src/main/resources/initial-objects/503-role-ruler.xml
index 5babfcf34aa..158ac204c2d 100644
--- a/gui/admin-gui/src/main/resources/initial-objects/503-role-ruler.xml
+++ b/gui/admin-gui/src/main/resources/initial-objects/503-role-ruler.xml
@@ -18,4 +18,7 @@
       xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3">
     <name>Ruler of the Universe</name>
     <description>Sovereign ruler of the universe and its dependencies</description>
+    <requestable>false</requestable>
+    <delegable>false</delegable>
+    <riskLevel>none, everything is perfectly OK</riskLevel>
 </role>
\ No newline at end of file
diff --git a/gui/admin-gui/src/main/resources/initial-objects/504-role-pest.xml b/gui/admin-gui/src/main/resources/initial-objects/504-role-pest.xml
new file mode 100644
index 00000000000..e67bdab22af
--- /dev/null
+++ b/gui/admin-gui/src/main/resources/initial-objects/504-role-pest.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2010-2017 Evolveum
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<role oid="00000000-0000-3333-3333-200000000004"
+      xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3">
+    <name>Pest</name>
+    <assignment>
+		<policyRule>
+			<policyConstraints>
+				<exclusion>
+					<targetRef oid="00000000-0000-3333-3333-200000000002" type="RoleType"/>	<!-- Pet -->
+				</exclusion>
+			</policyConstraints>
+		</policyRule>
+	</assignment>
+	<requestable>false</requestable>
+    <delegable>true</delegable>
+    <riskLevel>high</riskLevel>
+</role>
\ No newline at end of file
diff --git a/gui/admin-gui/src/main/resources/initial-objects/505-role-best-family-member.xml b/gui/admin-gui/src/main/resources/initial-objects/505-role-best-family-member.xml
new file mode 100644
index 00000000000..de268fa2fe5
--- /dev/null
+++ b/gui/admin-gui/src/main/resources/initial-objects/505-role-best-family-member.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2010-2017 Evolveum
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<role oid="00000000-0000-3333-3333-200000000005"
+      xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3">
+    <name>Best Family Member</name>
+	<requestable>true</requestable>
+    <delegable>true</delegable>
+    <approverRef oid="00000000-0000-3333-3333-300000000001" type="UserType" /> <!-- father -->
+    <approverRef oid="00000000-0000-3333-3333-300000000002" type="UserType" /> <!-- mother -->
+    <riskLevel>low</riskLevel>
+</role>
\ No newline at end of file
diff --git a/gui/admin-gui/src/main/resources/initial-objects/506-role-most-annoying-creature.xml b/gui/admin-gui/src/main/resources/initial-objects/506-role-most-annoying-creature.xml
new file mode 100644
index 00000000000..1067390f2e0
--- /dev/null
+++ b/gui/admin-gui/src/main/resources/initial-objects/506-role-most-annoying-creature.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2010-2017 Evolveum
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<role oid="00000000-0000-3333-3333-200000000006"
+      xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3">
+    <name>Most Annoying Creature</name>
+	<requestable>true</requestable>
+    <delegable>true</delegable>
+    <riskLevel>unbelievable</riskLevel>
+</role>
\ No newline at end of file
diff --git a/gui/admin-gui/src/main/resources/initial-objects/510-user-father.xml b/gui/admin-gui/src/main/resources/initial-objects/510-user-father.xml
index c583b9217eb..c6fb2260715 100644
--- a/gui/admin-gui/src/main/resources/initial-objects/510-user-father.xml
+++ b/gui/admin-gui/src/main/resources/initial-objects/510-user-father.xml
@@ -20,6 +20,8 @@
         xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3">
     <name>father</name>
     <fullName>Father</fullName>
+    <title>Parent</title>
+    <locality>garage</locality>
     <assignment>
         <targetRef oid="00000000-0000-3333-3333-200000000001" type="RoleType"/> <!-- Human -->
     </assignment>
diff --git a/gui/admin-gui/src/main/resources/initial-objects/511-user-mother.xml b/gui/admin-gui/src/main/resources/initial-objects/511-user-mother.xml
index c975e14ec0d..315a493c4a5 100644
--- a/gui/admin-gui/src/main/resources/initial-objects/511-user-mother.xml
+++ b/gui/admin-gui/src/main/resources/initial-objects/511-user-mother.xml
@@ -20,7 +20,11 @@
         xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3"
         xmlns:org='http://midpoint.evolveum.com/xml/ns/public/common/org-3'>
     <name>mother</name>
+    <description>She Who Must Be Obeyed</description>
     <fullName>Mother</fullName>
+    <title>Parent</title>
+    <locality>kitchen</locality>
+    <costCenter>costly</costCenter>
     <assignment>
         <targetRef oid="00000000-0000-3333-3333-200000000001" type="RoleType"/> <!-- Human -->
     </assignment>
diff --git a/gui/admin-gui/src/main/resources/initial-objects/512-user-daughter.xml b/gui/admin-gui/src/main/resources/initial-objects/512-user-daughter.xml
index a83ed1249af..75e52a1f1de 100644
--- a/gui/admin-gui/src/main/resources/initial-objects/512-user-daughter.xml
+++ b/gui/admin-gui/src/main/resources/initial-objects/512-user-daughter.xml
@@ -20,6 +20,9 @@
         xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3">
     <name>daughter</name>
     <fullName>Daughter</fullName>
+    <title>Child</title>
+    <locality>garden</locality>
+    <costCenter>extremely costly</costCenter>
     <assignment>
         <targetRef oid="00000000-0000-3333-3333-200000000001" type="RoleType"/> <!-- Human -->
     </assignment>
diff --git a/gui/admin-gui/src/main/resources/initial-objects/513-user-son.xml b/gui/admin-gui/src/main/resources/initial-objects/513-user-son.xml
index 5c7700956a4..7e1fb7f2f22 100644
--- a/gui/admin-gui/src/main/resources/initial-objects/513-user-son.xml
+++ b/gui/admin-gui/src/main/resources/initial-objects/513-user-son.xml
@@ -20,6 +20,9 @@
         xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3">
     <name>son</name>
     <fullName>Son</fullName>
+    <title>Child</title>
+    <locality>kids-bedroom</locality>
+    <costCenter>very costly</costCenter>
     <assignment>
         <targetRef oid="00000000-0000-3333-3333-200000000001" type="RoleType"/> <!-- Human -->
     </assignment>
diff --git a/gui/admin-gui/src/main/resources/initial-objects/514-user-dog.xml b/gui/admin-gui/src/main/resources/initial-objects/514-user-dog.xml
index 014d0660147..3f4fcdf2690 100644
--- a/gui/admin-gui/src/main/resources/initial-objects/514-user-dog.xml
+++ b/gui/admin-gui/src/main/resources/initial-objects/514-user-dog.xml
@@ -20,6 +20,8 @@
         xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3">
     <name>dog</name>
     <fullName>Dog</fullName>
+    <title>Pet</title>
+    <locality>master-bedroom</locality>
     <assignment>
         <targetRef oid="00000000-0000-3333-3333-200000000002" type="RoleType"/> <!-- Pet -->
     </assignment>
diff --git a/gui/admin-gui/src/main/resources/initial-objects/515-user-cat.xml b/gui/admin-gui/src/main/resources/initial-objects/515-user-cat.xml
index 10bd2872f05..9ecb65dcf03 100644
--- a/gui/admin-gui/src/main/resources/initial-objects/515-user-cat.xml
+++ b/gui/admin-gui/src/main/resources/initial-objects/515-user-cat.xml
@@ -20,6 +20,9 @@
         xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3">
     <name>cat</name>
     <fullName>Cat</fullName>
+    <honorificPrefix>His Majesty</honorificPrefix>
+    <title>Ruler of the Universe</title>
+    <locality>living-room</locality>
     <assignment>
         <targetRef oid="00000000-0000-3333-3333-200000000003" type="RoleType"/> <!-- Ruler -->
     </assignment>
diff --git a/gui/admin-gui/src/main/resources/initial-objects/516-user-mouse.xml b/gui/admin-gui/src/main/resources/initial-objects/516-user-mouse.xml
new file mode 100644
index 00000000000..c5801f3875e
--- /dev/null
+++ b/gui/admin-gui/src/main/resources/initial-objects/516-user-mouse.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2010-2017 Evolveum
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<c:user oid="00000000-0000-3333-3333-300000000006"
+		xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
+        xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
+        xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3">
+    <name>mouse</name>
+    <fullName>Mouse</fullName>
+    <title>Pest</title>
+    <locality>attic</locality>
+    <assignment>
+        <targetRef oid="00000000-0000-3333-3333-200000000004" type="RoleType"/> <!-- Pest -->
+    </assignment>
+    <assignment>
+        <targetRef oid="00000000-0000-3333-3333-100000000000" type="OrgType"/> <!-- Family -->
+    </assignment>
+    <activation>
+        <administrativeStatus>enabled</administrativeStatus>
+    </activation>
+</c:user>
diff --git a/gui/admin-gui/src/main/resources/initial-objects/530-lookup-locality.xml b/gui/admin-gui/src/main/resources/initial-objects/530-lookup-locality.xml
new file mode 100644
index 00000000000..144a14fa2e3
--- /dev/null
+++ b/gui/admin-gui/src/main/resources/initial-objects/530-lookup-locality.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2017 Evolveum
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<lookupTable oid="00000000-0000-3333-3333-500000000001"
+	xmlns='http://midpoint.evolveum.com/xml/ns/public/common/common-3'>
+
+	<name>Localities</name>
+
+	<row>
+		<key>living-room</key>
+		<label>Living room</label>
+	</row>
+	<row>
+		<key>kitchen</key>
+		<label>Kitchen</label>
+	</row>
+	<row>
+		<key>master-bedroom</key>
+		<label>Master bedroom</label>
+	</row>
+	<row>
+		<key>kids-bedroom</key>
+		<label>Kid's bedroom</label>
+	</row>
+	<row>
+		<key>bathroom</key>
+		<label>Bathroom</label>
+	</row>
+	<row>
+		<key>basement</key>
+		<label>Basement</label>
+	</row>
+	<row>
+		<key>garage</key>
+		<label>Garage</label>
+	</row>
+	<row>
+		<key>attic</key>
+		<label>Attic</label>
+	</row>
+	<row>
+		<key>garden</key>
+		<label>garden</label>
+	</row>
+
+</lookupTable>
diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
index 2be5051eaf3..01c81f2c19d 100644
--- a/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
+++ b/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
@@ -2370,7 +2370,6 @@
                             <xsd:appinfo>
 		                    	<a:displayName>UserType.givenName</a:displayName>
 		                    	<a:displayOrder>110</a:displayOrder>
-		                    	<a:emphasized>true</a:emphasized>
 		                    </xsd:appinfo>
                         </xsd:annotation>
                     </xsd:element>
@@ -2398,7 +2397,6 @@
                             <xsd:appinfo>
 		                    	<a:displayName>UserType.familyName</a:displayName>
 		                    	<a:displayOrder>120</a:displayOrder>
-		                    	<a:emphasized>true</a:emphasized>
 		                    </xsd:appinfo>
                         </xsd:annotation>
                     </xsd:element>
@@ -2753,6 +2751,7 @@
                             <xsd:appinfo>
                                 <a:displayName>UserType.locality</a:displayName>
                                 <a:displayOrder>450</a:displayOrder>
+                                <a:valueEnumerationRef oid="00000000-0000-3333-3333-500000000001" type="tns:LookupTableType"/>
                             </xsd:appinfo>
                         </xsd:annotation>
                     </xsd:element>