diff --git a/doc/DmDbSchema.graffle b/doc/DmDbSchema.graffle
index fffb31c8661c1744c65805e6613cf8034332b222..36d757e48eb239ffe8ae5ff0e1d4ed13d092da8f 100644
--- a/doc/DmDbSchema.graffle
+++ b/doc/DmDbSchema.graffle
@@ -63,8 +63,8 @@
 			<integer>112</integer>
 			<key>Points</key>
 			<array>
-				<string>{993.00000783123653, 153.5}</string>
-				<string>{993.00000783123653, 112.5}</string>
+				<string>{993.00000886315149, 151.5}</string>
+				<string>{993.00000886315149, 112.5}</string>
 			</array>
 			<key>Style</key>
 			<dict>
@@ -96,8 +96,8 @@
 			<integer>111</integer>
 			<key>Points</key>
 			<array>
-				<string>{893.49999999979661, 203.00794485493407}</string>
-				<string>{757.49999994448763, 203.01880415414487}</string>
+				<string>{893.50001265406206, 201.70846863482436}</string>
+				<string>{757.49999090147924, 202.67682805191799}</string>
 			</array>
 			<key>Style</key>
 			<dict>
@@ -124,7 +124,7 @@
 			<array>
 				<dict>
 					<key>Bounds</key>
-					<string>{{894, 154}, {198, 14}}</string>
+					<string>{{894, 152}, {198, 14}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FitText</key>
@@ -160,7 +160,7 @@
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{894, 168}, {198, 70}}</string>
+					<string>{{894, 166}, {198, 70}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FitText</key>
@@ -192,10 +192,12 @@
 \f0\b\fs24 \cf0 id : PK\
 template_policy_set_id : FK1,U1\
 policy_type_id : FK2,U1\
-value : U1\
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\b0 \cf0 description}</string>
+\b0 \cf0 policy_value
+\b  : U1\
+
+\b0 description}</string>
 						<key>VerticalPad</key>
 						<integer>0</integer>
 					</dict>
@@ -412,7 +414,7 @@ description}</string>
 \f0\b\fs24 \cf0 id : PK\
 setting_type_id : FK1,U1
 \b0 \
-value : U1\
+setting_value : U1\
 description}</string>
 						<key>VerticalPad</key>
 						<integer>0</integer>
@@ -538,7 +540,7 @@ description}</string>
 \f0\b\fs24 \cf0 id : PK\
 policy_type_id : FK1,U1
 \b0 \
-value : U1\
+policy_value : U1\
 description}</string>
 						<key>VerticalPad</key>
 						<integer>0</integer>
@@ -715,7 +717,7 @@ description}</string>
 \b0 \
 
 \b data_folder_id : FK1,U1\
-value : U1\
+permission_value : U1\
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
 \b0 \cf0 description}</string>
@@ -780,8 +782,8 @@ value : U1\
 			<integer>90</integer>
 			<key>Points</key>
 			<array>
-				<string>{531.50000016429431, 768.93142533663479}</string>
-				<string>{463.49999962014556, 768.87843582351161}</string>
+				<string>{531.49999999960221, 768.97730745693298}</string>
+				<string>{463.49999994551024, 768.95977231000359}</string>
 			</array>
 			<key>Style</key>
 			<dict>
@@ -1015,7 +1017,7 @@ value : U1\
 \b : PK
 \b0 \
 
-\b path : U1\
+\b data_path : U1\
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
 \b0 \cf0 parent_data_folder_id: FK1,U1\
@@ -1090,7 +1092,7 @@ description}</string>
 				<string>{839, 344.5}</string>
 				<string>{839, 266}</string>
 				<string>{835, 245}</string>
-				<string>{757.5, 245}</string>
+				<string>{757.49928771666043, 249.1412594349876}</string>
 			</array>
 			<key>Style</key>
 			<dict>
@@ -1234,10 +1236,12 @@ experiment_id
 \b0 \
 
 \b policy_type_id : FK2,U1\
-value : U1\
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\b0 \cf0 description}</string>
+\b0 \cf0 policy_value
+\b  : U1\
+
+\b0 description}</string>
 						<key>VerticalPad</key>
 						<integer>0</integer>
 					</dict>
@@ -1297,7 +1301,7 @@ value : U1\
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{651, 210}, {106, 70}}</string>
+					<string>{{651, 210}, {106, 84}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FitText</key>
@@ -1331,7 +1335,7 @@ name : U1
 \b0 \
 description\
 handler_name\
-default_value}</string>
+default_policy_value}</string>
 						<key>VerticalPad</key>
 						<integer>0</integer>
 					</dict>
@@ -1403,8 +1407,8 @@ default_value}</string>
 			<integer>73</integer>
 			<key>Points</key>
 			<array>
-				<string>{118.00003446436666, 264.25000000000068}</string>
-				<string>{118.00066745990092, 126.50000000018917}</string>
+				<string>{118.00000706196258, 264.25}</string>
+				<string>{118.00000706196258, 126.5}</string>
 			</array>
 			<key>Style</key>
 			<dict>
@@ -1503,7 +1507,10 @@ user_id
 \b0 \
 
 \b setting_type_id : FK2,U1\
-value : U1}</string>
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
+
+\b0 \cf0 setting_value
+\b  : U1}</string>
 						<key>VerticalPad</key>
 						<integer>0</integer>
 					</dict>
@@ -1798,7 +1805,7 @@ experiment_id: PK,FK2,U1
 			<key>Points</key>
 			<array>
 				<string>{619.50000311183703, 555.5}</string>
-				<string>{619.50003671967659, 474.50000000000006}</string>
+				<string>{619.50000311183703, 474.5}</string>
 			</array>
 			<key>Style</key>
 			<dict>
@@ -2069,8 +2076,8 @@ root_data_path}</string>
 			<integer>52</integer>
 			<key>Points</key>
 			<array>
-				<string>{319.4997484769375, 228.88995405079024}</string>
-				<string>{428.50017885795074, 225.43135575748479}</string>
+				<string>{319.49976435471223, 228.95761262371505}</string>
+				<string>{428.50022623689955, 225.60991403383832}</string>
 			</array>
 			<key>Style</key>
 			<dict>
@@ -2462,7 +2469,7 @@ password}</string>
 	<key>MasterSheets</key>
 	<array/>
 	<key>ModificationDate</key>
-	<string>2014-09-16 12:44:02 +0000</string>
+	<string>2014-09-30 15:40:17 +0000</string>
 	<key>Modifier</key>
 	<string>Sinisa Veseli</string>
 	<key>NotesVisible</key>
@@ -2557,7 +2564,7 @@ password}</string>
 		<key>SidebarWidth</key>
 		<integer>120</integer>
 		<key>VisibleRegion</key>
-		<string>{{-45, 60.5}, {1241, 735}}</string>
+		<string>{{-45, 240.5}, {1241, 735}}</string>
 		<key>Zoom</key>
 		<real>1</real>
 		<key>ZoomValues</key>
diff --git a/doc/DmDbSchema.pdf b/doc/DmDbSchema.pdf
index a6b078aba576d198869f6a77f6cdfa35d36b2c29..f65a4026e69157397a8730174d46163627e2a732 100644
Binary files a/doc/DmDbSchema.pdf and b/doc/DmDbSchema.pdf differ