diff --git a/doc/DmDbSchema.graffle b/doc/DmDbSchema.graffle
index 7f1e989e4261943ea5c6e923b857d7c67d8a8c4e..fffb31c8661c1744c65805e6613cf8034332b222 100644
--- a/doc/DmDbSchema.graffle
+++ b/doc/DmDbSchema.graffle
@@ -46,7 +46,7 @@
 	<key>Creator</key>
 	<string>Sinisa Veseli</string>
 	<key>DisplayScale</key>
-	<string>1 0/72 in = 1 0/72 in</string>
+	<string>1 0/72 in = 1.0000 in</string>
 	<key>GraphDocumentVersion</key>
 	<integer>8</integer>
 	<key>GraphicsList</key>
@@ -63,8 +63,8 @@
 			<integer>112</integer>
 			<key>Points</key>
 			<array>
-				<string>{993.00000783123653, 162.5}</string>
-				<string>{993.00000783123653, 126.5}</string>
+				<string>{993.00000783123653, 153.5}</string>
+				<string>{993.00000783123653, 112.5}</string>
 			</array>
 			<key>Style</key>
 			<dict>
@@ -96,8 +96,8 @@
 			<integer>111</integer>
 			<key>Points</key>
 			<array>
-				<string>{893.50001168866049, 204.31948293359324}</string>
-				<string>{757.49998673352263, 203.38932867343269}</string>
+				<string>{893.49999999979661, 203.00794485493407}</string>
+				<string>{757.49999994448763, 203.01880415414487}</string>
 			</array>
 			<key>Style</key>
 			<dict>
@@ -124,7 +124,7 @@
 			<array>
 				<dict>
 					<key>Bounds</key>
-					<string>{{894, 163}, {198, 14}}</string>
+					<string>{{894, 154}, {198, 14}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FitText</key>
@@ -160,7 +160,7 @@
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{894, 177}, {198, 56}}</string>
+					<string>{{894, 168}, {198, 70}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FitText</key>
@@ -192,7 +192,10 @@
 \f0\b\fs24 \cf0 id : PK\
 template_policy_set_id : FK1,U1\
 policy_type_id : FK2,U1\
-value : U1}</string>
+value : U1\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
+
+\b0 \cf0 description}</string>
 						<key>VerticalPad</key>
 						<integer>0</integer>
 					</dict>
@@ -216,7 +219,7 @@ value : U1}</string>
 			<array>
 				<dict>
 					<key>Bounds</key>
-					<string>{{888, 70}, {210, 14}}</string>
+					<string>{{888, 56}, {210, 14}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FitText</key>
@@ -252,7 +255,7 @@ value : U1}</string>
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{888, 84}, {210, 42}}</string>
+					<string>{{888, 70}, {210, 42}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FitText</key>
@@ -313,8 +316,8 @@ description}</string>
 			<integer>104</integer>
 			<key>Points</key>
 			<array>
-				<string>{182.5, 104.9999936506205}</string>
-				<string>{298.5, 104.9999936506205}</string>
+				<string>{175, 91.000018464369361}</string>
+				<string>{298.5, 91.000018464369361}</string>
 			</array>
 			<key>Style</key>
 			<dict>
@@ -341,7 +344,7 @@ description}</string>
 			<array>
 				<dict>
 					<key>Bounds</key>
-					<string>{{299, 63}, {192, 14}}</string>
+					<string>{{299, 49}, {192, 14}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FitText</key>
@@ -377,7 +380,7 @@ description}</string>
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{299, 77}, {192, 56}}</string>
+					<string>{{299, 63}, {192, 56}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FitText</key>
@@ -614,7 +617,7 @@ description}</string>
 			<key>Points</key>
 			<array>
 				<string>{367.00000243457237, 846.5}</string>
-				<string>{367.00000243457237, 783.5}</string>
+				<string>{367.00000243457237, 797.5}</string>
 			</array>
 			<key>Style</key>
 			<dict>
@@ -712,10 +715,10 @@ description}</string>
 \b0 \
 
 \b data_folder_id : FK1,U1\
+value : U1\
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
-\cf0 value : U1\
 
-\b0 description}</string>
+\b0 \cf0 description}</string>
 						<key>VerticalPad</key>
 						<integer>0</integer>
 					</dict>
@@ -744,8 +747,8 @@ description}</string>
 			<integer>91</integer>
 			<key>Points</key>
 			<array>
-				<string>{619.50329793104709, 735.50000004549997}</string>
-				<string>{619.53891558668533, 654.49999978709798}</string>
+				<string>{619.50000241517523, 740.5}</string>
+				<string>{619.50000241517523, 654.5}</string>
 			</array>
 			<key>Style</key>
 			<dict>
@@ -777,8 +780,8 @@ description}</string>
 			<integer>90</integer>
 			<key>Points</key>
 			<array>
-				<string>{531.50001581359754, 763.30015521672567}</string>
-				<string>{463.49998452504229, 762.75936572000273}</string>
+				<string>{531.50000016429431, 768.93142533663479}</string>
+				<string>{463.49999962014556, 768.87843582351161}</string>
 			</array>
 			<key>Style</key>
 			<dict>
@@ -805,7 +808,7 @@ description}</string>
 			<array>
 				<dict>
 					<key>Bounds</key>
-					<string>{{532, 736}, {175, 14}}</string>
+					<string>{{532, 741}, {175, 14}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FitText</key>
@@ -841,7 +844,7 @@ description}</string>
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{532, 750}, {175, 28}}</string>
+					<string>{{532, 755}, {175, 28}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FitText</key>
@@ -907,10 +910,10 @@ description}</string>
 			<key>OrthogonalBarPoint</key>
 			<string>{0, 0}</string>
 			<key>OrthogonalBarPosition</key>
-			<real>19.301292419433594</real>
+			<real>19.302753448486328</real>
 			<key>Points</key>
 			<array>
-				<string>{463.49741706214564, 752.15332478957691}</string>
+				<string>{463.49449281078699, 754.55864733444002}</string>
 				<string>{514, 747}</string>
 				<string>{498, 693}</string>
 				<string>{389.84302880201756, 726.85065510776553}</string>
@@ -978,7 +981,7 @@ description}</string>
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{271, 741}, {192, 42}}</string>
+					<string>{{271, 741}, {192, 56}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FitText</key>
@@ -1015,7 +1018,8 @@ description}</string>
 \b path : U1\
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\b0 \cf0 parent_data_folder_id: FK1,U1}</string>
+\b0 \cf0 parent_data_folder_id: FK1,U1\
+description}</string>
 						<key>VerticalPad</key>
 						<integer>0</integer>
 					</dict>
@@ -1085,8 +1089,8 @@ description}</string>
 			<array>
 				<string>{839, 344.5}</string>
 				<string>{839, 266}</string>
-				<string>{835, 238}</string>
-				<string>{757.5, 238}</string>
+				<string>{835, 245}</string>
+				<string>{757.5, 245}</string>
 			</array>
 			<key>Style</key>
 			<dict>
@@ -1129,7 +1133,7 @@ description}</string>
 				<string>{699.49998554858382, 612.6083649091147}</string>
 				<string>{751, 613}</string>
 				<string>{839, 600}</string>
-				<string>{839, 415.5}</string>
+				<string>{839, 429.5}</string>
 			</array>
 			<key>Style</key>
 			<dict>
@@ -1194,7 +1198,7 @@ description}</string>
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{746, 359}, {186, 56}}</string>
+					<string>{{746, 359}, {186, 70}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FitText</key>
@@ -1230,7 +1234,10 @@ experiment_id
 \b0 \
 
 \b policy_type_id : FK2,U1\
-value : U1}</string>
+value : U1\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
+
+\b0 \cf0 description}</string>
 						<key>VerticalPad</key>
 						<integer>0</integer>
 					</dict>
@@ -1290,7 +1297,7 @@ value : U1}</string>
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{651, 210}, {106, 56}}</string>
+					<string>{{651, 210}, {106, 70}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FitText</key>
@@ -1323,6 +1330,7 @@ value : U1}</string>
 name : U1
 \b0 \
 description\
+handler_name\
 default_value}</string>
 						<key>VerticalPad</key>
 						<integer>0</integer>
@@ -1355,11 +1363,11 @@ default_value}</string>
 			<key>OrthogonalBarPoint</key>
 			<string>{0, 0}</string>
 			<key>OrthogonalBarPosition</key>
-			<real>32.299999237060547</real>
+			<real>30.924999237060547</real>
 			<key>Points</key>
 			<array>
-				<string>{122, 333.5}</string>
-				<string>{122, 410}</string>
+				<string>{118, 335.25}</string>
+				<string>{118, 409}</string>
 				<string>{123, 432}</string>
 				<string>{193.00000367939722, 431.73076921661772}</string>
 			</array>
@@ -1395,8 +1403,8 @@ default_value}</string>
 			<integer>73</integer>
 			<key>Points</key>
 			<array>
-				<string>{129.0000028066388, 263}</string>
-				<string>{129.0000028066388, 140.5}</string>
+				<string>{118.00003446436666, 264.25000000000068}</string>
+				<string>{118.00066745990092, 126.50000000018917}</string>
 			</array>
 			<key>Style</key>
 			<dict>
@@ -1410,6 +1418,11 @@ default_value}</string>
 					<string>0</string>
 				</dict>
 			</dict>
+			<key>Tail</key>
+			<dict>
+				<key>ID</key>
+				<integer>71</integer>
+			</dict>
 		</dict>
 		<dict>
 			<key>Class</key>
@@ -1418,7 +1431,7 @@ default_value}</string>
 			<array>
 				<dict>
 					<key>Bounds</key>
-					<string>{{29, 263}, {186, 14}}</string>
+					<string>{{25, 264.75}, {186, 14}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FitText</key>
@@ -1454,7 +1467,7 @@ default_value}</string>
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{29, 277}, {186, 56}}</string>
+					<string>{{25, 278.75}, {186, 56}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FitText</key>
@@ -1514,7 +1527,7 @@ value : U1}</string>
 			<array>
 				<dict>
 					<key>Bounds</key>
-					<string>{{76, 56}, {106, 14}}</string>
+					<string>{{61.5, 42}, {113, 14}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FitText</key>
@@ -1550,7 +1563,7 @@ value : U1}</string>
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{76, 70}, {106, 70}}</string>
+					<string>{{61.5, 56}, {113, 70}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FitText</key>
@@ -1584,7 +1597,7 @@ name : U1
 \b0 \
 description\
 default_value\
-user_modifiable}</string>
+is_user_modifiable}</string>
 						<key>VerticalPad</key>
 						<integer>0</integer>
 					</dict>
@@ -1755,7 +1768,7 @@ user_modifiable}</string>
 experiment_id: PK,FK2,U1
 \b0 \
 
-\b role_id : PK,FK3,U1}</string>
+\b role_type_id : PK,FK3,U1}</string>
 						<key>VerticalPad</key>
 						<integer>0</integer>
 					</dict>
@@ -1784,8 +1797,8 @@ experiment_id: PK,FK2,U1
 			<integer>60</integer>
 			<key>Points</key>
 			<array>
-				<string>{619.50639616079923, 555.50000017658067}</string>
-				<string>{619.57547470068698, 474.49999826507866}</string>
+				<string>{619.50000311183703, 555.5}</string>
+				<string>{619.50003671967659, 474.50000000000006}</string>
 			</array>
 			<key>Style</key>
 			<dict>
@@ -2056,8 +2069,8 @@ root_data_path}</string>
 			<integer>52</integer>
 			<key>Points</key>
 			<array>
-				<string>{319.5, 224.0000181291208}</string>
-				<string>{428.5, 224.0000181291208}</string>
+				<string>{319.4997484769375, 228.88995405079024}</string>
+				<string>{428.50017885795074, 225.43135575748479}</string>
 			</array>
 			<key>Style</key>
 			<dict>
@@ -2089,7 +2102,7 @@ root_data_path}</string>
 			<integer>38</integer>
 			<key>Points</key>
 			<array>
-				<string>{253.00000140331943, 238.5}</string>
+				<string>{253.00000140331943, 252.5}</string>
 				<string>{253.00000140331943, 361}</string>
 			</array>
 			<key>Style</key>
@@ -2153,7 +2166,7 @@ root_data_path}</string>
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{187, 210}, {132, 28}}</string>
+					<string>{{187, 210}, {132, 42}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FitText</key>
@@ -2187,7 +2200,7 @@ root_data_path}</string>
 \b : PK,FK1,U1
 \b0 \
 
-\b role_id : PK,FK2,U1}</string>
+\b role_type_id : PK,FK2,U1}</string>
 						<key>VerticalPad</key>
 						<integer>0</integer>
 					</dict>
@@ -2238,7 +2251,7 @@ root_data_path}</string>
 {\colortbl;\red255\green255\blue255;}
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
 
-\f0\b\fs24 \cf0 role}</string>
+\f0\b\fs24 \cf0 role_type}</string>
 						<key>VerticalPad</key>
 						<integer>0</integer>
 					</dict>
@@ -2330,7 +2343,7 @@ description}</string>
 {\colortbl;\red255\green255\blue255;}
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
 
-\f0\b\fs24 \cf0 user}</string>
+\f0\b\fs24 \cf0 user_info}</string>
 						<key>VerticalPad</key>
 						<integer>0</integer>
 					</dict>
@@ -2449,7 +2462,7 @@ password}</string>
 	<key>MasterSheets</key>
 	<array/>
 	<key>ModificationDate</key>
-	<string>2014-08-18 18:53:15 +0000</string>
+	<string>2014-09-16 12:44:02 +0000</string>
 	<key>Modifier</key>
 	<string>Sinisa Veseli</string>
 	<key>NotesVisible</key>
@@ -2530,7 +2543,7 @@ password}</string>
 			</dict>
 		</array>
 		<key>Frame</key>
-		<string>{{431, 48}, {1376, 1130}}</string>
+		<string>{{64, 4}, {1376, 874}}</string>
 		<key>ListView</key>
 		<true/>
 		<key>OutlineWidth</key>
@@ -2544,7 +2557,7 @@ password}</string>
 		<key>SidebarWidth</key>
 		<integer>120</integer>
 		<key>VisibleRegion</key>
-		<string>{{-37, 0}, {1227, 991}}</string>
+		<string>{{-45, 60.5}, {1241, 735}}</string>
 		<key>Zoom</key>
 		<real>1</real>
 		<key>ZoomValues</key>
diff --git a/doc/DmDbSchema.pdf b/doc/DmDbSchema.pdf
index a02afeb0704048734821bdd1998c62d62b3e961c..a6b078aba576d198869f6a77f6cdfa35d36b2c29 100644
Binary files a/doc/DmDbSchema.pdf and b/doc/DmDbSchema.pdf differ