diff --git a/drafter_1/annotations/C10_D1_P1.xml b/drafter_1/annotations/C10_D1_P1.xml
index 83eff13f44acc5203e157fa29e74a1528a65a029..24667703816267c5a29ea04ea0c036ffa0117ec4 100755
--- a/drafter_1/annotations/C10_D1_P1.xml
+++ b/drafter_1/annotations/C10_D1_P1.xml
@@ -34,6 +34,7 @@
 			<ymin>1527</ymin>
 			<xmax>2412</xmax>
 			<ymax>1969</ymax>
+			<rotation>98</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -46,10 +47,11 @@
 			<ymin>1950</ymin>
 			<xmax>1649</xmax>
 			<ymax>2219</ymax>
+			<rotation>6</rotation>
 		</bndbox>
 	</object>
 	<object>
-		<name>voltage.dc</name>
+		<name>voltage.ac</name>
 		<pose>Unspecified</pose>
 		<truncated>0</truncated>
 		<difficult>0</difficult>
diff --git a/drafter_1/annotations/C10_D1_P2.xml b/drafter_1/annotations/C10_D1_P2.xml
index 52de9f00c75ae4795a1a018200ee6a55008a69e7..6afbbcac2e373cb117ce7c862d29622f0d06ad87 100644
--- a/drafter_1/annotations/C10_D1_P2.xml
+++ b/drafter_1/annotations/C10_D1_P2.xml
@@ -34,6 +34,7 @@
 			<ymin>1228</ymin>
 			<xmax>3242</xmax>
 			<ymax>1735</ymax>
+			<rotation>112</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -46,11 +47,11 @@
 			<ymin>1737</ymin>
 			<xmax>2339</xmax>
 			<ymax>2085</ymax>
-			<rotation>0</rotation>
+			<rotation>8</rotation>
 		</bndbox>
 	</object>
 	<object>
-		<name>voltage.dc</name>
+		<name>voltage.ac</name>
 		<pose>Unspecified</pose>
 		<truncated>0</truncated>
 		<difficult>0</difficult>
@@ -59,7 +60,6 @@
 			<ymin>1192</ymin>
 			<xmax>1411</xmax>
 			<ymax>1583</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C10_D1_P3.xml b/drafter_1/annotations/C10_D1_P3.xml
index c23eed5d59a0b048fe27f9966f8d856d94c471e0..8e2be9f5ed0259eeb36f3b18c4219843bb0587ed 100644
--- a/drafter_1/annotations/C10_D1_P3.xml
+++ b/drafter_1/annotations/C10_D1_P3.xml
@@ -12,7 +12,7 @@
 	</size>
 	<segmented>0</segmented>
 	<object>
-		<name>voltage.dc</name>
+		<name>voltage.ac</name>
 		<pose>Unspecified</pose>
 		<truncated>0</truncated>
 		<difficult>0</difficult>
@@ -57,6 +57,7 @@
 			<ymin>1812</ymin>
 			<xmax>2365</xmax>
 			<ymax>2236</ymax>
+			<rotation>94</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C10_D1_P4.xml b/drafter_1/annotations/C10_D1_P4.xml
index a17c3ea1ff030f54f7b9b03b73110fc122ccb27f..7ab022e961bd0cad5f0fd51575f4b9abfcb01984 100755
--- a/drafter_1/annotations/C10_D1_P4.xml
+++ b/drafter_1/annotations/C10_D1_P4.xml
@@ -18,9 +18,10 @@
 		<difficult>0</difficult>
 		<bndbox>
 			<xmin>2190</xmin>
-			<ymin>1783</ymin>
+			<ymin>1813</ymin>
 			<xmax>2360</xmax>
-			<ymax>2248</ymax>
+			<ymax>2264</ymax>
+			<rotation>94</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -33,7 +34,6 @@
 			<ymin>1490</ymin>
 			<xmax>1697</xmax>
 			<ymax>1660</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -46,11 +46,10 @@
 			<ymin>2205</ymin>
 			<xmax>1597</xmax>
 			<ymax>2485</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
-		<name>voltage.dc</name>
+		<name>voltage.ac</name>
 		<pose>Unspecified</pose>
 		<truncated>0</truncated>
 		<difficult>0</difficult>
@@ -59,7 +58,6 @@
 			<ymin>1703</ymin>
 			<xmax>917</xmax>
 			<ymax>2020</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C10_D2_P1.xml b/drafter_1/annotations/C10_D2_P1.xml
index d4ecf52ed07eadfcdd6e2d289ac7c61671c29ab1..8e6b27eae4d2ffda200c4c6c7d0ce25045d439dd 100755
--- a/drafter_1/annotations/C10_D2_P1.xml
+++ b/drafter_1/annotations/C10_D2_P1.xml
@@ -34,6 +34,7 @@
 			<ymin>1682</ymin>
 			<xmax>2300</xmax>
 			<ymax>2121</ymax>
+			<rotation>104</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -50,7 +51,7 @@
 		</bndbox>
 	</object>
 	<object>
-		<name>voltage.dc</name>
+		<name>voltage.ac</name>
 		<pose>Unspecified</pose>
 		<truncated>0</truncated>
 		<difficult>0</difficult>
@@ -59,7 +60,7 @@
 			<ymin>1738</ymin>
 			<xmax>981</xmax>
 			<ymax>2038</ymax>
-			<rotation>5</rotation>
+			<rotation>354</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C10_D2_P2.xml b/drafter_1/annotations/C10_D2_P2.xml
index db513f2ce4e6f2af077483d34a9ac711bf009da1..c82ae6b81335c40873ad2e953ce857d05f7c9c26 100644
--- a/drafter_1/annotations/C10_D2_P2.xml
+++ b/drafter_1/annotations/C10_D2_P2.xml
@@ -34,6 +34,7 @@
 			<ymin>1526</ymin>
 			<xmax>2362</xmax>
 			<ymax>2063</ymax>
+			<rotation>92</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -49,7 +50,7 @@
 		</bndbox>
 	</object>
 	<object>
-		<name>voltage.dc</name>
+		<name>voltage.ac</name>
 		<pose>Unspecified</pose>
 		<truncated>0</truncated>
 		<difficult>0</difficult>
@@ -58,6 +59,7 @@
 			<ymin>1537</ymin>
 			<xmax>1012</xmax>
 			<ymax>1919</ymax>
+			<rotation>358</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C10_D2_P3.xml b/drafter_1/annotations/C10_D2_P3.xml
index 9b05f332e0389099a1311a38503f75ef1bf984f3..2a03324a8672a198988679b4ec43c811148b1663 100644
--- a/drafter_1/annotations/C10_D2_P3.xml
+++ b/drafter_1/annotations/C10_D2_P3.xml
@@ -34,6 +34,7 @@
 			<ymin>1450</ymin>
 			<xmax>2293</xmax>
 			<ymax>1931</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -49,7 +50,7 @@
 		</bndbox>
 	</object>
 	<object>
-		<name>voltage.dc</name>
+		<name>voltage.ac</name>
 		<pose>Unspecified</pose>
 		<truncated>0</truncated>
 		<difficult>0</difficult>
@@ -58,6 +59,7 @@
 			<ymin>1450</ymin>
 			<xmax>1024</xmax>
 			<ymax>1794</ymax>
+			<rotation>356</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C10_D2_P4.xml b/drafter_1/annotations/C10_D2_P4.xml
index e2c12364e5d81b0d45abe9588fc758cb62616488..019bfdeac67023273f328a4d644534636940b0aa 100644
--- a/drafter_1/annotations/C10_D2_P4.xml
+++ b/drafter_1/annotations/C10_D2_P4.xml
@@ -31,9 +31,10 @@
 		<difficult>0</difficult>
 		<bndbox>
 			<xmin>2112</xmin>
-			<ymin>1344</ymin>
+			<ymin>1327</ymin>
 			<xmax>2322</xmax>
 			<ymax>1968</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -49,15 +50,16 @@
 		</bndbox>
 	</object>
 	<object>
-		<name>voltage.dc</name>
+		<name>voltage.ac</name>
 		<pose>Unspecified</pose>
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>549</xmin>
-			<ymin>1575</ymin>
-			<xmax>956</xmax>
+			<xmin>548</xmin>
+			<ymin>1567</ymin>
+			<xmax>944</xmax>
 			<ymax>1950</ymax>
+			<rotation>352</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C11_D1_P1.xml b/drafter_1/annotations/C11_D1_P1.xml
index e317793410f9f51b5e8a64eb879ba037bdd5de48..389bbf2630236608a523771a6d6d556f82b7fc29 100755
--- a/drafter_1/annotations/C11_D1_P1.xml
+++ b/drafter_1/annotations/C11_D1_P1.xml
@@ -18,9 +18,10 @@
 		<difficult>0</difficult>
 		<bndbox>
 			<xmin>1476</xmin>
-			<ymin>698</ymin>
+			<ymin>705</ymin>
 			<xmax>1820</xmax>
-			<ymax>902</ymax>
+			<ymax>868</ymax>
+			<rotation>12</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -33,6 +34,7 @@
 			<ymin>622</ymin>
 			<xmax>2792</xmax>
 			<ymax>858</ymax>
+			<rotation>8</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -45,7 +47,7 @@
 			<ymin>1014</ymin>
 			<xmax>2456</xmax>
 			<ymax>1206</ymax>
-			<rotation>90</rotation>
+			<rotation>94</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -71,6 +73,7 @@
 			<ymin>1012</ymin>
 			<xmax>1216</xmax>
 			<ymax>1354</ymax>
+			<rotation>356</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C11_D1_P2.xml b/drafter_1/annotations/C11_D1_P2.xml
index b6e1b9ded75dbacbc8b166b413de3e3cb603bfb1..c494a12acd8145f6b11475c8e05ee8688e80dc30 100644
--- a/drafter_1/annotations/C11_D1_P2.xml
+++ b/drafter_1/annotations/C11_D1_P2.xml
@@ -12,7 +12,7 @@
 	</size>
 	<segmented>0</segmented>
 	<object>
-		<name>voltage.ac</name>
+		<name>voltage.dc</name>
 		<pose>Unspecified</pose>
 		<truncated>0</truncated>
 		<difficult>0</difficult>
@@ -21,6 +21,7 @@
 			<ymin>813</ymin>
 			<xmax>1056</xmax>
 			<ymax>1218</ymax>
+			<rotation>356</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -45,7 +46,7 @@
 			<ymin>951</ymin>
 			<xmax>2460</xmax>
 			<ymax>1131</ymax>
-			<rotation>90</rotation>
+			<rotation>94</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -169,7 +170,7 @@
 			<xmax>1992</xmax>
 			<ymax>587</ymax>
 		</bndbox>
-		<text>10k&#937;</text>
+		<text>10K&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -195,7 +196,7 @@
 			<xmax>4015</xmax>
 			<ymax>1133</ymax>
 		</bndbox>
-		<text>20k&#937;</text>
+		<text>20K&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_1/annotations/C11_D1_P3.xml b/drafter_1/annotations/C11_D1_P3.xml
index 40042465f3052350c46df3a442758918e30ea09a..efb00b0daffa8666699f49ca7a3f5afe05f69956 100755
--- a/drafter_1/annotations/C11_D1_P3.xml
+++ b/drafter_1/annotations/C11_D1_P3.xml
@@ -21,6 +21,7 @@
 			<ymin>741</ymin>
 			<xmax>788</xmax>
 			<ymax>970</ymax>
+			<rotation>356</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -46,6 +47,7 @@
 			<ymin>491</ymin>
 			<xmax>1906</xmax>
 			<ymax>655</ymax>
+			<rotation>10</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -68,9 +70,10 @@
 		<difficult>0</difficult>
 		<bndbox>
 			<xmin>950</xmin>
-			<ymin>517</ymin>
+			<ymin>533</ymin>
 			<xmax>1218</xmax>
-			<ymax>658</ymax>
+			<ymax>647</ymax>
+			<rotation>8</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C11_D1_P4.xml b/drafter_1/annotations/C11_D1_P4.xml
index ea935eabb7d3b29d9c45e3ce44f912b737fd5f64..a47388761f2fd3a3883dd27f3fda333b03c3aed8 100644
--- a/drafter_1/annotations/C11_D1_P4.xml
+++ b/drafter_1/annotations/C11_D1_P4.xml
@@ -73,7 +73,7 @@
 			<ymin>747</ymin>
 			<xmax>735</xmax>
 			<ymax>1006</ymax>
-			<rotation>5</rotation>
+			<rotation>356</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C11_D2_P1.xml b/drafter_1/annotations/C11_D2_P1.xml
index de73adcff08d88d25d067bb9b295b83669a7f27a..157bb49f3d9ab54338e0005f61615949c67bcef7 100755
--- a/drafter_1/annotations/C11_D2_P1.xml
+++ b/drafter_1/annotations/C11_D2_P1.xml
@@ -21,7 +21,6 @@
 			<ymin>1015</ymin>
 			<xmax>1415</xmax>
 			<ymax>1206</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -47,7 +46,6 @@
 			<ymin>1012</ymin>
 			<xmax>2156</xmax>
 			<ymax>1237</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -73,6 +71,7 @@
 			<ymin>1346</ymin>
 			<xmax>869</xmax>
 			<ymax>1669</ymax>
+			<rotation>350</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -210,6 +209,6 @@
 			<xmax>558</xmax>
 			<ymax>1535</ymax>
 		</bndbox>
-		<text>10V AC</text>
+		<text>10VAC</text>
 	</object>
 </annotation>
diff --git a/drafter_1/annotations/C11_D2_P2.xml b/drafter_1/annotations/C11_D2_P2.xml
index 44b76c035a55b9a04c74190e4e185b94b8563bb7..02c3aedfd9f8dc31b804df562f33f73556ae8cd6 100755
--- a/drafter_1/annotations/C11_D2_P2.xml
+++ b/drafter_1/annotations/C11_D2_P2.xml
@@ -21,6 +21,7 @@
 			<ymin>1261</ymin>
 			<xmax>1073</xmax>
 			<ymax>1639</ymax>
+			<rotation>352</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -30,9 +31,9 @@
 		<difficult>0</difficult>
 		<bndbox>
 			<xmin>1297</xmin>
-			<ymin>909</ymin>
+			<ymin>932</ymin>
 			<xmax>1607</xmax>
-			<ymax>1099</ymax>
+			<ymax>1073</ymax>
 			<rotation>173</rotation>
 		</bndbox>
 	</object>
@@ -85,7 +86,7 @@
 			<xmax>698</xmax>
 			<ymax>1474</ymax>
 		</bndbox>
-		<text>10V AC</text>
+		<text>10VAC</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_1/annotations/C11_D2_P3.xml b/drafter_1/annotations/C11_D2_P3.xml
index 5139b54d8d6dd455c766a71360e2d12135ebb20a..bd965a8b04aee54ff9de9c76908e74e3ffa608d8 100755
--- a/drafter_1/annotations/C11_D2_P3.xml
+++ b/drafter_1/annotations/C11_D2_P3.xml
@@ -34,7 +34,6 @@
 			<ymin>613</ymin>
 			<xmax>1987</xmax>
 			<ymax>828</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -60,7 +59,6 @@
 			<ymin>658</ymin>
 			<xmax>1337</xmax>
 			<ymax>803</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -73,6 +71,7 @@
 			<ymin>982</ymin>
 			<xmax>790</xmax>
 			<ymax>1256</ymax>
+			<rotation>350</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -210,6 +209,6 @@
 			<xmax>512</xmax>
 			<ymax>1168</ymax>
 		</bndbox>
-		<text>10V AC</text>
+		<text>10VAC</text>
 	</object>
 </annotation>
diff --git a/drafter_1/annotations/C11_D2_P4.xml b/drafter_1/annotations/C11_D2_P4.xml
index ce788af447561b0ba982615ae73d1a6c84811fe8..5de2d0d943591d5156facca65ba6abbbec84155b 100755
--- a/drafter_1/annotations/C11_D2_P4.xml
+++ b/drafter_1/annotations/C11_D2_P4.xml
@@ -72,6 +72,7 @@
 			<ymin>1110</ymin>
 			<xmax>610</xmax>
 			<ymax>1358</ymax>
+			<rotation>347</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -157,7 +158,7 @@
 			<xmax>400</xmax>
 			<ymax>1270</ymax>
 		</bndbox>
-		<text>10V AC</text>
+		<text>10VAC</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_1/annotations/C12_D1_P2.xml b/drafter_1/annotations/C12_D1_P2.xml
index 876bfb7d9a4ef662ab27ec76f8658147ac5d2f80..2851b861313406086c9e7384fb02bb718a1a9521 100755
--- a/drafter_1/annotations/C12_D1_P2.xml
+++ b/drafter_1/annotations/C12_D1_P2.xml
@@ -21,6 +21,7 @@
 			<ymin>809</ymin>
 			<xmax>425</xmax>
 			<ymax>971</ymax>
+			<rotation>350</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C12_D1_P3.xml b/drafter_1/annotations/C12_D1_P3.xml
index 459abd3c70513d8caebdb9e47f0ec88e65ae2db6..3b1fb6d046c3ac61ef44f5cc8b5edbfc8e301079 100755
--- a/drafter_1/annotations/C12_D1_P3.xml
+++ b/drafter_1/annotations/C12_D1_P3.xml
@@ -21,6 +21,7 @@
 			<ymin>1039</ymin>
 			<xmax>334</xmax>
 			<ymax>1199</ymax>
+			<rotation>348</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C12_D1_P4.xml b/drafter_1/annotations/C12_D1_P4.xml
index 4be925f331e5f19529113ba6843f1b3406e0fd1a..15a7746d04bc364ac38c1813920eca105da7d740 100755
--- a/drafter_1/annotations/C12_D1_P4.xml
+++ b/drafter_1/annotations/C12_D1_P4.xml
@@ -21,6 +21,7 @@
 			<ymin>1323</ymin>
 			<xmax>467</xmax>
 			<ymax>1494</ymax>
+			<rotation>354</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C12_D2_P1.xml b/drafter_1/annotations/C12_D2_P1.xml
index a84761ae6696b62667d7aacd737c978d6ef998ee..cece3d07cb3b5e9c42d736dedc9d03b21a097380 100755
--- a/drafter_1/annotations/C12_D2_P1.xml
+++ b/drafter_1/annotations/C12_D2_P1.xml
@@ -47,6 +47,7 @@
 			<ymin>1110</ymin>
 			<xmax>590</xmax>
 			<ymax>1316</ymax>
+			<rotation>6</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C1_D1_P1.xml b/drafter_1/annotations/C1_D1_P1.xml
index 3b0dedf7e8cebbf1ed11aba15fe62d196ed528ef..083d54593e1e59da2d168ec30962727497356d48 100644
--- a/drafter_1/annotations/C1_D1_P1.xml
+++ b/drafter_1/annotations/C1_D1_P1.xml
@@ -21,6 +21,7 @@
 			<ymin>295</ymin>
 			<xmax>197</xmax>
 			<ymax>389</ymax>
+			<rotation>8</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C1_D1_P2.xml b/drafter_1/annotations/C1_D1_P2.xml
index 3474cb73c82d047345fca58dc5b6c801b4fa0033..2272acd347dbedfa464a0b0ef386bd1528296c85 100755
--- a/drafter_1/annotations/C1_D1_P2.xml
+++ b/drafter_1/annotations/C1_D1_P2.xml
@@ -21,6 +21,7 @@
 			<ymin>546</ymin>
 			<xmax>604</xmax>
 			<ymax>838</ymax>
+			<rotation>10</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C1_D1_P3.xml b/drafter_1/annotations/C1_D1_P3.xml
index 32f04cdf36ab29b1228fa127ce86cd67c0b80006..58f0c53fa2564b90a018c0dd9b9270e6999b90cc 100644
--- a/drafter_1/annotations/C1_D1_P3.xml
+++ b/drafter_1/annotations/C1_D1_P3.xml
@@ -21,6 +21,7 @@
 			<ymin>450</ymin>
 			<xmax>568</xmax>
 			<ymax>756</ymax>
+			<rotation>6</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C1_D1_P4.xml b/drafter_1/annotations/C1_D1_P4.xml
index e83358a3d1bb3f2851b8e67b8c75a6a7dd3a91d0..99056a13ec2af56519135fabe7de9e419e300192 100755
--- a/drafter_1/annotations/C1_D1_P4.xml
+++ b/drafter_1/annotations/C1_D1_P4.xml
@@ -21,6 +21,7 @@
 			<ymin>751</ymin>
 			<xmax>546</xmax>
 			<ymax>1035</ymax>
+			<rotation>8</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C2_D2_P1.xml b/drafter_1/annotations/C2_D2_P1.xml
index 02299f94fe031b87f36142d90033d56f00985583..d5e5453ee17406b61d6be8ff6cab2d56fefa7e5b 100755
--- a/drafter_1/annotations/C2_D2_P1.xml
+++ b/drafter_1/annotations/C2_D2_P1.xml
@@ -21,7 +21,7 @@
 			<ymin>574</ymin>
 			<xmax>170</xmax>
 			<ymax>650</ymax>
-			<rotation>5</rotation>
+			<rotation>354</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C2_D2_P4.xml b/drafter_1/annotations/C2_D2_P4.xml
index ec66ef2b4e2e0b4cb17d50dbb3d5ef4fb9dc6029..f6b94a02fd633deee30ba8ba5f8cefdcf6cb5f82 100755
--- a/drafter_1/annotations/C2_D2_P4.xml
+++ b/drafter_1/annotations/C2_D2_P4.xml
@@ -21,7 +21,7 @@
 			<ymin>1828</ymin>
 			<xmax>413</xmax>
 			<ymax>2073</ymax>
-			<rotation>0</rotation>
+			<rotation>354</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -34,7 +34,6 @@
 			<ymin>877</ymin>
 			<xmax>2382</xmax>
 			<ymax>1144</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -47,7 +46,6 @@
 			<ymin>1486</ymin>
 			<xmax>702</xmax>
 			<ymax>1644</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -138,7 +136,6 @@
 			<ymin>1452</ymin>
 			<xmax>1822</xmax>
 			<ymax>1738</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C3_D1_P1.xml b/drafter_1/annotations/C3_D1_P1.xml
index 92c8d5b8d76695be688f23c16e0063e0f40c9aec..81dfc1a4abfa820096294487b58ceda96d928efb 100644
--- a/drafter_1/annotations/C3_D1_P1.xml
+++ b/drafter_1/annotations/C3_D1_P1.xml
@@ -21,7 +21,7 @@
 			<ymin>608</ymin>
 			<xmax>241</xmax>
 			<ymax>766</ymax>
-			<rotation>0</rotation>
+			<rotation>6</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -34,7 +34,7 @@
 			<ymin>475</ymin>
 			<xmax>541</xmax>
 			<ymax>558</ymax>
-			<rotation>0</rotation>
+			<rotation>169</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C3_D1_P2.xml b/drafter_1/annotations/C3_D1_P2.xml
index b104a8d2e19359abfb48cce9fff1de27975cfbb1..a0112eed25e0d104087dd871f577beba23a761d7 100644
--- a/drafter_1/annotations/C3_D1_P2.xml
+++ b/drafter_1/annotations/C3_D1_P2.xml
@@ -21,7 +21,6 @@
 			<ymin>1462</ymin>
 			<xmax>824</xmax>
 			<ymax>1899</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -34,7 +33,7 @@
 			<ymin>1122</ymin>
 			<xmax>1629</xmax>
 			<ymax>1346</ymax>
-			<rotation>0</rotation>
+			<rotation>164</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C3_D1_P3.xml b/drafter_1/annotations/C3_D1_P3.xml
index cfa674858a3636b426dd80b54337daf07002ecf0..7db9e881fcbca3fb6c8308b411dcfc62c724be79 100644
--- a/drafter_1/annotations/C3_D1_P3.xml
+++ b/drafter_1/annotations/C3_D1_P3.xml
@@ -21,7 +21,7 @@
 			<ymin>1668</ymin>
 			<xmax>612</xmax>
 			<ymax>2194</ymax>
-			<rotation>0</rotation>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -34,7 +34,7 @@
 			<ymin>1237</ymin>
 			<xmax>1618</xmax>
 			<ymax>1469</ymax>
-			<rotation>0</rotation>
+			<rotation>162</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C3_D1_P4.xml b/drafter_1/annotations/C3_D1_P4.xml
index 76d7d4235478a5c4cf60e53fe7671267a1fdb358..2da159b6cfcd413186e93172571ca6b5aed22140 100644
--- a/drafter_1/annotations/C3_D1_P4.xml
+++ b/drafter_1/annotations/C3_D1_P4.xml
@@ -21,7 +21,6 @@
 			<ymin>1748</ymin>
 			<xmax>802</xmax>
 			<ymax>2190</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -34,7 +33,7 @@
 			<ymin>1400</ymin>
 			<xmax>1668</xmax>
 			<ymax>1619</ymax>
-			<rotation>0</rotation>
+			<rotation>162</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C3_D2_P1.xml b/drafter_1/annotations/C3_D2_P1.xml
index fc025aafbcbe2db93808c02a27c417b82ae6c285..21346bf8dd9d636f21b2de8d441b99c2251591c4 100644
--- a/drafter_1/annotations/C3_D2_P1.xml
+++ b/drafter_1/annotations/C3_D2_P1.xml
@@ -31,9 +31,9 @@
 		<difficult>0</difficult>
 		<bndbox>
 			<xmin>437</xmin>
-			<ymin>486</ymin>
+			<ymin>495</ymin>
 			<xmax>667</xmax>
-			<ymax>603</ymax>
+			<ymax>586</ymax>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C3_D2_P2.xml b/drafter_1/annotations/C3_D2_P2.xml
index 1c78dcb68269367f8e7879416a3c31d80201da45..ae60fb2204e1fc33e0fd214a51a82bb530a26de9 100644
--- a/drafter_1/annotations/C3_D2_P2.xml
+++ b/drafter_1/annotations/C3_D2_P2.xml
@@ -21,7 +21,7 @@
 			<ymin>2531</ymin>
 			<xmax>624</xmax>
 			<ymax>3056</ymax>
-			<rotation>0</rotation>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -34,7 +34,6 @@
 			<ymin>2089</ymin>
 			<xmax>1381</xmax>
 			<ymax>2319</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C3_D2_P3.xml b/drafter_1/annotations/C3_D2_P3.xml
index 1a8d5498c21db02e912a96f705badcac79f92db2..f9456a12cc2c71f6303a444f8d8201af3e2719ed 100644
--- a/drafter_1/annotations/C3_D2_P3.xml
+++ b/drafter_1/annotations/C3_D2_P3.xml
@@ -21,7 +21,7 @@
 			<ymin>1656</ymin>
 			<xmax>710</xmax>
 			<ymax>2201</ymax>
-			<rotation>0</rotation>
+			<rotation>6</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -34,7 +34,6 @@
 			<ymin>1131</ymin>
 			<xmax>1491</xmax>
 			<ymax>1385</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C4_D1_P1.xml b/drafter_1/annotations/C4_D1_P1.xml
index 39e7773d1adb4d74f7e1c0ae4508de5c5f850e0f..89ee6ee7657961a78df8c564270668b0a2fa7d4d 100644
--- a/drafter_1/annotations/C4_D1_P1.xml
+++ b/drafter_1/annotations/C4_D1_P1.xml
@@ -21,6 +21,7 @@
 			<ymin>291</ymin>
 			<xmax>353</xmax>
 			<ymax>430</ymax>
+			<rotation>2</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C4_D1_P2.xml b/drafter_1/annotations/C4_D1_P2.xml
index 3738bfc8b7eebb9aac584f5ec34f4ad61deaec93..f0fab114cc93a3c26677ce1251c6bd602af588d6 100644
--- a/drafter_1/annotations/C4_D1_P2.xml
+++ b/drafter_1/annotations/C4_D1_P2.xml
@@ -21,6 +21,7 @@
 			<ymin>770</ymin>
 			<xmax>724</xmax>
 			<ymax>1100</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C4_D1_P3.xml b/drafter_1/annotations/C4_D1_P3.xml
index 13e089f46f359cefd551700aa06c1a6c36bf1972..d594f90f6e1b41b4bd26f2fbfeb3837f5a13d75b 100644
--- a/drafter_1/annotations/C4_D1_P3.xml
+++ b/drafter_1/annotations/C4_D1_P3.xml
@@ -21,6 +21,7 @@
 			<ymin>606</ymin>
 			<xmax>848</xmax>
 			<ymax>884</ymax>
+			<rotation>2</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C4_D2_P1.xml b/drafter_1/annotations/C4_D2_P1.xml
index 0bc811e1d0e0811b241bd2a077cf099c79b1d58d..94e9ce4b94f84f30db332ba0bab1c785dd506134 100644
--- a/drafter_1/annotations/C4_D2_P1.xml
+++ b/drafter_1/annotations/C4_D2_P1.xml
@@ -21,6 +21,7 @@
 			<ymin>598</ymin>
 			<xmax>418</xmax>
 			<ymax>756</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C4_D2_P3.xml b/drafter_1/annotations/C4_D2_P3.xml
index 90103701e32fc845f2f608d22ce1a9f859e99ccd..11b23e9f20acc200f276e95d7000814c54f78078 100755
--- a/drafter_1/annotations/C4_D2_P3.xml
+++ b/drafter_1/annotations/C4_D2_P3.xml
@@ -21,6 +21,7 @@
 			<ymin>727</ymin>
 			<xmax>703</xmax>
 			<ymax>1064</ymax>
+			<rotation>356</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C4_D2_P4.xml b/drafter_1/annotations/C4_D2_P4.xml
index 95891d4199f9decfb100fad9ae8536afd42b70aa..92ec7825a3d57a9273911f82ef62eafe55a7b308 100644
--- a/drafter_1/annotations/C4_D2_P4.xml
+++ b/drafter_1/annotations/C4_D2_P4.xml
@@ -21,7 +21,7 @@
 			<ymin>786</ymin>
 			<xmax>761</xmax>
 			<ymax>1157</ymax>
-			<rotation>5</rotation>
+			<rotation>358</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C5_D1_P1.xml b/drafter_1/annotations/C5_D1_P1.xml
index 870b29300aecb47c970aec5f075a9b92efa4cd27..ab293beae3361693aa5d5dcb77a4193e5558ac7a 100644
--- a/drafter_1/annotations/C5_D1_P1.xml
+++ b/drafter_1/annotations/C5_D1_P1.xml
@@ -21,7 +21,7 @@
 			<ymin>524</ymin>
 			<xmax>394</xmax>
 			<ymax>703</ymax>
-			<rotation>5</rotation>
+			<rotation>358</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C5_D1_P2.xml b/drafter_1/annotations/C5_D1_P2.xml
index 84b10edd79b89e6712d616740e65cf438ede7810..2c0bc10971e935e0ad1281fccacd92fe7b32112b 100755
--- a/drafter_1/annotations/C5_D1_P2.xml
+++ b/drafter_1/annotations/C5_D1_P2.xml
@@ -21,7 +21,7 @@
 			<ymin>1091</ymin>
 			<xmax>1160</xmax>
 			<ymax>1756</ymax>
-			<rotation>5</rotation>
+			<rotation>358</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C5_D1_P3.xml b/drafter_1/annotations/C5_D1_P3.xml
index 3f857fae9f2d39947f02f76301e499ae1d7484cf..28e9e29c453b2a5a5c15e27c909ddfba1a2d5756 100644
--- a/drafter_1/annotations/C5_D1_P3.xml
+++ b/drafter_1/annotations/C5_D1_P3.xml
@@ -21,7 +21,7 @@
 			<ymin>1419</ymin>
 			<xmax>1293</xmax>
 			<ymax>1931</ymax>
-			<rotation>5</rotation>
+			<rotation>354</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C5_D2_P1.xml b/drafter_1/annotations/C5_D2_P1.xml
index e803be8b90ba8605b23a0928439fe2177d7c5c63..c0a2a200c8680eafea0dc03b3dcf32f06aa33636 100644
--- a/drafter_1/annotations/C5_D2_P1.xml
+++ b/drafter_1/annotations/C5_D2_P1.xml
@@ -21,6 +21,7 @@
 			<ymin>499</ymin>
 			<xmax>373</xmax>
 			<ymax>681</ymax>
+			<rotation>6</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C5_D2_P2.xml b/drafter_1/annotations/C5_D2_P2.xml
index 3fcd5b8bd45cdb1730f4af33769166fb36964df8..7b5e59ce2dd08145a5857e582f34b166d261dd3b 100644
--- a/drafter_1/annotations/C5_D2_P2.xml
+++ b/drafter_1/annotations/C5_D2_P2.xml
@@ -21,6 +21,7 @@
 			<ymin>1944</ymin>
 			<xmax>1074</xmax>
 			<ymax>2431</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C5_D2_P3.xml b/drafter_1/annotations/C5_D2_P3.xml
index 41c42d35d045be79290632e0ea6e5072daa4b206..3b56a94873e4f3a4599dadc553365274712554a3 100644
--- a/drafter_1/annotations/C5_D2_P3.xml
+++ b/drafter_1/annotations/C5_D2_P3.xml
@@ -21,6 +21,7 @@
 			<ymin>1881</ymin>
 			<xmax>968</xmax>
 			<ymax>2344</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C6_D1_P3.xml b/drafter_1/annotations/C6_D1_P3.xml
index 4b6d7b66876545ae6c6654d11243f3d2b5d566d8..f1f530c523de3eda6d1ea260248ab4c67595a33f 100755
--- a/drafter_1/annotations/C6_D1_P3.xml
+++ b/drafter_1/annotations/C6_D1_P3.xml
@@ -21,6 +21,7 @@
 			<ymin>1078</ymin>
 			<xmax>1012</xmax>
 			<ymax>1412</ymax>
+			<rotation>6</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -44,7 +45,8 @@
 			<xmin>1182</xmin>
 			<ymin>1728</ymin>
 			<xmax>1380</xmax>
-			<ymax>1946</ymax>
+			<ymax>1937</ymax>
+			<rotation>2</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -270,7 +272,7 @@
 			<xmax>1392</xmax>
 			<ymax>2271</ymax>
 		</bndbox>
-		<text>VBB</text>
+		<text>VDD</text>
 	</object>
 	<object>
 		<name>terminal</name>
diff --git a/drafter_1/annotations/C6_D1_P4.xml b/drafter_1/annotations/C6_D1_P4.xml
index b86b9079de7e567a61bd3571fca8589cb645c37c..1ed4261e7715247237967f1e8d0b1da1ae6d429b 100755
--- a/drafter_1/annotations/C6_D1_P4.xml
+++ b/drafter_1/annotations/C6_D1_P4.xml
@@ -293,7 +293,7 @@
 			<xmax>1403</xmax>
 			<ymax>2064</ymax>
 		</bndbox>
-		<text>VBB</text>
+		<text>VDD</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_1/annotations/C6_D2_P3.xml b/drafter_1/annotations/C6_D2_P3.xml
index ca2cb1562805654f0ef8fbae74905953687fcc27..3db6655490be84f1bfb15e626e3ab7c3a5a83cf6 100755
--- a/drafter_1/annotations/C6_D2_P3.xml
+++ b/drafter_1/annotations/C6_D2_P3.xml
@@ -21,6 +21,7 @@
 			<ymin>1305</ymin>
 			<xmax>639</xmax>
 			<ymax>1542</ymax>
+			<rotation>8</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -33,6 +34,7 @@
 			<ymin>1337</ymin>
 			<xmax>1182</xmax>
 			<ymax>1557</ymax>
+			<rotation>10</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -45,6 +47,7 @@
 			<ymin>1852</ymin>
 			<xmax>1088</xmax>
 			<ymax>2049</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -57,6 +60,7 @@
 			<ymin>2340</ymin>
 			<xmax>1055</xmax>
 			<ymax>2538</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -69,6 +73,7 @@
 			<ymin>2059</ymin>
 			<xmax>1562</xmax>
 			<ymax>2316</ymax>
+			<rotation>2</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C6_D2_P4.xml b/drafter_1/annotations/C6_D2_P4.xml
index 19eb1ed828c3c918625a65a324f238300c66b1c9..edc87c04a74a6695f9d961b2fbc351415dab28e5 100755
--- a/drafter_1/annotations/C6_D2_P4.xml
+++ b/drafter_1/annotations/C6_D2_P4.xml
@@ -45,6 +45,7 @@
 			<ymin>1874</ymin>
 			<xmax>1349</xmax>
 			<ymax>2063</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -69,6 +70,7 @@
 			<ymin>2095</ymin>
 			<xmax>1830</xmax>
 			<ymax>2332</ymax>
+			<rotation>2</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C7_D1_P1.xml b/drafter_1/annotations/C7_D1_P1.xml
index 7bd92756d1ebcc009b86b0863d0ed32ec2f43b88..8082d1309a51b3f1ca18f15dcfba076a99a2857e 100755
--- a/drafter_1/annotations/C7_D1_P1.xml
+++ b/drafter_1/annotations/C7_D1_P1.xml
@@ -488,4 +488,30 @@
 			<ymax>610</ymax>
 		</bndbox>
 	</object>
+	<object>
+		<name>inductor</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>659</xmin>
+			<ymin>316</ymin>
+			<xmax>681</xmax>
+			<ymax>411</ymax>
+			<rotation>83</rotation>
+		</bndbox>
+	</object>
+	<object>
+		<name>inductor</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>740</xmin>
+			<ymin>321</ymin>
+			<xmax>763</xmax>
+			<ymax>407</ymax>
+			<rotation>79</rotation>
+		</bndbox>
+	</object>
 </annotation>
diff --git a/drafter_1/annotations/C7_D1_P2.xml b/drafter_1/annotations/C7_D1_P2.xml
index 6eff80a33060721e37141c3d5ef90cc1d495d37e..29987c3cfc24d3a413d1cc97c35e655275e36e1c 100755
--- a/drafter_1/annotations/C7_D1_P2.xml
+++ b/drafter_1/annotations/C7_D1_P2.xml
@@ -21,7 +21,6 @@
 			<ymin>2862</ymin>
 			<xmax>792</xmax>
 			<ymax>2973</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -47,7 +46,6 @@
 			<ymin>2046</ymin>
 			<xmax>808</xmax>
 			<ymax>2115</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -60,7 +58,6 @@
 			<ymin>2346</ymin>
 			<xmax>958</xmax>
 			<ymax>2431</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -73,7 +70,6 @@
 			<ymin>1469</ymin>
 			<xmax>2554</xmax>
 			<ymax>1550</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -86,7 +82,6 @@
 			<ymin>1708</ymin>
 			<xmax>1038</xmax>
 			<ymax>1985</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -99,7 +94,6 @@
 			<ymin>2547</ymin>
 			<xmax>1054</xmax>
 			<ymax>2862</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -112,7 +106,6 @@
 			<ymin>1631</ymin>
 			<xmax>1569</xmax>
 			<ymax>1815</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -495,4 +488,30 @@
 			<ymax>2861</ymax>
 		</bndbox>
 	</object>
+	<object>
+		<name>inductor</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>1881</xmin>
+			<ymin>1868</ymin>
+			<xmax>1948</xmax>
+			<ymax>2160</ymax>
+			<rotation>85</rotation>
+		</bndbox>
+	</object>
+	<object>
+		<name>inductor</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>2175</xmin>
+			<ymin>1870</ymin>
+			<xmax>2249</xmax>
+			<ymax>2149</ymax>
+			<rotation>81</rotation>
+		</bndbox>
+	</object>
 </annotation>
diff --git a/drafter_1/annotations/C7_D1_P3.xml b/drafter_1/annotations/C7_D1_P3.xml
index 6da254d76e6420ef01acd4bab8d6c4e502d722ed..55dbaf12425b8c315fb1b62c6bdec2bd79973450 100644
--- a/drafter_1/annotations/C7_D1_P3.xml
+++ b/drafter_1/annotations/C7_D1_P3.xml
@@ -499,6 +499,7 @@
 			<ymin>863</ymin>
 			<xmax>2269</xmax>
 			<ymax>1132</ymax>
+			<rotation>83</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -511,6 +512,7 @@
 			<ymin>863</ymin>
 			<xmax>1987</xmax>
 			<ymax>1141</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 </annotation>
diff --git a/drafter_1/annotations/C7_D1_P4.xml b/drafter_1/annotations/C7_D1_P4.xml
index a793baa7f9a41bfba5d2d0306835227aacf34b02..da129f285ad635040f13193472aaa7720bc35129 100755
--- a/drafter_1/annotations/C7_D1_P4.xml
+++ b/drafter_1/annotations/C7_D1_P4.xml
@@ -491,4 +491,30 @@
 			<ymax>1666</ymax>
 		</bndbox>
 	</object>
+	<object>
+		<name>inductor</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>1756</xmin>
+			<ymin>2067</ymin>
+			<xmax>1826</xmax>
+			<ymax>2401</ymax>
+			<rotation>90</rotation>
+		</bndbox>
+	</object>
+	<object>
+		<name>inductor</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>2082</xmin>
+			<ymin>2085</ymin>
+			<xmax>2158</xmax>
+			<ymax>2396</ymax>
+			<rotation>90</rotation>
+		</bndbox>
+	</object>
 </annotation>
diff --git a/drafter_1/annotations/C7_D2_P1.xml b/drafter_1/annotations/C7_D2_P1.xml
index 1e2b6e919952d473b3d99417275c4b7b80994e5e..e6b2aa573eba0483790976d8264299e8a8713a6d 100755
--- a/drafter_1/annotations/C7_D2_P1.xml
+++ b/drafter_1/annotations/C7_D2_P1.xml
@@ -33,7 +33,6 @@
 			<ymin>354</ymin>
 			<xmax>314</xmax>
 			<ymax>444</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -46,7 +45,6 @@
 			<ymin>668</ymin>
 			<xmax>310</xmax>
 			<ymax>789</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -59,7 +57,6 @@
 			<ymin>271</ymin>
 			<xmax>254</xmax>
 			<ymax>303</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -72,7 +69,6 @@
 			<ymin>471</ymin>
 			<xmax>224</xmax>
 			<ymax>503</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -124,7 +120,6 @@
 			<ymin>401</ymin>
 			<xmax>472</xmax>
 			<ymax>459</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -505,6 +500,7 @@
 			<ymin>519</ymin>
 			<xmax>697</xmax>
 			<ymax>622</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -517,6 +513,7 @@
 			<ymin>520</ymin>
 			<xmax>618</xmax>
 			<ymax>629</ymax>
+			<rotation>110</rotation>
 		</bndbox>
 	</object>
 </annotation>
diff --git a/drafter_1/annotations/C7_D2_P2.xml b/drafter_1/annotations/C7_D2_P2.xml
index 71208aa5879254db2b1f9d4318c632d440c3af13..0d153d57b658fe614e02d38896a18ab27c4ec86e 100755
--- a/drafter_1/annotations/C7_D2_P2.xml
+++ b/drafter_1/annotations/C7_D2_P2.xml
@@ -21,7 +21,6 @@
 			<ymin>1656</ymin>
 			<xmax>1441</xmax>
 			<ymax>1838</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -47,7 +46,6 @@
 			<ymin>1897</ymin>
 			<xmax>630</xmax>
 			<ymax>1971</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -86,7 +84,6 @@
 			<ymin>1829</ymin>
 			<xmax>2685</xmax>
 			<ymax>1921</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -123,7 +120,6 @@
 			<ymin>1499</ymin>
 			<xmax>926</xmax>
 			<ymax>1799</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -136,7 +132,6 @@
 			<ymin>2503</ymin>
 			<xmax>933</xmax>
 			<ymax>2925</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -495,4 +490,30 @@
 			<ymax>1887</ymax>
 		</bndbox>
 	</object>
+	<object>
+		<name>inductor</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>1823</xmin>
+			<ymin>2057</ymin>
+			<xmax>1936</xmax>
+			<ymax>2399</ymax>
+			<rotation>104</rotation>
+		</bndbox>
+	</object>
+	<object>
+		<name>inductor</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>2076</xmin>
+			<ymin>2042</ymin>
+			<xmax>2178</xmax>
+			<ymax>2380</ymax>
+			<rotation>96</rotation>
+		</bndbox>
+	</object>
 </annotation>
diff --git a/drafter_1/annotations/C7_D2_P3.xml b/drafter_1/annotations/C7_D2_P3.xml
index 758610ff8362513b80e779fe062c2bbdb980d82c..1ab6e4cb7b072143497903b47c8e904f5344beec 100644
--- a/drafter_1/annotations/C7_D2_P3.xml
+++ b/drafter_1/annotations/C7_D2_P3.xml
@@ -133,6 +133,7 @@
 			<ymin>1835</ymin>
 			<xmax>1185</xmax>
 			<ymax>2031</ymax>
+			<rotation>358</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -501,6 +502,7 @@
 			<ymin>2287</ymin>
 			<xmax>1881</xmax>
 			<ymax>2660</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -513,6 +515,7 @@
 			<ymin>2275</ymin>
 			<xmax>1617</xmax>
 			<ymax>2673</ymax>
+			<rotation>95</rotation>
 		</bndbox>
 	</object>
 </annotation>
diff --git a/drafter_1/annotations/C7_D2_P4.xml b/drafter_1/annotations/C7_D2_P4.xml
index 6d7d626159193bd5275770dfd9d21f9a21bf689a..d4f7caa4c6e7527e72a1fee0506bfc44f6ba9eff 100755
--- a/drafter_1/annotations/C7_D2_P4.xml
+++ b/drafter_1/annotations/C7_D2_P4.xml
@@ -17,10 +17,10 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>1918</xmin>
-			<ymin>2171</ymin>
-			<xmax>2218</xmax>
-			<ymax>2524</ymax>
+			<xmin>1912</xmin>
+			<ymin>2166</ymin>
+			<xmax>2219</xmax>
+			<ymax>2518</ymax>
 		</bndbox>
 	</object>
 	<object>
@@ -494,4 +494,30 @@
 			<ymax>2039</ymax>
 		</bndbox>
 	</object>
+	<object>
+		<name>inductor</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>1924</xmin>
+			<ymin>2196</ymin>
+			<xmax>2007</xmax>
+			<ymax>2509</ymax>
+			<rotation>100</rotation>
+		</bndbox>
+	</object>
+	<object>
+		<name>inductor</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>2133</xmin>
+			<ymin>2177</ymin>
+			<xmax>2207</xmax>
+			<ymax>2474</ymax>
+			<rotation>100</rotation>
+		</bndbox>
+	</object>
 </annotation>
diff --git a/drafter_1/annotations/C8_D1_P1.xml b/drafter_1/annotations/C8_D1_P1.xml
index 5e04efd2ca22a229c8b1a6447c37959f2f7423f5..f53e4e75af961e3a77cb03fb4623fa31fd00c902 100644
--- a/drafter_1/annotations/C8_D1_P1.xml
+++ b/drafter_1/annotations/C8_D1_P1.xml
@@ -21,7 +21,7 @@
 			<ymin>909</ymin>
 			<xmax>744</xmax>
 			<ymax>1247</ymax>
-			<rotation>5</rotation>
+			<rotation>358</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C8_D1_P2.xml b/drafter_1/annotations/C8_D1_P2.xml
index 5945b78a8722d0e44c86757c0c48f854e524d718..271852fb1dfb9fda72e634d9c6ea38e80f01e955 100755
--- a/drafter_1/annotations/C8_D1_P2.xml
+++ b/drafter_1/annotations/C8_D1_P2.xml
@@ -21,6 +21,7 @@
 			<ymin>828</ymin>
 			<xmax>853</xmax>
 			<ymax>1166</ymax>
+			<rotation>350</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -377,7 +378,7 @@
 			<xmax>458</xmax>
 			<ymax>1040</ymax>
 		</bndbox>
-		<text>9v</text>
+		<text>9V</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_1/annotations/C8_D1_P4.xml b/drafter_1/annotations/C8_D1_P4.xml
index 903df7a49c8337ab29a4875570ff8caabd63227b..ff41619ac084fae0b08ad28f33c7c1cf7b1ff8ad 100755
--- a/drafter_1/annotations/C8_D1_P4.xml
+++ b/drafter_1/annotations/C8_D1_P4.xml
@@ -136,6 +136,7 @@
 			<ymin>676</ymin>
 			<xmax>947</xmax>
 			<ymax>999</ymax>
+			<rotation>6</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -148,6 +149,7 @@
 			<ymin>997</ymin>
 			<xmax>394</xmax>
 			<ymax>1237</ymax>
+			<rotation>354</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -455,7 +457,7 @@
 			<xmax>187</xmax>
 			<ymax>1174</ymax>
 		</bndbox>
-		<text>9v</text>
+		<text>9V</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_1/annotations/C8_D2_P1.xml b/drafter_1/annotations/C8_D2_P1.xml
index dcf504ed08c139df798bf4786880069a7e5a1294..3d38a47aed09ad82d274ddae83683b206ad2e206 100755
--- a/drafter_1/annotations/C8_D2_P1.xml
+++ b/drafter_1/annotations/C8_D2_P1.xml
@@ -353,7 +353,7 @@
 			<xmax>438</xmax>
 			<ymax>1204</ymax>
 		</bndbox>
-		<text>9v</text>
+		<text>9V</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_1/annotations/C8_D2_P3.xml b/drafter_1/annotations/C8_D2_P3.xml
index 8e8b01b799cdfdc2e644cf05579d9216b7b2ca97..4de79c3e42715d23953b2a96201570fd26447258 100644
--- a/drafter_1/annotations/C8_D2_P3.xml
+++ b/drafter_1/annotations/C8_D2_P3.xml
@@ -21,6 +21,7 @@
 			<ymin>812</ymin>
 			<xmax>652</xmax>
 			<ymax>995</ymax>
+			<rotation>352</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C9_D1_P2.xml b/drafter_1/annotations/C9_D1_P2.xml
index 3d0d897634770c203507835b88d412f1c5eacb58..c9913ce274d636031384a4f656ed6dc34bf01265 100644
--- a/drafter_1/annotations/C9_D1_P2.xml
+++ b/drafter_1/annotations/C9_D1_P2.xml
@@ -21,6 +21,7 @@
 			<ymin>737</ymin>
 			<xmax>1096</xmax>
 			<ymax>1323</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C9_D1_P3.xml b/drafter_1/annotations/C9_D1_P3.xml
index 0203248d437e51505a3bef89194972cbccda268a..c6caee81350b9e058a1d9696565e936315f46112 100644
--- a/drafter_1/annotations/C9_D1_P3.xml
+++ b/drafter_1/annotations/C9_D1_P3.xml
@@ -21,6 +21,7 @@
 			<ymin>737</ymin>
 			<xmax>934</xmax>
 			<ymax>1228</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C9_D1_P4.xml b/drafter_1/annotations/C9_D1_P4.xml
index 8756320dc8173f9c2578259f68f5fec378bdd6ee..c6095983161a47111dd164a39e8a5b3f5ad4ee40 100644
--- a/drafter_1/annotations/C9_D1_P4.xml
+++ b/drafter_1/annotations/C9_D1_P4.xml
@@ -21,6 +21,7 @@
 			<ymin>473</ymin>
 			<xmax>815</xmax>
 			<ymax>804</ymax>
+			<rotation>354</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_1/annotations/C9_D2_P1.xml b/drafter_1/annotations/C9_D2_P1.xml
index 1146859a3ad12c911a4ed39417994f4c9a0b6e3e..5ce1b14c4e0f8f22f377039542cb48254cbe574f 100755
--- a/drafter_1/annotations/C9_D2_P1.xml
+++ b/drafter_1/annotations/C9_D2_P1.xml
@@ -21,6 +21,7 @@
 			<ymin>907</ymin>
 			<xmax>733</xmax>
 			<ymax>1241</ymax>
+			<rotation>348</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -157,7 +158,7 @@
 			<xmax>391</xmax>
 			<ymax>1135</ymax>
 		</bndbox>
-		<text>9v</text>
+		<text>9V</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_1/annotations/C9_D2_P2.xml b/drafter_1/annotations/C9_D2_P2.xml
index e19d9f42ca19d7e25f33b3e8d46d7ded1bad0d7f..9d8fd85810c9e27f452a130c87429904d07327ef 100755
--- a/drafter_1/annotations/C9_D2_P2.xml
+++ b/drafter_1/annotations/C9_D2_P2.xml
@@ -21,6 +21,7 @@
 			<ymin>1366</ymin>
 			<xmax>850</xmax>
 			<ymax>1733</ymax>
+			<rotation>356</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -133,7 +134,7 @@
 			<xmax>491</xmax>
 			<ymax>1633</ymax>
 		</bndbox>
-		<text>9v</text>
+		<text>9V</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_1/annotations/C9_D2_P3.xml b/drafter_1/annotations/C9_D2_P3.xml
index a2a10f8a9f883d11a178c8fc3d8ef908294f5a4e..bd901058ffcc08ed67dd96ad71abc6e5bd9407af 100755
--- a/drafter_1/annotations/C9_D2_P3.xml
+++ b/drafter_1/annotations/C9_D2_P3.xml
@@ -21,7 +21,7 @@
 			<ymin>1418</ymin>
 			<xmax>842</xmax>
 			<ymax>1814</ymax>
-			<rotation>5</rotation>
+			<rotation>356</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -158,7 +158,7 @@
 			<xmax>468</xmax>
 			<ymax>1673</ymax>
 		</bndbox>
-		<text>9v</text>
+		<text>9V</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_1/annotations/C9_D2_P4.xml b/drafter_1/annotations/C9_D2_P4.xml
index eb868bffc7464b703afa48283862d8257152e716..85ca61b726ef69fa1d05187df6ac2e3daa7faa62 100755
--- a/drafter_1/annotations/C9_D2_P4.xml
+++ b/drafter_1/annotations/C9_D2_P4.xml
@@ -157,7 +157,7 @@
 			<xmax>412</xmax>
 			<ymax>1762</ymax>
 		</bndbox>
-		<text>9v</text>
+		<text>9V</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_1/instances/C10_D2_P1.json b/drafter_1/instances/C10_D2_P1.json
index cab339c740c77d2e64a4b93b8bc95467b4f23ba5..7084d3634acb2938ee67816a36bfb3d040d48c98 100644
--- a/drafter_1/instances/C10_D2_P1.json
+++ b/drafter_1/instances/C10_D2_P1.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.16.7",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           1337.0,
@@ -25,13 +25,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "inductor",
       "line_color": null,
       "fill_color": null,
+      "label": "inductor",
       "points": [
         [
           2068.0,
@@ -51,13 +52,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "capacitor.unpolarized",
       "line_color": null,
       "fill_color": null,
+      "label": "capacitor.unpolarized",
       "points": [
         [
           1237.0,
@@ -77,13 +79,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "voltage.dc",
       "line_color": null,
       "fill_color": null,
+      "label": "voltage.dc",
       "points": [
         [
           493.0,
@@ -103,13 +106,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2156.0,
@@ -129,13 +133,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           637.0,
@@ -155,13 +160,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           666.0,
@@ -181,13 +187,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2033.0,
@@ -207,13 +214,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           135.0,
@@ -233,13 +241,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           2369.0,
@@ -259,13 +268,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1554.0,
@@ -285,13 +295,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1296.0,
@@ -311,10 +322,15 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
   ],
+  "imagePath": "../segmentation/C10_D2_P1.jpg",
+  "imageData": null,
+  "imageHeight": 4032,
+  "imageWidth": 3024,
   "lineColor": [
     0,
     255,
@@ -326,9 +342,5 @@
     0,
     0,
     128
-  ],
-  "imagePath": "../segmentation/C10_D2_P1.jpg",
-  "imageData": null,
-  "imageHeight": 4032,
-  "imageWidth": 3024
+  ]
 }
\ No newline at end of file
diff --git a/drafter_1/instances/C11_D1_P4.json b/drafter_1/instances/C11_D1_P4.json
index b07e7ae104eb51e92263cf7e3ea56c6b39d9e181..390e6a5f5db82a6c6b5390a436a418fc918aadf7 100644
--- a/drafter_1/instances/C11_D1_P4.json
+++ b/drafter_1/instances/C11_D1_P4.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.16.7",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           1891.0,
@@ -24,13 +24,15 @@
           800.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           873.0,
@@ -49,13 +51,15 @@
           512.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "capacitor.unpolarized",
       "line_color": null,
       "fill_color": null,
+      "label": "capacitor.unpolarized",
       "points": [
         [
           1603.0,
@@ -74,13 +78,15 @@
           371.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "capacitor.unpolarized",
       "line_color": null,
       "fill_color": null,
+      "label": "capacitor.unpolarized",
       "points": [
         [
           1232.0,
@@ -99,13 +105,15 @@
           750.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "voltage.ac",
       "line_color": null,
       "fill_color": null,
+      "label": "voltage.ac",
       "points": [
         [
           532.0,
@@ -124,13 +132,15 @@
           747.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           2168.0,
@@ -149,13 +159,15 @@
           741.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1624.0,
@@ -178,13 +190,15 @@
           109.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1480.0,
@@ -203,13 +217,15 @@
           749.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           236.0,
@@ -228,13 +244,15 @@
           809.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           900.0,
@@ -253,13 +271,15 @@
           313.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           612.0,
@@ -278,13 +298,15 @@
           585.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1316.0,
@@ -303,13 +325,15 @@
           489.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1980.0,
@@ -328,13 +352,15 @@
           1301.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1920.0,
@@ -353,13 +379,15 @@
           365.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1340.0,
@@ -378,13 +406,15 @@
           1289.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           588.0,
@@ -403,10 +433,16 @@
           1197.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
   ],
+  "imagePath": "../segmentation/C11_D1_P4.jpg",
+  "imageData": null,
+  "imageHeight": 1775,
+  "imageWidth": 3024,
   "lineColor": [
     0,
     255,
@@ -418,9 +454,5 @@
     0,
     0,
     128
-  ],
-  "imagePath": "../segmentation/C11_D1_P4.jpg",
-  "imageData": null,
-  "imageHeight": 1775,
-  "imageWidth": 3024
+  ]
 }
\ No newline at end of file
diff --git a/drafter_1/instances/C12_D2_P2.json b/drafter_1/instances/C12_D2_P2.json
index 0c747ff0542dfe14a1ffecc6b0c6b2c3bda97c5c..ac5553b8836f3c6bc57fd574861d770ed8a7b937 100644
--- a/drafter_1/instances/C12_D2_P2.json
+++ b/drafter_1/instances/C12_D2_P2.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.16.7",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
-      "label": "voltage.dc",
       "line_color": null,
       "fill_color": null,
+      "label": "voltage.dc",
       "points": [
         [
           478.0,
@@ -24,13 +24,15 @@
           869.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           843.0,
@@ -49,13 +51,15 @@
           630.9468822170901
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           959.0,
@@ -74,13 +78,15 @@
           812.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           1078.0,
@@ -99,13 +105,15 @@
           1043.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           1573.0,
@@ -124,13 +132,15 @@
           669.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           2808.0,
@@ -153,13 +163,15 @@
           747.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           3439.0,
@@ -178,13 +190,15 @@
           696.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           3286.0,
@@ -203,13 +217,15 @@
           929.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           3637.0,
@@ -228,13 +244,15 @@
           894.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "diode.light_emitting",
       "line_color": null,
       "fill_color": null,
+      "label": "diode.light_emitting",
       "points": [
         [
           3624.0,
@@ -253,13 +271,15 @@
           1184.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "diode.light_emitting",
       "line_color": null,
       "fill_color": null,
+      "label": "diode.light_emitting",
       "points": [
         [
           1035.0,
@@ -278,13 +298,15 @@
           1225.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "transistor.bjt",
       "line_color": null,
       "fill_color": null,
+      "label": "transistor.bjt",
       "points": [
         [
           1329.0,
@@ -319,13 +341,15 @@
           784.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "transistor.bjt",
       "line_color": null,
       "fill_color": null,
+      "label": "transistor.bjt",
       "points": [
         [
           1833.0,
@@ -360,13 +384,15 @@
           643.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "transistor.bjt",
       "line_color": null,
       "fill_color": null,
+      "label": "transistor.bjt",
       "points": [
         [
           1867.0,
@@ -401,13 +427,15 @@
           1100.8849557522124
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "transistor.bjt",
       "line_color": null,
       "fill_color": null,
+      "label": "transistor.bjt",
       "points": [
         [
           2549.0,
@@ -442,13 +470,15 @@
           1047.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "transistor.bjt",
       "line_color": null,
       "fill_color": null,
+      "label": "transistor.bjt",
       "points": [
         [
           2535.0,
@@ -483,13 +513,15 @@
           669.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "transistor.bjt",
       "line_color": null,
       "fill_color": null,
+      "label": "transistor.bjt",
       "points": [
         [
           3127.280112044818,
@@ -528,13 +560,15 @@
           866.9607843137255
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "diode",
       "line_color": null,
       "fill_color": null,
+      "label": "diode",
       "points": [
         [
           2304.0,
@@ -553,13 +587,15 @@
           1110.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "diode",
       "line_color": null,
       "fill_color": null,
+      "label": "diode",
       "points": [
         [
           2286.0,
@@ -578,13 +614,15 @@
           782.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "diode",
       "line_color": null,
       "fill_color": null,
+      "label": "diode",
       "points": [
         [
           2078.5221238938057,
@@ -603,13 +641,15 @@
           745.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "diode",
       "line_color": null,
       "fill_color": null,
+      "label": "diode",
       "points": [
         [
           2084.0,
@@ -628,13 +668,15 @@
           1149.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "switch",
       "line_color": null,
       "fill_color": null,
+      "label": "switch",
       "points": [
         [
           3455.0,
@@ -653,13 +695,15 @@
           1108.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "switch",
       "line_color": null,
       "fill_color": null,
+      "label": "switch",
       "points": [
         [
           868.3333333333333,
@@ -682,13 +726,15 @@
           918.0952380952381
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "crossover",
       "line_color": null,
       "fill_color": null,
+      "label": "crossover",
       "points": [
         [
           1115.0602409638552,
@@ -743,13 +789,15 @@
           833.1325301204819
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "crossover",
       "line_color": null,
       "fill_color": null,
+      "label": "crossover",
       "points": [
         [
           1809.8765432098764,
@@ -800,13 +848,15 @@
           1409.2592592592591
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "crossover",
       "line_color": null,
       "fill_color": null,
+      "label": "crossover",
       "points": [
         [
           3487.654320987654,
@@ -857,13 +907,15 @@
           818.5185185185185
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           3538.9220779220777,
@@ -882,13 +934,15 @@
           696.1688311688312
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           3730.0,
@@ -907,13 +961,15 @@
           917.8571428571429
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           3326.0,
@@ -932,13 +988,15 @@
           1005.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           2999.9999999999995,
@@ -973,13 +1031,15 @@
           949.579831932773
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           2815.638655462185,
@@ -1006,13 +1066,15 @@
           807.282913165266
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           2492.0,
@@ -1043,13 +1105,15 @@
           1187.799043062201
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           2431.0,
@@ -1080,13 +1144,15 @@
           767.5070028011204
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1975.8139534883721,
@@ -1113,13 +1179,15 @@
           1197.952380952381
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1891.0,
@@ -1142,13 +1210,15 @@
           744.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1423.0,
@@ -1171,13 +1241,15 @@
           846.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1604.0,
@@ -1196,13 +1268,15 @@
           758.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1149.3650793650793,
@@ -1221,13 +1295,15 @@
           1079.4444444444443
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           970.8253968253969,
@@ -1246,13 +1322,15 @@
           905.7301587301588
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           917.0900692840646,
@@ -1271,13 +1349,15 @@
           654.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           360.0,
@@ -1296,13 +1376,15 @@
           942.3529411764706
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           519.0,
@@ -1321,13 +1403,15 @@
           486.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           530.0,
@@ -1346,13 +1430,15 @@
           1408.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           872.0,
@@ -1371,13 +1457,15 @@
           1425.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1107.0,
@@ -1396,13 +1484,15 @@
           1436.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           885.0,
@@ -1421,13 +1511,15 @@
           517.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           887.0,
@@ -1446,13 +1538,15 @@
           837.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1106.0,
@@ -1471,13 +1565,15 @@
           685.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1435.0,
@@ -1496,13 +1592,15 @@
           700.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1414.0,
@@ -1521,13 +1619,15 @@
           1398.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1789.0,
@@ -1546,13 +1646,15 @@
           1447.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1774.0,
@@ -1571,13 +1673,15 @@
           1205.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1940.0,
@@ -1596,13 +1700,15 @@
           537.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1948.0,
@@ -1621,13 +1727,15 @@
           976.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2111.0,
@@ -1646,13 +1754,15 @@
           969.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2116.222222222222,
@@ -1671,13 +1781,15 @@
           1366.8095238095239
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2348.0,
@@ -1696,13 +1808,15 @@
           1371.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2121.0,
@@ -1721,13 +1835,15 @@
           551.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2328.0,
@@ -1746,13 +1862,15 @@
           564.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2540.0,
@@ -1771,13 +1889,15 @@
           1380.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2538.0,
@@ -1796,13 +1916,15 @@
           581.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2733.0,
@@ -1821,13 +1943,15 @@
           1173.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2736.0,
@@ -1846,13 +1970,15 @@
           1408.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           3145.0,
@@ -1871,13 +1997,15 @@
           768.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           3152.9411764705883,
@@ -1896,13 +2024,15 @@
           833.9869281045751
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           3472.0,
@@ -1921,13 +2051,15 @@
           953.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           3140.0,
@@ -1946,13 +2078,15 @@
           1449.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           3496.0,
@@ -1971,13 +2105,15 @@
           1407.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           3689.0,
@@ -1996,13 +2132,15 @@
           1398.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           3662.0,
@@ -2021,13 +2159,15 @@
           827.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           3453.0,
@@ -2046,10 +2186,16 @@
           608.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
   ],
+  "imagePath": "../segmentation/C12_D2_P2.jpg",
+  "imageData": null,
+  "imageHeight": 3024,
+  "imageWidth": 4032,
   "lineColor": [
     0,
     255,
@@ -2061,9 +2207,5 @@
     0,
     0,
     128
-  ],
-  "imagePath": "../segmentation/C12_D2_P2.jpg",
-  "imageData": null,
-  "imageHeight": 3024,
-  "imageWidth": 4032
+  ]
 }
\ No newline at end of file
diff --git a/drafter_1/instances/C1_D2_P1.json b/drafter_1/instances/C1_D2_P1.json
index 98d492fd67fdcf75ae9f1173caa4c675c8248a84..9d60b93a8e5f53a30a86b2b2e4bb35cda7fdc2db 100644
--- a/drafter_1/instances/C1_D2_P1.json
+++ b/drafter_1/instances/C1_D2_P1.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.16.7",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
-      "label": "transistor.bjt",
       "line_color": null,
       "fill_color": null,
+      "label": "transistor.bjt",
       "points": [
         [
           319.0,
@@ -48,13 +48,15 @@
           281.9264069264069
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           348.0,
@@ -73,13 +75,15 @@
           400.4464285714286
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "capacitor.unpolarized",
       "line_color": null,
       "fill_color": null,
+      "label": "capacitor.unpolarized",
       "points": [
         [
           455.8528428093645,
@@ -126,13 +130,15 @@
           391.9732441471572
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "diode.light_emitting",
       "line_color": null,
       "fill_color": null,
+      "label": "diode.light_emitting",
       "points": [
         [
           340.0,
@@ -151,13 +157,15 @@
           470.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           512.0,
@@ -184,13 +192,15 @@
           399.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "gnd",
       "line_color": null,
       "fill_color": null,
+      "label": "gnd",
       "points": [
         [
           659.2,
@@ -209,13 +219,15 @@
           390.4
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "integrated_circuit.ne555",
       "line_color": null,
       "fill_color": null,
+      "label": "integrated_circuit.ne555",
       "points": [
         [
           680.0,
@@ -234,13 +246,15 @@
           359.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "voltage.dc",
       "line_color": null,
       "fill_color": null,
+      "label": "voltage.dc",
       "points": [
         [
           117.0,
@@ -259,13 +273,15 @@
           316.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           890.0,
@@ -284,13 +300,15 @@
           261.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           889.0,
@@ -309,13 +327,15 @@
           462.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           569.0,
@@ -334,13 +354,15 @@
           225.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           629.0,
@@ -359,13 +381,15 @@
           325.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           833.0,
@@ -384,13 +408,15 @@
           337.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           833.0,
@@ -409,13 +435,15 @@
           379.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           638.0,
@@ -434,13 +462,15 @@
           509.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           581.0,
@@ -459,13 +489,15 @@
           371.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           625.0,
@@ -484,13 +516,15 @@
           293.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           454.0,
@@ -509,13 +543,15 @@
           556.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           523.0,
@@ -534,13 +570,15 @@
           368.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           451.0,
@@ -559,13 +597,15 @@
           362.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           533.0,
@@ -584,13 +624,15 @@
           474.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           582.6999999999999,
@@ -609,13 +651,15 @@
           426.7
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           351.0,
@@ -634,13 +678,15 @@
           553.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           356.0,
@@ -659,13 +705,15 @@
           255.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           143.0,
@@ -684,13 +732,15 @@
           550.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           140.0,
@@ -709,13 +759,15 @@
           233.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           285.0,
@@ -734,13 +786,15 @@
           311.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           281.0,
@@ -759,13 +813,15 @@
           190.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "crossover",
       "line_color": null,
       "fill_color": null,
+      "label": "crossover",
       "points": [
         [
           594.3521594684385,
@@ -824,13 +880,15 @@
           281.39534883720927
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "crossover",
       "line_color": null,
       "fill_color": null,
+      "label": "crossover",
       "points": [
         [
           638.6524822695036,
@@ -889,13 +947,15 @@
           413.6
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "crossover",
       "line_color": null,
       "fill_color": null,
+      "label": "crossover",
       "points": [
         [
           630.8510638297872,
@@ -954,13 +1014,15 @@
           459.2198581560284
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "crossover",
       "line_color": null,
       "fill_color": null,
+      "label": "crossover",
       "points": [
         [
           301.66389351081534,
@@ -1023,13 +1085,15 @@
           244.7587354409318
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           376.6233766233766,
@@ -1056,13 +1120,15 @@
           311.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           420.0892857142857,
@@ -1085,13 +1151,15 @@
           438.5416666666667
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           506.7,
@@ -1122,13 +1190,15 @@
           451.1904761904762
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           542.5595238095239,
@@ -1167,13 +1237,15 @@
           417.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           27.0,
@@ -1192,13 +1264,15 @@
           327.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           785.0,
@@ -1217,13 +1291,15 @@
           502.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           769.0,
@@ -1242,13 +1318,15 @@
           462.77602523659306
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           773.0,
@@ -1267,13 +1345,15 @@
           423.81703470031545
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           772.0,
@@ -1292,13 +1372,15 @@
           377.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           696.0,
@@ -1317,13 +1399,15 @@
           380.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           695.1,
@@ -1350,13 +1434,15 @@
           421.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           698.2647058823529,
@@ -1375,13 +1461,15 @@
           461.7352941176471
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           705.0,
@@ -1400,13 +1488,15 @@
           501.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           666.0,
@@ -1425,10 +1515,16 @@
           378.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
   ],
+  "imagePath": "../segmentation/C1_D2_P1.jpg",
+  "imageData": null,
+  "imageHeight": 1280,
+  "imageWidth": 960,
   "lineColor": [
     0,
     255,
@@ -1440,9 +1536,5 @@
     0,
     0,
     128
-  ],
-  "imagePath": "../segmentation/C1_D2_P1.jpg",
-  "imageData": null,
-  "imageHeight": 1280,
-  "imageWidth": 960
+  ]
 }
\ No newline at end of file
diff --git a/drafter_1/instances/C2_D2_P1.json b/drafter_1/instances/C2_D2_P1.json
index 2eedd999fe03bcf9bf6678db3399cfa7baeea48c..6710a7d5526fd42542685808cead5d3fafac808d 100644
--- a/drafter_1/instances/C2_D2_P1.json
+++ b/drafter_1/instances/C2_D2_P1.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.16.7",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
-      "label": "voltage.dc",
       "line_color": null,
       "fill_color": null,
+      "label": "voltage.dc",
       "points": [
         [
           79.0,
@@ -24,13 +24,15 @@
           574.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "capacitor.unpolarized",
       "line_color": null,
       "fill_color": null,
+      "label": "capacitor.unpolarized",
       "points": [
         [
           219.0,
@@ -49,13 +51,15 @@
           470.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           330.0,
@@ -74,13 +78,15 @@
           572.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           333.0,
@@ -99,13 +105,15 @@
           363.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           548.0,
@@ -124,13 +132,15 @@
           348.2678983833718
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "transistor.bjt",
       "line_color": null,
       "fill_color": null,
+      "label": "transistor.bjt",
       "points": [
         [
           563.4356435643564,
@@ -165,13 +175,15 @@
           464.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           576.0,
@@ -190,13 +202,15 @@
           603.2679738562092
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "voltage.dc",
       "line_color": null,
       "fill_color": null,
+      "label": "voltage.dc",
       "points": [
         [
           658.0,
@@ -231,13 +245,15 @@
           312.4
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "capacitor.unpolarized",
       "line_color": null,
       "fill_color": null,
+      "label": "capacitor.unpolarized",
       "points": [
         [
           730.0,
@@ -256,13 +272,15 @@
           583.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           747.0,
@@ -281,13 +299,15 @@
           653.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           124.0,
@@ -306,13 +326,15 @@
           800.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           357.0,
@@ -331,13 +353,15 @@
           793.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           608.0,
@@ -356,13 +380,15 @@
           779.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           784.0,
@@ -381,13 +407,15 @@
           768.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           750.0,
@@ -406,13 +434,15 @@
           530.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           684.0,
@@ -431,13 +461,15 @@
           282.3
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           558.0,
@@ -456,13 +488,15 @@
           278.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           350.0,
@@ -481,13 +515,15 @@
           276.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           349.0,
@@ -506,13 +542,15 @@
           486.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           133.0,
@@ -531,13 +569,15 @@
           486.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "gnd",
       "line_color": null,
       "fill_color": null,
+      "label": "gnd",
       "points": [
         [
           693.0,
@@ -556,13 +596,15 @@
           406.10021786492376
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           387.0,
@@ -581,13 +623,15 @@
           599.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           620.0,
@@ -606,13 +650,15 @@
           631.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           812.0,
@@ -631,13 +677,15 @@
           551.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           800.9,
@@ -656,13 +704,15 @@
           662.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           586.0,
@@ -681,13 +731,15 @@
           473.42047930283223
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           742.0,
@@ -706,13 +758,15 @@
           337.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           658.2,
@@ -735,13 +789,15 @@
           385.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           384.0,
@@ -760,13 +816,15 @@
           381.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           203.0,
@@ -785,10 +843,16 @@
           435.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
   ],
+  "imagePath": "../segmentation/C2_D2_P1.jpg",
+  "imageData": null,
+  "imageHeight": 1280,
+  "imageWidth": 960,
   "lineColor": [
     0,
     255,
@@ -800,9 +864,5 @@
     0,
     0,
     128
-  ],
-  "imagePath": "../segmentation/C2_D2_P1.jpg",
-  "imageData": null,
-  "imageHeight": 1280,
-  "imageWidth": 960
+  ]
 }
\ No newline at end of file
diff --git a/drafter_1/instances/C3_D2_P1.json b/drafter_1/instances/C3_D2_P1.json
index ff115d4876462290163ddbe858c0d76c0aa2bca4..ffb966189816ac8ff675d2858ad3ecaed9a2d93d 100644
--- a/drafter_1/instances/C3_D2_P1.json
+++ b/drafter_1/instances/C3_D2_P1.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.16.7",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
-      "label": "voltage.dc",
       "line_color": null,
       "fill_color": null,
+      "label": "voltage.dc",
       "points": [
         [
           63.0,
@@ -24,13 +24,15 @@
           705.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           437.0,
@@ -49,13 +51,15 @@
           486.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "capacitor.unpolarized",
       "line_color": null,
       "fill_color": null,
+      "label": "capacitor.unpolarized",
       "points": [
         [
           758.0,
@@ -74,13 +78,15 @@
           677.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           137.0,
@@ -99,13 +105,15 @@
           537.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           841.0,
@@ -124,13 +132,15 @@
           531.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           837.0,
@@ -149,13 +159,15 @@
           1087.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           189.0,
@@ -174,13 +186,15 @@
           1122.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           534.0,
@@ -199,13 +213,15 @@
           360.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           993.0,
@@ -228,10 +244,16 @@
           666.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
   ],
+  "imagePath": "../segmentation/C3_D2_P1.jpg",
+  "imageData": null,
+  "imageHeight": 1247,
+  "imageWidth": 1280,
   "lineColor": [
     0,
     255,
@@ -243,9 +265,5 @@
     0,
     0,
     128
-  ],
-  "imagePath": "../segmentation/C3_D2_P1.jpg",
-  "imageData": null,
-  "imageHeight": 1247,
-  "imageWidth": 1280
+  ]
 }
\ No newline at end of file
diff --git a/drafter_1/instances/C3_D2_P4.json b/drafter_1/instances/C3_D2_P4.json
index e7d0d9fd4b159423f0b7f03e106dad595815b55b..f23d1865189f5f7888661b843c2a0973a615cf97 100644
--- a/drafter_1/instances/C3_D2_P4.json
+++ b/drafter_1/instances/C3_D2_P4.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.16.7",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
-      "label": "voltage.dc",
       "line_color": null,
       "fill_color": null,
+      "label": "voltage.dc",
       "points": [
         [
           400.0,
@@ -25,13 +25,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           899.0,
@@ -51,13 +52,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "capacitor.unpolarized",
       "line_color": null,
       "fill_color": null,
+      "label": "capacitor.unpolarized",
       "points": [
         [
           1423.0,
@@ -77,13 +79,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1061.0,
@@ -103,13 +106,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1828.0,
@@ -129,13 +133,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1563.0,
@@ -155,13 +160,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1574.0,
@@ -181,13 +187,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           565.0,
@@ -207,13 +214,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           504.0,
@@ -233,10 +241,15 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
   ],
+  "imagePath": "../segmentation/C3_D2_P4.jpg",
+  "imageData": null,
+  "imageHeight": 3052,
+  "imageWidth": 2990,
   "lineColor": [
     0,
     255,
@@ -248,9 +261,5 @@
     0,
     0,
     128
-  ],
-  "imagePath": "../segmentation/C3_D2_P4.jpg",
-  "imageData": null,
-  "imageHeight": 3052,
-  "imageWidth": 2990
+  ]
 }
\ No newline at end of file
diff --git a/drafter_1/instances/C4_D2_P4.json b/drafter_1/instances/C4_D2_P4.json
index f26ebb81e12816f30138cd7088a4cc78cca0f09c..3821086c08ccb182bf1e5081718bcac7b81e9d19 100644
--- a/drafter_1/instances/C4_D2_P4.json
+++ b/drafter_1/instances/C4_D2_P4.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.16.7",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
-      "label": "voltage.dc",
       "line_color": null,
       "fill_color": null,
+      "label": "voltage.dc",
       "points": [
         [
           380.0,
@@ -24,13 +24,15 @@
           786.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           1074.0,
@@ -49,13 +51,15 @@
           838.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           1674.0,
@@ -74,13 +78,15 @@
           866.4804469273743
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           2215.0,
@@ -111,13 +117,15 @@
           795.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           109.0,
@@ -136,13 +144,15 @@
           871.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1250.0,
@@ -161,13 +171,15 @@
           943.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1829.608938547486,
@@ -198,13 +210,15 @@
           957.3359073359073
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           2430.0,
@@ -227,13 +241,15 @@
           888.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           523.0,
@@ -252,13 +268,15 @@
           505.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1181.0,
@@ -277,13 +295,15 @@
           505.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1726.0,
@@ -302,13 +322,15 @@
           550.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2271.0,
@@ -327,13 +349,15 @@
           554.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2316.0,
@@ -352,13 +376,15 @@
           1447.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1774.0,
@@ -377,13 +403,15 @@
           1478.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1150.0,
@@ -402,13 +430,15 @@
           1485.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           499.0,
@@ -427,10 +457,16 @@
           1471.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
   ],
+  "imagePath": "../segmentation/C4_D2_P4.jpg",
+  "imageData": null,
+  "imageHeight": 2263,
+  "imageWidth": 3018,
   "lineColor": [
     0,
     255,
@@ -442,9 +478,5 @@
     0,
     0,
     128
-  ],
-  "imagePath": "../segmentation/C4_D2_P4.jpg",
-  "imageData": null,
-  "imageHeight": 2263,
-  "imageWidth": 3018
+  ]
 }
\ No newline at end of file
diff --git a/drafter_1/instances/C5_D1_P1.json b/drafter_1/instances/C5_D1_P1.json
index 16d23bf98509c6e3479900bdb488fc32bf5066b5..f3b327cfb90814bf36f579253095bd47faab5a89 100644
--- a/drafter_1/instances/C5_D1_P1.json
+++ b/drafter_1/instances/C5_D1_P1.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.16.7",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
-      "label": "voltage.dc",
       "line_color": null,
       "fill_color": null,
+      "label": "voltage.dc",
       "points": [
         [
           221.0,
@@ -25,13 +25,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           529.0,
@@ -51,13 +52,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           541.0,
@@ -77,13 +79,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           97.0,
@@ -103,13 +106,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           627.0,
@@ -129,13 +133,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           609.0,
@@ -155,13 +160,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           292.0,
@@ -181,13 +187,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           554.0,
@@ -207,13 +214,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           306.0,
@@ -233,13 +241,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           580.0,
@@ -259,10 +268,15 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
   ],
+  "imagePath": "../segmentation/C5_D1_P1.jpg",
+  "imageData": null,
+  "imageHeight": 1280,
+  "imageWidth": 960,
   "lineColor": [
     0,
     255,
@@ -274,9 +288,5 @@
     0,
     0,
     128
-  ],
-  "imagePath": "../segmentation/C5_D1_P1.jpg",
-  "imageData": null,
-  "imageHeight": 1280,
-  "imageWidth": 960
+  ]
 }
\ No newline at end of file
diff --git a/drafter_1/instances/C5_D1_P2.json b/drafter_1/instances/C5_D1_P2.json
index 22dda9a50743a5737f223169d10bbe0a635cd81f..d48565c7703bfb503fc867c9d87832c00f2cc3e6 100644
--- a/drafter_1/instances/C5_D1_P2.json
+++ b/drafter_1/instances/C5_D1_P2.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.16.7",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
-      "label": "voltage.dc",
       "line_color": null,
       "fill_color": null,
+      "label": "voltage.dc",
       "points": [
         [
           549.0,
@@ -25,13 +25,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           1736.0,
@@ -51,13 +52,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           1713.0,
@@ -77,13 +79,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           795.0,
@@ -103,13 +106,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1801.0,
@@ -129,13 +133,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1842.0,
@@ -155,13 +160,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           790.0,
@@ -181,13 +187,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           2107.0,
@@ -207,13 +214,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           2001.0,
@@ -233,13 +241,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           95.0,
@@ -259,10 +268,15 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
   ],
+  "imagePath": "../segmentation/C5_D1_P2.jpg",
+  "imageData": null,
+  "imageHeight": 3800,
+  "imageWidth": 2992,
   "lineColor": [
     0,
     255,
@@ -274,9 +288,5 @@
     0,
     0,
     128
-  ],
-  "imagePath": "../segmentation/C5_D1_P2.jpg",
-  "imageData": null,
-  "imageHeight": 3800,
-  "imageWidth": 2992
+  ]
 }
\ No newline at end of file
diff --git a/drafter_1/instances/C5_D1_P3.json b/drafter_1/instances/C5_D1_P3.json
index 945583e0383f2cad46416f3ea4c898f0079a11fc..54875ff346d76c9fe912e90168872969e765cf45 100644
--- a/drafter_1/instances/C5_D1_P3.json
+++ b/drafter_1/instances/C5_D1_P3.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.16.7",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
-      "label": "voltage.dc",
       "line_color": null,
       "fill_color": null,
+      "label": "voltage.dc",
       "points": [
         [
           762.0,
@@ -25,13 +25,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           1756.0,
@@ -51,13 +52,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           1762.0,
@@ -77,13 +79,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           418.0,
@@ -103,13 +106,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           2049.0,
@@ -129,13 +133,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           2030.0,
@@ -155,13 +160,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1917.0,
@@ -181,13 +187,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1830.0,
@@ -207,13 +214,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1030.0,
@@ -233,13 +241,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           926.0,
@@ -259,10 +268,15 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
   ],
+  "imagePath": "../segmentation/C5_D1_P3.jpg",
+  "imageData": null,
+  "imageHeight": 4032,
+  "imageWidth": 3024,
   "lineColor": [
     0,
     255,
@@ -274,9 +288,5 @@
     0,
     0,
     128
-  ],
-  "imagePath": "../segmentation/C5_D1_P3.jpg",
-  "imageData": null,
-  "imageHeight": 4032,
-  "imageWidth": 3024
+  ]
 }
\ No newline at end of file
diff --git a/drafter_1/instances/C6_D2_P2.json b/drafter_1/instances/C6_D2_P2.json
index 723077af5ef00b2a13cbb0dfa661ca8c958fefee..0b92062895b3b4580428f9919320b5aa1e2dc87b 100644
--- a/drafter_1/instances/C6_D2_P2.json
+++ b/drafter_1/instances/C6_D2_P2.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.16.7",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
-      "label": "xor",
       "line_color": null,
       "fill_color": null,
+      "label": "xor",
       "points": [
         [
           654.0,
@@ -24,13 +24,15 @@
           1419.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "xor",
       "line_color": null,
       "fill_color": null,
+      "label": "xor",
       "points": [
         [
           1281.0,
@@ -49,13 +51,15 @@
           1527.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "and",
       "line_color": null,
       "fill_color": null,
+      "label": "and",
       "points": [
         [
           1173.0,
@@ -74,13 +78,15 @@
           2016.1417322834645
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "or",
       "line_color": null,
       "fill_color": null,
+      "label": "or",
       "points": [
         [
           1627.0,
@@ -99,13 +105,15 @@
           2225.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "and",
       "line_color": null,
       "fill_color": null,
+      "label": "and",
       "points": [
         [
           1139.0,
@@ -124,13 +132,15 @@
           2477.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           1916.0,
@@ -149,13 +159,15 @@
           2462.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           2420.0,
@@ -174,13 +186,15 @@
           2392.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "diode.light_emitting",
       "line_color": null,
       "fill_color": null,
+      "label": "diode.light_emitting",
       "points": [
         [
           1939.0,
@@ -199,13 +213,15 @@
           2777.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "diode.light_emitting",
       "line_color": null,
       "fill_color": null,
+      "label": "diode.light_emitting",
       "points": [
         [
           2427.0,
@@ -224,13 +240,15 @@
           2665.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1446.0,
@@ -249,13 +267,15 @@
           1436.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           816.0,
@@ -278,13 +298,15 @@
           1329.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1298.3622047244094,
@@ -303,13 +325,15 @@
           1943.3937007874015
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1219.0,
@@ -328,13 +352,15 @@
           2396.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1760.0,
@@ -353,13 +379,15 @@
           2160.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           333.2564102564102,
@@ -378,13 +406,15 @@
           1494.4615384615383
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           387.0,
@@ -403,13 +433,15 @@
           2082.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           319.3984962406015,
@@ -428,13 +460,15 @@
           1580.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "gnd",
       "line_color": null,
       "fill_color": null,
+      "label": "gnd",
       "points": [
         [
           759.0,
@@ -453,13 +487,15 @@
           1694.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "gnd",
       "line_color": null,
       "fill_color": null,
+      "label": "gnd",
       "points": [
         [
           1383.0,
@@ -478,13 +514,15 @@
           1761.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "gnd",
       "line_color": null,
       "fill_color": null,
+      "label": "gnd",
       "points": [
         [
           1224.0,
@@ -503,13 +541,15 @@
           2220.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "gnd",
       "line_color": null,
       "fill_color": null,
+      "label": "gnd",
       "points": [
         [
           1709.0,
@@ -528,13 +568,15 @@
           2457.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "gnd",
       "line_color": null,
       "fill_color": null,
+      "label": "gnd",
       "points": [
         [
           1174.0,
@@ -553,13 +595,15 @@
           2698.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "gnd",
       "line_color": null,
       "fill_color": null,
+      "label": "gnd",
       "points": [
         [
           1971.259842519685,
@@ -578,13 +622,15 @@
           2981.496062992126
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "gnd",
       "line_color": null,
       "fill_color": null,
+      "label": "gnd",
       "points": [
         [
           2457.0,
@@ -603,13 +649,15 @@
           2970.8661417322833
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2464.0,
@@ -628,13 +676,15 @@
           1648.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1987.0,
@@ -653,13 +703,15 @@
           2332.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1465.0,
@@ -678,13 +730,15 @@
           2106.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1470.0,
@@ -703,13 +757,15 @@
           2275.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1470.0,
@@ -728,13 +784,15 @@
           2362.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1465.0,
@@ -753,13 +811,15 @@
           2575.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           637.0,
@@ -778,13 +838,15 @@
           2653.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           967.0,
@@ -803,13 +865,15 @@
           2127.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1074.0,
@@ -828,13 +892,15 @@
           2071.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1133.0,
@@ -853,13 +919,15 @@
           1553.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1059.0,
@@ -878,13 +946,15 @@
           1658.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           951.0,
@@ -903,13 +973,15 @@
           1541.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           543.0,
@@ -928,13 +1000,15 @@
           1500.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           575.0,
@@ -953,13 +1027,15 @@
           2512.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "crossover",
       "line_color": null,
       "fill_color": null,
+      "label": "crossover",
       "points": [
         [
           569.9115044247787,
@@ -1006,13 +1082,15 @@
           1574.3362831858406
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "crossover",
       "line_color": null,
       "fill_color": null,
+      "label": "crossover",
       "points": [
         [
           551.4056224899598,
@@ -1071,13 +1149,15 @@
           2051.004016064257
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "crossover",
       "line_color": null,
       "fill_color": null,
+      "label": "crossover",
       "points": [
         [
           692.7392739273927,
@@ -1172,13 +1252,15 @@
           2069.3069306930693
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "crossover",
       "line_color": null,
       "fill_color": null,
+      "label": "crossover",
       "points": [
         [
           998.1432360742706,
@@ -1281,13 +1363,15 @@
           2046.4190981432362
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "crossover",
       "line_color": null,
       "fill_color": null,
+      "label": "crossover",
       "points": [
         [
           714.9253731343283,
@@ -1346,13 +1430,15 @@
           2507.462686567164
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           2045.0,
@@ -1371,13 +1457,15 @@
           2469.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           2564.0,
@@ -1396,13 +1484,15 @@
           2445.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           276.0,
@@ -1421,13 +1511,15 @@
           1408.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           247.30075187969925,
@@ -1446,13 +1538,15 @@
           1561.4962406015036
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           317.0,
@@ -1471,10 +1565,16 @@
           2054.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
   ],
+  "imagePath": "../segmentation/C6_D2_P2.jpg",
+  "imageData": null,
+  "imageHeight": 4032,
+  "imageWidth": 3024,
   "lineColor": [
     0,
     255,
@@ -1486,9 +1586,5 @@
     0,
     0,
     128
-  ],
-  "imagePath": "../segmentation/C6_D2_P2.jpg",
-  "imageData": null,
-  "imageHeight": 4032,
-  "imageWidth": 3024
+  ]
 }
\ No newline at end of file
diff --git a/drafter_1/instances/C7_D2_P4.json b/drafter_1/instances/C7_D2_P4.json
index 70a151a62d27f0049c8cc5191fb2714f0a33b2f3..942055694b963f78c8731cee7d3019ec2b5303cb 100644
--- a/drafter_1/instances/C7_D2_P4.json
+++ b/drafter_1/instances/C7_D2_P4.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.16.7",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
-      "label": "transformer",
       "line_color": null,
       "fill_color": null,
+      "label": "transformer",
       "points": [
         [
           1918.0,
@@ -24,13 +24,15 @@
           2171.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           652.0,
@@ -49,13 +51,15 @@
           1407.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           605.0,
@@ -74,13 +78,15 @@
           2080.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           2388.0,
@@ -99,13 +105,15 @@
           1988.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           593.0,
@@ -124,13 +132,15 @@
           2463.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           652.0,
@@ -149,13 +159,15 @@
           3213.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "transistor.bjt",
       "line_color": null,
       "fill_color": null,
+      "label": "transistor.bjt",
       "points": [
         [
           966.0,
@@ -190,13 +202,15 @@
           2674.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "transistor.bjt",
       "line_color": null,
       "fill_color": null,
+      "label": "transistor.bjt",
       "points": [
         [
           916.0,
@@ -235,13 +249,15 @@
           1666.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "voltage.dc",
       "line_color": null,
       "fill_color": null,
+      "label": "voltage.dc",
       "points": [
         [
           1385.0,
@@ -260,13 +276,15 @@
           1832.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "gnd",
       "line_color": null,
       "fill_color": null,
+      "label": "gnd",
       "points": [
         [
           1441.0,
@@ -285,13 +303,15 @@
           2480.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "gnd",
       "line_color": null,
       "fill_color": null,
+      "label": "gnd",
       "points": [
         [
           2452.0,
@@ -310,13 +330,15 @@
           2624.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2163.0,
@@ -335,13 +357,15 @@
           2047.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2182.0,
@@ -360,13 +384,15 @@
           2579.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2448.0,
@@ -385,13 +411,15 @@
           2553.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1855.0,
@@ -410,13 +438,15 @@
           1470.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1952.0,
@@ -435,13 +465,15 @@
           3044.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1059.0,
@@ -460,13 +492,15 @@
           3197.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1057.0,
@@ -485,13 +519,15 @@
           2444.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1486.0,
@@ -510,13 +546,15 @@
           2390.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1036.0,
@@ -535,13 +573,15 @@
           2101.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1454.0,
@@ -560,13 +600,15 @@
           1483.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1032.0,
@@ -585,13 +627,15 @@
           1474.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           393.0,
@@ -610,13 +654,15 @@
           1838.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           404.0,
@@ -635,13 +681,15 @@
           2138.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           400.0,
@@ -660,13 +708,15 @@
           3267.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           157.0,
@@ -685,13 +735,15 @@
           2913.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           157.0,
@@ -710,13 +762,15 @@
           2585.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           186.0,
@@ -735,13 +789,15 @@
           1469.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "crossover",
       "line_color": null,
       "fill_color": null,
+      "label": "crossover",
       "points": [
         [
           450.33557046979865,
@@ -804,13 +860,15 @@
           2546.979865771812
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "crossover",
       "line_color": null,
       "fill_color": null,
+      "label": "crossover",
       "points": [
         [
           439.5973154362416,
@@ -881,13 +939,15 @@
           2890.6040268456377
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1043.0,
@@ -906,13 +966,15 @@
           2822.151898734177
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           666.0,
@@ -931,13 +993,15 @@
           3302.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           638.0,
@@ -956,13 +1020,15 @@
           2571.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           649.0,
@@ -981,13 +1047,15 @@
           2185.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           710.0,
@@ -1006,13 +1074,15 @@
           1285.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1018.0,
@@ -1031,13 +1101,15 @@
           1782.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1602.0,
@@ -1056,13 +1128,15 @@
           1874.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           2452.0,
@@ -1081,13 +1155,15 @@
           1899.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           2716.0,
@@ -1106,10 +1182,16 @@
           1989.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
   ],
+  "imagePath": "../segmentation/C7_D2_P4.jpg",
+  "imageData": null,
+  "imageHeight": 4032,
+  "imageWidth": 3024,
   "lineColor": [
     0,
     255,
@@ -1121,9 +1203,5 @@
     0,
     0,
     128
-  ],
-  "imagePath": "../segmentation/C7_D2_P4.jpg",
-  "imageData": null,
-  "imageHeight": 4032,
-  "imageWidth": 3024
+  ]
 }
\ No newline at end of file
diff --git a/drafter_1/instances/C8_D1_P1.json b/drafter_1/instances/C8_D1_P1.json
index d30d12b95077ef1b621b237aef07857e25a82eb2..c652e965ef9fce71c62f1774bb515090bf4a4aa2 100644
--- a/drafter_1/instances/C8_D1_P1.json
+++ b/drafter_1/instances/C8_D1_P1.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.16.7",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
-      "label": "voltage.dc",
       "line_color": null,
       "fill_color": null,
+      "label": "voltage.dc",
       "points": [
         [
           363.0,
@@ -24,13 +24,15 @@
           909.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           1062.8989898989898,
@@ -49,13 +51,15 @@
           1094.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           1530.0,
@@ -74,13 +78,15 @@
           1947.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           2568.0,
@@ -99,13 +105,15 @@
           1775.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           3025.0,
@@ -124,13 +132,15 @@
           1418.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "capacitor.unpolarized",
       "line_color": null,
       "fill_color": null,
+      "label": "capacitor.unpolarized",
       "points": [
         [
           1792.0,
@@ -149,13 +159,15 @@
           1207.171717171717
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "capacitor.unpolarized",
       "line_color": null,
       "fill_color": null,
+      "label": "capacitor.unpolarized",
       "points": [
         [
           1747.7979797979797,
@@ -174,13 +186,15 @@
           1610.1111111111113
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "transistor.bjt",
       "line_color": null,
       "fill_color": null,
+      "label": "transistor.bjt",
       "points": [
         [
           1353.0,
@@ -211,13 +225,15 @@
           599.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "transistor.bjt",
       "line_color": null,
       "fill_color": null,
+      "label": "transistor.bjt",
       "points": [
         [
           2177.0,
@@ -248,13 +264,15 @@
           561.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "diode.light_emitting",
       "line_color": null,
       "fill_color": null,
+      "label": "diode.light_emitting",
       "points": [
         [
           1487.0,
@@ -273,13 +291,15 @@
           2252.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "diode.light_emitting",
       "line_color": null,
       "fill_color": null,
+      "label": "diode.light_emitting",
       "points": [
         [
           2534.0,
@@ -298,13 +318,15 @@
           2213.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           3121.0,
@@ -323,13 +345,15 @@
           2477.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           3047.0,
@@ -348,13 +372,15 @@
           1224.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2758.0,
@@ -373,13 +399,15 @@
           1230.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2737.0,
@@ -398,13 +426,15 @@
           777.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2168.0,
@@ -423,13 +453,15 @@
           414.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1609.0,
@@ -448,13 +480,15 @@
           1295.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1533.0,
@@ -473,13 +507,15 @@
           420.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           528.0,
@@ -498,13 +534,15 @@
           431.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1079.0,
@@ -523,13 +561,15 @@
           820.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1070.0,
@@ -548,13 +588,15 @@
           1642.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           602.0,
@@ -573,13 +615,15 @@
           2617.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1107.0,
@@ -598,13 +642,15 @@
           2615.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1595.0,
@@ -623,13 +669,15 @@
           2605.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2287.0,
@@ -648,13 +696,15 @@
           1638.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2592.0,
@@ -673,13 +723,15 @@
           1631.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2651.0,
@@ -698,13 +750,15 @@
           2546.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "crossover",
       "line_color": null,
       "fill_color": null,
+      "label": "crossover",
       "points": [
         [
           2287.6470588235293,
@@ -771,13 +825,15 @@
           1248.8235294117646
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "crossover",
       "line_color": null,
       "fill_color": null,
+      "label": "crossover",
       "points": [
         [
           1637.8531073446327,
@@ -840,13 +896,15 @@
           1637.2881355932204
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           168.0,
@@ -865,13 +923,15 @@
           988.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1208.080808080808,
@@ -894,13 +954,15 @@
           1196.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1511.0,
@@ -919,13 +981,15 @@
           785.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1852.0,
@@ -944,13 +1008,15 @@
           1087.949494949495
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1824.0,
@@ -977,13 +1043,15 @@
           1502.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1675.0,
@@ -1002,13 +1070,15 @@
           1986.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           2060.0,
@@ -1027,13 +1097,15 @@
           780.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           2704.0,
@@ -1052,13 +1124,15 @@
           1820.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           3263.0,
@@ -1077,10 +1151,16 @@
           1444.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
   ],
+  "imagePath": "../segmentation/C8_D1_P1.jpg",
+  "imageData": null,
+  "imageHeight": 3024,
+  "imageWidth": 4032,
   "lineColor": [
     0,
     255,
@@ -1092,9 +1172,5 @@
     0,
     0,
     128
-  ],
-  "imagePath": "../segmentation/C8_D1_P1.jpg",
-  "imageData": null,
-  "imageHeight": 3024,
-  "imageWidth": 4032
+  ]
 }
\ No newline at end of file
diff --git a/drafter_1/instances/C9_D1_P1.json b/drafter_1/instances/C9_D1_P1.json
index af1dbc17320c45ea2841d36368721b17e6bf67be..903ce4e5c8301d2e3b826ea45a1ebf3b8b9d03cf 100644
--- a/drafter_1/instances/C9_D1_P1.json
+++ b/drafter_1/instances/C9_D1_P1.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.16.7",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
-      "label": "voltage.dc",
       "line_color": null,
       "fill_color": null,
+      "label": "voltage.dc",
       "points": [
         [
           396.0,
@@ -24,13 +24,15 @@
           809.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           1314.0,
@@ -49,13 +51,15 @@
           452.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "capacitor.unpolarized",
       "line_color": null,
       "fill_color": null,
+      "label": "capacitor.unpolarized",
       "points": [
         [
           2303.6585365853657,
@@ -98,13 +102,15 @@
           963.4146341463414
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           3073.0,
@@ -123,13 +129,15 @@
           699.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "diode.light_emitting",
       "line_color": null,
       "fill_color": null,
+      "label": "diode.light_emitting",
       "points": [
         [
           3068.0,
@@ -148,13 +156,15 @@
           1232.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           584.0,
@@ -173,13 +183,15 @@
           567.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2300.0,
@@ -198,13 +210,15 @@
           545.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           3185.0,
@@ -223,13 +237,15 @@
           1572.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           3127.0,
@@ -248,13 +264,15 @@
           546.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2353.0,
@@ -273,13 +291,15 @@
           1561.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           679.0,
@@ -298,13 +318,15 @@
           1661.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           37.0,
@@ -323,13 +345,15 @@
           982.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1432.0,
@@ -348,13 +372,15 @@
           267.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           2542.0,
@@ -373,13 +399,15 @@
           956.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           3328.0,
@@ -398,10 +426,16 @@
           730.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
   ],
+  "imagePath": "../segmentation/C9_D1_P1.jpg",
+  "imageData": null,
+  "imageHeight": 3024,
+  "imageWidth": 4032,
   "lineColor": [
     0,
     255,
@@ -413,9 +447,5 @@
     0,
     0,
     128
-  ],
-  "imagePath": "../segmentation/C9_D1_P1.jpg",
-  "imageData": null,
-  "imageHeight": 3024,
-  "imageWidth": 4032
+  ]
 }
\ No newline at end of file
diff --git a/drafter_1/instances/C9_D2_P3.json b/drafter_1/instances/C9_D2_P3.json
index e2ffa768161cc8c8875d4c2ce6c9c0d6b3e762a3..e70d0cc5d838c9da6c5c5bdbb1e5d3b6faf6d541 100644
--- a/drafter_1/instances/C9_D2_P3.json
+++ b/drafter_1/instances/C9_D2_P3.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.16.7",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
-      "label": "voltage.dc",
       "line_color": null,
       "fill_color": null,
+      "label": "voltage.dc",
       "points": [
         [
           472.0,
@@ -25,13 +25,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           1082.0,
@@ -51,13 +52,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "capacitor.unpolarized",
       "line_color": null,
       "fill_color": null,
+      "label": "capacitor.unpolarized",
       "points": [
         [
           1312.0,
@@ -77,13 +79,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           2133.0,
@@ -103,13 +106,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "diode.light_emitting",
       "line_color": null,
       "fill_color": null,
+      "label": "diode.light_emitting",
       "points": [
         [
           2112.0,
@@ -129,13 +133,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2216.0,
@@ -155,13 +160,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2188.0,
@@ -181,13 +187,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1412.0,
@@ -207,13 +214,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1399.0,
@@ -233,13 +241,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           595.0,
@@ -259,13 +268,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           624.0,
@@ -285,13 +295,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           276.0,
@@ -311,13 +322,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1168.0,
@@ -337,13 +349,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1632.0,
@@ -363,13 +376,14 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           2318.0,
@@ -389,10 +403,15 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
   ],
+  "imagePath": "../segmentation/C9_D2_P3.jpg",
+  "imageData": null,
+  "imageHeight": 2755,
+  "imageWidth": 3024,
   "lineColor": [
     0,
     255,
@@ -404,9 +423,5 @@
     0,
     0,
     128
-  ],
-  "imagePath": "../segmentation/C9_D2_P3.jpg",
-  "imageData": null,
-  "imageHeight": 2755,
-  "imageWidth": 3024
+  ]
 }
\ No newline at end of file
diff --git a/drafter_2/annotations/C13_D1_P3.xml b/drafter_2/annotations/C13_D1_P3.xml
index 4c3f8d2fa90ae18f051eb08041db28bffae9695e..0908aa21c5c0954b90d538e98bae4792c458afe8 100644
--- a/drafter_2/annotations/C13_D1_P3.xml
+++ b/drafter_2/annotations/C13_D1_P3.xml
@@ -21,6 +21,7 @@
 			<ymin>716</ymin>
 			<xmax>1184</xmax>
 			<ymax>1074</ymax>
+			<rotation>356</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_2/annotations/C13_D1_P4.xml b/drafter_2/annotations/C13_D1_P4.xml
index 4a08f04651ddc91d3ef7e648fce3c16892c46ee4..44dc83510b56a4cad363e49c149a6847cd955507 100644
--- a/drafter_2/annotations/C13_D1_P4.xml
+++ b/drafter_2/annotations/C13_D1_P4.xml
@@ -21,6 +21,7 @@
 			<ymin>729</ymin>
 			<xmax>999</xmax>
 			<ymax>1109</ymax>
+			<rotation>356</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -33,7 +34,7 @@
 			<ymin>452</ymin>
 			<xmax>3147</xmax>
 			<ymax>803</ymax>
-			<rotation>89</rotation>
+			<rotation>96</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_2/annotations/C13_D2_P1.xml b/drafter_2/annotations/C13_D2_P1.xml
index 2337478169e4e8875c0ddbed2ebae7e1d128c773..08bf41d6169e2d5957555ebd2ae2b8c44de09259 100644
--- a/drafter_2/annotations/C13_D2_P1.xml
+++ b/drafter_2/annotations/C13_D2_P1.xml
@@ -21,6 +21,7 @@
 			<ymin>606</ymin>
 			<xmax>964</xmax>
 			<ymax>1069</ymax>
+			<rotation>354</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_2/annotations/C13_D2_P2.xml b/drafter_2/annotations/C13_D2_P2.xml
index 5d09c27f036b504a06be6950fbd9c148b591a23c..838df9786cf6f78903322870770253863f8e1c49 100644
--- a/drafter_2/annotations/C13_D2_P2.xml
+++ b/drafter_2/annotations/C13_D2_P2.xml
@@ -21,6 +21,7 @@
 			<ymin>812</ymin>
 			<xmax>1173</xmax>
 			<ymax>1340</ymax>
+			<rotation>2</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_2/annotations/C13_D2_P3.xml b/drafter_2/annotations/C13_D2_P3.xml
index fafac80ab37139eb705dd3faaf7db1d739ba5b9c..9936f727c443d1779f49e2725abc0b2c65a441b8 100644
--- a/drafter_2/annotations/C13_D2_P3.xml
+++ b/drafter_2/annotations/C13_D2_P3.xml
@@ -21,6 +21,7 @@
 			<ymin>726</ymin>
 			<xmax>1101</xmax>
 			<ymax>1180</ymax>
+			<rotation>348</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_2/annotations/C13_D2_P4.xml b/drafter_2/annotations/C13_D2_P4.xml
index 61993f9304f68be696921c9ff29ea4311aafdd96..5eef283bf79f109433a85c04a6046d0a6de1daab 100644
--- a/drafter_2/annotations/C13_D2_P4.xml
+++ b/drafter_2/annotations/C13_D2_P4.xml
@@ -21,6 +21,7 @@
 			<ymin>639</ymin>
 			<xmax>890</xmax>
 			<ymax>1125</ymax>
+			<rotation>348</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_2/annotations/C14_D1_P1.xml b/drafter_2/annotations/C14_D1_P1.xml
index ba4d22e1a0951c7995365a34ebef7be7bab69bd8..799483b4c87ff396720ac50859cfaa5e6cea83df 100644
--- a/drafter_2/annotations/C14_D1_P1.xml
+++ b/drafter_2/annotations/C14_D1_P1.xml
@@ -190,7 +190,7 @@
 			<ymin>1073</ymin>
 			<xmax>710</xmax>
 			<ymax>1498</ymax>
-			<rotation>5</rotation>
+			<rotation>356</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_2/annotations/C14_D1_P3.xml b/drafter_2/annotations/C14_D1_P3.xml
index d0646b1bc447da72230139bb7be368315912997e..ed886b95d74d4113df03ef8cbe4567c915fd24b5 100644
--- a/drafter_2/annotations/C14_D1_P3.xml
+++ b/drafter_2/annotations/C14_D1_P3.xml
@@ -21,6 +21,7 @@
 			<ymin>997</ymin>
 			<xmax>752</xmax>
 			<ymax>1407</ymax>
+			<rotation>358</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_2/annotations/C14_D1_P4.xml b/drafter_2/annotations/C14_D1_P4.xml
index 5d864eec13ed19daccc16f9feccbc08e88b35e3a..ac3798c2ad9a71d2a453849f7f2f071c96490908 100644
--- a/drafter_2/annotations/C14_D1_P4.xml
+++ b/drafter_2/annotations/C14_D1_P4.xml
@@ -21,6 +21,7 @@
 			<ymin>845</ymin>
 			<xmax>830</xmax>
 			<ymax>1228</ymax>
+			<rotation>356</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_2/annotations/C14_D2_P3.xml b/drafter_2/annotations/C14_D2_P3.xml
index ad87afee114196c60061ab8f9cf968cd57e79e1d..282cc81d7d26b73112d1fb67979d04785f327123 100644
--- a/drafter_2/annotations/C14_D2_P3.xml
+++ b/drafter_2/annotations/C14_D2_P3.xml
@@ -21,6 +21,7 @@
 			<ymin>1108</ymin>
 			<xmax>830</xmax>
 			<ymax>1580</ymax>
+			<rotation>352</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -60,7 +61,7 @@
 			<xmax>2290</xmax>
 			<ymax>1008</ymax>
 		</bndbox>
-		<text>47K&#937;</text>
+		<text>47K</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_2/annotations/C14_D2_P4.xml b/drafter_2/annotations/C14_D2_P4.xml
index 095d4fcde958166d1598ea70216cf1178baef0ed..a945c7fa4073b087916bdd708d8192c750f2c6a8 100644
--- a/drafter_2/annotations/C14_D2_P4.xml
+++ b/drafter_2/annotations/C14_D2_P4.xml
@@ -21,6 +21,7 @@
 			<ymin>1257</ymin>
 			<xmax>778</xmax>
 			<ymax>1680</ymax>
+			<rotation>352</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_2/annotations/C15_D1_P1.xml b/drafter_2/annotations/C15_D1_P1.xml
index d0b06abad6b6556036b5d0bd44d0ff1d8b75a6e3..b38edce1c638b01b456eacfcf3241f812b743f55 100644
--- a/drafter_2/annotations/C15_D1_P1.xml
+++ b/drafter_2/annotations/C15_D1_P1.xml
@@ -21,6 +21,7 @@
 			<ymin>1210</ymin>
 			<xmax>760</xmax>
 			<ymax>1675</ymax>
+			<rotation>350</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_2/annotations/C15_D1_P2.xml b/drafter_2/annotations/C15_D1_P2.xml
index e768371c2f34fbb1c0b065ce61e60aba5f707d8c..abce27d7b52425b4c3f73e0941cc6acf0631ddb0 100644
--- a/drafter_2/annotations/C15_D1_P2.xml
+++ b/drafter_2/annotations/C15_D1_P2.xml
@@ -21,6 +21,7 @@
 			<ymin>1297</ymin>
 			<xmax>864</xmax>
 			<ymax>1710</ymax>
+			<rotation>350</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -162,7 +163,7 @@
 			<xmax>2255</xmax>
 			<ymax>892</ymax>
 		</bndbox>
-		<text>470K&#937;</text>
+		<text>47K&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_2/annotations/C15_D1_P3.xml b/drafter_2/annotations/C15_D1_P3.xml
index 9ba9005eca6c7bfe61ad31e4c3b550b5a7077325..8406dddcf61b36eb41f91034c6be3eb8c6e275c1 100644
--- a/drafter_2/annotations/C15_D1_P3.xml
+++ b/drafter_2/annotations/C15_D1_P3.xml
@@ -21,6 +21,7 @@
 			<ymin>1020</ymin>
 			<xmax>908</xmax>
 			<ymax>1537</ymax>
+			<rotation>347</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_2/annotations/C15_D1_P4.xml b/drafter_2/annotations/C15_D1_P4.xml
index 3763c16a69751a27b9f62b33fab5a3d25867d2dd..62803896f8188a270f88d04f12c60de6b829307a 100644
--- a/drafter_2/annotations/C15_D1_P4.xml
+++ b/drafter_2/annotations/C15_D1_P4.xml
@@ -21,6 +21,7 @@
 			<ymin>813</ymin>
 			<xmax>762</xmax>
 			<ymax>1194</ymax>
+			<rotation>341</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -368,7 +369,7 @@
 			<xmax>1582</xmax>
 			<ymax>609</ymax>
 		</bndbox>
-		<text>10k&#937;</text>
+		<text>10K&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -381,7 +382,7 @@
 			<xmax>2284</xmax>
 			<ymax>544</ymax>
 		</bndbox>
-		<text>470K&#937;</text>
+		<text>47K&#937;</text>
 	</object>
 	<object>
 		<name>resistor</name>
diff --git a/drafter_2/annotations/C16_D1_P1.xml b/drafter_2/annotations/C16_D1_P1.xml
index dcc1184dc74feb40fef4873913a18e0d4e24fdf5..7d6b5752d04103b812a1187667e70b2fb194b3f8 100644
--- a/drafter_2/annotations/C16_D1_P1.xml
+++ b/drafter_2/annotations/C16_D1_P1.xml
@@ -73,6 +73,7 @@
 			<ymin>1406</ymin>
 			<xmax>1105</xmax>
 			<ymax>1953</ymax>
+			<rotation>345</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_2/annotations/C16_D1_P2.xml b/drafter_2/annotations/C16_D1_P2.xml
index 593f6f37445b9cacee367299039621810f0fca28..6b394e869e80543196202a757254851ceb5d35ec 100644
--- a/drafter_2/annotations/C16_D1_P2.xml
+++ b/drafter_2/annotations/C16_D1_P2.xml
@@ -21,6 +21,7 @@
 			<ymin>1476</ymin>
 			<xmax>1138</xmax>
 			<ymax>1990</ymax>
+			<rotation>343</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_2/annotations/C16_D1_P3.xml b/drafter_2/annotations/C16_D1_P3.xml
index 0ceb41294b94e52fd5ed0377c8096a592e8c5547..ff0cc970d976c99611be31aec1de266ccedcaf2e 100644
--- a/drafter_2/annotations/C16_D1_P3.xml
+++ b/drafter_2/annotations/C16_D1_P3.xml
@@ -21,6 +21,7 @@
 			<ymin>1424</ymin>
 			<xmax>1381</xmax>
 			<ymax>1903</ymax>
+			<rotation>345</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_2/annotations/C16_D1_P4.xml b/drafter_2/annotations/C16_D1_P4.xml
index 4238ccb33acd9948af69631c6c9cb8090ecbdd4e..c05c8a8af861be722fe13428d076a79913fdb2f8 100644
--- a/drafter_2/annotations/C16_D1_P4.xml
+++ b/drafter_2/annotations/C16_D1_P4.xml
@@ -21,6 +21,7 @@
 			<ymin>1167</ymin>
 			<xmax>1218</xmax>
 			<ymax>1687</ymax>
+			<rotation>348</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_2/annotations/C16_D2_P1.xml b/drafter_2/annotations/C16_D2_P1.xml
index 3e38843b63b4554faadf56285e02a0e52e135f69..5eaacbedaaaa0fd9635cf5f169a2e130967ca8aa 100644
--- a/drafter_2/annotations/C16_D2_P1.xml
+++ b/drafter_2/annotations/C16_D2_P1.xml
@@ -46,6 +46,7 @@
 			<ymin>961</ymin>
 			<xmax>3678</xmax>
 			<ymax>1090</ymax>
+			<rotation>162</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -110,7 +111,7 @@
 			<xmax>3685</xmax>
 			<ymax>937</ymax>
 		</bndbox>
-		<text>470&#937;</text>
+		<text>470</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_2/annotations/C16_D2_P2.xml b/drafter_2/annotations/C16_D2_P2.xml
index e36547d002fd926fc4dbd4aa28e4ed5b363f2ccd..4f84a31cba84255022a853a953f4a276fa86c634 100644
--- a/drafter_2/annotations/C16_D2_P2.xml
+++ b/drafter_2/annotations/C16_D2_P2.xml
@@ -98,6 +98,7 @@
 			<ymin>907</ymin>
 			<xmax>1548</xmax>
 			<ymax>1097</ymax>
+			<rotation>6</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -109,7 +110,8 @@
 			<xmin>3238</xmin>
 			<ymin>867</ymin>
 			<xmax>3611</xmax>
-			<ymax>1000</ymax>
+			<ymax>967</ymax>
+			<rotation>164</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_2/annotations/C16_D2_P3.xml b/drafter_2/annotations/C16_D2_P3.xml
index 4694d8a7d36727e709a3f3b53ac7db3677dd368c..7fb0b9cb319ac057df65785a01d18c9dcecf0231 100644
--- a/drafter_2/annotations/C16_D2_P3.xml
+++ b/drafter_2/annotations/C16_D2_P3.xml
@@ -83,8 +83,9 @@
 		<bndbox>
 			<xmin>902</xmin>
 			<ymin>1003</ymin>
-			<xmax>1448</xmax>
+			<xmax>1497</xmax>
 			<ymax>1187</ymax>
+			<rotation>8</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -97,6 +98,7 @@
 			<ymin>989</ymin>
 			<xmax>3598</xmax>
 			<ymax>1103</ymax>
+			<rotation>162</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_2/annotations/C16_D2_P4.xml b/drafter_2/annotations/C16_D2_P4.xml
index 389882c3af231f034d79cf330108e46cf27cac31..d4b8e73e79d6db8dc4f919d109525c12038fee9a 100644
--- a/drafter_2/annotations/C16_D2_P4.xml
+++ b/drafter_2/annotations/C16_D2_P4.xml
@@ -21,7 +21,7 @@
 			<ymin>1523</ymin>
 			<xmax>691</xmax>
 			<ymax>1977</ymax>
-			<rotation>5</rotation>
+			<rotation>358</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_2/annotations/C17_D1_P1.xml b/drafter_2/annotations/C17_D1_P1.xml
index 5feaeb09181b73c991646796c28b46403ede69f0..6140a08c480950e7a4ac17b595519463fc75fe0e 100644
--- a/drafter_2/annotations/C17_D1_P1.xml
+++ b/drafter_2/annotations/C17_D1_P1.xml
@@ -34,7 +34,7 @@
 			<ymin>699</ymin>
 			<xmax>489</xmax>
 			<ymax>915</ymax>
-			<rotation>0</rotation>
+			<rotation>358</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -126,7 +126,7 @@
 			<xmax>1131</xmax>
 			<ymax>955</ymax>
 		</bndbox>
-		<text>6.8K&#937;</text>
+		<text>6.8k&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -306,7 +306,7 @@
 			<xmax>3184</xmax>
 			<ymax>1115</ymax>
 		</bndbox>
-		<text>100&#181;F</text>
+		<text>100nF</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -319,7 +319,7 @@
 			<xmax>2406</xmax>
 			<ymax>1149</ymax>
 		</bndbox>
-		<text>10&#181;F</text>
+		<text>10nF</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -332,7 +332,7 @@
 			<xmax>1716</xmax>
 			<ymax>1288</ymax>
 		</bndbox>
-		<text>100&#181;F</text>
+		<text>100nF</text>
 	</object>
 	<object>
 		<name>speaker</name>
diff --git a/drafter_2/annotations/C17_D1_P2.xml b/drafter_2/annotations/C17_D1_P2.xml
index 46417443e064f1eeb022cc7763dac41a37086e0e..82b512396f3dc879c012ae146351a39dc98ed282 100644
--- a/drafter_2/annotations/C17_D1_P2.xml
+++ b/drafter_2/annotations/C17_D1_P2.xml
@@ -34,7 +34,7 @@
 			<ymin>698</ymin>
 			<xmax>429</xmax>
 			<ymax>912</ymax>
-			<rotation>0</rotation>
+			<rotation>352</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -269,6 +269,7 @@
 			<ymin>958</ymin>
 			<xmax>3903</xmax>
 			<ymax>1282</ymax>
+			<rotation>2</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -281,7 +282,7 @@
 			<ymin>775</ymin>
 			<xmax>3734</xmax>
 			<ymax>958</ymax>
-			<rotation>79</rotation>
+			<rotation>104</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -437,7 +438,7 @@
 			<xmax>1065</xmax>
 			<ymax>934</ymax>
 		</bndbox>
-		<text>6.8K&#937;</text>
+		<text>6.8k&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -463,7 +464,7 @@
 			<xmax>1655</xmax>
 			<ymax>1271</ymax>
 		</bndbox>
-		<text>100&#181;F</text>
+		<text>100nF</text>
 	</object>
 	<object>
 		<name>junction</name>
@@ -856,7 +857,7 @@
 			<xmax>2361</xmax>
 			<ymax>1118</ymax>
 		</bndbox>
-		<text>10&#181;F</text>
+		<text>10nF</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -869,7 +870,7 @@
 			<xmax>3138</xmax>
 			<ymax>1073</ymax>
 		</bndbox>
-		<text>100&#181;F</text>
+		<text>100nF</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_2/annotations/C17_D1_P3.xml b/drafter_2/annotations/C17_D1_P3.xml
index cb1bfd373780ea86a3095dda377f11ad97e5e1be..0bdd689340f84692544cd8a9095bcd8be49739e1 100644
--- a/drafter_2/annotations/C17_D1_P3.xml
+++ b/drafter_2/annotations/C17_D1_P3.xml
@@ -21,7 +21,7 @@
 			<ymin>835</ymin>
 			<xmax>377</xmax>
 			<ymax>1040</ymax>
-			<rotation>0</rotation>
+			<rotation>350</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -73,7 +73,7 @@
 			<ymin>580</ymin>
 			<xmax>1032</xmax>
 			<ymax>782</ymax>
-			<rotation>97</rotation>
+			<rotation>89</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -575,7 +575,7 @@
 			<xmax>916</xmax>
 			<ymax>1063</ymax>
 		</bndbox>
-		<text>6.8K&#937;</text>
+		<text>6.8k&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -753,6 +753,7 @@
 			<ymin>1093</ymin>
 			<xmax>3793</xmax>
 			<ymax>1448</ymax>
+			<rotation>358</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_2/annotations/C17_D1_P4.xml b/drafter_2/annotations/C17_D1_P4.xml
index a95ac2b2e41254f7bc4b362bc5bf6043f1d99418..eb59d5735e9064b50224f5410415bf95f5df420e 100644
--- a/drafter_2/annotations/C17_D1_P4.xml
+++ b/drafter_2/annotations/C17_D1_P4.xml
@@ -111,7 +111,7 @@
 			<ymin>902</ymin>
 			<xmax>1445</xmax>
 			<ymax>1098</ymax>
-			<rotation>88</rotation>
+			<rotation>92</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -124,7 +124,7 @@
 			<ymin>469</ymin>
 			<xmax>2646</xmax>
 			<ymax>645</ymax>
-			<rotation>84</rotation>
+			<rotation>98</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -137,7 +137,7 @@
 			<ymin>761</ymin>
 			<xmax>2691</xmax>
 			<ymax>972</ymax>
-			<rotation>86</rotation>
+			<rotation>92</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -202,7 +202,7 @@
 			<xmax>3305</xmax>
 			<ymax>1224</ymax>
 		</bndbox>
-		<text>100&#181;F</text>
+		<text>100nF</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -293,7 +293,7 @@
 			<xmax>1344</xmax>
 			<ymax>1073</ymax>
 		</bndbox>
-		<text>6.8K&#937;</text>
+		<text>6.8k&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -972,6 +972,6 @@
 			<xmax>1752</xmax>
 			<ymax>690</ymax>
 		</bndbox>
-		<text>1K&#937;</text>
+		<text>1k&#937;</text>
 	</object>
 </annotation>
diff --git a/drafter_2/annotations/C17_D2_P1.xml b/drafter_2/annotations/C17_D2_P1.xml
index 39822b04f0d32c50919039b56aa1caa6c6ef7803..6b833a19aa47a13da19113d96964578f915813fa 100644
--- a/drafter_2/annotations/C17_D2_P1.xml
+++ b/drafter_2/annotations/C17_D2_P1.xml
@@ -93,7 +93,7 @@
 			<ymin>795</ymin>
 			<xmax>457</xmax>
 			<ymax>1044</ymax>
-			<rotation>0</rotation>
+			<rotation>352</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -184,7 +184,7 @@
 			<ymin>391</ymin>
 			<xmax>1087</xmax>
 			<ymax>586</ymax>
-			<rotation>86</rotation>
+			<rotation>94</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -210,7 +210,7 @@
 			<ymin>375</ymin>
 			<xmax>2358</xmax>
 			<ymax>607</ymax>
-			<rotation>97</rotation>
+			<rotation>73</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -236,7 +236,6 @@
 			<ymin>858</ymin>
 			<xmax>3782</xmax>
 			<ymax>924</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -313,7 +312,7 @@
 			<xmax>2602</xmax>
 			<ymax>847</ymax>
 		</bndbox>
-		<text>100K&#937;</text>
+		<text>100k&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -326,7 +325,7 @@
 			<xmax>3061</xmax>
 			<ymax>1397</ymax>
 		</bndbox>
-		<text>100&#181;F</text>
+		<text>100nF</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -339,7 +338,7 @@
 			<xmax>2242</xmax>
 			<ymax>1422</ymax>
 		</bndbox>
-		<text>10&#181;F</text>
+		<text>10nF</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -352,7 +351,7 @@
 			<xmax>1472</xmax>
 			<ymax>1476</ymax>
 		</bndbox>
-		<text>100&#181;F</text>
+		<text>100nF</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -391,7 +390,7 @@
 			<xmax>982</xmax>
 			<ymax>1052</ymax>
 		</bndbox>
-		<text>6.8K&#937;</text>
+		<text>6.8k&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_2/annotations/C17_D2_P2.xml b/drafter_2/annotations/C17_D2_P2.xml
index e72c8b1265b6c491f5564a4fe6e5a11a046c725b..be13149b95c06866521fd1912f567e386983ecb6 100644
--- a/drafter_2/annotations/C17_D2_P2.xml
+++ b/drafter_2/annotations/C17_D2_P2.xml
@@ -21,7 +21,7 @@
 			<ymin>788</ymin>
 			<xmax>386</xmax>
 			<ymax>1023</ymax>
-			<rotation>0</rotation>
+			<rotation>348</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -123,6 +123,7 @@
 			<ymin>1114</ymin>
 			<xmax>3785</xmax>
 			<ymax>1387</ymax>
+			<rotation>358</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -148,7 +149,7 @@
 			<ymin>378</ymin>
 			<xmax>2102</xmax>
 			<ymax>605</ymax>
-			<rotation>99</rotation>
+			<rotation>75</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -187,7 +188,6 @@
 			<ymin>837</ymin>
 			<xmax>3587</xmax>
 			<ymax>908</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -252,7 +252,7 @@
 			<xmax>825</xmax>
 			<ymax>1023</ymax>
 		</bndbox>
-		<text>6.8K&#937;</text>
+		<text>6.8k&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -278,7 +278,7 @@
 			<xmax>1243</xmax>
 			<ymax>1415</ymax>
 		</bndbox>
-		<text>100&#181;F</text>
+		<text>100nF</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -291,7 +291,7 @@
 			<xmax>1964</xmax>
 			<ymax>1384</ymax>
 		</bndbox>
-		<text>10&#181;F</text>
+		<text>10nF</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -330,7 +330,7 @@
 			<xmax>2801</xmax>
 			<ymax>1391</ymax>
 		</bndbox>
-		<text>100&#181;F</text>
+		<text>100nF</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_2/annotations/C17_D2_P3.xml b/drafter_2/annotations/C17_D2_P3.xml
index da7b592881e44b2958c6572fe1266aadc353339d..11f25e5e2492620b33f3813c31db6c44d546559c 100644
--- a/drafter_2/annotations/C17_D2_P3.xml
+++ b/drafter_2/annotations/C17_D2_P3.xml
@@ -21,6 +21,7 @@
 			<ymin>797</ymin>
 			<xmax>585</xmax>
 			<ymax>1047</ymax>
+			<rotation>352</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -225,7 +226,7 @@
 			<xmax>1176</xmax>
 			<ymax>1052</ymax>
 		</bndbox>
-		<text>6.8K&#937;</text>
+		<text>6.8k&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -251,7 +252,7 @@
 			<xmax>1703</xmax>
 			<ymax>1479</ymax>
 		</bndbox>
-		<text>100&#181;F</text>
+		<text>100nF</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -290,7 +291,7 @@
 			<xmax>2772</xmax>
 			<ymax>851</ymax>
 		</bndbox>
-		<text>100K&#937;</text>
+		<text>100k&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -303,7 +304,7 @@
 			<xmax>2461</xmax>
 			<ymax>1406</ymax>
 		</bndbox>
-		<text>10&#181;F</text>
+		<text>10nF</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -329,7 +330,7 @@
 			<xmax>3223</xmax>
 			<ymax>1372</ymax>
 		</bndbox>
-		<text>100&#181;F</text>
+		<text>100nF</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_2/annotations/C17_D2_P4.xml b/drafter_2/annotations/C17_D2_P4.xml
index 2f05d62411b0fc01ed4e2501a68ecb1f9a55555a..939338763926ec0d89fce582bd3e3c142e7a19a3 100644
--- a/drafter_2/annotations/C17_D2_P4.xml
+++ b/drafter_2/annotations/C17_D2_P4.xml
@@ -21,6 +21,7 @@
 			<ymin>583</ymin>
 			<xmax>429</xmax>
 			<ymax>806</ymax>
+			<rotation>343</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -162,6 +163,7 @@
 			<ymin>922</ymin>
 			<xmax>4015</xmax>
 			<ymax>1171</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -233,12 +235,12 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>709</xmin>
+			<xmin>702</xmin>
 			<ymin>714</ymin>
 			<xmax>960</xmax>
 			<ymax>826</ymax>
 		</bndbox>
-		<text>6.8K&#937;</text>
+		<text>6.8k&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -264,7 +266,7 @@
 			<xmax>1453</xmax>
 			<ymax>1232</ymax>
 		</bndbox>
-		<text>100&#181;F</text>
+		<text>100nF</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -290,7 +292,7 @@
 			<xmax>2265</xmax>
 			<ymax>1190</ymax>
 		</bndbox>
-		<text>100&#181;F</text>
+		<text>10nF</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -316,7 +318,7 @@
 			<xmax>2604</xmax>
 			<ymax>669</ymax>
 		</bndbox>
-		<text>100K&#937;</text>
+		<text>100k&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -329,7 +331,7 @@
 			<xmax>3121</xmax>
 			<ymax>1185</ymax>
 		</bndbox>
-		<text>100&#181;F</text>
+		<text>100nF</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_2/annotations/C18_D1_P1.xml b/drafter_2/annotations/C18_D1_P1.xml
index cff41f11d8d410815cf86e2804887f79e9216efe..214636ea152035d5173f2d431d7e88dcc5870a8c 100644
--- a/drafter_2/annotations/C18_D1_P1.xml
+++ b/drafter_2/annotations/C18_D1_P1.xml
@@ -21,6 +21,7 @@
 			<ymin>669</ymin>
 			<xmax>1280</xmax>
 			<ymax>1022</ymax>
+			<rotation>75</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -33,6 +34,7 @@
 			<ymin>695</ymin>
 			<xmax>2535</xmax>
 			<ymax>994</ymax>
+			<rotation>102</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -45,6 +47,7 @@
 			<ymin>1329</ymin>
 			<xmax>1204</xmax>
 			<ymax>1613</ymax>
+			<rotation>69</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -57,6 +60,7 @@
 			<ymin>1726</ymin>
 			<xmax>1696</xmax>
 			<ymax>2033</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -69,6 +73,7 @@
 			<ymin>1439</ymin>
 			<xmax>2529</xmax>
 			<ymax>1747</ymax>
+			<rotation>81</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -81,6 +86,7 @@
 			<ymin>1673</ymin>
 			<xmax>3070</xmax>
 			<ymax>2020</ymax>
+			<rotation>81</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -171,6 +177,7 @@
 			<ymin>1784</ymin>
 			<xmax>1278</xmax>
 			<ymax>2110</ymax>
+			<rotation>358</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -183,6 +190,7 @@
 			<ymin>1858</ymin>
 			<xmax>2644</xmax>
 			<ymax>2160</ymax>
+			<rotation>358</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -591,6 +599,7 @@
 			<ymin>1410</ymin>
 			<xmax>541</xmax>
 			<ymax>1690</ymax>
+			<rotation>350</rotation>
 		</bndbox>
 	</object>
 </annotation>
diff --git a/drafter_2/annotations/C18_D1_P2.xml b/drafter_2/annotations/C18_D1_P2.xml
index f42203004c3b0c35abd958f88b260308512b50d1..33800086f0e035e0b8eb48660b42632718bc6343 100644
--- a/drafter_2/annotations/C18_D1_P2.xml
+++ b/drafter_2/annotations/C18_D1_P2.xml
@@ -21,6 +21,7 @@
 			<ymin>1804</ymin>
 			<xmax>1214</xmax>
 			<ymax>2100</ymax>
+			<rotation>358</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -33,6 +34,7 @@
 			<ymin>1911</ymin>
 			<xmax>2498</xmax>
 			<ymax>2196</ymax>
+			<rotation>356</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -135,6 +137,7 @@
 			<ymin>762</ymin>
 			<xmax>1234</xmax>
 			<ymax>1084</ymax>
+			<rotation>70</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -147,6 +150,7 @@
 			<ymin>748</ymin>
 			<xmax>2432</xmax>
 			<ymax>1047</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -159,6 +163,7 @@
 			<ymin>1483</ymin>
 			<xmax>2397</xmax>
 			<ymax>1777</ymax>
+			<rotation>75</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -171,6 +176,7 @@
 			<ymin>1377</ymin>
 			<xmax>1157</xmax>
 			<ymax>1642</ymax>
+			<rotation>65</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -183,6 +189,7 @@
 			<ymin>1756</ymin>
 			<xmax>1601</xmax>
 			<ymax>2054</ymax>
+			<rotation>75</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -195,6 +202,7 @@
 			<ymin>1718</ymin>
 			<xmax>2922</xmax>
 			<ymax>2065</ymax>
+			<rotation>75</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -299,7 +307,7 @@
 			<xmax>2866</xmax>
 			<ymax>886</ymax>
 		</bndbox>
-		<text>0.96mH</text>
+		<text>0,96mH</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -591,6 +599,7 @@
 			<ymin>1457</ymin>
 			<xmax>575</xmax>
 			<ymax>1713</ymax>
+			<rotation>350</rotation>
 		</bndbox>
 	</object>
 </annotation>
diff --git a/drafter_2/annotations/C18_D1_P3.xml b/drafter_2/annotations/C18_D1_P3.xml
index b66e3871f5fd5ac29a439f6e3268145db6f1b411..4b71c89c013b559927bab064c63f90746114616e 100644
--- a/drafter_2/annotations/C18_D1_P3.xml
+++ b/drafter_2/annotations/C18_D1_P3.xml
@@ -21,6 +21,7 @@
 			<ymin>1742</ymin>
 			<xmax>1270</xmax>
 			<ymax>2086</ymax>
+			<rotation>358</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -135,6 +136,7 @@
 			<ymin>543</ymin>
 			<xmax>1261</xmax>
 			<ymax>911</ymax>
+			<rotation>75</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -147,6 +149,7 @@
 			<ymin>1247</ymin>
 			<xmax>1183</xmax>
 			<ymax>1560</ymax>
+			<rotation>70</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -159,6 +162,7 @@
 			<ymin>1663</ymin>
 			<xmax>1729</xmax>
 			<ymax>2011</ymax>
+			<rotation>80</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -171,6 +175,7 @@
 			<ymin>1373</ymin>
 			<xmax>2589</xmax>
 			<ymax>1691</ymax>
+			<rotation>85</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -183,6 +188,7 @@
 			<ymin>578</ymin>
 			<xmax>2599</xmax>
 			<ymax>907</ymax>
+			<rotation>95</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -195,6 +201,7 @@
 			<ymin>1600</ymin>
 			<xmax>3134</xmax>
 			<ymax>1960</ymax>
+			<rotation>75</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -591,6 +598,7 @@
 			<ymin>1347</ymin>
 			<xmax>446</xmax>
 			<ymax>1648</ymax>
+			<rotation>352</rotation>
 		</bndbox>
 	</object>
 </annotation>
diff --git a/drafter_2/annotations/C18_D1_P4.xml b/drafter_2/annotations/C18_D1_P4.xml
index 0c4ac859816f2bbb9003e42bb106fb4fa5b1c383..64a62040b82c8e87efd20bbdc7ef8090f4b4f47c 100644
--- a/drafter_2/annotations/C18_D1_P4.xml
+++ b/drafter_2/annotations/C18_D1_P4.xml
@@ -21,6 +21,7 @@
 			<ymin>1678</ymin>
 			<xmax>1275</xmax>
 			<ymax>2025</ymax>
+			<rotation>354</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -33,6 +34,7 @@
 			<ymin>1790</ymin>
 			<xmax>2713</xmax>
 			<ymax>2073</ymax>
+			<rotation>356</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -135,6 +137,7 @@
 			<ymin>1221</ymin>
 			<xmax>1198</xmax>
 			<ymax>1498</ymax>
+			<rotation>65</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -147,6 +150,7 @@
 			<ymin>1617</ymin>
 			<xmax>1720</xmax>
 			<ymax>1951</ymax>
+			<rotation>80</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -159,6 +163,7 @@
 			<ymin>580</ymin>
 			<xmax>1315</xmax>
 			<ymax>895</ymax>
+			<rotation>70</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -171,6 +176,7 @@
 			<ymin>617</ymin>
 			<xmax>2588</xmax>
 			<ymax>902</ymax>
+			<rotation>95</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -183,6 +189,7 @@
 			<ymin>1341</ymin>
 			<xmax>2588</xmax>
 			<ymax>1648</ymax>
+			<rotation>85</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -195,6 +202,7 @@
 			<ymin>1576</ymin>
 			<xmax>3144</xmax>
 			<ymax>1944</ymax>
+			<rotation>85</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -587,10 +595,11 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>128</xmin>
-			<ymin>1303</ymin>
+			<xmin>137</xmin>
+			<ymin>1296</ymin>
 			<xmax>495</xmax>
-			<ymax>1573</ymax>
+			<ymax>1577</ymax>
+			<rotation>348</rotation>
 		</bndbox>
 	</object>
 </annotation>
diff --git a/drafter_2/annotations/C18_D2_P1.xml b/drafter_2/annotations/C18_D2_P1.xml
index e0dbd1d83b631fefdacc44c622521bbbd1c7f5a7..e3c7cf537f804d7217152343ddb7076ba5cf5121 100644
--- a/drafter_2/annotations/C18_D2_P1.xml
+++ b/drafter_2/annotations/C18_D2_P1.xml
@@ -21,6 +21,7 @@
 			<ymin>1920</ymin>
 			<xmax>1158</xmax>
 			<ymax>2233</ymax>
+			<rotation>358</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -135,6 +136,7 @@
 			<ymin>858</ymin>
 			<xmax>1093</xmax>
 			<ymax>1228</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -147,6 +149,7 @@
 			<ymin>883</ymin>
 			<xmax>2140</xmax>
 			<ymax>1128</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -159,6 +162,7 @@
 			<ymin>1373</ymin>
 			<xmax>2163</xmax>
 			<ymax>1743</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -171,6 +175,7 @@
 			<ymin>1711</ymin>
 			<xmax>2961</xmax>
 			<ymax>2091</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -183,6 +188,7 @@
 			<ymin>1849</ymin>
 			<xmax>1480</xmax>
 			<ymax>2174</ymax>
+			<rotation>85</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -195,6 +201,7 @@
 			<ymin>1442</ymin>
 			<xmax>1057</xmax>
 			<ymax>1756</ymax>
+			<rotation>65</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -286,7 +293,7 @@
 			<xmax>2638</xmax>
 			<ymax>1079</ymax>
 		</bndbox>
-		<text>0.96mH</text>
+		<text>0,96mH</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -325,7 +332,7 @@
 			<xmax>3354</xmax>
 			<ymax>1900</ymax>
 		</bndbox>
-		<text>0.48mH</text>
+		<text>0,48mH</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_2/annotations/C18_D2_P2.xml b/drafter_2/annotations/C18_D2_P2.xml
index b516849199a25e725071a217ebbde7167426559a..4bdba0e0d59aedc4d472937cb33feea968363a56 100644
--- a/drafter_2/annotations/C18_D2_P2.xml
+++ b/drafter_2/annotations/C18_D2_P2.xml
@@ -249,6 +249,7 @@
 			<ymin>1043</ymin>
 			<xmax>1329</xmax>
 			<ymax>1414</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -261,6 +262,7 @@
 			<ymin>1665</ymin>
 			<xmax>1308</xmax>
 			<ymax>2002</ymax>
+			<rotation>71</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -273,6 +275,7 @@
 			<ymin>2078</ymin>
 			<xmax>1751</xmax>
 			<ymax>2433</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -285,6 +288,7 @@
 			<ymin>1571</ymin>
 			<xmax>2438</xmax>
 			<ymax>1943</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -297,6 +301,7 @@
 			<ymin>1907</ymin>
 			<xmax>3207</xmax>
 			<ymax>2272</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -387,6 +392,7 @@
 			<ymin>1080</ymin>
 			<xmax>2410</xmax>
 			<ymax>1324</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -501,7 +507,7 @@
 			<xmax>2866</xmax>
 			<ymax>1288</ymax>
 		</bndbox>
-		<text>0.96mH</text>
+		<text>0,96mH</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_2/annotations/C18_D2_P3.xml b/drafter_2/annotations/C18_D2_P3.xml
index cd35c9017581fde1868dfa0810b4cbab4df8aaa5..29a24eb1a47548adca1d9bed21627511eb9d0d4e 100644
--- a/drafter_2/annotations/C18_D2_P3.xml
+++ b/drafter_2/annotations/C18_D2_P3.xml
@@ -71,6 +71,7 @@
 			<ymin>1825</ymin>
 			<xmax>1027</xmax>
 			<ymax>2096</ymax>
+			<rotation>358</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -135,6 +136,7 @@
 			<ymin>1747</ymin>
 			<xmax>1310</xmax>
 			<ymax>2049</ymax>
+			<rotation>81</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -147,6 +149,7 @@
 			<ymin>1303</ymin>
 			<xmax>1925</xmax>
 			<ymax>1648</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -159,6 +162,7 @@
 			<ymin>1611</ymin>
 			<xmax>2707</xmax>
 			<ymax>1982</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -171,6 +175,7 @@
 			<ymin>1396</ymin>
 			<xmax>954</xmax>
 			<ymax>1671</ymax>
+			<rotation>70</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -183,6 +188,7 @@
 			<ymin>870</ymin>
 			<xmax>982</xmax>
 			<ymax>1202</ymax>
+			<rotation>80</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -195,6 +201,7 @@
 			<ymin>836</ymin>
 			<xmax>1903</xmax>
 			<ymax>1065</ymax>
+			<rotation>95</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_2/annotations/C18_D2_P4.xml b/drafter_2/annotations/C18_D2_P4.xml
index c7686f2957d81781f68b5953eedba50fc584798b..274aed79e4343198c75a3c19a96ce82050cfa41c 100644
--- a/drafter_2/annotations/C18_D2_P4.xml
+++ b/drafter_2/annotations/C18_D2_P4.xml
@@ -21,6 +21,7 @@
 			<ymin>653</ymin>
 			<xmax>1145</xmax>
 			<ymax>1008</ymax>
+			<rotation>80</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -33,6 +34,7 @@
 			<ymin>682</ymin>
 			<xmax>2165</xmax>
 			<ymax>907</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -45,6 +47,7 @@
 			<ymin>1122</ymin>
 			<xmax>2204</xmax>
 			<ymax>1478</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -57,6 +60,7 @@
 			<ymin>1431</ymin>
 			<xmax>3014</xmax>
 			<ymax>1783</ymax>
+			<rotation>95</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -69,6 +73,7 @@
 			<ymin>1581</ymin>
 			<xmax>1513</xmax>
 			<ymax>1911</ymax>
+			<rotation>85</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -81,6 +86,7 @@
 			<ymin>1204</ymin>
 			<xmax>1091</xmax>
 			<ymax>1486</ymax>
+			<rotation>70</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -171,6 +177,7 @@
 			<ymin>1656</ymin>
 			<xmax>1179</xmax>
 			<ymax>1960</ymax>
+			<rotation>358</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -195,6 +202,7 @@
 			<ymin>1567</ymin>
 			<xmax>3657</xmax>
 			<ymax>1842</ymax>
+			<rotation>2</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -299,7 +307,7 @@
 			<xmax>2636</xmax>
 			<ymax>860</ymax>
 		</bndbox>
-		<text>0.96mH</text>
+		<text>0,96mH</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_2/annotations/C19_D1_P1.xml b/drafter_2/annotations/C19_D1_P1.xml
index c7827645cd8040c1522a252741264458d2f4afba..0c14c3d24441368c6dc175b141ec99edc92ccf1b 100644
--- a/drafter_2/annotations/C19_D1_P1.xml
+++ b/drafter_2/annotations/C19_D1_P1.xml
@@ -124,6 +124,7 @@
 			<ymin>522</ymin>
 			<xmax>2373</xmax>
 			<ymax>883</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_2/annotations/C19_D1_P2.xml b/drafter_2/annotations/C19_D1_P2.xml
index 09837f1318b5bf5110da0fb33aaf4d390465a222..4a95d15457f5a52df1b774fa334c44b0eec54eb9 100644
--- a/drafter_2/annotations/C19_D1_P2.xml
+++ b/drafter_2/annotations/C19_D1_P2.xml
@@ -21,7 +21,7 @@
 			<ymin>1508</ymin>
 			<xmax>690</xmax>
 			<ymax>1820</ymax>
-			<rotation>5</rotation>
+			<rotation>358</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -125,6 +125,7 @@
 			<ymin>695</ymin>
 			<xmax>2198</xmax>
 			<ymax>1045</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -239,7 +240,7 @@
 			<xmax>2620</xmax>
 			<ymax>1302</ymax>
 		</bndbox>
-		<text>1&#181;F</text>
+		<text>1n</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_2/annotations/C19_D1_P3.xml b/drafter_2/annotations/C19_D1_P3.xml
index cff7f6be99f87ea46db1619974fab64e4dc5f36e..2de20b35fa383e8817d555d82cd20eb3ec5d58e0 100644
--- a/drafter_2/annotations/C19_D1_P3.xml
+++ b/drafter_2/annotations/C19_D1_P3.xml
@@ -137,6 +137,7 @@
 			<ymin>700</ymin>
 			<xmax>2418</xmax>
 			<ymax>1060</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_2/annotations/C19_D1_P4.xml b/drafter_2/annotations/C19_D1_P4.xml
index dc896052d818416e829561e5bf145451ff386586..cdd2d4e2538b2a504dcb73e3198b6888a89f861c 100644
--- a/drafter_2/annotations/C19_D1_P4.xml
+++ b/drafter_2/annotations/C19_D1_P4.xml
@@ -21,6 +21,7 @@
 			<ymin>1170</ymin>
 			<xmax>655</xmax>
 			<ymax>1478</ymax>
+			<rotation>354</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -136,6 +137,7 @@
 			<ymin>415</ymin>
 			<xmax>2260</xmax>
 			<ymax>725</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -566,7 +568,7 @@
 			<xmax>903</xmax>
 			<ymax>1233</ymax>
 		</bndbox>
-		<text>1&#181;F</text>
+		<text>1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_2/annotations/C19_D2_P1.xml b/drafter_2/annotations/C19_D2_P1.xml
index 98af548d674739a421c2568804936f7e3d461319..e4b5e7d511b0f37a5b876358426bb6052d51c98d 100644
--- a/drafter_2/annotations/C19_D2_P1.xml
+++ b/drafter_2/annotations/C19_D2_P1.xml
@@ -136,6 +136,7 @@
 			<ymin>757</ymin>
 			<xmax>2531</xmax>
 			<ymax>1190</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_2/annotations/C19_D2_P2.xml b/drafter_2/annotations/C19_D2_P2.xml
index b5bb6243dcf47a6d42f0812941ea9330a6d04d4e..2bcdae63d70b4f0ac78ab92aad6e80f47c6c7704 100644
--- a/drafter_2/annotations/C19_D2_P2.xml
+++ b/drafter_2/annotations/C19_D2_P2.xml
@@ -123,6 +123,7 @@
 			<ymin>725</ymin>
 			<xmax>2218</xmax>
 			<ymax>1163</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -198,7 +199,7 @@
 			<xmax>1348</xmax>
 			<ymax>900</ymax>
 		</bndbox>
-		<text>150K&#937;</text>
+		<text>150K</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_2/annotations/C19_D2_P3.xml b/drafter_2/annotations/C19_D2_P3.xml
index 60b68e2f989c49b2c1c4f188a42a1f0ff8fe2754..0b3c26bdaed92284a2af9fc940211bfa4ff2b7ff 100644
--- a/drafter_2/annotations/C19_D2_P3.xml
+++ b/drafter_2/annotations/C19_D2_P3.xml
@@ -279,6 +279,7 @@
 			<ymin>657</ymin>
 			<xmax>2628</xmax>
 			<ymax>1083</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_2/annotations/C19_D2_P4.xml b/drafter_2/annotations/C19_D2_P4.xml
index 602309d6579b348b38e9dae68c31c03ce1effe18..3ca397164bbe6ecd1eecd411b92bf441a653a3b3 100644
--- a/drafter_2/annotations/C19_D2_P4.xml
+++ b/drafter_2/annotations/C19_D2_P4.xml
@@ -21,6 +21,7 @@
 			<ymin>997</ymin>
 			<xmax>971</xmax>
 			<ymax>1377</ymax>
+			<rotation>358</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -136,6 +137,7 @@
 			<ymin>622</ymin>
 			<xmax>2500</xmax>
 			<ymax>1027</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_2/annotations/C20_D1_P1.xml b/drafter_2/annotations/C20_D1_P1.xml
index 7f5a01d6c0e7a88008bf37fa503e8a14c8557e91..d057b2c22f43a13e5430dcc2ee2ec4e4c1957033 100644
--- a/drafter_2/annotations/C20_D1_P1.xml
+++ b/drafter_2/annotations/C20_D1_P1.xml
@@ -46,6 +46,7 @@
 			<ymin>1253</ymin>
 			<xmax>3021</xmax>
 			<ymax>1880</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -169,7 +170,7 @@
 			<ymin>1423</ymin>
 			<xmax>1405</xmax>
 			<ymax>2070</ymax>
-			<rotation>5</rotation>
+			<rotation>360</rotation>
 		</bndbox>
 	</object>
 </annotation>
diff --git a/drafter_2/annotations/C20_D1_P2.xml b/drafter_2/annotations/C20_D1_P2.xml
index 4b9150c464f030767b988c1a7baff6ea8fc025dc..e95af9f73eae68b92ae9cd6bf095f54b15ceee7d 100644
--- a/drafter_2/annotations/C20_D1_P2.xml
+++ b/drafter_2/annotations/C20_D1_P2.xml
@@ -21,7 +21,7 @@
 			<ymin>813</ymin>
 			<xmax>1885</xmax>
 			<ymax>1007</ymax>
-			<rotation>174</rotation>
+			<rotation>183</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -47,6 +47,7 @@
 			<ymin>1273</ymin>
 			<xmax>2851</xmax>
 			<ymax>1900</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_2/annotations/C20_D1_P3.xml b/drafter_2/annotations/C20_D1_P3.xml
index 8f927968941eda94b32ec9e8674531d4e51b0dd2..90950330b6d038eb99e80e63bb4b024d20455b72 100644
--- a/drafter_2/annotations/C20_D1_P3.xml
+++ b/drafter_2/annotations/C20_D1_P3.xml
@@ -47,6 +47,7 @@
 			<ymin>1340</ymin>
 			<xmax>3085</xmax>
 			<ymax>1960</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_2/annotations/C20_D1_P4.xml b/drafter_2/annotations/C20_D1_P4.xml
index 5590edf6f80645c450b6f333d3dd674aab393764..37d94da549b99eca641a64b0eb5a0b79ac897bf1 100644
--- a/drafter_2/annotations/C20_D1_P4.xml
+++ b/drafter_2/annotations/C20_D1_P4.xml
@@ -21,7 +21,6 @@
 			<ymin>917</ymin>
 			<xmax>2204</xmax>
 			<ymax>1100</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -47,6 +46,7 @@
 			<ymin>1393</ymin>
 			<xmax>3188</xmax>
 			<ymax>2050</ymax>
+			<rotation>95</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -170,6 +170,7 @@
 			<ymin>1503</ymin>
 			<xmax>1511</xmax>
 			<ymax>2167</ymax>
+			<rotation>356</rotation>
 		</bndbox>
 	</object>
 </annotation>
diff --git a/drafter_2/annotations/C20_D2_P1.xml b/drafter_2/annotations/C20_D2_P1.xml
index 005881d20a30f638a8bd325803c7ff780103a504..4d782f0a5acd7600c3a17a066169b3e543b4bb14 100644
--- a/drafter_2/annotations/C20_D2_P1.xml
+++ b/drafter_2/annotations/C20_D2_P1.xml
@@ -21,7 +21,6 @@
 			<ymin>667</ymin>
 			<xmax>1891</xmax>
 			<ymax>873</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -47,6 +46,7 @@
 			<ymin>1320</ymin>
 			<xmax>3488</xmax>
 			<ymax>2030</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_2/annotations/C20_D2_P2.xml b/drafter_2/annotations/C20_D2_P2.xml
index d5b39ca19c01986f81d637ad42b0dd8fab898ed7..71a9b95f1e1b40f744c17a6fbed471c4e89fd8e6 100644
--- a/drafter_2/annotations/C20_D2_P2.xml
+++ b/drafter_2/annotations/C20_D2_P2.xml
@@ -85,6 +85,7 @@
 			<ymin>1333</ymin>
 			<xmax>3018</xmax>
 			<ymax>1933</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -168,8 +169,8 @@
 			<xmin>745</xmin>
 			<ymin>1433</ymin>
 			<xmax>1268</xmax>
-			<ymax>1927</ymax>
-			<rotation>5</rotation>
+			<ymax>1937</ymax>
+			<rotation>358</rotation>
 		</bndbox>
 	</object>
 </annotation>
diff --git a/drafter_2/annotations/C20_D2_P3.xml b/drafter_2/annotations/C20_D2_P3.xml
index eb395566e1dad9665f1dfcf70562fd4ca481504c..b059a176c2e04b85933aae3fa5c7ea8b640e3a4a 100644
--- a/drafter_2/annotations/C20_D2_P3.xml
+++ b/drafter_2/annotations/C20_D2_P3.xml
@@ -21,7 +21,6 @@
 			<ymin>677</ymin>
 			<xmax>1681</xmax>
 			<ymax>877</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -47,6 +46,7 @@
 			<ymin>1363</ymin>
 			<xmax>3078</xmax>
 			<ymax>1980</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -169,7 +169,8 @@
 			<xmin>408</xmin>
 			<ymin>1377</ymin>
 			<xmax>1168</xmax>
-			<ymax>2033</ymax>
+			<ymax>2049</ymax>
+			<rotation>358</rotation>
 		</bndbox>
 	</object>
 </annotation>
diff --git a/drafter_2/annotations/C20_D2_P4.xml b/drafter_2/annotations/C20_D2_P4.xml
index 917b696733b32dcb7b4d14f6bbe1e4841ac3ccb6..42b2592308782d7232e4b41551dda3770453cdf6 100644
--- a/drafter_2/annotations/C20_D2_P4.xml
+++ b/drafter_2/annotations/C20_D2_P4.xml
@@ -47,6 +47,7 @@
 			<ymin>1140</ymin>
 			<xmax>3145</xmax>
 			<ymax>1780</ymax>
+			<rotation>95</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -170,6 +171,7 @@
 			<ymin>1207</ymin>
 			<xmax>1211</xmax>
 			<ymax>1760</ymax>
+			<rotation>354</rotation>
 		</bndbox>
 	</object>
 </annotation>
diff --git a/drafter_2/annotations/C21_D1_P1.xml b/drafter_2/annotations/C21_D1_P1.xml
index 4766910f73765b5690a4d3158c5484f3b339d6a4..93b123e7eb458573cf75afcd0e4a6f5db2497d68 100644
--- a/drafter_2/annotations/C21_D1_P1.xml
+++ b/drafter_2/annotations/C21_D1_P1.xml
@@ -58,7 +58,7 @@
 			<ymin>768</ymin>
 			<xmax>1105</xmax>
 			<ymax>1040</ymax>
-			<rotation>95</rotation>
+			<rotation>75</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -71,7 +71,7 @@
 			<ymin>1510</ymin>
 			<xmax>1063</xmax>
 			<ymax>1878</ymax>
-			<rotation>90</rotation>
+			<rotation>81</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -109,7 +109,7 @@
 			<ymin>700</ymin>
 			<xmax>1747</xmax>
 			<ymax>909</ymax>
-			<rotation>93</rotation>
+			<rotation>79</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -134,6 +134,7 @@
 			<ymin>1004</ymin>
 			<xmax>1766</xmax>
 			<ymax>1434</ymax>
+			<rotation>356</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -195,7 +196,7 @@
 			<xmax>1022</xmax>
 			<ymax>900</ymax>
 		</bndbox>
-		<text>47K&#937;</text>
+		<text>47k&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -221,7 +222,7 @@
 			<xmax>2250</xmax>
 			<ymax>868</ymax>
 		</bndbox>
-		<text>4,7K&#937;</text>
+		<text>4,7k&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -234,7 +235,7 @@
 			<xmax>1422</xmax>
 			<ymax>1816</ymax>
 		</bndbox>
-		<text>10K&#937;</text>
+		<text>10k&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -247,7 +248,7 @@
 			<xmax>1976</xmax>
 			<ymax>1894</ymax>
 		</bndbox>
-		<text>1K&#937;</text>
+		<text>1k&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_2/annotations/C21_D1_P2.xml b/drafter_2/annotations/C21_D1_P2.xml
index 8bcd853781df659af8ef5ce3c1d50fdbc5493fe4..3afb0ac1b09a58fc22d9275bf31bcb14890a41a8 100644
--- a/drafter_2/annotations/C21_D1_P2.xml
+++ b/drafter_2/annotations/C21_D1_P2.xml
@@ -21,7 +21,6 @@
 			<ymin>1268</ymin>
 			<xmax>664</xmax>
 			<ymax>1434</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -47,7 +46,6 @@
 			<ymin>956</ymin>
 			<xmax>2134</xmax>
 			<ymax>1134</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -60,7 +58,7 @@
 			<ymin>890</ymin>
 			<xmax>863</xmax>
 			<ymax>1144</ymax>
-			<rotation>90</rotation>
+			<rotation>75</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -73,7 +71,7 @@
 			<ymin>816</ymin>
 			<xmax>1434</xmax>
 			<ymax>1002</ymax>
-			<rotation>94</rotation>
+			<rotation>79</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -86,7 +84,7 @@
 			<ymin>1564</ymin>
 			<xmax>823</xmax>
 			<ymax>1907</ymax>
-			<rotation>92</rotation>
+			<rotation>81</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -99,7 +97,7 @@
 			<ymin>1705</ymin>
 			<xmax>1384</xmax>
 			<ymax>2007</ymax>
-			<rotation>94</rotation>
+			<rotation>79</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -112,7 +110,6 @@
 			<ymin>1315</ymin>
 			<xmax>2810</xmax>
 			<ymax>1635</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -125,7 +122,7 @@
 			<ymin>1103</ymin>
 			<xmax>1458</xmax>
 			<ymax>1510</ymax>
-			<rotation>0</rotation>
+			<rotation>358</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -138,7 +135,6 @@
 			<ymin>1520</ymin>
 			<xmax>1863</xmax>
 			<ymax>1635</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -212,7 +208,7 @@
 			<xmax>803</xmax>
 			<ymax>1030</ymax>
 		</bndbox>
-		<text>47K&#937;</text>
+		<text>47k&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -264,7 +260,7 @@
 			<xmax>1144</xmax>
 			<ymax>1864</ymax>
 		</bndbox>
-		<text>10K&#937;</text>
+		<text>10k&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -277,7 +273,7 @@
 			<xmax>1644</xmax>
 			<ymax>1946</ymax>
 		</bndbox>
-		<text>1K&#937;</text>
+		<text>1k&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -303,7 +299,7 @@
 			<xmax>1902</xmax>
 			<ymax>962</ymax>
 		</bndbox>
-		<text>4,7K&#937;</text>
+		<text>4,7k&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_2/annotations/C21_D1_P3.xml b/drafter_2/annotations/C21_D1_P3.xml
index a38a61f4895172215953610255b6d9ec71433f44..30a4536d303d60459809ce37c2167a815791a9dd 100644
--- a/drafter_2/annotations/C21_D1_P3.xml
+++ b/drafter_2/annotations/C21_D1_P3.xml
@@ -46,7 +46,7 @@
 			<ymin>1043</ymin>
 			<xmax>2668</xmax>
 			<ymax>1225</ymax>
-			<rotation>5</rotation>
+			<rotation>358</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -59,7 +59,7 @@
 			<ymin>875</ymin>
 			<xmax>1287</xmax>
 			<ymax>1195</ymax>
-			<rotation>90</rotation>
+			<rotation>71</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -72,7 +72,7 @@
 			<ymin>1683</ymin>
 			<xmax>1238</xmax>
 			<ymax>2103</ymax>
-			<rotation>90</rotation>
+			<rotation>87</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -85,7 +85,7 @@
 			<ymin>1833</ymin>
 			<xmax>1905</xmax>
 			<ymax>2176</ymax>
-			<rotation>94</rotation>
+			<rotation>83</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -149,7 +149,7 @@
 			<xmax>1190</xmax>
 			<ymax>1043</ymax>
 		</bndbox>
-		<text>47K&#937;</text>
+		<text>47k&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -162,7 +162,7 @@
 			<xmax>2460</xmax>
 			<ymax>1030</ymax>
 		</bndbox>
-		<text>4,7K&#937;</text>
+		<text>4,7k&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -227,7 +227,7 @@
 			<xmax>2182</xmax>
 			<ymax>2090</ymax>
 		</bndbox>
-		<text>1K&#937;</text>
+		<text>1k&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -240,7 +240,7 @@
 			<xmax>1620</xmax>
 			<ymax>2028</ymax>
 		</bndbox>
-		<text>10K&#937;</text>
+		<text>10k&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -365,7 +365,7 @@
 			<ymin>1153</ymin>
 			<xmax>1975</xmax>
 			<ymax>1608</ymax>
-			<rotation>5</rotation>
+			<rotation>354</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_2/annotations/C21_D1_P4.xml b/drafter_2/annotations/C21_D1_P4.xml
index 7cae8ba83e96e5f4371f6dc250087fdeebffc39a..d05bcf4ccf37c7bf40c6f3960dcf057a77c8911a 100644
--- a/drafter_2/annotations/C21_D1_P4.xml
+++ b/drafter_2/annotations/C21_D1_P4.xml
@@ -21,6 +21,7 @@
 			<ymin>1274</ymin>
 			<xmax>980</xmax>
 			<ymax>1450</ymax>
+			<rotation>358</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -58,7 +59,7 @@
 			<ymin>926</ymin>
 			<xmax>1248</xmax>
 			<ymax>1170</ymax>
-			<rotation>95</rotation>
+			<rotation>65</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -84,7 +85,7 @@
 			<ymin>886</ymin>
 			<xmax>1844</xmax>
 			<ymax>1044</ymax>
-			<rotation>91</rotation>
+			<rotation>87</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -134,6 +135,7 @@
 			<ymin>1148</ymin>
 			<xmax>1844</xmax>
 			<ymax>1538</ymax>
+			<rotation>352</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -195,7 +197,7 @@
 			<xmax>1170</xmax>
 			<ymax>1043</ymax>
 		</bndbox>
-		<text>47K&#937;</text>
+		<text>47k&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -234,7 +236,7 @@
 			<xmax>2318</xmax>
 			<ymax>1023</ymax>
 		</bndbox>
-		<text>4,7K&#937;</text>
+		<text>4,7k&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -260,7 +262,7 @@
 			<xmax>1480</xmax>
 			<ymax>1898</ymax>
 		</bndbox>
-		<text>10K&#937;</text>
+		<text>10k&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -273,7 +275,7 @@
 			<xmax>2028</xmax>
 			<ymax>1995</ymax>
 		</bndbox>
-		<text>1K&#937;</text>
+		<text>1k&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_2/annotations/C21_D2_P1.xml b/drafter_2/annotations/C21_D2_P1.xml
index 090534395fb37d04461a1df7e4b2ba3a122e4af8..850027d4d98634c6ca8abeba37dcb3d1a292ebeb 100644
--- a/drafter_2/annotations/C21_D2_P1.xml
+++ b/drafter_2/annotations/C21_D2_P1.xml
@@ -124,7 +124,7 @@
 			<ymin>1052</ymin>
 			<xmax>3182</xmax>
 			<ymax>1392</ymax>
-			<rotation>5</rotation>
+			<rotation>356</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -164,7 +164,7 @@
 			<xmax>2520</xmax>
 			<ymax>902</ymax>
 		</bndbox>
-		<text>4,7K&#937;</text>
+		<text>4,7k&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -190,7 +190,7 @@
 			<xmax>1666</xmax>
 			<ymax>950</ymax>
 		</bndbox>
-		<text>47K&#937;</text>
+		<text>47k&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -203,7 +203,7 @@
 			<xmax>1768</xmax>
 			<ymax>2052</ymax>
 		</bndbox>
-		<text>1K&#937;</text>
+		<text>1k&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -242,7 +242,7 @@
 			<xmax>1054</xmax>
 			<ymax>1884</ymax>
 		</bndbox>
-		<text>10K&#937;</text>
+		<text>10k&#937;</text>
 	</object>
 	<object>
 		<name>transistor.bjt</name>
diff --git a/drafter_2/annotations/C21_D2_P2.xml b/drafter_2/annotations/C21_D2_P2.xml
index 6fab616f55d7a8cbe1c788f9c6cac9af86549b95..8cad74607f2668efb33b64e49667b6782749ba7d 100644
--- a/drafter_2/annotations/C21_D2_P2.xml
+++ b/drafter_2/annotations/C21_D2_P2.xml
@@ -21,7 +21,6 @@
 			<ymin>1328</ymin>
 			<xmax>1046</xmax>
 			<ymax>1512</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -34,7 +33,6 @@
 			<ymin>1106</ymin>
 			<xmax>2306</xmax>
 			<ymax>1280</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -125,7 +123,6 @@
 			<ymin>1174</ymin>
 			<xmax>1958</xmax>
 			<ymax>1574</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -138,7 +135,7 @@
 			<ymin>1168</ymin>
 			<xmax>3042</xmax>
 			<ymax>1508</ymax>
-			<rotation>0</rotation>
+			<rotation>354</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -225,7 +222,7 @@
 			<xmax>1657</xmax>
 			<ymax>1126</ymax>
 		</bndbox>
-		<text>47K&#937;</text>
+		<text>47k&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -238,7 +235,7 @@
 			<xmax>2406</xmax>
 			<ymax>1041</ymax>
 		</bndbox>
-		<text>4,7K&#937;</text>
+		<text>4,7k&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -251,7 +248,7 @@
 			<xmax>1147</xmax>
 			<ymax>1921</ymax>
 		</bndbox>
-		<text>10K&#937;</text>
+		<text>10k&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -264,7 +261,7 @@
 			<xmax>1720</xmax>
 			<ymax>2100</ymax>
 		</bndbox>
-		<text>1K&#937;</text>
+		<text>1k&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_2/annotations/C21_D2_P3.xml b/drafter_2/annotations/C21_D2_P3.xml
index 4c5bda48c25c7a6249beb8f2d08b7737a20cf155..921a70d4f7df3d3f34d7a5068a72eea9c242d749 100644
--- a/drafter_2/annotations/C21_D2_P3.xml
+++ b/drafter_2/annotations/C21_D2_P3.xml
@@ -21,7 +21,6 @@
 			<ymin>1134</ymin>
 			<xmax>1034</xmax>
 			<ymax>1322</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -34,7 +33,6 @@
 			<ymin>960</ymin>
 			<xmax>2384</xmax>
 			<ymax>1108</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -112,7 +110,6 @@
 			<ymin>1447</ymin>
 			<xmax>2324</xmax>
 			<ymax>1527</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -125,7 +122,6 @@
 			<ymin>1008</ymin>
 			<xmax>2056</xmax>
 			<ymax>1384</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -138,7 +134,6 @@
 			<ymin>1048</ymin>
 			<xmax>3084</xmax>
 			<ymax>1326</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -200,7 +195,7 @@
 			<xmax>1132</xmax>
 			<ymax>1756</ymax>
 		</bndbox>
-		<text>10K&#937;</text>
+		<text>10k&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -226,7 +221,7 @@
 			<xmax>1730</xmax>
 			<ymax>956</ymax>
 		</bndbox>
-		<text>47K&#937;</text>
+		<text>47k&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -239,7 +234,7 @@
 			<xmax>2480</xmax>
 			<ymax>907</ymax>
 		</bndbox>
-		<text>4,7K&#937;</text>
+		<text>4,7k&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -265,7 +260,7 @@
 			<xmax>1813</xmax>
 			<ymax>1901</ymax>
 		</bndbox>
-		<text>1K&#937;</text>
+		<text>1k&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_2/annotations/C21_D2_P4.xml b/drafter_2/annotations/C21_D2_P4.xml
index 65c0ce801203d186a1d542765d09ed6c16ec4ab5..695a4165a11e33364d7af2db4648d87cd07ebc7b 100644
--- a/drafter_2/annotations/C21_D2_P4.xml
+++ b/drafter_2/annotations/C21_D2_P4.xml
@@ -21,7 +21,6 @@
 			<ymin>1244</ymin>
 			<xmax>1170</xmax>
 			<ymax>1472</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -34,7 +33,6 @@
 			<ymin>1060</ymin>
 			<xmax>2604</xmax>
 			<ymax>1236</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -99,7 +97,6 @@
 			<ymin>1604</ymin>
 			<xmax>2534</xmax>
 			<ymax>1692</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -125,7 +122,6 @@
 			<ymin>1113</ymin>
 			<xmax>2270</xmax>
 			<ymax>1545</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -138,7 +134,6 @@
 			<ymin>1170</ymin>
 			<xmax>3275</xmax>
 			<ymax>1475</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -225,7 +220,7 @@
 			<xmax>1923</xmax>
 			<ymax>1044</ymax>
 		</bndbox>
-		<text>47K&#937;</text>
+		<text>47k&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -238,7 +233,7 @@
 			<xmax>2709</xmax>
 			<ymax>1009</ymax>
 		</bndbox>
-		<text>4,7K&#937;</text>
+		<text>4,7k&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -303,7 +298,7 @@
 			<xmax>2025</xmax>
 			<ymax>2092</ymax>
 		</bndbox>
-		<text>1K&#937;</text>
+		<text>1k&#937;</text>
 	</object>
 	<object>
 		<name>junction</name>
@@ -520,6 +515,6 @@
 			<xmax>1342</xmax>
 			<ymax>1953</ymax>
 		</bndbox>
-		<text>10K&#937;</text>
+		<text>10k&#937;</text>
 	</object>
 </annotation>
diff --git a/drafter_2/annotations/C22_D1_P1.xml b/drafter_2/annotations/C22_D1_P1.xml
index 901ec58c240f0418e9d5b5bf0bca537fff04bea9..627dfa33e342704294778a0e8d18f988264d65c9 100644
--- a/drafter_2/annotations/C22_D1_P1.xml
+++ b/drafter_2/annotations/C22_D1_P1.xml
@@ -21,6 +21,7 @@
 			<ymin>1023</ymin>
 			<xmax>1325</xmax>
 			<ymax>1473</ymax>
+			<rotation>354</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -251,7 +252,7 @@
 			<xmax>1913</xmax>
 			<ymax>2413</ymax>
 		</bndbox>
-		<text>2k2</text>
+		<text>2K2</text>
 	</object>
 	<object>
 		<name>junction</name>
diff --git a/drafter_2/annotations/C22_D1_P2.xml b/drafter_2/annotations/C22_D1_P2.xml
index a8a4a0fa7d426174144ec6914a800beb71ecb8e1..2bc8ccc9222b5692e7746249b26df08cb112614b 100644
--- a/drafter_2/annotations/C22_D1_P2.xml
+++ b/drafter_2/annotations/C22_D1_P2.xml
@@ -21,6 +21,7 @@
 			<ymin>1020</ymin>
 			<xmax>1608</xmax>
 			<ymax>1513</ymax>
+			<rotation>352</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -33,6 +34,7 @@
 			<ymin>1373</ymin>
 			<xmax>2541</xmax>
 			<ymax>1950</ymax>
+			<rotation>356</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -148,7 +150,7 @@
 			<xmax>1860</xmax>
 			<ymax>700</ymax>
 		</bndbox>
-		<text>470k</text>
+		<text>470K</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_2/annotations/C22_D1_P3.xml b/drafter_2/annotations/C22_D1_P3.xml
index e437926056084c7260cd9deb69c56634dbe02710..cb8d25861f5a4b237581434e41efad45de7b33a7 100644
--- a/drafter_2/annotations/C22_D1_P3.xml
+++ b/drafter_2/annotations/C22_D1_P3.xml
@@ -21,6 +21,7 @@
 			<ymin>934</ymin>
 			<xmax>1226</xmax>
 			<ymax>1354</ymax>
+			<rotation>352</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -33,6 +34,7 @@
 			<ymin>1216</ymin>
 			<xmax>2138</xmax>
 			<ymax>1752</ymax>
+			<rotation>354</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_2/annotations/C22_D1_P4.xml b/drafter_2/annotations/C22_D1_P4.xml
index c91133cc2b35aab193b2abc2d86005c7aab8e531..67eb20caaaa9db236432958bc79b94fac131caae 100644
--- a/drafter_2/annotations/C22_D1_P4.xml
+++ b/drafter_2/annotations/C22_D1_P4.xml
@@ -21,6 +21,7 @@
 			<ymin>1007</ymin>
 			<xmax>1525</xmax>
 			<ymax>1417</ymax>
+			<rotation>356</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -33,6 +34,7 @@
 			<ymin>1237</ymin>
 			<xmax>2385</xmax>
 			<ymax>1760</ymax>
+			<rotation>358</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_2/annotations/C23_D1_P1.xml b/drafter_2/annotations/C23_D1_P1.xml
index d7029a81e48ab33821621ed03e2a9c77f13fba6b..0f935c80b4b3f97d0e51c4eb66081e919bba01a5 100644
--- a/drafter_2/annotations/C23_D1_P1.xml
+++ b/drafter_2/annotations/C23_D1_P1.xml
@@ -21,6 +21,7 @@
 			<ymin>1350</ymin>
 			<xmax>723</xmax>
 			<ymax>1710</ymax>
+			<rotation>352</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -33,6 +34,7 @@
 			<ymin>1358</ymin>
 			<xmax>1298</xmax>
 			<ymax>1780</ymax>
+			<rotation>354</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -45,6 +47,7 @@
 			<ymin>1348</ymin>
 			<xmax>2390</xmax>
 			<ymax>1688</ymax>
+			<rotation>356</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -57,6 +60,7 @@
 			<ymin>1418</ymin>
 			<xmax>3470</xmax>
 			<ymax>1753</ymax>
+			<rotation>354</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -82,7 +86,7 @@
 			<ymin>974</ymin>
 			<xmax>1260</xmax>
 			<ymax>1216</ymax>
-			<rotation>93</rotation>
+			<rotation>87</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -108,7 +112,7 @@
 			<ymin>930</ymin>
 			<xmax>2440</xmax>
 			<ymax>1162</ymax>
-			<rotation>89</rotation>
+			<rotation>81</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -134,7 +138,7 @@
 			<ymin>984</ymin>
 			<xmax>3441</xmax>
 			<ymax>1262</ymax>
-			<rotation>92</rotation>
+			<rotation>83</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_2/annotations/C23_D1_P2.xml b/drafter_2/annotations/C23_D1_P2.xml
index 2b3a7b37f9d7a93afbb63ab90fcc989d2592c945..cd8c3642f8dad022b7771a151357ae0975b816fb 100644
--- a/drafter_2/annotations/C23_D1_P2.xml
+++ b/drafter_2/annotations/C23_D1_P2.xml
@@ -21,7 +21,7 @@
 			<ymin>1195</ymin>
 			<xmax>782</xmax>
 			<ymax>1532</ymax>
-			<rotation>5</rotation>
+			<rotation>356</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -34,7 +34,7 @@
 			<ymin>1197</ymin>
 			<xmax>1320</xmax>
 			<ymax>1598</ymax>
-			<rotation>5</rotation>
+			<rotation>354</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -47,7 +47,7 @@
 			<ymin>1185</ymin>
 			<xmax>2377</xmax>
 			<ymax>1512</ymax>
-			<rotation>5</rotation>
+			<rotation>356</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -112,7 +112,7 @@
 			<ymin>695</ymin>
 			<xmax>993</xmax>
 			<ymax>930</ymax>
-			<rotation>101</rotation>
+			<rotation>81</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -122,10 +122,10 @@
 		<difficult>0</difficult>
 		<bndbox>
 			<xmin>1169</xmin>
-			<ymin>838</ymin>
+			<ymin>820</ymin>
 			<xmax>1280</xmax>
 			<ymax>1055</ymax>
-			<rotation>94</rotation>
+			<rotation>89</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -151,7 +151,7 @@
 			<ymin>773</ymin>
 			<xmax>2427</xmax>
 			<ymax>1010</ymax>
-			<rotation>91</rotation>
+			<rotation>81</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -282,7 +282,7 @@
 			<xmax>2001</xmax>
 			<ymax>756</ymax>
 		</bndbox>
-		<text>18K&#937;</text>
+		<text>18K</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_2/annotations/C23_D1_P3.xml b/drafter_2/annotations/C23_D1_P3.xml
index de4d5dcf0dc0ebbc6f546b29d6300d0c01e4870f..b063ec7e33aadddc83641f2d759829278574c08f 100644
--- a/drafter_2/annotations/C23_D1_P3.xml
+++ b/drafter_2/annotations/C23_D1_P3.xml
@@ -108,7 +108,7 @@
 			<ymin>735</ymin>
 			<xmax>1114</xmax>
 			<ymax>973</ymax>
-			<rotation>100</rotation>
+			<rotation>85</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -325,7 +325,7 @@
 			<xmax>2746</xmax>
 			<ymax>974</ymax>
 		</bndbox>
-		<text>470&#937;</text>
+		<text>470</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_2/annotations/C23_D1_P4.xml b/drafter_2/annotations/C23_D1_P4.xml
index f0520a5ab685ba1736eb6fc6b520e8efc6642dd7..d7c220733c5b3891afb82dbf8e6d9cff11a939d5 100644
--- a/drafter_2/annotations/C23_D1_P4.xml
+++ b/drafter_2/annotations/C23_D1_P4.xml
@@ -21,6 +21,7 @@
 			<ymin>980</ymin>
 			<xmax>815</xmax>
 			<ymax>1303</ymax>
+			<rotation>350</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -272,7 +273,7 @@
 			<xmax>1000</xmax>
 			<ymax>627</ymax>
 		</bndbox>
-		<text>18K&#937;</text>
+		<text>18K</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_2/annotations/C23_D2_P2.xml b/drafter_2/annotations/C23_D2_P2.xml
index 81f12ee9c887dd370657f32de7f751a28c51f53b..8f251635a5d0e4d4eb384a0c2e893a7e5408f60c 100644
--- a/drafter_2/annotations/C23_D2_P2.xml
+++ b/drafter_2/annotations/C23_D2_P2.xml
@@ -111,6 +111,7 @@
 			<ymin>1245</ymin>
 			<xmax>1410</xmax>
 			<ymax>1652</ymax>
+			<rotation>354</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -671,7 +672,7 @@
 			<xmax>2220</xmax>
 			<ymax>2104</ymax>
 		</bndbox>
-		<text>470&#181;F</text>
+		<text>470&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_2/annotations/C23_D2_P3.xml b/drafter_2/annotations/C23_D2_P3.xml
index d6e954a128103015430b8d02f54529f404bfc617..4ea66c4a99f2afbe87bd821f2ee91119a270dfe2 100644
--- a/drafter_2/annotations/C23_D2_P3.xml
+++ b/drafter_2/annotations/C23_D2_P3.xml
@@ -33,6 +33,7 @@
 			<ymin>1307</ymin>
 			<xmax>1645</xmax>
 			<ymax>1720</ymax>
+			<rotation>354</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_2/annotations/C23_D2_P4.xml b/drafter_2/annotations/C23_D2_P4.xml
index e2d71123bc9246d732f90a68546b1d1746892117..cbb78280ebc4014a2f54e5a7d59d0623fd5bf87e 100644
--- a/drafter_2/annotations/C23_D2_P4.xml
+++ b/drafter_2/annotations/C23_D2_P4.xml
@@ -21,6 +21,7 @@
 			<ymin>1047</ymin>
 			<xmax>738</xmax>
 			<ymax>1400</ymax>
+			<rotation>354</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_2/annotations/C24_D1_P1.xml b/drafter_2/annotations/C24_D1_P1.xml
index 3ae1f4ebedb0c009e8ec7c510a3571e7b20f9f62..eac63ce4ba5dbc8f03c52669107251f45139ed2c 100644
--- a/drafter_2/annotations/C24_D1_P1.xml
+++ b/drafter_2/annotations/C24_D1_P1.xml
@@ -273,7 +273,7 @@
 			<xmax>263</xmax>
 			<ymax>1702</ymax>
 		</bndbox>
-		<text>9v</text>
+		<text>9V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -351,7 +351,7 @@
 			<xmax>1775</xmax>
 			<ymax>1546</ymax>
 		</bndbox>
-		<text>22mF</text>
+		<text>22&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -403,7 +403,7 @@
 			<xmax>2478</xmax>
 			<ymax>1944</ymax>
 		</bndbox>
-		<text>47&#181;F</text>
+		<text>47&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_2/annotations/C24_D1_P2.xml b/drafter_2/annotations/C24_D1_P2.xml
index e25c669e44f4abd8a2e138b2c4f4b72a47749449..dca71692596cc216909e14b5d39fd9b693e04924 100644
--- a/drafter_2/annotations/C24_D1_P2.xml
+++ b/drafter_2/annotations/C24_D1_P2.xml
@@ -296,7 +296,7 @@
 			<xmax>274</xmax>
 			<ymax>1740</ymax>
 		</bndbox>
-		<text>9v</text>
+		<text>9V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -309,7 +309,7 @@
 			<xmax>672</xmax>
 			<ymax>1304</ymax>
 		</bndbox>
-		<text>1K&#937;</text>
+		<text>1K</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -322,7 +322,7 @@
 			<xmax>1028</xmax>
 			<ymax>1104</ymax>
 		</bndbox>
-		<text>22K&#937;</text>
+		<text>22K</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -335,7 +335,7 @@
 			<xmax>1004</xmax>
 			<ymax>1580</ymax>
 		</bndbox>
-		<text>22&#181;F</text>
+		<text>22&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -348,7 +348,7 @@
 			<xmax>1654</xmax>
 			<ymax>1550</ymax>
 		</bndbox>
-		<text>22&#181;F</text>
+		<text>22&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -361,7 +361,7 @@
 			<xmax>1588</xmax>
 			<ymax>1080</ymax>
 		</bndbox>
-		<text>22K&#937;</text>
+		<text>22K</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -374,7 +374,7 @@
 			<xmax>1660</xmax>
 			<ymax>1328</ymax>
 		</bndbox>
-		<text>1K&#937;</text>
+		<text>1K</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -413,7 +413,7 @@
 			<xmax>2356</xmax>
 			<ymax>1936</ymax>
 		</bndbox>
-		<text>47&#181;F</text>
+		<text>47&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -426,7 +426,7 @@
 			<xmax>2530</xmax>
 			<ymax>1078</ymax>
 		</bndbox>
-		<text>1K&#937;</text>
+		<text>1K</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -439,7 +439,7 @@
 			<xmax>3202</xmax>
 			<ymax>1114</ymax>
 		</bndbox>
-		<text>10K&#937;</text>
+		<text>10K</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -452,7 +452,7 @@
 			<xmax>3964</xmax>
 			<ymax>1314</ymax>
 		</bndbox>
-		<text>100&#937;</text>
+		<text>100</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -465,7 +465,7 @@
 			<xmax>3582</xmax>
 			<ymax>1444</ymax>
 		</bndbox>
-		<text>22&#181;F</text>
+		<text>22n</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -478,7 +478,7 @@
 			<xmax>2866</xmax>
 			<ymax>1478</ymax>
 		</bndbox>
-		<text>22&#181;F</text>
+		<text>22n</text>
 	</object>
 	<object>
 		<name>junction</name>
diff --git a/drafter_2/annotations/C24_D1_P3.xml b/drafter_2/annotations/C24_D1_P3.xml
index f473ee50fea59cd1b2be68b78567e5e9eca43dc9..be9fa4ad9d0a3f2518e9e3e90bc1c5bbb32d1821 100644
--- a/drafter_2/annotations/C24_D1_P3.xml
+++ b/drafter_2/annotations/C24_D1_P3.xml
@@ -309,7 +309,7 @@
 			<xmax>337</xmax>
 			<ymax>1761</ymax>
 		</bndbox>
-		<text>9v</text>
+		<text>9V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -322,7 +322,7 @@
 			<xmax>840</xmax>
 			<ymax>1277</ymax>
 		</bndbox>
-		<text>1K&#937;</text>
+		<text>1K</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -335,7 +335,7 @@
 			<xmax>1274</xmax>
 			<ymax>1070</ymax>
 		</bndbox>
-		<text>22K&#937;</text>
+		<text>22K</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -348,7 +348,7 @@
 			<xmax>1253</xmax>
 			<ymax>1596</ymax>
 		</bndbox>
-		<text>22&#181;F</text>
+		<text>22&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -361,7 +361,7 @@
 			<xmax>1895</xmax>
 			<ymax>1082</ymax>
 		</bndbox>
-		<text>22K&#937;</text>
+		<text>22K</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -374,7 +374,7 @@
 			<xmax>1967</xmax>
 			<ymax>1351</ymax>
 		</bndbox>
-		<text>1K&#937;</text>
+		<text>1K</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -387,7 +387,7 @@
 			<xmax>1953</xmax>
 			<ymax>1561</ymax>
 		</bndbox>
-		<text>22&#181;F</text>
+		<text>22&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -426,7 +426,7 @@
 			<xmax>2661</xmax>
 			<ymax>1956</ymax>
 		</bndbox>
-		<text>47&#181;F</text>
+		<text>47&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -439,7 +439,7 @@
 			<xmax>2821</xmax>
 			<ymax>1125</ymax>
 		</bndbox>
-		<text>1K&#937;</text>
+		<text>1K</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -452,7 +452,7 @@
 			<xmax>3126</xmax>
 			<ymax>1526</ymax>
 		</bndbox>
-		<text>22&#181;F</text>
+		<text>22n</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -465,7 +465,7 @@
 			<xmax>3411</xmax>
 			<ymax>1198</ymax>
 		</bndbox>
-		<text>10k&#937;</text>
+		<text>10K</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -478,7 +478,7 @@
 			<xmax>3698</xmax>
 			<ymax>1504</ymax>
 		</bndbox>
-		<text>22&#181;F</text>
+		<text>22n</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -491,7 +491,7 @@
 			<xmax>3977</xmax>
 			<ymax>1395</ymax>
 		</bndbox>
-		<text>100&#937;</text>
+		<text>100</text>
 	</object>
 	<object>
 		<name>junction</name>
diff --git a/drafter_2/annotations/C24_D1_P4.xml b/drafter_2/annotations/C24_D1_P4.xml
index 4e04b48d3057b7317d91b8f8296e8939313e99db..9ff07dec630431a55566beca30cda0acf38f446b 100644
--- a/drafter_2/annotations/C24_D1_P4.xml
+++ b/drafter_2/annotations/C24_D1_P4.xml
@@ -21,7 +21,7 @@
 			<ymin>1027</ymin>
 			<xmax>631</xmax>
 			<ymax>1289</ymax>
-			<rotation>5</rotation>
+			<rotation>356</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -314,7 +314,7 @@
 			<xmax>253</xmax>
 			<ymax>1224</ymax>
 		</bndbox>
-		<text>9v</text>
+		<text>9V</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_2/annotations/C24_D2_P1.xml b/drafter_2/annotations/C24_D2_P1.xml
index fdfae4c1ed0bc8d8e25cd1a3a9996cb51d0c4aa6..d4bfe97de82d52272e880623b97fa915a93565c2 100644
--- a/drafter_2/annotations/C24_D2_P1.xml
+++ b/drafter_2/annotations/C24_D2_P1.xml
@@ -21,6 +21,7 @@
 			<ymin>1257</ymin>
 			<xmax>548</xmax>
 			<ymax>1523</ymax>
+			<rotation>352</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -107,6 +108,7 @@
 			<ymin>782</ymin>
 			<xmax>4027</xmax>
 			<ymax>1077</ymax>
+			<rotation>356</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -144,6 +146,7 @@
 			<ymin>1565</ymin>
 			<xmax>2244</xmax>
 			<ymax>1673</ymax>
+			<rotation>264</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -308,7 +311,7 @@
 			<xmax>247</xmax>
 			<ymax>1459</ymax>
 		</bndbox>
-		<text>9v</text>
+		<text>9V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -438,7 +441,7 @@
 			<xmax>2437</xmax>
 			<ymax>1810</ymax>
 		</bndbox>
-		<text>47&#181;F</text>
+		<text>47&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -464,7 +467,7 @@
 			<xmax>3558</xmax>
 			<ymax>1354</ymax>
 		</bndbox>
-		<text>22&#181;F</text>
+		<text>22n</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -477,7 +480,7 @@
 			<xmax>3813</xmax>
 			<ymax>1251</ymax>
 		</bndbox>
-		<text>100&#937;</text>
+		<text>100</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_2/annotations/C24_D2_P2.xml b/drafter_2/annotations/C24_D2_P2.xml
index df048ceb0f852aec96dd00f88ae293b530806738..21b9a7f36af4f6817282784167efad8b7d5cfb97 100644
--- a/drafter_2/annotations/C24_D2_P2.xml
+++ b/drafter_2/annotations/C24_D2_P2.xml
@@ -21,6 +21,7 @@
 			<ymin>1240</ymin>
 			<xmax>516</xmax>
 			<ymax>1497</ymax>
+			<rotation>352</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -108,6 +109,7 @@
 			<ymin>1489</ymin>
 			<xmax>2091</xmax>
 			<ymax>1591</ymax>
+			<rotation>268</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -144,6 +146,7 @@
 			<ymin>600</ymin>
 			<xmax>3965</xmax>
 			<ymax>899</ymax>
+			<rotation>358</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -349,7 +352,7 @@
 			<xmax>951</xmax>
 			<ymax>1169</ymax>
 		</bndbox>
-		<text>22&#181;F</text>
+		<text>22&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -414,7 +417,7 @@
 			<xmax>2286</xmax>
 			<ymax>1719</ymax>
 		</bndbox>
-		<text>47&#181;F</text>
+		<text>47&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -466,7 +469,7 @@
 			<xmax>3071</xmax>
 			<ymax>886</ymax>
 		</bndbox>
-		<text>100K&#937;</text>
+		<text>100K</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_2/annotations/C24_D2_P3.xml b/drafter_2/annotations/C24_D2_P3.xml
index fb91260df4925f73794fdd7e08855c9f9b0c46be..08626bfdeccc06674e6b510fbc72b7e224b58105 100644
--- a/drafter_2/annotations/C24_D2_P3.xml
+++ b/drafter_2/annotations/C24_D2_P3.xml
@@ -21,6 +21,7 @@
 			<ymin>1148</ymin>
 			<xmax>755</xmax>
 			<ymax>1470</ymax>
+			<rotation>354</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -108,6 +109,7 @@
 			<ymin>1483</ymin>
 			<xmax>2616</xmax>
 			<ymax>1593</ymax>
+			<rotation>262</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -296,7 +298,7 @@
 			<xmax>390</xmax>
 			<ymax>1401</ymax>
 		</bndbox>
-		<text>9v</text>
+		<text>9V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -922,6 +924,7 @@
 			<ymin>706</ymin>
 			<xmax>4150</xmax>
 			<ymax>981</ymax>
+			<rotation>358</rotation>
 		</bndbox>
 	</object>
 </annotation>
diff --git a/drafter_2/annotations/C24_D2_P4.xml b/drafter_2/annotations/C24_D2_P4.xml
index 2f7b581d569dc410cf36ec91a1e6db0ca09b7e6d..fc5299c3047f8c86057eb5820afb70edfa292dd3 100644
--- a/drafter_2/annotations/C24_D2_P4.xml
+++ b/drafter_2/annotations/C24_D2_P4.xml
@@ -21,6 +21,7 @@
 			<ymin>951</ymin>
 			<xmax>501</xmax>
 			<ymax>1208</ymax>
+			<rotation>348</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -95,7 +96,7 @@
 			<ymin>1036</ymin>
 			<xmax>3514</xmax>
 			<ymax>1144</ymax>
-			<rotation>7</rotation>
+			<rotation>358</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -296,7 +297,7 @@
 			<ymin>748</ymin>
 			<xmax>3666</xmax>
 			<ymax>946</ymax>
-			<rotation>83</rotation>
+			<rotation>96</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -310,7 +311,7 @@
 			<xmax>204</xmax>
 			<ymax>1139</ymax>
 		</bndbox>
-		<text>9v</text>
+		<text>9V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -375,7 +376,7 @@
 			<xmax>1725</xmax>
 			<ymax>872</ymax>
 		</bndbox>
-		<text>22&#181;F</text>
+		<text>22&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -440,7 +441,7 @@
 			<xmax>2955</xmax>
 			<ymax>1038</ymax>
 		</bndbox>
-		<text>22&#181;F</text>
+		<text>22n</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -479,7 +480,7 @@
 			<xmax>3581</xmax>
 			<ymax>1030</ymax>
 		</bndbox>
-		<text>22&#181;</text>
+		<text>22n</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_2/instances/C13_D1_P2.json b/drafter_2/instances/C13_D1_P2.json
index 3137f20d246a13ddf2eb7277bdd5948c63aa86e8..21b29a8b1c5a552ad6b680593501f058026278b4 100644
--- a/drafter_2/instances/C13_D1_P2.json
+++ b/drafter_2/instances/C13_D1_P2.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.16.7",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
-      "label": "voltage.dc",
       "line_color": null,
       "fill_color": null,
+      "label": "voltage.dc",
       "points": [
         [
           596.0,
@@ -24,13 +24,15 @@
           680.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           270.0,
@@ -49,13 +51,15 @@
           911.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           3253.0,
@@ -74,13 +78,15 @@
           471.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "diode.light_emitting",
       "line_color": null,
       "fill_color": null,
+      "label": "diode.light_emitting",
       "points": [
         [
           1140.1891891891892,
@@ -99,13 +105,15 @@
           183.4324324324324
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "diode.light_emitting",
       "line_color": null,
       "fill_color": null,
+      "label": "diode.light_emitting",
       "points": [
         [
           1780.7297297297298,
@@ -124,13 +132,15 @@
           77.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "diode.light_emitting",
       "line_color": null,
       "fill_color": null,
+      "label": "diode.light_emitting",
       "points": [
         [
           2269.9189189189187,
@@ -149,13 +159,15 @@
           80.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "diode.light_emitting",
       "line_color": null,
       "fill_color": null,
+      "label": "diode.light_emitting",
       "points": [
         [
           2659.1081081081084,
@@ -174,13 +186,15 @@
           64.51351351351354
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "switch",
       "line_color": null,
       "fill_color": null,
+      "label": "switch",
       "points": [
         [
           1107.0,
@@ -199,13 +213,15 @@
           1026.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "switch",
       "line_color": null,
       "fill_color": null,
+      "label": "switch",
       "points": [
         [
           1696.0,
@@ -224,13 +240,15 @@
           926.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "switch",
       "line_color": null,
       "fill_color": null,
+      "label": "switch",
       "points": [
         [
           2259.0,
@@ -249,13 +267,15 @@
           886.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "switch",
       "line_color": null,
       "fill_color": null,
+      "label": "switch",
       "points": [
         [
           2787.0,
@@ -274,13 +294,15 @@
           868.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           3044.0,
@@ -299,13 +321,15 @@
           374.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           724.0,
@@ -324,13 +348,15 @@
           448.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           3092.0,
@@ -349,13 +375,15 @@
           200.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           790.0,
@@ -374,13 +402,15 @@
           1223.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           3164.0,
@@ -399,10 +429,16 @@
           978.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
   ],
+  "imagePath": "../segmentation/C13_D1_P2.jpg",
+  "imageData": null,
+  "imageHeight": 1595,
+  "imageWidth": 4160,
   "lineColor": [
     0,
     255,
@@ -414,9 +450,5 @@
     0,
     0,
     128
-  ],
-  "imagePath": "../segmentation/C13_D1_P2.jpg",
-  "imageData": null,
-  "imageHeight": 1595,
-  "imageWidth": 4160
+  ]
 }
\ No newline at end of file
diff --git a/drafter_2/instances/C14_D1_P1.json b/drafter_2/instances/C14_D1_P1.json
index d8849604bdd49e4acdaac0a163f44fe979c508d1..95f7cb334e376c75913b5630e6816b973d264d47 100644
--- a/drafter_2/instances/C14_D1_P1.json
+++ b/drafter_2/instances/C14_D1_P1.json
@@ -1,27 +1,11 @@
 {
-  "version": "3.16.7",
+  "version": "5.2.0",
   "flags": {},
-  "lineColor": [
-    0,
-    255,
-    0,
-    128
-  ],
-  "fillColor": [
-    255,
-    0,
-    0,
-    128
-  ],
-  "imagePath": "../segmentation/C14_D1_P1.jpg",
-  "imageData": null,
-  "imageHeight": 3120,
-  "imageWidth": 4160,
   "shapes": [
     {
-      "label": "diode.light_emitting",
       "line_color": null,
       "fill_color": null,
+      "label": "diode.light_emitting",
       "points": [
         [
           1107.0,
@@ -56,13 +40,15 @@
           678.7878787878788
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           625.0,
@@ -81,13 +67,15 @@
           343.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1164.950980392157,
@@ -122,13 +110,15 @@
           365.19607843137254
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1828.181818181818,
@@ -171,13 +161,15 @@
           365.48672566371675
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2511.5384615384614,
@@ -196,13 +188,15 @@
           375.64102564102564
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           3500.0,
@@ -221,13 +215,15 @@
           400.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           3525.4464285714284,
@@ -246,13 +242,15 @@
           1476.7857142857142
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2529.3650793650795,
@@ -279,13 +277,15 @@
           1459.5238095238094
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1832.1646341463413,
@@ -328,13 +328,15 @@
           1468.4210526315787
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1128.7,
@@ -365,13 +367,15 @@
           1430.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           518.0,
@@ -390,13 +394,15 @@
           2450.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1060.5555555555554,
@@ -415,13 +421,15 @@
           2471.111111111111
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           3503.0,
@@ -440,13 +448,15 @@
           2500.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "crossover",
       "line_color": null,
       "fill_color": null,
+      "label": "crossover",
       "points": [
         [
           2191.2280701754385,
@@ -465,13 +475,15 @@
           1640.3508771929824
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "voltage.dc",
       "line_color": null,
       "fill_color": null,
+      "label": "voltage.dc",
       "points": [
         [
           358.0,
@@ -514,13 +526,15 @@
           1498.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           69.0,
@@ -539,13 +553,15 @@
           1377.2727272727273
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "diode.light_emitting",
       "line_color": null,
       "fill_color": null,
+      "label": "diode.light_emitting",
       "points": [
         [
           3423.0,
@@ -584,13 +600,15 @@
           682.8685258964143
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           2478.409090909091,
@@ -609,13 +627,15 @@
           1164.9122807017543
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           1799.9999999999998,
@@ -638,13 +658,15 @@
           1170.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           1110.0,
@@ -663,13 +685,15 @@
           1115.934065934066
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1292.0,
@@ -688,13 +712,15 @@
           1085.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1917.0,
@@ -713,13 +739,15 @@
           914.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           2655.0,
@@ -738,13 +766,15 @@
           913.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           3462.190812720848,
@@ -763,13 +793,15 @@
           1247.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           3685.0,
@@ -788,13 +820,15 @@
           1190.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "transistor.bjt",
       "line_color": null,
       "fill_color": null,
+      "label": "transistor.bjt",
       "points": [
         [
           3161.7117117117114,
@@ -837,13 +871,15 @@
           2138.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "transistor.bjt",
       "line_color": null,
       "fill_color": null,
+      "label": "transistor.bjt",
       "points": [
         [
           990.0,
@@ -862,13 +898,15 @@
           2080.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "capacitor.polarized",
       "line_color": null,
       "fill_color": null,
+      "label": "capacitor.polarized",
       "points": [
         [
           1351.5942028985507,
@@ -899,13 +937,15 @@
           1560.5797101449275
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "capacitor.polarized",
       "line_color": null,
       "fill_color": null,
+      "label": "capacitor.polarized",
       "points": [
         [
           2830.0,
@@ -932,13 +972,15 @@
           1589.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1857.0175438596489,
@@ -957,13 +999,15 @@
           1878.9473684210525
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2496.8253968253966,
@@ -982,8 +1026,26 @@
           1896.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
+  ],
+  "imagePath": "../segmentation/C14_D1_P1.jpg",
+  "imageData": null,
+  "imageHeight": 3120,
+  "imageWidth": 4160,
+  "lineColor": [
+    0,
+    255,
+    0,
+    128
+  ],
+  "fillColor": [
+    255,
+    0,
+    0,
+    128
   ]
 }
\ No newline at end of file
diff --git a/drafter_2/instances/C15_D2_P2.json b/drafter_2/instances/C15_D2_P2.json
index b5fada7d9757941cc1098e63f96e6793b37672fb..708d189ad2b0f67450e435c4e70459b900040e30 100644
--- a/drafter_2/instances/C15_D2_P2.json
+++ b/drafter_2/instances/C15_D2_P2.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.16.7",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
-      "label": "voltage.dc",
       "line_color": null,
       "fill_color": null,
+      "label": "voltage.dc",
       "points": [
         [
           441.0,
@@ -24,13 +24,15 @@
           1474.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           148.0,
@@ -49,13 +51,15 @@
           1624.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           1068.0,
@@ -74,13 +78,15 @@
           697.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           1534.0,
@@ -99,13 +105,15 @@
           574.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           3374.206896551724,
@@ -124,13 +132,15 @@
           1943.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "integrated_circuit.ne555",
       "line_color": null,
       "fill_color": null,
+      "label": "integrated_circuit.ne555",
       "points": [
         [
           2372.916666666667,
@@ -157,13 +167,15 @@
           827.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "switch",
       "line_color": null,
       "fill_color": null,
+      "label": "switch",
       "points": [
         [
           1055.0,
@@ -182,13 +194,15 @@
           1803.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "capacitor.polarized",
       "line_color": null,
       "fill_color": null,
+      "label": "capacitor.polarized",
       "points": [
         [
           1686.2162162162163,
@@ -223,13 +237,15 @@
           1954.0540540540542
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "capacitor.unpolarized",
       "line_color": null,
       "fill_color": null,
+      "label": "capacitor.unpolarized",
       "points": [
         [
           2598.0,
@@ -248,13 +264,15 @@
           1967.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           731.0,
@@ -273,13 +291,15 @@
           704.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1694.0,
@@ -298,13 +318,15 @@
           567.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1826.7241379310346,
@@ -327,13 +349,15 @@
           2277.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           3000.0,
@@ -356,13 +380,15 @@
           1827.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           3595.0,
@@ -381,13 +407,15 @@
           2110.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           688.0,
@@ -406,13 +434,15 @@
           493.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1078.0,
@@ -431,13 +461,15 @@
           463.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1521.0,
@@ -456,13 +488,15 @@
           397.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2325.0,
@@ -481,13 +515,15 @@
           358.33333333333337
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2618.0,
@@ -506,13 +542,15 @@
           323.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           3347.0,
@@ -531,13 +569,15 @@
           1276.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1529.0,
@@ -556,13 +596,15 @@
           1140.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1058.0,
@@ -581,13 +623,15 @@
           1467.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1529.0,
@@ -606,13 +650,15 @@
           1323.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           565.0,
@@ -631,13 +677,15 @@
           2439.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           998.0,
@@ -656,13 +704,15 @@
           2450.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1465.0,
@@ -681,13 +731,15 @@
           2460.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2328.0,
@@ -706,13 +758,15 @@
           2460.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2681.0,
@@ -731,13 +785,15 @@
           2467.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           3414.0,
@@ -756,13 +812,15 @@
           2487.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "crossover",
       "line_color": null,
       "fill_color": null,
+      "label": "crossover",
       "points": [
         [
           1644.2307692307693,
@@ -829,13 +887,15 @@
           1505.7692307692307
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           2658.0,
@@ -854,13 +914,15 @@
           1622.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           2340.0,
@@ -879,13 +941,15 @@
           1639.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           2699.0,
@@ -904,13 +968,15 @@
           1302.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           2255.0,
@@ -929,13 +995,15 @@
           1478.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           2267.0,
@@ -954,13 +1022,15 @@
           1295.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           2260.0,
@@ -979,13 +1049,15 @@
           1127.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           2353.0,
@@ -1004,13 +1076,15 @@
           902.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           2660.0,
@@ -1029,13 +1103,15 @@
           885.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1092.5925925925926,
@@ -1054,10 +1130,16 @@
           1191.358024691358
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
   ],
+  "imagePath": "../segmentation/C15_D2_P2.jpg",
+  "imageData": null,
+  "imageHeight": 3120,
+  "imageWidth": 4160,
   "lineColor": [
     0,
     255,
@@ -1069,9 +1151,5 @@
     0,
     0,
     128
-  ],
-  "imagePath": "../segmentation/C15_D2_P2.jpg",
-  "imageData": null,
-  "imageHeight": 3120,
-  "imageWidth": 4160
+  ]
 }
\ No newline at end of file
diff --git a/drafter_2/instances/C16_D2_P4.json b/drafter_2/instances/C16_D2_P4.json
index dfabe5a1a7411db1f65570f8394584625ff1000a..4358e53521cdc6030d7e30d2d175b3356ab10f21 100644
--- a/drafter_2/instances/C16_D2_P4.json
+++ b/drafter_2/instances/C16_D2_P4.json
@@ -1,5 +1,5 @@
 {
-  "version": "5.0.1",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
@@ -25,6 +25,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -51,6 +52,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -77,6 +79,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -103,6 +106,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -129,6 +133,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -155,6 +160,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -181,6 +187,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -207,6 +214,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -233,6 +241,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -259,6 +268,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -285,6 +295,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -331,6 +342,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -357,6 +369,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -383,6 +396,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -417,6 +431,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -443,6 +458,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
diff --git a/drafter_2/instances/C19_D1_P2.json b/drafter_2/instances/C19_D1_P2.json
index 2831ea6e6cfac6181d28323e673c7e5ee79fe833..438f9324baae9c2760b8d002ad3d7859c355d985 100644
--- a/drafter_2/instances/C19_D1_P2.json
+++ b/drafter_2/instances/C19_D1_P2.json
@@ -1,5 +1,5 @@
 {
-  "version": "5.0.1",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
@@ -41,6 +41,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -67,6 +68,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -93,6 +95,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -119,6 +122,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -145,6 +149,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -171,6 +176,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -197,6 +203,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -231,6 +238,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -257,6 +265,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -307,6 +316,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -349,6 +359,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -375,6 +386,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -401,6 +413,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -427,6 +440,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -453,6 +467,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -479,6 +494,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -505,6 +521,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -531,6 +548,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -557,6 +575,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -583,6 +602,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -609,6 +629,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -635,6 +656,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -661,6 +683,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -687,6 +710,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -713,6 +737,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -739,6 +764,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -765,6 +791,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -791,6 +818,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -817,6 +845,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -843,6 +872,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -869,6 +899,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -895,6 +926,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -921,6 +953,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -947,6 +980,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -973,6 +1007,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -999,6 +1034,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1029,6 +1065,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1055,6 +1092,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1081,6 +1119,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1107,6 +1146,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1133,6 +1173,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1159,6 +1200,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1185,6 +1227,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1211,6 +1254,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1237,6 +1281,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1263,6 +1308,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
diff --git a/drafter_2/instances/C20_D1_P1.json b/drafter_2/instances/C20_D1_P1.json
index 5adde6c026ba40436771c559a8eca1709a064f5f..c1f446b2991101514ad6b5ebea3d338a4ede92a7 100644
--- a/drafter_2/instances/C20_D1_P1.json
+++ b/drafter_2/instances/C20_D1_P1.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.16.7",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           1538.0,
@@ -24,13 +24,15 @@
           747.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "capacitor.unpolarized",
       "line_color": null,
       "fill_color": null,
+      "label": "capacitor.unpolarized",
       "points": [
         [
           2018.0,
@@ -49,13 +51,15 @@
           1517.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "inductor",
       "line_color": null,
       "fill_color": null,
+      "label": "inductor",
       "points": [
         [
           2765.0,
@@ -86,13 +90,15 @@
           1253.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1809.8360655737704,
@@ -119,13 +125,15 @@
           507.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           2968.0,
@@ -144,13 +152,15 @@
           1476.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1738.0,
@@ -169,13 +179,15 @@
           1793.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1071.0,
@@ -194,13 +206,15 @@
           783.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2185.0,
@@ -219,13 +233,15 @@
           803.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2911.0,
@@ -244,13 +260,15 @@
           783.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2175.0,
@@ -269,13 +287,15 @@
           2406.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2911.0,
@@ -294,13 +314,15 @@
           2442.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1035.0,
@@ -319,13 +341,15 @@
           2420.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "voltage.ac",
       "line_color": null,
       "fill_color": null,
+      "label": "voltage.ac",
       "points": [
         [
           688.0,
@@ -344,10 +368,16 @@
           1423.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
   ],
+  "imagePath": "../segmentation/C20_D1_P1.jpg",
+  "imageData": null,
+  "imageHeight": 3120,
+  "imageWidth": 4160,
   "lineColor": [
     0,
     255,
@@ -359,9 +389,5 @@
     0,
     0,
     128
-  ],
-  "imagePath": "../segmentation/C20_D1_P1.jpg",
-  "imageData": null,
-  "imageHeight": 3120,
-  "imageWidth": 4160
+  ]
 }
\ No newline at end of file
diff --git a/drafter_2/instances/C20_D2_P2.json b/drafter_2/instances/C20_D2_P2.json
index dd48f9f0a000fa45264700a02fb41390ddf5ab3f..10fb91987ce87a21e309a8af00957bf3c892b84b 100644
--- a/drafter_2/instances/C20_D2_P2.json
+++ b/drafter_2/instances/C20_D2_P2.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.16.7",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           1258.0,
@@ -24,13 +24,15 @@
           833.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1265.0,
@@ -49,13 +51,15 @@
           630.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1531.0,
@@ -74,13 +78,15 @@
           1813.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           2991.0,
@@ -99,13 +105,15 @@
           1530.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "capacitor.unpolarized",
       "line_color": null,
       "fill_color": null,
+      "label": "capacitor.unpolarized",
       "points": [
         [
           1811.0,
@@ -124,13 +132,15 @@
           1513.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "inductor",
       "line_color": null,
       "fill_color": null,
+      "label": "inductor",
       "points": [
         [
           2775.0,
@@ -157,13 +167,15 @@
           1333.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           943.0,
@@ -182,13 +194,15 @@
           879.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1955.0,
@@ -207,13 +221,15 @@
           863.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2898.0,
@@ -232,13 +248,15 @@
           860.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           921.0,
@@ -257,13 +275,15 @@
           2367.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1948.0,
@@ -282,13 +302,15 @@
           2380.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2898.0,
@@ -307,13 +329,15 @@
           2437.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "voltage.ac",
       "line_color": null,
       "fill_color": null,
+      "label": "voltage.ac",
       "points": [
         [
           745.0,
@@ -332,10 +356,16 @@
           1433.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
   ],
+  "imagePath": "../segmentation/C20_D2_P2.jpg",
+  "imageData": null,
+  "imageHeight": 3120,
+  "imageWidth": 4160,
   "lineColor": [
     0,
     255,
@@ -347,9 +377,5 @@
     0,
     0,
     128
-  ],
-  "imagePath": "../segmentation/C20_D2_P2.jpg",
-  "imageData": null,
-  "imageHeight": 3120,
-  "imageWidth": 4160
+  ]
 }
\ No newline at end of file
diff --git a/drafter_2/instances/C21_D1_P3.json b/drafter_2/instances/C21_D1_P3.json
index 2d58dd1629d1808ba3c80fb5f985f255ec270ada..1e5b7b7565bee601673f6edd15ec8f1b1c4e5967 100644
--- a/drafter_2/instances/C21_D1_P3.json
+++ b/drafter_2/instances/C21_D1_P3.json
@@ -1,5 +1,5 @@
 {
-  "version": "5.0.1",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
@@ -33,6 +33,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -59,6 +60,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -85,6 +87,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -131,6 +134,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -157,6 +161,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -183,6 +188,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -209,6 +215,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -243,6 +250,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -289,6 +297,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -363,6 +372,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -409,6 +419,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -435,6 +446,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -461,6 +473,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -487,6 +500,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -525,6 +539,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -551,6 +566,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -577,6 +593,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -603,6 +620,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -641,6 +659,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -667,6 +686,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -693,6 +713,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -719,6 +740,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -745,6 +767,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -771,6 +794,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -797,6 +821,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -823,6 +848,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -849,6 +875,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -875,6 +902,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -901,6 +929,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -927,6 +956,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -953,6 +983,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -979,6 +1010,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1005,6 +1037,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1031,6 +1064,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1057,6 +1091,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1083,6 +1118,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1109,6 +1145,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1175,6 +1212,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1201,6 +1239,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1227,6 +1266,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1253,6 +1293,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1279,6 +1320,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1305,6 +1347,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1331,6 +1374,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
diff --git a/drafter_2/instances/C21_D2_P1.json b/drafter_2/instances/C21_D2_P1.json
index a1a9318d7eace062661257909d436a119383af71..aa9fd40b10b0591cfbcd9edf31ee31a18020a59a 100644
--- a/drafter_2/instances/C21_D2_P1.json
+++ b/drafter_2/instances/C21_D2_P1.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.16.7",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
-      "label": "capacitor.unpolarized",
       "line_color": null,
       "fill_color": null,
+      "label": "capacitor.unpolarized",
       "points": [
         [
           775.0,
@@ -24,13 +24,15 @@
           1170.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "capacitor.unpolarized",
       "line_color": null,
       "fill_color": null,
+      "label": "capacitor.unpolarized",
       "points": [
         [
           2271.0,
@@ -49,13 +51,15 @@
           956.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "capacitor.unpolarized",
       "line_color": null,
       "fill_color": null,
+      "label": "capacitor.unpolarized",
       "points": [
         [
           2378.0,
@@ -74,13 +78,15 @@
           2020.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           1098.0,
@@ -99,13 +105,15 @@
           780.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           1070.0,
@@ -124,13 +132,15 @@
           1628.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           1890.0,
@@ -149,13 +159,15 @@
           695.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           2050.5050505050503,
@@ -174,13 +186,15 @@
           1563.6363636363637
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           1830.0,
@@ -199,13 +213,15 @@
           1800.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "voltage.dc",
       "line_color": null,
       "fill_color": null,
+      "label": "voltage.dc",
       "points": [
         [
           2874.0,
@@ -224,13 +240,15 @@
           1052.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           2426.222222222222,
@@ -257,13 +275,15 @@
           1126.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           3200.0,
@@ -282,13 +302,15 @@
           1154.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           2018.0,
@@ -307,13 +329,15 @@
           758.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           2080.0,
@@ -332,13 +356,15 @@
           1412.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1268.0,
@@ -357,13 +383,15 @@
           830.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1442.0,
@@ -382,13 +410,15 @@
           1908.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           2158.0,
@@ -407,13 +437,15 @@
           2148.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           614.0,
@@ -432,13 +464,15 @@
           984.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           742.0,
@@ -457,13 +491,15 @@
           1758.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "transistor.bjt",
       "line_color": null,
       "fill_color": null,
+      "label": "transistor.bjt",
       "points": [
         [
           1923.5294117647059,
@@ -490,13 +526,15 @@
           1131.1764705882354
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "crossover",
       "line_color": null,
       "fill_color": null,
+      "label": "crossover",
       "points": [
         [
           3098.3870967741937,
@@ -559,13 +597,15 @@
           758.0645161290323
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           125.0,
@@ -584,13 +624,15 @@
           1203.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           115.0,
@@ -609,13 +651,15 @@
           1548.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           3835.0,
@@ -634,13 +678,15 @@
           758.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           3875.0,
@@ -659,13 +705,15 @@
           1133.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1151.0,
@@ -684,13 +732,15 @@
           540.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1942.0,
@@ -709,13 +759,15 @@
           535.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2992.0,
@@ -734,13 +786,15 @@
           560.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2717.0,
@@ -759,13 +813,15 @@
           773.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2678.0,
@@ -784,13 +840,15 @@
           1007.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1938.5294117647059,
@@ -809,13 +867,15 @@
           993.0000000000002
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1900.0,
@@ -834,13 +894,15 @@
           1548.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1095.0,
@@ -859,13 +921,15 @@
           1195.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2465.0,
@@ -884,13 +948,15 @@
           1560.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           436.0,
@@ -909,13 +975,15 @@
           1586.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           370.0,
@@ -934,13 +1002,15 @@
           2438.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1040.0,
@@ -959,13 +1029,15 @@
           2432.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1876.0,
@@ -984,13 +1056,15 @@
           2432.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2444.0,
@@ -1009,13 +1083,15 @@
           2448.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2940.0,
@@ -1034,13 +1110,15 @@
           2445.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           3738.0,
@@ -1059,13 +1137,15 @@
           2453.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           3734.0,
@@ -1084,10 +1164,16 @@
           1136.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
   ],
+  "imagePath": "../segmentation/C21_D2_P1.jpg",
+  "imageData": null,
+  "imageHeight": 3120,
+  "imageWidth": 4160,
   "lineColor": [
     0,
     255,
@@ -1099,9 +1185,5 @@
     0,
     0,
     128
-  ],
-  "imagePath": "../segmentation/C21_D2_P1.jpg",
-  "imageData": null,
-  "imageHeight": 3120,
-  "imageWidth": 4160
+  ]
 }
\ No newline at end of file
diff --git a/drafter_2/instances/C22_D2_P3.json b/drafter_2/instances/C22_D2_P3.json
index bd696030bf2da8a42a90fbbbc22d295c20a11f72..279580d10ae920f9ff7796f5f35f6be94a93cc6a 100644
--- a/drafter_2/instances/C22_D2_P3.json
+++ b/drafter_2/instances/C22_D2_P3.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.16.7",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
-      "label": "voltage.dc",
       "line_color": null,
       "fill_color": null,
+      "label": "voltage.dc",
       "points": [
         [
           972.0,
@@ -24,13 +24,15 @@
           1058.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "transistor.bjt",
       "line_color": null,
       "fill_color": null,
+      "label": "transistor.bjt",
       "points": [
         [
           2120.472440944882,
@@ -65,13 +67,15 @@
           1367.716535433071
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           1522.0,
@@ -90,13 +94,15 @@
           496.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           2240.0,
@@ -115,13 +121,15 @@
           558.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           1536.0,
@@ -140,13 +148,15 @@
           2328.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           2976.0,
@@ -165,13 +175,15 @@
           2324.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "diode.light_emitting",
       "line_color": null,
       "fill_color": null,
+      "label": "diode.light_emitting",
       "points": [
         [
           2240.0,
@@ -190,13 +202,15 @@
           946.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "capacitor.polarized",
       "line_color": null,
       "fill_color": null,
+      "label": "capacitor.polarized",
       "points": [
         [
           2676.0,
@@ -215,13 +229,15 @@
           1156.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "capacitor.polarized",
       "line_color": null,
       "fill_color": null,
+      "label": "capacitor.polarized",
       "points": [
         [
           1498.0,
@@ -240,13 +256,15 @@
           1920.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "capacitor.polarized",
       "line_color": null,
       "fill_color": null,
+      "label": "capacitor.polarized",
       "points": [
         [
           2620.0,
@@ -265,13 +283,15 @@
           2132.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           500.0,
@@ -290,13 +310,15 @@
           1198.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1200.0,
@@ -315,13 +337,15 @@
           628.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           2478.0,
@@ -340,13 +364,15 @@
           640.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           2883.0,
@@ -365,13 +391,15 @@
           1058.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           2238.0,
@@ -390,13 +418,15 @@
           1510.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1793.0,
@@ -415,13 +445,15 @@
           1973.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           2590.0,
@@ -440,13 +472,15 @@
           1988.888888888889
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           3118.0,
@@ -465,13 +499,15 @@
           2403.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1735.0,
@@ -490,13 +526,15 @@
           2410.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "crossover",
       "line_color": null,
       "fill_color": null,
+      "label": "crossover",
       "points": [
         [
           2300.0,
@@ -571,13 +609,15 @@
           2155.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1157.0,
@@ -596,13 +636,15 @@
           298.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1588.0,
@@ -621,13 +663,15 @@
           320.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2290.0,
@@ -646,13 +690,15 @@
           380.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1570.0393700787401,
@@ -671,13 +717,15 @@
           1460.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2120.0,
@@ -696,13 +744,15 @@
           1193.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2288.0,
@@ -721,13 +771,15 @@
           1213.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2960.0,
@@ -746,13 +798,15 @@
           1228.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1580.0,
@@ -771,13 +825,15 @@
           2238.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2082.315112540193,
@@ -800,13 +856,15 @@
           1792.7241379310342
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2315.0,
@@ -825,13 +883,15 @@
           1793.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2990.0,
@@ -850,13 +910,15 @@
           2198.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1087.0,
@@ -875,13 +937,15 @@
           2880.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1583.0,
@@ -900,13 +964,15 @@
           2883.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           2301.0,
@@ -925,13 +991,15 @@
           2800.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           3010.0,
@@ -950,10 +1018,16 @@
           2806.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
   ],
+  "imagePath": "../segmentation/C22_D2_P3.jpg",
+  "imageData": null,
+  "imageHeight": 3120,
+  "imageWidth": 4160,
   "lineColor": [
     0,
     255,
@@ -965,9 +1039,5 @@
     0,
     0,
     128
-  ],
-  "imagePath": "../segmentation/C22_D2_P3.jpg",
-  "imageData": null,
-  "imageHeight": 3120,
-  "imageWidth": 4160
+  ]
 }
\ No newline at end of file
diff --git a/drafter_2/instances/C23_D1_P2.json b/drafter_2/instances/C23_D1_P2.json
index b6717c9b7e924eeedc3c7df68e1206e817817b10..5775a8cd5f0e401aae81ea03f1e6ddac242dc59c 100644
--- a/drafter_2/instances/C23_D1_P2.json
+++ b/drafter_2/instances/C23_D1_P2.json
@@ -1,5 +1,5 @@
 {
-  "version": "5.0.1",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
@@ -25,6 +25,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -99,6 +100,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -133,6 +135,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -179,6 +182,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -213,6 +217,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -247,6 +252,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -281,6 +287,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -319,6 +326,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -345,6 +353,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -391,6 +400,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -417,6 +427,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -447,6 +458,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -473,6 +485,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -499,6 +512,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -529,6 +543,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -555,6 +570,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -581,6 +597,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -615,6 +632,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -641,6 +659,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -667,6 +686,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -701,6 +721,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -727,6 +748,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -753,6 +775,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -791,6 +814,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -817,6 +841,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -843,6 +868,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -957,6 +983,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1063,6 +1090,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1153,6 +1181,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1179,6 +1208,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1205,6 +1235,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1231,6 +1262,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1257,6 +1289,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1283,6 +1316,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1309,6 +1343,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1335,6 +1370,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1361,6 +1397,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1387,6 +1424,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1413,6 +1451,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1439,6 +1478,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1465,6 +1505,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1491,6 +1532,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1517,6 +1559,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1543,6 +1586,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1569,6 +1613,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1595,6 +1640,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1621,6 +1667,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1651,6 +1698,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1677,6 +1725,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1703,6 +1752,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1729,6 +1779,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1759,6 +1810,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1785,6 +1837,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1811,6 +1864,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1837,6 +1891,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1863,6 +1918,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1889,6 +1945,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1915,6 +1972,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1941,6 +1999,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1967,6 +2026,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
diff --git a/drafter_2/instances/C24_D1_P4.json b/drafter_2/instances/C24_D1_P4.json
index 239fdc4ec8b97fbc9f731da7d62242bb1ae4a0a7..714b8ce53c09a99277ab4019d87fff53dce81036 100644
--- a/drafter_2/instances/C24_D1_P4.json
+++ b/drafter_2/instances/C24_D1_P4.json
@@ -1,5 +1,5 @@
 {
-  "version": "5.0.1",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
@@ -25,6 +25,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -59,6 +60,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -93,6 +95,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -127,6 +130,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -169,6 +173,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -195,6 +200,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -225,6 +231,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -251,6 +258,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -277,6 +285,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -303,6 +312,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -329,6 +339,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -355,6 +366,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -381,6 +393,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -407,6 +420,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -433,6 +447,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -459,6 +474,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -497,6 +513,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -523,6 +540,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -549,6 +567,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -575,6 +594,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -601,6 +621,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -627,6 +648,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -713,6 +735,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -739,6 +762,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -765,6 +789,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -791,6 +816,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -825,6 +851,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -851,6 +878,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -877,6 +905,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -903,6 +932,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -929,6 +959,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -955,6 +986,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -981,6 +1013,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1011,6 +1044,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1037,6 +1071,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1063,6 +1098,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1089,6 +1125,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1115,6 +1152,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1141,6 +1179,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1167,6 +1206,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1193,6 +1233,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1219,6 +1260,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1245,6 +1287,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1271,6 +1314,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1301,6 +1345,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1327,6 +1372,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1353,6 +1399,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1379,6 +1426,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1405,6 +1453,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1431,6 +1480,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1457,6 +1507,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1487,6 +1538,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1513,6 +1565,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1539,6 +1592,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1565,6 +1619,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1591,6 +1646,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1617,6 +1673,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1643,6 +1700,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1669,6 +1727,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1695,6 +1754,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1721,6 +1781,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1747,6 +1808,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1773,6 +1835,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1799,6 +1862,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1825,6 +1889,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1851,6 +1916,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1877,6 +1943,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1903,6 +1970,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1929,6 +1997,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1955,6 +2024,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1981,6 +2051,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2007,6 +2078,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2033,6 +2105,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2059,6 +2132,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2085,6 +2159,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2111,6 +2186,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
diff --git a/drafter_3/annotations/C25_D1_P1.xml b/drafter_3/annotations/C25_D1_P1.xml
index 360795d6d464202599401c01fa6d57d3bf7132b0..fa20590d64e622df68f7291de8e22e16ac0d5f21 100644
--- a/drafter_3/annotations/C25_D1_P1.xml
+++ b/drafter_3/annotations/C25_D1_P1.xml
@@ -209,7 +209,7 @@
 			<xmax>103</xmax>
 			<ymax>88</ymax>
 		</bndbox>
-		<text>12v</text>
+		<text>12V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -256,10 +256,10 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>137</xmin>
-			<ymin>641</ymin>
-			<xmax>205</xmax>
-			<ymax>731</ymax>
+			<xmin>134</xmin>
+			<ymin>686</ymin>
+			<xmax>219</xmax>
+			<ymax>729</ymax>
 		</bndbox>
 		<text>1&#181;F</text>
 	</object>
@@ -451,4 +451,17 @@
 			<ymax>342</ymax>
 		</bndbox>
 	</object>
+	<object>
+		<name>text</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>151</xmin>
+			<ymin>643</ymin>
+			<xmax>199</xmax>
+			<ymax>686</ymax>
+		</bndbox>
+		<text>C1</text>
+	</object>
 </annotation>
diff --git a/drafter_3/annotations/C25_D1_P2.xml b/drafter_3/annotations/C25_D1_P2.xml
index 5cb2328eaae39d24c47559168e31b32882422ca5..f67dbe77698432f2e1909ca88509a665b1fe8076 100644
--- a/drafter_3/annotations/C25_D1_P2.xml
+++ b/drafter_3/annotations/C25_D1_P2.xml
@@ -114,11 +114,11 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>530</xmin>
+			<xmin>528</xmin>
 			<ymin>514</ymin>
-			<xmax>604</xmax>
+			<xmax>594</xmax>
 			<ymax>632</ymax>
-			<rotation>84</rotation>
+			<rotation>104</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -127,11 +127,11 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>515</xmin>
+			<xmin>513</xmin>
 			<ymin>189</ymin>
 			<xmax>568</xmax>
-			<ymax>292</ymax>
-			<rotation>83</rotation>
+			<ymax>297</ymax>
+			<rotation>98</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -142,9 +142,9 @@
 		<bndbox>
 			<xmin>1286</xmin>
 			<ymin>395</ymin>
-			<xmax>1347</xmax>
-			<ymax>478</ymax>
-			<rotation>80</rotation>
+			<xmax>1333</xmax>
+			<ymax>486</ymax>
+			<rotation>98</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -157,6 +157,7 @@
 			<ymin>353</ymin>
 			<xmax>1166</xmax>
 			<ymax>807</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -195,6 +196,7 @@
 			<ymin>1045</ymin>
 			<xmax>868</xmax>
 			<ymax>1137</ymax>
+			<rotation>6</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -208,7 +210,7 @@
 			<xmax>251</xmax>
 			<ymax>49</ymax>
 		</bndbox>
-		<text>12v</text>
+		<text>12V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -256,7 +258,7 @@
 		<difficult>0</difficult>
 		<bndbox>
 			<xmin>324</xmin>
-			<ymin>905</ymin>
+			<ymin>958</ymin>
 			<xmax>458</xmax>
 			<ymax>1041</ymax>
 		</bndbox>
@@ -451,4 +453,17 @@
 			<ymax>985</ymax>
 		</bndbox>
 	</object>
+	<object>
+		<name>text</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>349</xmin>
+			<ymin>899</ymin>
+			<xmax>422</xmax>
+			<ymax>961</ymax>
+		</bndbox>
+		<text>C1</text>
+	</object>
 </annotation>
diff --git a/drafter_3/annotations/C25_D1_P3.xml b/drafter_3/annotations/C25_D1_P3.xml
index 42d717b4e9e6eafd74b5a2878e7442b8c3fc16e9..d9ba606672c9133dae868f63a3fd797a6b71bfdf 100644
--- a/drafter_3/annotations/C25_D1_P3.xml
+++ b/drafter_3/annotations/C25_D1_P3.xml
@@ -142,9 +142,9 @@
 		<bndbox>
 			<xmin>1203</xmin>
 			<ymin>357</ymin>
-			<xmax>1264</xmax>
-			<ymax>451</ymax>
-			<rotation>90</rotation>
+			<xmax>1266</xmax>
+			<ymax>476</ymax>
+			<rotation>96</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -157,7 +157,7 @@
 			<ymin>849</ymin>
 			<xmax>354</xmax>
 			<ymax>980</ymax>
-			<rotation>270</rotation>
+			<rotation>264</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -195,6 +195,7 @@
 			<ymin>348</ymin>
 			<xmax>1009</xmax>
 			<ymax>849</ymax>
+			<rotation>2</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -208,7 +209,7 @@
 			<xmax>158</xmax>
 			<ymax>200</ymax>
 		</bndbox>
-		<text>12v</text>
+		<text>12V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -256,7 +257,7 @@
 		<difficult>0</difficult>
 		<bndbox>
 			<xmin>101</xmin>
-			<ymin>884</ymin>
+			<ymin>941</ymin>
 			<xmax>211</xmax>
 			<ymax>1004</ymax>
 		</bndbox>
@@ -451,4 +452,17 @@
 			<ymax>1033</ymax>
 		</bndbox>
 	</object>
+	<object>
+		<name>text</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>129</xmin>
+			<ymin>884</ymin>
+			<xmax>186</xmax>
+			<ymax>942</ymax>
+		</bndbox>
+		<text>C1</text>
+	</object>
 </annotation>
diff --git a/drafter_3/annotations/C25_D1_P4.xml b/drafter_3/annotations/C25_D1_P4.xml
index cd0795740a3c55be1d55077e1b77e786b54ff856..5fc44c5330cdf4bb50a83c9943484a4b2d365f80 100644
--- a/drafter_3/annotations/C25_D1_P4.xml
+++ b/drafter_3/annotations/C25_D1_P4.xml
@@ -131,6 +131,7 @@
 			<ymin>204</ymin>
 			<xmax>1106</xmax>
 			<ymax>596</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -208,7 +209,7 @@
 			<xmax>145</xmax>
 			<ymax>49</ymax>
 		</bndbox>
-		<text>12v</text>
+		<text>12V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -255,10 +256,10 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>29</xmin>
-			<ymin>678</ymin>
-			<xmax>165</xmax>
-			<ymax>805</ymax>
+			<xmin>17</xmin>
+			<ymin>735</ymin>
+			<xmax>178</xmax>
+			<ymax>813</ymax>
 		</bndbox>
 		<text>1&#181;F</text>
 	</object>
@@ -438,4 +439,17 @@
 			<ymax>114</ymax>
 		</bndbox>
 	</object>
+	<object>
+		<name>text</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>64</xmin>
+			<ymin>673</ymin>
+			<xmax>148</xmax>
+			<ymax>736</ymax>
+		</bndbox>
+		<text>C1</text>
+	</object>
 </annotation>
diff --git a/drafter_3/annotations/C25_D2_P1.xml b/drafter_3/annotations/C25_D2_P1.xml
index 069e052a034f20aa82cb475ff8db4b4c7b002d23..3918f487751fbd6bdc66a61a378d2f99c8691272 100644
--- a/drafter_3/annotations/C25_D2_P1.xml
+++ b/drafter_3/annotations/C25_D2_P1.xml
@@ -196,6 +196,7 @@
 			<ymin>327</ymin>
 			<xmax>1085</xmax>
 			<ymax>959</ymax>
+			<rotation>6</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_3/annotations/C25_D2_P2.xml b/drafter_3/annotations/C25_D2_P2.xml
index 5f54597587b137626ca10f03a576a16282e700e1..c4066b4fa4eff10db8b0d5eea40ecd644e930911 100644
--- a/drafter_3/annotations/C25_D2_P2.xml
+++ b/drafter_3/annotations/C25_D2_P2.xml
@@ -195,6 +195,7 @@
 			<ymin>270</ymin>
 			<xmax>955</xmax>
 			<ymax>957</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_3/annotations/C25_D2_P3.xml b/drafter_3/annotations/C25_D2_P3.xml
index cf68674f2ca434e55a772eac8009b3ed8750d5e2..5b4999315846de764a8a827b620b5bb2b5c3a9a6 100644
--- a/drafter_3/annotations/C25_D2_P3.xml
+++ b/drafter_3/annotations/C25_D2_P3.xml
@@ -183,6 +183,7 @@
 			<ymin>272</ymin>
 			<xmax>1199</xmax>
 			<ymax>841</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_3/annotations/C25_D2_P4.xml b/drafter_3/annotations/C25_D2_P4.xml
index 8a8b4fa9b5897632ac88e932166620cff473f62f..2146fb2adf4d241dd0444cde15d932d538fc5fcd 100644
--- a/drafter_3/annotations/C25_D2_P4.xml
+++ b/drafter_3/annotations/C25_D2_P4.xml
@@ -170,6 +170,7 @@
 			<ymin>279</ymin>
 			<xmax>1065</xmax>
 			<ymax>919</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_3/annotations/C26_D1_P1.xml b/drafter_3/annotations/C26_D1_P1.xml
index 2de3d26ba7bb644a91ccaa698eec645d161c2aa9..1efb6a01dd6f57eb99b3856a5bdae02b33fe91a2 100644
--- a/drafter_3/annotations/C26_D1_P1.xml
+++ b/drafter_3/annotations/C26_D1_P1.xml
@@ -195,6 +195,7 @@
 			<ymin>487</ymin>
 			<xmax>1067</xmax>
 			<ymax>574</ymax>
+			<rotation>8</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_3/annotations/C26_D1_P2.xml b/drafter_3/annotations/C26_D1_P2.xml
index b529ddfde8fe6d77e2e3e9943cc9443795428adc..cab7faec6fe3a59bdf5f741b647b48dfc6714c43 100644
--- a/drafter_3/annotations/C26_D1_P2.xml
+++ b/drafter_3/annotations/C26_D1_P2.xml
@@ -207,6 +207,7 @@
 			<ymin>352</ymin>
 			<xmax>970</xmax>
 			<ymax>417</ymax>
+			<rotation>8</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_3/annotations/C26_D1_P3.xml b/drafter_3/annotations/C26_D1_P3.xml
index 4a23c7b1fc242716c2f669a084c072cd801936af..cb59a5e1c4088549cfd8a72db15ae901e269bbe4 100644
--- a/drafter_3/annotations/C26_D1_P3.xml
+++ b/drafter_3/annotations/C26_D1_P3.xml
@@ -94,7 +94,7 @@
 			<ymin>205</ymin>
 			<xmax>783</xmax>
 			<ymax>295</ymax>
-			<rotation>86</rotation>
+			<rotation>94</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -107,7 +107,7 @@
 			<ymin>413</ymin>
 			<xmax>1214</xmax>
 			<ymax>527</ymax>
-			<rotation>84</rotation>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_3/annotations/C27_D1_P1.xml b/drafter_3/annotations/C27_D1_P1.xml
index 569f60fcb7c3f5299cb18ad1244a2f856c3aceb6..c7d6f2800401638954126af49a041a3b6f12bda2 100644
--- a/drafter_3/annotations/C27_D1_P1.xml
+++ b/drafter_3/annotations/C27_D1_P1.xml
@@ -146,6 +146,7 @@
 			<ymin>216</ymin>
 			<xmax>1194</xmax>
 			<ymax>288</ymax>
+			<rotation>6</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -352,10 +353,10 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>791</xmin>
+			<xmin>788</xmin>
 			<ymin>327</ymin>
 			<xmax>858</xmax>
-			<ymax>365</ymax>
+			<ymax>363</ymax>
 		</bndbox>
 		<text>1nf</text>
 	</object>
diff --git a/drafter_3/annotations/C27_D1_P2.xml b/drafter_3/annotations/C27_D1_P2.xml
index 48c1ed3d2dd6f44f5b97f57c35816e30036bee99..1712774fd4a957b5aef9e641e3fb8ab30efa4875 100644
--- a/drafter_3/annotations/C27_D1_P2.xml
+++ b/drafter_3/annotations/C27_D1_P2.xml
@@ -17,10 +17,10 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>131</xmin>
+			<xmin>129</xmin>
 			<ymin>202</ymin>
-			<xmax>262</xmax>
-			<ymax>266</ymax>
+			<xmax>269</xmax>
+			<ymax>274</ymax>
 		</bndbox>
 		<text>150pF</text>
 	</object>
@@ -35,7 +35,7 @@
 			<xmax>256</xmax>
 			<ymax>527</ymax>
 		</bndbox>
-		<text>100&#937;</text>
+		<text>100</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -48,7 +48,7 @@
 			<xmax>548</xmax>
 			<ymax>502</ymax>
 		</bndbox>
-		<text>1K&#937;</text>
+		<text>1K</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -74,7 +74,7 @@
 			<xmax>951</xmax>
 			<ymax>483</ymax>
 		</bndbox>
-		<text>1&#181;F</text>
+		<text>1nF</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -87,7 +87,7 @@
 			<xmax>1202</xmax>
 			<ymax>523</ymax>
 		</bndbox>
-		<text>51&#181;F</text>
+		<text>51nF</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -96,11 +96,11 @@
 		<difficult>0</difficult>
 		<bndbox>
 			<xmin>1256</xmin>
-			<ymin>95</ymin>
-			<xmax>1331</xmax>
+			<ymin>101</ymin>
+			<xmax>1335</xmax>
 			<ymax>141</ymax>
 		</bndbox>
-		<text>100&#937;</text>
+		<text>100</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -224,6 +224,7 @@
 			<ymin>280</ymin>
 			<xmax>1441</xmax>
 			<ymax>371</ymax>
+			<rotation>8</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_3/annotations/C27_D1_P3.xml b/drafter_3/annotations/C27_D1_P3.xml
index 3f540afedc58264a881103b0dc6fdc83e78b1c8f..edd7c113261f2b10759119c6f72c2d3a1fc09938 100644
--- a/drafter_3/annotations/C27_D1_P3.xml
+++ b/drafter_3/annotations/C27_D1_P3.xml
@@ -234,6 +234,7 @@
 			<ymin>649</ymin>
 			<xmax>553</xmax>
 			<ymax>742</ymax>
+			<rotation>6</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -246,6 +247,7 @@
 			<ymin>638</ymin>
 			<xmax>829</xmax>
 			<ymax>741</ymax>
+			<rotation>2</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -258,6 +260,7 @@
 			<ymin>616</ymin>
 			<xmax>993</xmax>
 			<ymax>742</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -282,6 +285,7 @@
 			<ymin>550</ymin>
 			<xmax>1441</xmax>
 			<ymax>651</ymax>
+			<rotation>2</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_3/annotations/C27_D1_P4.xml b/drafter_3/annotations/C27_D1_P4.xml
index d408f2e199aa0f6630ee94417a532da2fed877b9..fb64c9db378048737e6e926b0093d9fa29c859c2 100644
--- a/drafter_3/annotations/C27_D1_P4.xml
+++ b/drafter_3/annotations/C27_D1_P4.xml
@@ -184,11 +184,11 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>1203</xmin>
+			<xmin>1206</xmin>
 			<ymin>48</ymin>
-			<xmax>1237</xmax>
-			<ymax>90</ymax>
-			<rotation>270</rotation>
+			<xmax>1235</xmax>
+			<ymax>95</ymax>
+			<rotation>283</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -323,6 +323,7 @@
 			<ymin>489</ymin>
 			<xmax>848</xmax>
 			<ymax>625</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -347,6 +348,7 @@
 			<ymin>436</ymin>
 			<xmax>1422</xmax>
 			<ymax>543</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_3/annotations/C27_D2_P1.xml b/drafter_3/annotations/C27_D2_P1.xml
index b3d5668d1680f87928dd07b83e05f27a6ba47f58..91cbf03aec41d9c38e4e20eaebafbb1091f6c659 100644
--- a/drafter_3/annotations/C27_D2_P1.xml
+++ b/drafter_3/annotations/C27_D2_P1.xml
@@ -122,6 +122,7 @@
 			<ymin>277</ymin>
 			<xmax>1101</xmax>
 			<ymax>316</ymax>
+			<rotation>189</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -195,6 +196,7 @@
 			<ymin>240</ymin>
 			<xmax>1397</xmax>
 			<ymax>319</ymax>
+			<rotation>6</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -207,6 +209,7 @@
 			<ymin>287</ymin>
 			<xmax>584</xmax>
 			<ymax>358</ymax>
+			<rotation>2</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_3/annotations/C27_D2_P2.xml b/drafter_3/annotations/C27_D2_P2.xml
index ee368a45cb0e63b325b1c7a6c04a7a237583f1b6..7685174bae542ec180050ec07e31735397807dc1 100644
--- a/drafter_3/annotations/C27_D2_P2.xml
+++ b/drafter_3/annotations/C27_D2_P2.xml
@@ -156,6 +156,7 @@
 			<ymin>300</ymin>
 			<xmax>1027</xmax>
 			<ymax>349</ymax>
+			<rotation>13</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -228,6 +229,7 @@
 			<ymin>259</ymin>
 			<xmax>1387</xmax>
 			<ymax>349</ymax>
+			<rotation>6</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -266,7 +268,7 @@
 			<ymin>67</ymin>
 			<xmax>1368</xmax>
 			<ymax>135</ymax>
-			<rotation>86</rotation>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_3/annotations/C27_D2_P3.xml b/drafter_3/annotations/C27_D2_P3.xml
index 1cc821ae8cbe69c815d1c66b964a05b7e9a8fa30..77b8c2c7fce8f6681b4cddfc1db6296a20d8af7c 100644
--- a/drafter_3/annotations/C27_D2_P3.xml
+++ b/drafter_3/annotations/C27_D2_P3.xml
@@ -72,6 +72,7 @@
 			<ymin>185</ymin>
 			<xmax>1441</xmax>
 			<ymax>256</ymax>
+			<rotation>10</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -108,7 +109,7 @@
 			<ymin>324</ymin>
 			<xmax>859</xmax>
 			<ymax>369</ymax>
-			<rotation>84</rotation>
+			<rotation>92</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -121,7 +122,7 @@
 			<ymin>297</ymin>
 			<xmax>1281</xmax>
 			<ymax>335</ymax>
-			<rotation>86</rotation>
+			<rotation>96</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -230,6 +231,7 @@
 			<ymin>454</ymin>
 			<xmax>907</xmax>
 			<ymax>555</ymax>
+			<rotation>6</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -242,6 +244,7 @@
 			<ymin>425</ymin>
 			<xmax>1341</xmax>
 			<ymax>522</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_3/annotations/C27_D2_P4.xml b/drafter_3/annotations/C27_D2_P4.xml
index b13d5b555a79936a2fc429e8daf06fb2f258f377..471cd717ae2675ec924d3e70618a3c8418e49103 100644
--- a/drafter_3/annotations/C27_D2_P4.xml
+++ b/drafter_3/annotations/C27_D2_P4.xml
@@ -70,7 +70,7 @@
 			<ymin>383</ymin>
 			<xmax>947</xmax>
 			<ymax>439</ymax>
-			<rotation>85</rotation>
+			<rotation>94</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -83,7 +83,7 @@
 			<ymin>363</ymin>
 			<xmax>1324</xmax>
 			<ymax>402</ymax>
-			<rotation>86</rotation>
+			<rotation>92</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -96,7 +96,7 @@
 			<ymin>369</ymin>
 			<xmax>473</xmax>
 			<ymax>486</ymax>
-			<rotation>84</rotation>
+			<rotation>92</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -243,6 +243,7 @@
 			<ymin>540</ymin>
 			<xmax>991</xmax>
 			<ymax>639</ymax>
+			<rotation>6</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_3/annotations/C28_D1_P1.xml b/drafter_3/annotations/C28_D1_P1.xml
index 1c6c2d216edf35dca84aa29494d3bd0c333ff0da..19895bf3be1bdadc5321e360623e1862fa2bba16 100644
--- a/drafter_3/annotations/C28_D1_P1.xml
+++ b/drafter_3/annotations/C28_D1_P1.xml
@@ -53,10 +53,10 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>385</xmin>
-			<ymin>396</ymin>
-			<xmax>471</xmax>
-			<ymax>519</ymax>
+			<xmin>387</xmin>
+			<ymin>398</ymin>
+			<xmax>470</xmax>
+			<ymax>518</ymax>
 		</bndbox>
 	</object>
 	<object>
@@ -172,7 +172,7 @@
 			<ymin>632</ymin>
 			<xmax>457</xmax>
 			<ymax>691</ymax>
-			<rotation>94</rotation>
+			<rotation>79</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -407,7 +407,7 @@
 			<xmax>601</xmax>
 			<ymax>505</ymax>
 		</bndbox>
-		<text>Rd</text>
+		<text>RD</text>
 	</object>
 	<object>
 		<name>terminal</name>
@@ -432,7 +432,7 @@
 			<xmax>518</xmax>
 			<ymax>690</ymax>
 		</bndbox>
-		<text>Rd</text>
+		<text>RD</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -445,7 +445,7 @@
 			<xmax>628</xmax>
 			<ymax>647</ymax>
 		</bndbox>
-		<text>Rk</text>
+		<text>RK</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -458,7 +458,7 @@
 			<xmax>767</xmax>
 			<ymax>443</ymax>
 		</bndbox>
-		<text>Cc</text>
+		<text>CC</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -484,7 +484,7 @@
 			<xmax>1043</xmax>
 			<ymax>556</ymax>
 		</bndbox>
-		<text>Cf</text>
+		<text>CF</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -497,7 +497,7 @@
 			<xmax>839</xmax>
 			<ymax>249</ymax>
 		</bndbox>
-		<text>Rl</text>
+		<text>RL</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -510,7 +510,7 @@
 			<xmax>912</xmax>
 			<ymax>291</ymax>
 		</bndbox>
-		<text>Cc</text>
+		<text>CC</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -536,7 +536,7 @@
 			<xmax>1499</xmax>
 			<ymax>173</ymax>
 		</bndbox>
-		<text>Vcc</text>
+		<text>VCC</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -549,7 +549,7 @@
 			<xmax>1349</xmax>
 			<ymax>545</ymax>
 		</bndbox>
-		<text>Cf</text>
+		<text>CF</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -562,7 +562,7 @@
 			<xmax>1495</xmax>
 			<ymax>396</ymax>
 		</bndbox>
-		<text>Af</text>
+		<text>AF out</text>
 	</object>
 	<object>
 		<name>junction</name>
@@ -696,4 +696,30 @@
 			<ymax>598</ymax>
 		</bndbox>
 	</object>
+	<object>
+		<name>inductor</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>389</xmin>
+			<ymin>419</ymin>
+			<xmax>418</xmax>
+			<ymax>516</ymax>
+			<rotation>95</rotation>
+		</bndbox>
+	</object>
+	<object>
+		<name>inductor</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>434</xmin>
+			<ymin>400</ymin>
+			<xmax>468</xmax>
+			<ymax>512</ymax>
+			<rotation>95</rotation>
+		</bndbox>
+	</object>
 </annotation>
diff --git a/drafter_3/annotations/C28_D1_P2.xml b/drafter_3/annotations/C28_D1_P2.xml
index c01f816e98d3b7b637ee7931d59592f66aa347b5..6f4a7363d02aee2bbbe31e18789386bf9fd42325 100644
--- a/drafter_3/annotations/C28_D1_P2.xml
+++ b/drafter_3/annotations/C28_D1_P2.xml
@@ -129,10 +129,10 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>410</xmin>
-			<ymin>250</ymin>
-			<xmax>507</xmax>
-			<ymax>368</ymax>
+			<xmin>412</xmin>
+			<ymin>252</ymin>
+			<xmax>512</xmax>
+			<ymax>367</ymax>
 		</bndbox>
 	</object>
 	<object>
@@ -145,7 +145,7 @@
 			<ymin>490</ymin>
 			<xmax>494</xmax>
 			<ymax>565</ymax>
-			<rotation>93</rotation>
+			<rotation>77</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -171,7 +171,7 @@
 			<ymin>63</ymin>
 			<xmax>853</xmax>
 			<ymax>138</ymax>
-			<rotation>78</rotation>
+			<rotation>98</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -390,7 +390,7 @@
 			<xmax>215</xmax>
 			<ymax>579</ymax>
 		</bndbox>
-		<text>Cb</text>
+		<text>CB</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -403,7 +403,7 @@
 			<xmax>575</xmax>
 			<ymax>561</ymax>
 		</bndbox>
-		<text>Rd</text>
+		<text>RD</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -416,7 +416,7 @@
 			<xmax>719</xmax>
 			<ymax>499</ymax>
 		</bndbox>
-		<text>Rk</text>
+		<text>RK</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -429,7 +429,7 @@
 			<xmax>675</xmax>
 			<ymax>346</ymax>
 		</bndbox>
-		<text>Rd</text>
+		<text>RD</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -442,7 +442,7 @@
 			<xmax>859</xmax>
 			<ymax>284</ymax>
 		</bndbox>
-		<text>Cc</text>
+		<text>CC</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -455,7 +455,7 @@
 			<xmax>1197</xmax>
 			<ymax>377</ymax>
 		</bndbox>
-		<text>Cf</text>
+		<text>CF</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -481,7 +481,7 @@
 			<xmax>908</xmax>
 			<ymax>123</ymax>
 		</bndbox>
-		<text>Rl</text>
+		<text>RL</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -507,7 +507,7 @@
 			<xmax>1504</xmax>
 			<ymax>60</ymax>
 		</bndbox>
-		<text>Vcc</text>
+		<text>VCC</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -520,7 +520,7 @@
 			<xmax>1577</xmax>
 			<ymax>224</ymax>
 		</bndbox>
-		<text>AF</text>
+		<text>AF out</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -533,7 +533,7 @@
 			<xmax>1523</xmax>
 			<ymax>356</ymax>
 		</bndbox>
-		<text>Cf</text>
+		<text>CF</text>
 	</object>
 	<object>
 		<name>junction</name>
@@ -691,6 +691,32 @@
 			<xmax>100</xmax>
 			<ymax>348</ymax>
 		</bndbox>
-		<text>SSB in</text>
+		<text>B in</text>
+	</object>
+	<object>
+		<name>inductor</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>414</xmin>
+			<ymin>272</ymin>
+			<xmax>449</xmax>
+			<ymax>365</ymax>
+			<rotation>90</rotation>
+		</bndbox>
+	</object>
+	<object>
+		<name>inductor</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>472</xmin>
+			<ymin>254</ymin>
+			<xmax>510</xmax>
+			<ymax>363</ymax>
+			<rotation>90</rotation>
+		</bndbox>
 	</object>
 </annotation>
diff --git a/drafter_3/annotations/C28_D1_P3.xml b/drafter_3/annotations/C28_D1_P3.xml
index 4d3b94d344b1d76c7344b90f2e50ef9516b77a75..d083ff5a90b7976ed8f04f8b73c332649a15d619 100644
--- a/drafter_3/annotations/C28_D1_P3.xml
+++ b/drafter_3/annotations/C28_D1_P3.xml
@@ -78,9 +78,9 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>274</xmin>
-			<ymin>402</ymin>
-			<xmax>354</xmax>
+			<xmin>276</xmin>
+			<ymin>407</ymin>
+			<xmax>361</xmax>
 			<ymax>533</ymax>
 		</bndbox>
 	</object>
@@ -157,7 +157,7 @@
 			<ymin>658</ymin>
 			<xmax>335</xmax>
 			<ymax>722</ymax>
-			<rotation>97</rotation>
+			<rotation>81</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -170,7 +170,7 @@
 			<ymin>418</ymin>
 			<xmax>436</xmax>
 			<ymax>502</ymax>
-			<rotation>98</rotation>
+			<rotation>83</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -206,10 +206,10 @@
 		<difficult>0</difficult>
 		<bndbox>
 			<xmin>1018</xmin>
-			<ymin>231</ymin>
+			<ymin>233</ymin>
 			<xmax>1118</xmax>
-			<ymax>265</ymax>
-			<rotation>185</rotation>
+			<ymax>268</ymax>
+			<rotation>196</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -536,7 +536,7 @@
 			<xmax>522</xmax>
 			<ymax>664</ymax>
 		</bndbox>
-		<text>Rk</text>
+		<text>RK</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -549,7 +549,7 @@
 			<xmax>397</xmax>
 			<ymax>722</ymax>
 		</bndbox>
-		<text>Rd</text>
+		<text>RD</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -601,7 +601,7 @@
 			<xmax>52</xmax>
 			<ymax>517</ymax>
 		</bndbox>
-		<text>SSB in</text>
+		<text>in</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -614,7 +614,7 @@
 			<xmax>1010</xmax>
 			<ymax>522</ymax>
 		</bndbox>
-		<text>Cf</text>
+		<text>CF</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -627,7 +627,7 @@
 			<xmax>1418</xmax>
 			<ymax>479</ymax>
 		</bndbox>
-		<text>Cf</text>
+		<text>CF</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -640,7 +640,7 @@
 			<xmax>1582</xmax>
 			<ymax>282</ymax>
 		</bndbox>
-		<text>Af</text>
+		<text>AF out</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -666,7 +666,7 @@
 			<xmax>851</xmax>
 			<ymax>249</ymax>
 		</bndbox>
-		<text>Cc</text>
+		<text>CC</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -679,7 +679,7 @@
 			<xmax>767</xmax>
 			<ymax>214</ymax>
 		</bndbox>
-		<text>Rl</text>
+		<text>RL</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -694,4 +694,30 @@
 		</bndbox>
 		<text>VCC</text>
 	</object>
+	<object>
+		<name>inductor</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>278</xmin>
+			<ymin>431</ymin>
+			<xmax>309</xmax>
+			<ymax>531</ymax>
+			<rotation>85</rotation>
+		</bndbox>
+	</object>
+	<object>
+		<name>inductor</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>328</xmin>
+			<ymin>409</ymin>
+			<xmax>359</xmax>
+			<ymax>526</ymax>
+			<rotation>90</rotation>
+		</bndbox>
+	</object>
 </annotation>
diff --git a/drafter_3/annotations/C28_D1_P4.xml b/drafter_3/annotations/C28_D1_P4.xml
index 7b620843cb599ae1dff0fa28298bf60801eda29d..5a356d25b27dbd89c5cf0e5cd1db6a2e1e13d374 100644
--- a/drafter_3/annotations/C28_D1_P4.xml
+++ b/drafter_3/annotations/C28_D1_P4.xml
@@ -141,10 +141,10 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>433</xmin>
-			<ymin>346</ymin>
-			<xmax>538</xmax>
-			<ymax>497</ymax>
+			<xmin>434</xmin>
+			<ymin>348</ymin>
+			<xmax>539</xmax>
+			<ymax>494</ymax>
 		</bndbox>
 	</object>
 	<object>
@@ -390,7 +390,7 @@
 			<xmax>81</xmax>
 			<ymax>454</ymax>
 		</bndbox>
-		<text>SSB in</text>
+		<text>in</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -403,7 +403,7 @@
 			<xmax>272</xmax>
 			<ymax>747</ymax>
 		</bndbox>
-		<text>Cb</text>
+		<text>CB</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -416,7 +416,7 @@
 			<xmax>618</xmax>
 			<ymax>719</ymax>
 		</bndbox>
-		<text>Rd</text>
+		<text>RD</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -429,7 +429,7 @@
 			<xmax>710</xmax>
 			<ymax>473</ymax>
 		</bndbox>
-		<text>Rd</text>
+		<text>RD</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -442,7 +442,7 @@
 			<xmax>754</xmax>
 			<ymax>649</ymax>
 		</bndbox>
-		<text>Rk</text>
+		<text>RK</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -468,7 +468,7 @@
 			<xmax>900</xmax>
 			<ymax>395</ymax>
 		</bndbox>
-		<text>Cc</text>
+		<text>CC</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -481,7 +481,7 @@
 			<xmax>962</xmax>
 			<ymax>179</ymax>
 		</bndbox>
-		<text>Rl</text>
+		<text>RL</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -494,7 +494,7 @@
 			<xmax>1043</xmax>
 			<ymax>228</ymax>
 		</bndbox>
-		<text>Cc</text>
+		<text>CC</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -520,7 +520,7 @@
 			<xmax>1210</xmax>
 			<ymax>512</ymax>
 		</bndbox>
-		<text>Cf</text>
+		<text>CF</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -533,7 +533,7 @@
 			<xmax>1507</xmax>
 			<ymax>489</ymax>
 		</bndbox>
-		<text>Cf</text>
+		<text>CF</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -546,7 +546,7 @@
 			<xmax>1599</xmax>
 			<ymax>329</ymax>
 		</bndbox>
-		<text>AF</text>
+		<text>AF out</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -693,4 +693,30 @@
 			<ymax>330</ymax>
 		</bndbox>
 	</object>
+	<object>
+		<name>inductor</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>436</xmin>
+			<ymin>376</ymin>
+			<xmax>469</xmax>
+			<ymax>492</ymax>
+			<rotation>90</rotation>
+		</bndbox>
+	</object>
+	<object>
+		<name>inductor</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>492</xmin>
+			<ymin>350</ymin>
+			<xmax>537</xmax>
+			<ymax>489</ymax>
+			<rotation>105</rotation>
+		</bndbox>
+	</object>
 </annotation>
diff --git a/drafter_3/annotations/C28_D2_P1.xml b/drafter_3/annotations/C28_D2_P1.xml
index 56df3b4b23fbc58b145cc2abce748f8f6f2d562f..e926d3e2aca624b55fa21cad04966b2140f7debb 100644
--- a/drafter_3/annotations/C28_D2_P1.xml
+++ b/drafter_3/annotations/C28_D2_P1.xml
@@ -95,7 +95,7 @@
 			<ymin>418</ymin>
 			<xmax>883</xmax>
 			<ymax>478</ymax>
-			<rotation>0</rotation>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -108,7 +108,6 @@
 			<ymin>183</ymin>
 			<xmax>1002</xmax>
 			<ymax>247</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -121,7 +120,7 @@
 			<ymin>436</ymin>
 			<xmax>1173</xmax>
 			<ymax>481</ymax>
-			<rotation>82</rotation>
+			<rotation>96</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -134,7 +133,7 @@
 			<ymin>405</ymin>
 			<xmax>1456</xmax>
 			<ymax>450</ymax>
-			<rotation>82</rotation>
+			<rotation>94</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -143,10 +142,10 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>382</xmin>
-			<ymin>338</ymin>
-			<xmax>535</xmax>
-			<ymax>532</ymax>
+			<xmin>379</xmin>
+			<ymin>341</ymin>
+			<xmax>540</xmax>
+			<ymax>528</ymax>
 		</bndbox>
 	</object>
 	<object>
@@ -159,7 +158,7 @@
 			<ymin>247</ymin>
 			<xmax>781</xmax>
 			<ymax>335</ymax>
-			<rotation>0</rotation>
+			<rotation>6</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -172,7 +171,7 @@
 			<ymin>697</ymin>
 			<xmax>568</xmax>
 			<ymax>807</ymax>
-			<rotation>77</rotation>
+			<rotation>94</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -185,7 +184,7 @@
 			<ymin>602</ymin>
 			<xmax>795</xmax>
 			<ymax>702</ymax>
-			<rotation>81</rotation>
+			<rotation>94</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -198,7 +197,7 @@
 			<ymin>376</ymin>
 			<xmax>653</xmax>
 			<ymax>480</ymax>
-			<rotation>78</rotation>
+			<rotation>94</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -224,7 +223,6 @@
 			<ymin>177</ymin>
 			<xmax>1335</xmax>
 			<ymax>211</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -503,4 +501,30 @@
 			<ymax>106</ymax>
 		</bndbox>
 	</object>
+	<object>
+		<name>inductor</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>381</xmin>
+			<ymin>343</ymin>
+			<xmax>431</xmax>
+			<ymax>524</ymax>
+			<rotation>105</rotation>
+		</bndbox>
+	</object>
+	<object>
+		<name>inductor</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>465</xmin>
+			<ymin>343</ymin>
+			<xmax>538</xmax>
+			<ymax>526</ymax>
+			<rotation>105</rotation>
+		</bndbox>
+	</object>
 </annotation>
diff --git a/drafter_3/annotations/C28_D2_P2.xml b/drafter_3/annotations/C28_D2_P2.xml
index 51b9b94eafbc411d1b2cc15f929eadb55c8b42fa..5250d3187c3906bbdf939dd7f922d1d7aa709186 100644
--- a/drafter_3/annotations/C28_D2_P2.xml
+++ b/drafter_3/annotations/C28_D2_P2.xml
@@ -78,10 +78,10 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>410</xmin>
-			<ymin>219</ymin>
-			<xmax>569</xmax>
-			<ymax>388</ymax>
+			<xmin>408</xmin>
+			<ymin>222</ymin>
+			<xmax>574</xmax>
+			<ymax>383</ymax>
 		</bndbox>
 	</object>
 	<object>
@@ -94,7 +94,7 @@
 			<ymin>165</ymin>
 			<xmax>809</xmax>
 			<ymax>225</ymax>
-			<rotation>0</rotation>
+			<rotation>8</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -120,7 +120,6 @@
 			<ymin>124</ymin>
 			<xmax>1017</xmax>
 			<ymax>163</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -133,7 +132,7 @@
 			<ymin>300</ymin>
 			<xmax>915</xmax>
 			<ymax>345</ymax>
-			<rotation>0</rotation>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -146,7 +145,7 @@
 			<ymin>317</ymin>
 			<xmax>1210</xmax>
 			<ymax>363</ymax>
-			<rotation>77</rotation>
+			<rotation>98</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -159,7 +158,7 @@
 			<ymin>304</ymin>
 			<xmax>1480</xmax>
 			<ymax>342</ymax>
-			<rotation>77</rotation>
+			<rotation>102</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -185,7 +184,7 @@
 			<ymin>531</ymin>
 			<xmax>586</xmax>
 			<ymax>648</ymax>
-			<rotation>79</rotation>
+			<rotation>92</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -198,7 +197,7 @@
 			<ymin>456</ymin>
 			<xmax>836</xmax>
 			<ymax>547</ymax>
-			<rotation>81</rotation>
+			<rotation>102</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -211,7 +210,7 @@
 			<ymin>61</ymin>
 			<xmax>878</xmax>
 			<ymax>116</ymax>
-			<rotation>82</rotation>
+			<rotation>98</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -224,7 +223,6 @@
 			<ymin>122</ymin>
 			<xmax>1333</xmax>
 			<ymax>156</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -503,4 +501,30 @@
 			<ymax>58</ymax>
 		</bndbox>
 	</object>
+	<object>
+		<name>inductor</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>410</xmin>
+			<ymin>224</ymin>
+			<xmax>467</xmax>
+			<ymax>368</ymax>
+			<rotation>100</rotation>
+		</bndbox>
+	</object>
+	<object>
+		<name>inductor</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>503</xmin>
+			<ymin>232</ymin>
+			<xmax>572</xmax>
+			<ymax>381</ymax>
+			<rotation>95</rotation>
+		</bndbox>
+	</object>
 </annotation>
diff --git a/drafter_3/annotations/C28_D2_P3.xml b/drafter_3/annotations/C28_D2_P3.xml
index e5e11df31ef5e7d27370d32d5f1e652a32064b93..ed48b090f9ca0a6342bccbeb0314613b78c84ff4 100644
--- a/drafter_3/annotations/C28_D2_P3.xml
+++ b/drafter_3/annotations/C28_D2_P3.xml
@@ -78,10 +78,10 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>316</xmin>
-			<ymin>322</ymin>
-			<xmax>447</xmax>
-			<ymax>490</ymax>
+			<xmin>315</xmin>
+			<ymin>324</ymin>
+			<xmax>450</xmax>
+			<ymax>488</ymax>
 		</bndbox>
 	</object>
 	<object>
@@ -500,4 +500,30 @@
 			<ymax>218</ymax>
 		</bndbox>
 	</object>
+	<object>
+		<name>inductor</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>317</xmin>
+			<ymin>325</ymin>
+			<xmax>363</xmax>
+			<ymax>474</ymax>
+			<rotation>95</rotation>
+		</bndbox>
+	</object>
+	<object>
+		<name>inductor</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>395</xmin>
+			<ymin>326</ymin>
+			<xmax>448</xmax>
+			<ymax>486</ymax>
+			<rotation>90</rotation>
+		</bndbox>
+	</object>
 </annotation>
diff --git a/drafter_3/annotations/C28_D2_P4.xml b/drafter_3/annotations/C28_D2_P4.xml
index c8d9069822e8e758010af970339f08c38a3644ca..ee9e1d96db587dd1fce03afcf0abbcbeb9ae2fe9 100644
--- a/drafter_3/annotations/C28_D2_P4.xml
+++ b/drafter_3/annotations/C28_D2_P4.xml
@@ -199,9 +199,9 @@
 		<difficult>0</difficult>
 		<bndbox>
 			<xmin>460</xmin>
-			<ymin>252</ymin>
-			<xmax>638</xmax>
-			<ymax>473</ymax>
+			<ymin>254</ymin>
+			<xmax>643</xmax>
+			<ymax>472</ymax>
 		</bndbox>
 	</object>
 	<object>
@@ -214,6 +214,7 @@
 			<ymin>205</ymin>
 			<xmax>885</xmax>
 			<ymax>283</ymax>
+			<rotation>6</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -501,4 +502,30 @@
 			<ymax>864</ymax>
 		</bndbox>
 	</object>
+	<object>
+		<name>inductor</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>461</xmin>
+			<ymin>256</ymin>
+			<xmax>520</xmax>
+			<ymax>455</ymax>
+			<rotation>100</rotation>
+		</bndbox>
+	</object>
+	<object>
+		<name>inductor</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>558</xmin>
+			<ymin>276</ymin>
+			<xmax>640</xmax>
+			<ymax>470</ymax>
+			<rotation>100</rotation>
+		</bndbox>
+	</object>
 </annotation>
diff --git a/drafter_3/annotations/C29_D1_P1.xml b/drafter_3/annotations/C29_D1_P1.xml
index 3fd9cdad50ba9668c312ac78aa916b45058592c5..44d3a2707fa25a43457703cd59340bb675ac9325 100644
--- a/drafter_3/annotations/C29_D1_P1.xml
+++ b/drafter_3/annotations/C29_D1_P1.xml
@@ -123,7 +123,7 @@
 			<ymin>300</ymin>
 			<xmax>290</xmax>
 			<ymax>404</ymax>
-			<rotation>5</rotation>
+			<rotation>358</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -150,7 +150,7 @@
 			<xmax>863</xmax>
 			<ymax>365</ymax>
 		</bndbox>
-		<text>diode rectifier</text>
+		<text>Diode rectifier</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -163,7 +163,7 @@
 			<xmax>1294</xmax>
 			<ymax>430</ymax>
 		</bndbox>
-		<text>switch</text>
+		<text>Switch</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_3/annotations/C29_D1_P2.xml b/drafter_3/annotations/C29_D1_P2.xml
index f4705fd5e5555648cca549b4849ef740cfc988ae..84eb638ba5dc431561b0464e61674bc14daae0d5 100644
--- a/drafter_3/annotations/C29_D1_P2.xml
+++ b/drafter_3/annotations/C29_D1_P2.xml
@@ -21,6 +21,7 @@
 			<ymin>120</ymin>
 			<xmax>203</xmax>
 			<ymax>212</ymax>
+			<rotation>350</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -122,7 +123,7 @@
 			<ymin>354</ymin>
 			<xmax>1165</xmax>
 			<ymax>413</ymax>
-			<rotation>90</rotation>
+			<rotation>96</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -136,7 +137,7 @@
 			<xmax>902</xmax>
 			<ymax>191</ymax>
 		</bndbox>
-		<text>diode rectifier</text>
+		<text>Diode rectifier</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -162,7 +163,7 @@
 			<xmax>1031</xmax>
 			<ymax>437</ymax>
 		</bndbox>
-		<text>capacitor</text>
+		<text>Capacitor</text>
 	</object>
 	<object>
 		<name>junction</name>
diff --git a/drafter_3/annotations/C29_D1_P3.xml b/drafter_3/annotations/C29_D1_P3.xml
index fff64b962e03de43253a5ef88f38769e8c01eb7a..4e9c54d5b82dc4fb12f8ed91b6b1fb0ff21cc334 100644
--- a/drafter_3/annotations/C29_D1_P3.xml
+++ b/drafter_3/annotations/C29_D1_P3.xml
@@ -46,6 +46,7 @@
 			<ymin>204</ymin>
 			<xmax>142</xmax>
 			<ymax>305</ymax>
+			<rotation>352</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -136,7 +137,7 @@
 			<xmax>730</xmax>
 			<ymax>179</ymax>
 		</bndbox>
-		<text>diode rectifier</text>
+		<text>Diode rectifier</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -149,7 +150,7 @@
 			<xmax>812</xmax>
 			<ymax>478</ymax>
 		</bndbox>
-		<text>capacitor</text>
+		<text>Capacitor</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -162,7 +163,7 @@
 			<xmax>1309</xmax>
 			<ymax>165</ymax>
 		</bndbox>
-		<text>switch</text>
+		<text>Switch</text>
 	</object>
 	<object>
 		<name>junction</name>
diff --git a/drafter_3/annotations/C29_D1_P4.xml b/drafter_3/annotations/C29_D1_P4.xml
index bc6e9dfb70d069e71a13dcd8485f6ba5c3425ec7..477172b1e339449d1da4fc34cfc9feb316ff9578 100644
--- a/drafter_3/annotations/C29_D1_P4.xml
+++ b/drafter_3/annotations/C29_D1_P4.xml
@@ -136,7 +136,7 @@
 			<xmax>1007</xmax>
 			<ymax>314</ymax>
 		</bndbox>
-		<text>diode rectifier</text>
+		<text>Diode rectifier</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -149,7 +149,7 @@
 			<xmax>1452</xmax>
 			<ymax>403</ymax>
 		</bndbox>
-		<text>switch</text>
+		<text>Switch</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -162,7 +162,7 @@
 			<xmax>1120</xmax>
 			<ymax>652</ymax>
 		</bndbox>
-		<text>capacitor</text>
+		<text>Capacitor</text>
 	</object>
 	<object>
 		<name>junction</name>
diff --git a/drafter_3/annotations/C29_D2_P1.xml b/drafter_3/annotations/C29_D2_P1.xml
index d47ac46f0991c86e30157340b919e57d46d04fb2..3260dfcd6e5ec7ae25dd7047900a7775f586d2f6 100644
--- a/drafter_3/annotations/C29_D2_P1.xml
+++ b/drafter_3/annotations/C29_D2_P1.xml
@@ -59,6 +59,7 @@
 			<ymin>191</ymin>
 			<xmax>185</xmax>
 			<ymax>293</ymax>
+			<rotation>354</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_3/annotations/C29_D2_P2.xml b/drafter_3/annotations/C29_D2_P2.xml
index 8c1fb68085a922bc96a9f571ee9f8445ce416930..1dd4a7764e568a0500d185c273fcfbf58d1817bf 100644
--- a/drafter_3/annotations/C29_D2_P2.xml
+++ b/drafter_3/annotations/C29_D2_P2.xml
@@ -45,6 +45,7 @@
 			<ymin>223</ymin>
 			<xmax>151</xmax>
 			<ymax>312</ymax>
+			<rotation>356</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_3/annotations/C29_D2_P3.xml b/drafter_3/annotations/C29_D2_P3.xml
index 36bc3e2ea664fce42ed67ef426751166e147265b..32bec05ffae603486ad13e71f163d41fd5588025 100644
--- a/drafter_3/annotations/C29_D2_P3.xml
+++ b/drafter_3/annotations/C29_D2_P3.xml
@@ -59,6 +59,7 @@
 			<ymin>129</ymin>
 			<xmax>215</xmax>
 			<ymax>202</ymax>
+			<rotation>350</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_3/annotations/C29_D2_P4.xml b/drafter_3/annotations/C29_D2_P4.xml
index f6767dca98aa30e8a5271f60d62020f29be69b0a..f53f9270e80e46f3edb78614510cc267eacf1e53 100644
--- a/drafter_3/annotations/C29_D2_P4.xml
+++ b/drafter_3/annotations/C29_D2_P4.xml
@@ -45,7 +45,7 @@
 			<ymin>210</ymin>
 			<xmax>193</xmax>
 			<ymax>334</ymax>
-			<rotation>5</rotation>
+			<rotation>356</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_3/annotations/C30_D1_P1.xml b/drafter_3/annotations/C30_D1_P1.xml
index ed7cea5ae874a6ab5d91b322d692f3706c998774..d760b093ff5daf986395662be27202c7ecba0a94 100644
--- a/drafter_3/annotations/C30_D1_P1.xml
+++ b/drafter_3/annotations/C30_D1_P1.xml
@@ -21,6 +21,7 @@
 			<ymin>174</ymin>
 			<xmax>236</xmax>
 			<ymax>318</ymax>
+			<rotation>133</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -33,6 +34,7 @@
 			<ymin>198</ymin>
 			<xmax>517</xmax>
 			<ymax>348</ymax>
+			<rotation>44</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -45,6 +47,7 @@
 			<ymin>443</ymin>
 			<xmax>279</xmax>
 			<ymax>585</ymax>
+			<rotation>79</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -57,7 +60,6 @@
 			<ymin>217</ymin>
 			<xmax>908</xmax>
 			<ymax>284</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -83,7 +85,6 @@
 			<ymin>439</ymin>
 			<xmax>893</xmax>
 			<ymax>499</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_3/annotations/C30_D1_P2.xml b/drafter_3/annotations/C30_D1_P2.xml
index 2b07f0655498443d44244fafc26bc675697cc51e..dc071a3ba3ab63423a45ba0b78fb18eb983fea18 100644
--- a/drafter_3/annotations/C30_D1_P2.xml
+++ b/drafter_3/annotations/C30_D1_P2.xml
@@ -21,6 +21,7 @@
 			<ymin>279</ymin>
 			<xmax>206</xmax>
 			<ymax>420</ymax>
+			<rotation>137</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -33,6 +34,7 @@
 			<ymin>534</ymin>
 			<xmax>265</xmax>
 			<ymax>670</ymax>
+			<rotation>81</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -45,6 +47,7 @@
 			<ymin>277</ymin>
 			<xmax>478</xmax>
 			<ymax>435</ymax>
+			<rotation>46</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -57,7 +60,6 @@
 			<ymin>264</ymin>
 			<xmax>841</xmax>
 			<ymax>330</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -70,7 +72,6 @@
 			<ymin>372</ymin>
 			<xmax>847</xmax>
 			<ymax>444</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -83,7 +84,6 @@
 			<ymin>488</ymin>
 			<xmax>834</xmax>
 			<ymax>556</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_3/annotations/C30_D1_P3.xml b/drafter_3/annotations/C30_D1_P3.xml
index fb345bc6e922582d49d7989aeb5ea7aaedda273b..3921dacfeb3e8e9221c7776ec6cde7c81b167025 100644
--- a/drafter_3/annotations/C30_D1_P3.xml
+++ b/drafter_3/annotations/C30_D1_P3.xml
@@ -153,7 +153,6 @@
 			<ymin>344</ymin>
 			<xmax>1033</xmax>
 			<ymax>409</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -166,7 +165,7 @@
 			<ymin>453</ymin>
 			<xmax>1046</xmax>
 			<ymax>524</ymax>
-			<rotation>0</rotation>
+			<rotation>356</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -179,7 +178,6 @@
 			<ymin>563</ymin>
 			<xmax>1037</xmax>
 			<ymax>632</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -192,7 +190,6 @@
 			<ymin>367</ymin>
 			<xmax>1414</xmax>
 			<ymax>435</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -231,6 +228,7 @@
 			<ymin>218</ymin>
 			<xmax>302</xmax>
 			<ymax>404</ymax>
+			<rotation>318</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -243,6 +241,7 @@
 			<ymin>553</ymin>
 			<xmax>412</xmax>
 			<ymax>718</ymax>
+			<rotation>87</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -255,6 +254,7 @@
 			<ymin>294</ymin>
 			<xmax>651</xmax>
 			<ymax>441</ymax>
+			<rotation>42</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_3/annotations/C30_D1_P4.xml b/drafter_3/annotations/C30_D1_P4.xml
index 7da09b40266dafeaf88b0b696ee021c75047573f..a2516f862cc74fe6b7556e84e5fc74557cc24e94 100644
--- a/drafter_3/annotations/C30_D1_P4.xml
+++ b/drafter_3/annotations/C30_D1_P4.xml
@@ -166,7 +166,6 @@
 			<ymin>228</ymin>
 			<xmax>861</xmax>
 			<ymax>289</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -179,7 +178,6 @@
 			<ymin>329</ymin>
 			<xmax>861</xmax>
 			<ymax>394</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -192,7 +190,6 @@
 			<ymin>434</ymin>
 			<xmax>840</xmax>
 			<ymax>500</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -205,7 +202,6 @@
 			<ymin>218</ymin>
 			<xmax>1323</xmax>
 			<ymax>289</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -218,7 +214,6 @@
 			<ymin>336</ymin>
 			<xmax>1281</xmax>
 			<ymax>410</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -231,7 +226,6 @@
 			<ymin>454</ymin>
 			<xmax>1275</xmax>
 			<ymax>524</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -244,6 +238,7 @@
 			<ymin>190</ymin>
 			<xmax>182</xmax>
 			<ymax>321</ymax>
+			<rotation>135</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -256,6 +251,7 @@
 			<ymin>446</ymin>
 			<xmax>215</xmax>
 			<ymax>584</ymax>
+			<rotation>65</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -268,6 +264,7 @@
 			<ymin>210</ymin>
 			<xmax>491</xmax>
 			<ymax>345</ymax>
+			<rotation>45</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_3/annotations/C30_D2_P1.xml b/drafter_3/annotations/C30_D2_P1.xml
index d770f7ded71febe15a8c15343bff6c2aad25a448..55ec2a0373a06a9c99b51b6edb4626535010259e 100644
--- a/drafter_3/annotations/C30_D2_P1.xml
+++ b/drafter_3/annotations/C30_D2_P1.xml
@@ -21,6 +21,7 @@
 			<ymin>225</ymin>
 			<xmax>162</xmax>
 			<ymax>398</ymax>
+			<rotation>121</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -33,6 +34,7 @@
 			<ymin>594</ymin>
 			<xmax>163</xmax>
 			<ymax>825</ymax>
+			<rotation>60</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -45,6 +47,7 @@
 			<ymin>234</ymin>
 			<xmax>464</xmax>
 			<ymax>402</ymax>
+			<rotation>44</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -57,7 +60,6 @@
 			<ymin>204</ymin>
 			<xmax>744</xmax>
 			<ymax>270</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -70,7 +72,6 @@
 			<ymin>309</ymin>
 			<xmax>714</xmax>
 			<ymax>372</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -83,7 +84,6 @@
 			<ymin>426</ymin>
 			<xmax>700</xmax>
 			<ymax>490</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -96,7 +96,6 @@
 			<ymin>204</ymin>
 			<xmax>1184</xmax>
 			<ymax>286</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -109,7 +108,6 @@
 			<ymin>325</ymin>
 			<xmax>1196</xmax>
 			<ymax>406</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_3/annotations/C30_D2_P2.xml b/drafter_3/annotations/C30_D2_P2.xml
index 984894ac07693f7c23fd033b3380828bdce1a6ce..4150b651b74e69965a55f55aaef6048d40f596f4 100644
--- a/drafter_3/annotations/C30_D2_P2.xml
+++ b/drafter_3/annotations/C30_D2_P2.xml
@@ -34,6 +34,7 @@
 			<ymin>304</ymin>
 			<xmax>249</xmax>
 			<ymax>564</ymax>
+			<rotation>131</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -46,6 +47,7 @@
 			<ymin>840</ymin>
 			<xmax>345</xmax>
 			<ymax>1155</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -58,6 +60,7 @@
 			<ymin>361</ymin>
 			<xmax>630</xmax>
 			<ymax>601</ymax>
+			<rotation>45</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -178,7 +181,6 @@
 			<ymin>388</ymin>
 			<xmax>939</xmax>
 			<ymax>467</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -204,7 +206,6 @@
 			<ymin>661</ymin>
 			<xmax>919</xmax>
 			<ymax>736</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -243,7 +244,6 @@
 			<ymin>706</ymin>
 			<xmax>1328</xmax>
 			<ymax>795</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_3/annotations/C30_D2_P3.xml b/drafter_3/annotations/C30_D2_P3.xml
index 17e95e6ce2931b5ccdb635ce73b67c8172aeeb80..023e7528a66d93f9703d5bf4d759e0dbe38f96d8 100644
--- a/drafter_3/annotations/C30_D2_P3.xml
+++ b/drafter_3/annotations/C30_D2_P3.xml
@@ -153,7 +153,7 @@
 			<ymin>282</ymin>
 			<xmax>666</xmax>
 			<ymax>357</ymax>
-			<rotation>356</rotation>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -179,7 +179,6 @@
 			<ymin>530</ymin>
 			<xmax>645</xmax>
 			<ymax>599</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -192,7 +191,7 @@
 			<ymin>231</ymin>
 			<xmax>1108</xmax>
 			<ymax>318</ymax>
-			<rotation>358</rotation>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -205,7 +204,7 @@
 			<ymin>362</ymin>
 			<xmax>1133</xmax>
 			<ymax>465</ymax>
-			<rotation>355</rotation>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -218,7 +217,7 @@
 			<ymin>502</ymin>
 			<xmax>1120</xmax>
 			<ymax>612</ymax>
-			<rotation>0</rotation>
+			<rotation>2</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -231,6 +230,7 @@
 			<ymin>372</ymin>
 			<xmax>177</xmax>
 			<ymax>545</ymax>
+			<rotation>129</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -243,6 +243,7 @@
 			<ymin>722</ymin>
 			<xmax>220</xmax>
 			<ymax>948</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -255,6 +256,7 @@
 			<ymin>331</ymin>
 			<xmax>414</xmax>
 			<ymax>527</ymax>
+			<rotation>45</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -267,7 +269,7 @@
 			<ymin>456</ymin>
 			<xmax>1581</xmax>
 			<ymax>615</ymax>
-			<rotation>86</rotation>
+			<rotation>94</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_3/annotations/C30_D2_P4.xml b/drafter_3/annotations/C30_D2_P4.xml
index 55044b3336355b9a57bbc78d2e4b6ed24e9bfd82..f8718a78c2813a64fe7629aba7a9701aaf31f740 100644
--- a/drafter_3/annotations/C30_D2_P4.xml
+++ b/drafter_3/annotations/C30_D2_P4.xml
@@ -21,7 +21,7 @@
 			<ymin>515</ymin>
 			<xmax>1597</xmax>
 			<ymax>636</ymax>
-			<rotation>86</rotation>
+			<rotation>98</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -179,7 +179,7 @@
 			<ymin>365</ymin>
 			<xmax>824</xmax>
 			<ymax>435</ymax>
-			<rotation>5</rotation>
+			<rotation>358</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -192,7 +192,7 @@
 			<ymin>490</ymin>
 			<xmax>816</xmax>
 			<ymax>565</ymax>
-			<rotation>5</rotation>
+			<rotation>358</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -244,6 +244,7 @@
 			<ymin>247</ymin>
 			<xmax>211</xmax>
 			<ymax>451</ymax>
+			<rotation>129</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -256,6 +257,7 @@
 			<ymin>260</ymin>
 			<xmax>537</xmax>
 			<ymax>460</ymax>
+			<rotation>45</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -268,6 +270,7 @@
 			<ymin>670</ymin>
 			<xmax>274</xmax>
 			<ymax>932</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_3/annotations/C31_D1_P1.xml b/drafter_3/annotations/C31_D1_P1.xml
index ca35d991a517db7ce1798e8c9fce3a3343c1c374..eb9842c08896c2c07f943f6cf1e8fb659325cdd7 100644
--- a/drafter_3/annotations/C31_D1_P1.xml
+++ b/drafter_3/annotations/C31_D1_P1.xml
@@ -58,7 +58,6 @@
 			<ymin>386</ymin>
 			<xmax>1116</xmax>
 			<ymax>422</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -171,6 +170,6 @@
 			<xmax>138</xmax>
 			<ymax>190</ymax>
 		</bndbox>
-		<text>5v</text>
+		<text>5V</text>
 	</object>
 </annotation>
diff --git a/drafter_3/annotations/C31_D1_P2.xml b/drafter_3/annotations/C31_D1_P2.xml
index c4948dec01be0aaf4a89a2951af45beb84a76f76..360a3dc51cdd2f4a1d6c1de962c610a40efc8762 100644
--- a/drafter_3/annotations/C31_D1_P2.xml
+++ b/drafter_3/annotations/C31_D1_P2.xml
@@ -45,7 +45,6 @@
 			<ymin>71</ymin>
 			<xmax>315</xmax>
 			<ymax>99</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -70,7 +69,6 @@
 			<ymin>208</ymin>
 			<xmax>1203</xmax>
 			<ymax>240</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -135,7 +133,7 @@
 			<xmax>123</xmax>
 			<ymax>74</ymax>
 		</bndbox>
-		<text>5v</text>
+		<text>5V</text>
 	</object>
 	<object>
 		<name>junction</name>
diff --git a/drafter_3/annotations/C31_D1_P3.xml b/drafter_3/annotations/C31_D1_P3.xml
index a627d221fdfa5d6843c09d4dd99acac8880e349a..a46f4962a190067c968ee3115a141f424d0ab653 100644
--- a/drafter_3/annotations/C31_D1_P3.xml
+++ b/drafter_3/annotations/C31_D1_P3.xml
@@ -57,7 +57,6 @@
 			<ymin>94</ymin>
 			<xmax>251</xmax>
 			<ymax>131</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -82,7 +81,7 @@
 			<ymin>222</ymin>
 			<xmax>1084</xmax>
 			<ymax>268</ymax>
-			<rotation>0</rotation>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -135,7 +134,7 @@
 			<xmax>96</xmax>
 			<ymax>108</ymax>
 		</bndbox>
-		<text>5v</text>
+		<text>5V</text>
 	</object>
 	<object>
 		<name>junction</name>
diff --git a/drafter_3/annotations/C31_D1_P4.xml b/drafter_3/annotations/C31_D1_P4.xml
index 30911824d9c4e6e76c3c9af8d70f19ce910b5d6e..95e843ab778394591a9c310424d15360ddc08c2b 100644
--- a/drafter_3/annotations/C31_D1_P4.xml
+++ b/drafter_3/annotations/C31_D1_P4.xml
@@ -21,7 +21,7 @@
 			<ymin>280</ymin>
 			<xmax>1287</xmax>
 			<ymax>323</ymax>
-			<rotation>0</rotation>
+			<rotation>8</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -46,7 +46,6 @@
 			<ymin>54</ymin>
 			<xmax>343</xmax>
 			<ymax>97</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -171,6 +170,6 @@
 			<xmax>74</xmax>
 			<ymax>48</ymax>
 		</bndbox>
-		<text>5v</text>
+		<text>5V</text>
 	</object>
 </annotation>
diff --git a/drafter_3/annotations/C31_D2_P1.xml b/drafter_3/annotations/C31_D2_P1.xml
index 79160a81507205a89fefe2fb6fcc935911c844b2..ea85d76dfa90e3641ec2b96eab22ff65c0e54182 100644
--- a/drafter_3/annotations/C31_D2_P1.xml
+++ b/drafter_3/annotations/C31_D2_P1.xml
@@ -96,7 +96,7 @@
 			<xmax>91</xmax>
 			<ymax>71</ymax>
 		</bndbox>
-		<text>5v</text>
+		<text>5V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -109,7 +109,7 @@
 			<xmax>611</xmax>
 			<ymax>170</ymax>
 		</bndbox>
-		<text>switch</text>
+		<text>Switch</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_3/annotations/C31_D2_P2.xml b/drafter_3/annotations/C31_D2_P2.xml
index 03062d775512068541dfbec403de169632d1b334..3583dc1a44350ecfe479ccb2535875f353a9f73a 100644
--- a/drafter_3/annotations/C31_D2_P2.xml
+++ b/drafter_3/annotations/C31_D2_P2.xml
@@ -33,7 +33,7 @@
 			<ymin>198</ymin>
 			<xmax>946</xmax>
 			<ymax>237</ymax>
-			<rotation>0</rotation>
+			<rotation>8</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -46,7 +46,6 @@
 			<ymin>87</ymin>
 			<xmax>193</xmax>
 			<ymax>131</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -96,7 +95,7 @@
 			<xmax>76</xmax>
 			<ymax>96</ymax>
 		</bndbox>
-		<text>5v</text>
+		<text>5V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -109,7 +108,7 @@
 			<xmax>458</xmax>
 			<ymax>155</ymax>
 		</bndbox>
-		<text>switch</text>
+		<text>Switch</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_3/annotations/C31_D2_P3.xml b/drafter_3/annotations/C31_D2_P3.xml
index 931905caf648b8ea59512d5dfe3c6eb5d5aa392c..4c61a6acdcafd018f62655d6c7891880b5234588 100644
--- a/drafter_3/annotations/C31_D2_P3.xml
+++ b/drafter_3/annotations/C31_D2_P3.xml
@@ -57,7 +57,6 @@
 			<ymin>61</ymin>
 			<xmax>252</xmax>
 			<ymax>97</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -82,7 +81,6 @@
 			<ymin>175</ymin>
 			<xmax>1103</xmax>
 			<ymax>207</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -158,7 +156,7 @@
 			<xmax>596</xmax>
 			<ymax>132</ymax>
 		</bndbox>
-		<text>switch</text>
+		<text>Switch</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -171,6 +169,6 @@
 			<xmax>86</xmax>
 			<ymax>62</ymax>
 		</bndbox>
-		<text>5v</text>
+		<text>5V</text>
 	</object>
 </annotation>
diff --git a/drafter_3/annotations/C31_D2_P4.xml b/drafter_3/annotations/C31_D2_P4.xml
index 7bd70e453f55233acabaf6e367a446aaf00741b2..a47ac0a40b2af01f15daff0976cbd994a07d5223 100644
--- a/drafter_3/annotations/C31_D2_P4.xml
+++ b/drafter_3/annotations/C31_D2_P4.xml
@@ -21,7 +21,6 @@
 			<ymin>283</ymin>
 			<xmax>1225</xmax>
 			<ymax>323</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -46,7 +45,6 @@
 			<ymin>17</ymin>
 			<xmax>244</xmax>
 			<ymax>72</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -96,7 +94,7 @@
 			<xmax>681</xmax>
 			<ymax>172</ymax>
 		</bndbox>
-		<text>switch</text>
+		<text>Switch</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_3/annotations/C32_D1_P1.xml b/drafter_3/annotations/C32_D1_P1.xml
index aa91c5dfbb9818545e526a03b0426113b9b46211..ed5028054e3e14ad309d7dde2e898a81e18fd0d3 100644
--- a/drafter_3/annotations/C32_D1_P1.xml
+++ b/drafter_3/annotations/C32_D1_P1.xml
@@ -21,7 +21,7 @@
 			<ymin>253</ymin>
 			<xmax>421</xmax>
 			<ymax>341</ymax>
-			<rotation>94</rotation>
+			<rotation>77</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -84,6 +84,7 @@
 			<ymin>175</ymin>
 			<xmax>877</xmax>
 			<ymax>291</ymax>
+			<rotation>10</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -197,7 +198,7 @@
 			<xmax>1486</xmax>
 			<ymax>491</ymax>
 		</bndbox>
-		<text>9v</text>
+		<text>9V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -210,7 +211,7 @@
 			<xmax>1062</xmax>
 			<ymax>695</ymax>
 		</bndbox>
-		<text>4.7v</text>
+		<text>4.7V</text>
 	</object>
 	<object>
 		<name>junction</name>
diff --git a/drafter_3/annotations/C32_D1_P2.xml b/drafter_3/annotations/C32_D1_P2.xml
index 6afb153e5176c8051deae277fca5c55fa6646266..38f915243d0a64dffba5bcfce0e0c3e9de7c714c 100644
--- a/drafter_3/annotations/C32_D1_P2.xml
+++ b/drafter_3/annotations/C32_D1_P2.xml
@@ -69,6 +69,7 @@
 			<ymin>57</ymin>
 			<xmax>937</xmax>
 			<ymax>128</ymax>
+			<rotation>10</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -171,7 +172,7 @@
 			<xmax>352</xmax>
 			<ymax>138</ymax>
 		</bndbox>
-		<text>100&#937;</text>
+		<text>110&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -184,7 +185,7 @@
 			<xmax>1562</xmax>
 			<ymax>277</ymax>
 		</bndbox>
-		<text>9v</text>
+		<text>9V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -197,7 +198,7 @@
 			<xmax>1198</xmax>
 			<ymax>445</ymax>
 		</bndbox>
-		<text>4.7v</text>
+		<text>4.7V</text>
 	</object>
 	<object>
 		<name>junction</name>
diff --git a/drafter_3/annotations/C32_D1_P3.xml b/drafter_3/annotations/C32_D1_P3.xml
index 9ecf850e32e0736777c4c151db48da3a86940583..493923dec98591adefe279bd73d2da650c569620 100644
--- a/drafter_3/annotations/C32_D1_P3.xml
+++ b/drafter_3/annotations/C32_D1_P3.xml
@@ -98,6 +98,7 @@
 			<ymin>155</ymin>
 			<xmax>799</xmax>
 			<ymax>271</ymax>
+			<rotation>6</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -159,7 +160,7 @@
 			<xmax>242</xmax>
 			<ymax>366</ymax>
 		</bndbox>
-		<text>100&#937;</text>
+		<text>110&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -185,7 +186,7 @@
 			<xmax>1010</xmax>
 			<ymax>734</ymax>
 		</bndbox>
-		<text>4.7v</text>
+		<text>4.7V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -198,7 +199,7 @@
 			<xmax>1580</xmax>
 			<ymax>458</ymax>
 		</bndbox>
-		<text>9v</text>
+		<text>9V</text>
 	</object>
 	<object>
 		<name>junction</name>
diff --git a/drafter_3/annotations/C32_D1_P4.xml b/drafter_3/annotations/C32_D1_P4.xml
index 5ddf73ae8d74c573542bedd18518cffc3b367138..4463eaf5d508915aae2e06e064d97867e4bcb252 100644
--- a/drafter_3/annotations/C32_D1_P4.xml
+++ b/drafter_3/annotations/C32_D1_P4.xml
@@ -146,6 +146,7 @@
 			<ymin>148</ymin>
 			<xmax>1009</xmax>
 			<ymax>266</ymax>
+			<rotation>8</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -159,7 +160,7 @@
 			<xmax>309</xmax>
 			<ymax>247</ymax>
 		</bndbox>
-		<text>100&#937;</text>
+		<text>110&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -185,7 +186,7 @@
 			<xmax>1587</xmax>
 			<ymax>512</ymax>
 		</bndbox>
-		<text>9v</text>
+		<text>9V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -198,7 +199,7 @@
 			<xmax>1228</xmax>
 			<ymax>736</ymax>
 		</bndbox>
-		<text>4.7v</text>
+		<text>4.7V</text>
 	</object>
 	<object>
 		<name>junction</name>
@@ -259,6 +260,6 @@
 			<xmax>294</xmax>
 			<ymax>634</ymax>
 		</bndbox>
-		<text>100&#937;</text>
+		<text>00&#937;</text>
 	</object>
 </annotation>
diff --git a/drafter_3/annotations/C32_D2_P1.xml b/drafter_3/annotations/C32_D2_P1.xml
index 41bd832f1a40467d8bcc23b73a3a3330657fcd87..6f2e7bef70a3e41d0d1527d6647ca2deac21403e 100644
--- a/drafter_3/annotations/C32_D2_P1.xml
+++ b/drafter_3/annotations/C32_D2_P1.xml
@@ -21,6 +21,7 @@
 			<ymin>285</ymin>
 			<xmax>930</xmax>
 			<ymax>430</ymax>
+			<rotation>2</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -246,7 +247,7 @@
 			<xmax>1147</xmax>
 			<ymax>845</ymax>
 		</bndbox>
-		<text>4.7v</text>
+		<text>4.7V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -259,6 +260,6 @@
 			<xmax>1565</xmax>
 			<ymax>652</ymax>
 		</bndbox>
-		<text>9v</text>
+		<text>9V</text>
 	</object>
 </annotation>
diff --git a/drafter_3/annotations/C32_D2_P2.xml b/drafter_3/annotations/C32_D2_P2.xml
index 07eaaf97c2a90069bc4c8d09543e03773ccd184c..eab950d223daedf55cec93bf743404b2552dbdb8 100644
--- a/drafter_3/annotations/C32_D2_P2.xml
+++ b/drafter_3/annotations/C32_D2_P2.xml
@@ -33,7 +33,7 @@
 			<ymin>499</ymin>
 			<xmax>375</xmax>
 			<ymax>656</ymax>
-			<rotation>96</rotation>
+			<rotation>81</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -72,6 +72,7 @@
 			<ymin>140</ymin>
 			<xmax>888</xmax>
 			<ymax>259</ymax>
+			<rotation>6</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -185,7 +186,7 @@
 			<xmax>1558</xmax>
 			<ymax>417</ymax>
 		</bndbox>
-		<text>9v</text>
+		<text>9V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -211,7 +212,7 @@
 			<xmax>1168</xmax>
 			<ymax>619</ymax>
 		</bndbox>
-		<text>4.7v</text>
+		<text>4.7V</text>
 	</object>
 	<object>
 		<name>junction</name>
diff --git a/drafter_3/annotations/C32_D2_P3.xml b/drafter_3/annotations/C32_D2_P3.xml
index a65514027928bc1f2ebb2e0352cad217a3c3d1c6..006e99b18acf69c64810e84d7e6d98d6bfb1cb02 100644
--- a/drafter_3/annotations/C32_D2_P3.xml
+++ b/drafter_3/annotations/C32_D2_P3.xml
@@ -134,6 +134,7 @@
 			<ymin>204</ymin>
 			<xmax>744</xmax>
 			<ymax>343</ymax>
+			<rotation>6</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -159,7 +160,7 @@
 			<xmax>222</xmax>
 			<ymax>458</ymax>
 		</bndbox>
-		<text>100&#937;</text>
+		<text>110&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -198,7 +199,7 @@
 			<xmax>984</xmax>
 			<ymax>775</ymax>
 		</bndbox>
-		<text>4.7v</text>
+		<text>4.7V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -206,12 +207,12 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>1437</xmin>
-			<ymin>362</ymin>
-			<xmax>1566</xmax>
-			<ymax>436</ymax>
+			<xmin>1431</xmin>
+			<ymin>336</ymin>
+			<xmax>1568</xmax>
+			<ymax>441</ymax>
 		</bndbox>
-		<text>9v</text>
+		<text>9V</text>
 	</object>
 	<object>
 		<name>junction</name>
diff --git a/drafter_3/annotations/C32_D2_P4.xml b/drafter_3/annotations/C32_D2_P4.xml
index 1698fae0c1200bd214bdb5342c8d7aeaf006e431..6f662244615041b99ea8378223da98dfef8c075b 100644
--- a/drafter_3/annotations/C32_D2_P4.xml
+++ b/drafter_3/annotations/C32_D2_P4.xml
@@ -172,7 +172,7 @@
 			<xmax>313</xmax>
 			<ymax>294</ymax>
 		</bndbox>
-		<text>100&#937;</text>
+		<text>110&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -180,12 +180,12 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>621</xmin>
+			<xmin>613</xmin>
 			<ymin>615</ymin>
 			<xmax>848</xmax>
 			<ymax>681</ymax>
 		</bndbox>
-		<text>&#8730;3.3K&#937;</text>
+		<text>3.3K&#937;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -198,7 +198,7 @@
 			<xmax>1179</xmax>
 			<ymax>830</ymax>
 		</bndbox>
-		<text>4.7v</text>
+		<text>4.7V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -211,7 +211,7 @@
 			<xmax>1502</xmax>
 			<ymax>644</ymax>
 		</bndbox>
-		<text>9v</text>
+		<text>9V</text>
 	</object>
 	<object>
 		<name>junction</name>
diff --git a/drafter_3/annotations/C33_D1_P1.xml b/drafter_3/annotations/C33_D1_P1.xml
index 55ccae2e583b89484feec8eec62d03fe99699b7f..076fdd1a513ec597092c5d0a6c89e20748a8c4df 100644
--- a/drafter_3/annotations/C33_D1_P1.xml
+++ b/drafter_3/annotations/C33_D1_P1.xml
@@ -21,7 +21,7 @@
 			<ymin>122</ymin>
 			<xmax>415</xmax>
 			<ymax>148</ymax>
-			<rotation>175</rotation>
+			<rotation>191</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -72,7 +72,7 @@
 			<ymin>400</ymin>
 			<xmax>834</xmax>
 			<ymax>428</ymax>
-			<rotation>170</rotation>
+			<rotation>192</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -81,11 +81,11 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>929</xmin>
+			<xmin>936</xmin>
 			<ymin>207</ymin>
-			<xmax>973</xmax>
+			<xmax>965</xmax>
 			<ymax>294</ymax>
-			<rotation>89</rotation>
+			<rotation>96</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -111,7 +111,7 @@
 			<ymin>398</ymin>
 			<xmax>1152</xmax>
 			<ymax>429</ymax>
-			<rotation>170</rotation>
+			<rotation>187</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -222,7 +222,7 @@
 			<xmax>187</xmax>
 			<ymax>396</ymax>
 		</bndbox>
-		<text>voltage battery</text>
+		<text>Voltage Battery</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_3/annotations/C33_D1_P2.xml b/drafter_3/annotations/C33_D1_P2.xml
index 1b9e7ec8bfd3d26c84ffc0ec881f24d00d135553..24b1de317a5860433dd2daf6aabbecb1eceb5291 100644
--- a/drafter_3/annotations/C33_D1_P2.xml
+++ b/drafter_3/annotations/C33_D1_P2.xml
@@ -33,7 +33,7 @@
 			<ymin>77</ymin>
 			<xmax>473</xmax>
 			<ymax>102</ymax>
-			<rotation>174</rotation>
+			<rotation>193</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -97,7 +97,7 @@
 			<ymin>146</ymin>
 			<xmax>1045</xmax>
 			<ymax>195</ymax>
-			<rotation>72</rotation>
+			<rotation>98</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -135,7 +135,7 @@
 			<ymin>305</ymin>
 			<xmax>1273</xmax>
 			<ymax>330</ymax>
-			<rotation>171</rotation>
+			<rotation>191</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -352,7 +352,7 @@
 			<xmax>191</xmax>
 			<ymax>309</ymax>
 		</bndbox>
-		<text>voltage battery</text>
+		<text>Voltage Battery</text>
 	</object>
 	<object>
 		<name>junction</name>
diff --git a/drafter_3/annotations/C33_D1_P3.xml b/drafter_3/annotations/C33_D1_P3.xml
index bd34f86b519124cfec74d65dc3bd1fc388f86c8e..869a0625dbf448997c53f489758a1960d05ca6b4 100644
--- a/drafter_3/annotations/C33_D1_P3.xml
+++ b/drafter_3/annotations/C33_D1_P3.xml
@@ -57,7 +57,7 @@
 			<ymin>86</ymin>
 			<xmax>382</xmax>
 			<ymax>119</ymax>
-			<rotation>169</rotation>
+			<rotation>187</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -158,7 +158,7 @@
 			<ymin>163</ymin>
 			<xmax>1369</xmax>
 			<ymax>259</ymax>
-			<rotation>96</rotation>
+			<rotation>85</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -325,7 +325,7 @@
 			<xmax>147</xmax>
 			<ymax>351</ymax>
 		</bndbox>
-		<text>voltage battery</text>
+		<text>Voltage Battery</text>
 	</object>
 	<object>
 		<name>junction</name>
diff --git a/drafter_3/annotations/C33_D1_P4.xml b/drafter_3/annotations/C33_D1_P4.xml
index eba752f87024090a65bfd9cd2b75b5d2325939ef..30bc2376b008fa6cfe40174eb2e13ad910a3fe27 100644
--- a/drafter_3/annotations/C33_D1_P4.xml
+++ b/drafter_3/annotations/C33_D1_P4.xml
@@ -18,9 +18,9 @@
 		<difficult>0</difficult>
 		<bndbox>
 			<xmin>278</xmin>
-			<ymin>77</ymin>
+			<ymin>88</ymin>
 			<xmax>435</xmax>
-			<ymax>137</ymax>
+			<ymax>133</ymax>
 		</bndbox>
 	</object>
 	<object>
@@ -46,6 +46,7 @@
 			<ymin>129</ymin>
 			<xmax>879</xmax>
 			<ymax>160</ymax>
+			<rotation>343</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -122,7 +123,7 @@
 			<ymin>262</ymin>
 			<xmax>1485</xmax>
 			<ymax>346</ymax>
-			<rotation>82</rotation>
+			<rotation>108</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -183,7 +184,7 @@
 			<ymin>491</ymin>
 			<xmax>1352</xmax>
 			<ymax>532</ymax>
-			<rotation>169</rotation>
+			<rotation>10</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_3/annotations/C33_D2_P1.xml b/drafter_3/annotations/C33_D2_P1.xml
index 92efe9a6436162026535f3e9c2a731d27cd82a45..a523512ed255d9793dee956fe320b876a338d66e 100644
--- a/drafter_3/annotations/C33_D2_P1.xml
+++ b/drafter_3/annotations/C33_D2_P1.xml
@@ -57,7 +57,7 @@
 			<ymin>213</ymin>
 			<xmax>568</xmax>
 			<ymax>314</ymax>
-			<rotation>82</rotation>
+			<rotation>102</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -134,7 +134,7 @@
 			<ymin>235</ymin>
 			<xmax>1378</xmax>
 			<ymax>310</ymax>
-			<rotation>78</rotation>
+			<rotation>96</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_3/annotations/C33_D2_P2.xml b/drafter_3/annotations/C33_D2_P2.xml
index 2350bd2c44f5e770ff39920078bda42167b455ce..913914e042cf919b2d9ebd13f6a44bafd50ad855 100644
--- a/drafter_3/annotations/C33_D2_P2.xml
+++ b/drafter_3/annotations/C33_D2_P2.xml
@@ -114,11 +114,11 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>692</xmin>
+			<xmin>687</xmin>
 			<ymin>261</ymin>
 			<xmax>778</xmax>
-			<ymax>331</ymax>
-			<rotation>26</rotation>
+			<ymax>333</ymax>
+			<rotation>35</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_3/annotations/C33_D2_P3.xml b/drafter_3/annotations/C33_D2_P3.xml
index 2a74c753043863610c7fa87c28d1e35d83304787..053d39d9dcef8e899f275e857a7268111c096be6 100644
--- a/drafter_3/annotations/C33_D2_P3.xml
+++ b/drafter_3/annotations/C33_D2_P3.xml
@@ -56,10 +56,10 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>543</xmin>
-			<ymin>374</ymin>
+			<xmin>525</xmin>
+			<ymin>365</ymin>
 			<xmax>627</xmax>
-			<ymax>443</ymax>
+			<ymax>450</ymax>
 			<rotation>48</rotation>
 		</bndbox>
 	</object>
diff --git a/drafter_3/annotations/C33_D2_P4.xml b/drafter_3/annotations/C33_D2_P4.xml
index f88cb3d7f4c32942d3dba318c8c701aa72b08538..8d6fd797f8efab23081ac2a29dc6cea9689923da 100644
--- a/drafter_3/annotations/C33_D2_P4.xml
+++ b/drafter_3/annotations/C33_D2_P4.xml
@@ -159,7 +159,7 @@
 			<ymin>524</ymin>
 			<xmax>1006</xmax>
 			<ymax>567</ymax>
-			<rotation>168</rotation>
+			<rotation>193</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_3/annotations/C34_D1_P1.xml b/drafter_3/annotations/C34_D1_P1.xml
index 9b0054df96c30bfda539d489155d4df273617226..56d395b291dad8ffbd08f57644195a69765a422f 100644
--- a/drafter_3/annotations/C34_D1_P1.xml
+++ b/drafter_3/annotations/C34_D1_P1.xml
@@ -17,9 +17,9 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>283</xmin>
-			<ymin>203</ymin>
-			<xmax>466</xmax>
+			<xmin>277</xmin>
+			<ymin>201</ymin>
+			<xmax>475</xmax>
 			<ymax>496</ymax>
 		</bndbox>
 	</object>
@@ -121,30 +121,6 @@
 			<ymax>120</ymax>
 		</bndbox>
 	</object>
-	<object>
-		<name>junction</name>
-		<pose>Unspecified</pose>
-		<truncated>0</truncated>
-		<difficult>0</difficult>
-		<bndbox>
-			<xmin>552</xmin>
-			<ymin>109</ymin>
-			<xmax>593</xmax>
-			<ymax>147</ymax>
-		</bndbox>
-	</object>
-	<object>
-		<name>junction</name>
-		<pose>Unspecified</pose>
-		<truncated>0</truncated>
-		<difficult>0</difficult>
-		<bndbox>
-			<xmin>798</xmin>
-			<ymin>111</ymin>
-			<xmax>828</xmax>
-			<ymax>141</ymax>
-		</bndbox>
-	</object>
 	<object>
 		<name>terminal</name>
 		<pose>Unspecified</pose>
@@ -258,27 +234,29 @@
 		</bndbox>
 	</object>
 	<object>
-		<name>junction</name>
+		<name>inductor</name>
 		<pose>Unspecified</pose>
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>572</xmin>
-			<ymin>575</ymin>
-			<xmax>599</xmax>
-			<ymax>604</ymax>
+			<xmin>282</xmin>
+			<ymin>236</ymin>
+			<xmax>353</xmax>
+			<ymax>443</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
-		<name>junction</name>
+		<name>inductor</name>
 		<pose>Unspecified</pose>
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>705</xmin>
-			<ymin>575</ymin>
-			<xmax>736</xmax>
-			<ymax>602</ymax>
+			<xmin>372</xmin>
+			<ymin>204</ymin>
+			<xmax>471</xmax>
+			<ymax>492</ymax>
+			<rotation>105</rotation>
 		</bndbox>
 	</object>
 </annotation>
diff --git a/drafter_3/annotations/C34_D1_P2.xml b/drafter_3/annotations/C34_D1_P2.xml
index f85537e01de2cb722c9cc788e137caa4c796a920..b19293c074e55872228502ef432aa2bd84a8f020 100644
--- a/drafter_3/annotations/C34_D1_P2.xml
+++ b/drafter_3/annotations/C34_D1_P2.xml
@@ -17,11 +17,11 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>574</xmin>
+			<xmin>579</xmin>
 			<ymin>74</ymin>
 			<xmax>631</xmax>
-			<ymax>132</ymax>
-			<rotation>356</rotation>
+			<ymax>135</ymax>
+			<rotation>2</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -30,22 +30,10 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>223</xmin>
-			<ymin>194</ymin>
-			<xmax>391</xmax>
-			<ymax>477</ymax>
-		</bndbox>
-	</object>
-	<object>
-		<name>junction</name>
-		<pose>Unspecified</pose>
-		<truncated>0</truncated>
-		<difficult>0</difficult>
-		<bndbox>
-			<xmin>490</xmin>
-			<ymin>99</ymin>
-			<xmax>532</xmax>
-			<ymax>133</ymax>
+			<xmin>220</xmin>
+			<ymin>197</ymin>
+			<xmax>388</xmax>
+			<ymax>480</ymax>
 		</bndbox>
 	</object>
 	<object>
@@ -84,18 +72,6 @@
 			<ymax>591</ymax>
 		</bndbox>
 	</object>
-	<object>
-		<name>junction</name>
-		<pose>Unspecified</pose>
-		<truncated>0</truncated>
-		<difficult>0</difficult>
-		<bndbox>
-			<xmin>722</xmin>
-			<ymin>80</ymin>
-			<xmax>763</xmax>
-			<ymax>107</ymax>
-		</bndbox>
-	</object>
 	<object>
 		<name>junction</name>
 		<pose>Unspecified</pose>
@@ -195,7 +171,7 @@
 			<xmax>176</xmax>
 			<ymax>441</ymax>
 		</bndbox>
-		<text>input wave</text>
+		<text>AM input wave</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -259,27 +235,29 @@
 		</bndbox>
 	</object>
 	<object>
-		<name>junction</name>
+		<name>inductor</name>
 		<pose>Unspecified</pose>
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>465</xmin>
-			<ymin>570</ymin>
-			<xmax>488</xmax>
-			<ymax>598</ymax>
+			<xmin>223</xmin>
+			<ymin>231</ymin>
+			<xmax>292</xmax>
+			<ymax>418</ymax>
+			<rotation>80</rotation>
 		</bndbox>
 	</object>
 	<object>
-		<name>junction</name>
+		<name>inductor</name>
 		<pose>Unspecified</pose>
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>604</xmin>
-			<ymin>571</ymin>
-			<xmax>631</xmax>
-			<ymax>602</ymax>
+			<xmin>313</xmin>
+			<ymin>199</ymin>
+			<xmax>385</xmax>
+			<ymax>478</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 </annotation>
diff --git a/drafter_3/annotations/C34_D1_P3.xml b/drafter_3/annotations/C34_D1_P3.xml
index 4953e38fbfec834cdc7b8496e2c8fbc11c802d26..0773963f835e5d01fdbd63d636ed9f0e2409f2c5 100644
--- a/drafter_3/annotations/C34_D1_P3.xml
+++ b/drafter_3/annotations/C34_D1_P3.xml
@@ -50,30 +50,6 @@
 			<rotation>355</rotation>
 		</bndbox>
 	</object>
-	<object>
-		<name>junction</name>
-		<pose>Unspecified</pose>
-		<truncated>0</truncated>
-		<difficult>0</difficult>
-		<bndbox>
-			<xmin>858</xmin>
-			<ymin>23</ymin>
-			<xmax>883</xmax>
-			<ymax>46</ymax>
-		</bndbox>
-	</object>
-	<object>
-		<name>junction</name>
-		<pose>Unspecified</pose>
-		<truncated>0</truncated>
-		<difficult>0</difficult>
-		<bndbox>
-			<xmin>633</xmin>
-			<ymin>18</ymin>
-			<xmax>663</xmax>
-			<ymax>38</ymax>
-		</bndbox>
-	</object>
 	<object>
 		<name>junction</name>
 		<pose>Unspecified</pose>
@@ -106,7 +82,7 @@
 		<bndbox>
 			<xmin>306</xmin>
 			<ymin>60</ymin>
-			<xmax>508</xmax>
+			<xmax>511</xmax>
 			<ymax>259</ymax>
 		</bndbox>
 	</object>
@@ -171,7 +147,7 @@
 			<xmax>239</xmax>
 			<ymax>215</ymax>
 		</bndbox>
-		<text>input wave</text>
+		<text>AM input wave</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -222,30 +198,6 @@
 			<ymax>361</ymax>
 		</bndbox>
 	</object>
-	<object>
-		<name>junction</name>
-		<pose>Unspecified</pose>
-		<truncated>0</truncated>
-		<difficult>0</difficult>
-		<bndbox>
-			<xmin>600</xmin>
-			<ymin>333</ymin>
-			<xmax>626</xmax>
-			<ymax>361</ymax>
-		</bndbox>
-	</object>
-	<object>
-		<name>junction</name>
-		<pose>Unspecified</pose>
-		<truncated>0</truncated>
-		<difficult>0</difficult>
-		<bndbox>
-			<xmin>762</xmin>
-			<ymin>337</ymin>
-			<xmax>793</xmax>
-			<ymax>363</ymax>
-		</bndbox>
-	</object>
 	<object>
 		<name>junction</name>
 		<pose>Unspecified</pose>
@@ -282,4 +234,30 @@
 			<ymax>86</ymax>
 		</bndbox>
 	</object>
+	<object>
+		<name>inductor</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>309</xmin>
+			<ymin>82</ymin>
+			<xmax>402</xmax>
+			<ymax>225</ymax>
+			<rotation>65</rotation>
+		</bndbox>
+	</object>
+	<object>
+		<name>inductor</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>415</xmin>
+			<ymin>65</ymin>
+			<xmax>508</xmax>
+			<ymax>256</ymax>
+			<rotation>80</rotation>
+		</bndbox>
+	</object>
 </annotation>
diff --git a/drafter_3/annotations/C34_D1_P4.xml b/drafter_3/annotations/C34_D1_P4.xml
index c08d44ac2e3a0e8c0d2ed1300f0b3dbacfd27a12..e31a9ac6a7c8f92693f8dff7af496e580eb401a2 100644
--- a/drafter_3/annotations/C34_D1_P4.xml
+++ b/drafter_3/annotations/C34_D1_P4.xml
@@ -17,34 +17,10 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>452</xmin>
+			<xmin>447</xmin>
 			<ymin>112</ymin>
-			<xmax>721</xmax>
-			<ymax>508</ymax>
-		</bndbox>
-	</object>
-	<object>
-		<name>junction</name>
-		<pose>Unspecified</pose>
-		<truncated>0</truncated>
-		<difficult>0</difficult>
-		<bndbox>
-			<xmin>791</xmin>
-			<ymin>22</ymin>
-			<xmax>829</xmax>
-			<ymax>57</ymax>
-		</bndbox>
-	</object>
-	<object>
-		<name>junction</name>
-		<pose>Unspecified</pose>
-		<truncated>0</truncated>
-		<difficult>0</difficult>
-		<bndbox>
-			<xmin>1038</xmin>
-			<ymin>55</ymin>
-			<xmax>1069</xmax>
-			<ymax>86</ymax>
+			<xmax>716</xmax>
+			<ymax>506</ymax>
 		</bndbox>
 	</object>
 	<object>
@@ -207,7 +183,7 @@
 			<xmax>373</xmax>
 			<ymax>443</ymax>
 		</bndbox>
-		<text>input wave</text>
+		<text>AM input wave</text>
 	</object>
 	<object>
 		<name>junction</name>
@@ -221,30 +197,6 @@
 			<ymax>648</ymax>
 		</bndbox>
 	</object>
-	<object>
-		<name>junction</name>
-		<pose>Unspecified</pose>
-		<truncated>0</truncated>
-		<difficult>0</difficult>
-		<bndbox>
-			<xmin>833</xmin>
-			<ymin>597</ymin>
-			<xmax>863</xmax>
-			<ymax>632</ymax>
-		</bndbox>
-	</object>
-	<object>
-		<name>junction</name>
-		<pose>Unspecified</pose>
-		<truncated>0</truncated>
-		<difficult>0</difficult>
-		<bndbox>
-			<xmin>978</xmin>
-			<ymin>589</ymin>
-			<xmax>1008</xmax>
-			<ymax>620</ymax>
-		</bndbox>
-	</object>
 	<object>
 		<name>junction</name>
 		<pose>Unspecified</pose>
@@ -281,4 +233,30 @@
 			<ymax>508</ymax>
 		</bndbox>
 	</object>
+	<object>
+		<name>inductor</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>453</xmin>
+			<ymin>141</ymin>
+			<xmax>552</xmax>
+			<ymax>427</ymax>
+			<rotation>100</rotation>
+		</bndbox>
+	</object>
+	<object>
+		<name>inductor</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>572</xmin>
+			<ymin>116</ymin>
+			<xmax>709</xmax>
+			<ymax>501</ymax>
+			<rotation>110</rotation>
+		</bndbox>
+	</object>
 </annotation>
diff --git a/drafter_3/annotations/C34_D2_P1.xml b/drafter_3/annotations/C34_D2_P1.xml
index ee6c7d2544362afa369bfe0d25400164fd963db6..0d786f12f6ad2bec76bf67edbdac2389c4cb0008 100644
--- a/drafter_3/annotations/C34_D2_P1.xml
+++ b/drafter_3/annotations/C34_D2_P1.xml
@@ -17,10 +17,10 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>234</xmin>
+			<xmin>230</xmin>
 			<ymin>160</ymin>
-			<xmax>420</xmax>
-			<ymax>400</ymax>
+			<xmax>426</xmax>
+			<ymax>395</ymax>
 		</bndbox>
 	</object>
 	<object>
@@ -33,6 +33,7 @@
 			<ymin>71</ymin>
 			<xmax>726</xmax>
 			<ymax>150</ymax>
+			<rotation>6</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -205,4 +206,30 @@
 			<ymax>550</ymax>
 		</bndbox>
 	</object>
+	<object>
+		<name>inductor</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>233</xmin>
+			<ymin>185</ymin>
+			<xmax>313</xmax>
+			<ymax>387</ymax>
+			<rotation>90</rotation>
+		</bndbox>
+	</object>
+	<object>
+		<name>inductor</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>342</xmin>
+			<ymin>163</ymin>
+			<xmax>422</xmax>
+			<ymax>392</ymax>
+			<rotation>90</rotation>
+		</bndbox>
+	</object>
 </annotation>
diff --git a/drafter_3/annotations/C34_D2_P2.xml b/drafter_3/annotations/C34_D2_P2.xml
index d69083a720edd950c3625bdc6993656aab3c8e97..cc7e1d4cb9f1376cda163c5307d79546f1899fe6 100644
--- a/drafter_3/annotations/C34_D2_P2.xml
+++ b/drafter_3/annotations/C34_D2_P2.xml
@@ -77,10 +77,10 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>237</xmin>
-			<ymin>285</ymin>
-			<xmax>377</xmax>
-			<ymax>525</ymax>
+			<xmin>232</xmin>
+			<ymin>287</ymin>
+			<xmax>379</xmax>
+			<ymax>523</ymax>
 		</bndbox>
 	</object>
 	<object>
@@ -119,7 +119,7 @@
 			<ymin>154</ymin>
 			<xmax>652</xmax>
 			<ymax>250</ymax>
-			<rotation>357</rotation>
+			<rotation>6</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -206,4 +206,30 @@
 			<ymax>654</ymax>
 		</bndbox>
 	</object>
+	<object>
+		<name>inductor</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>234</xmin>
+			<ymin>313</ymin>
+			<xmax>296</xmax>
+			<ymax>515</ymax>
+			<rotation>90</rotation>
+		</bndbox>
+	</object>
+	<object>
+		<name>inductor</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>315</xmin>
+			<ymin>289</ymin>
+			<xmax>377</xmax>
+			<ymax>521</ymax>
+			<rotation>90</rotation>
+		</bndbox>
+	</object>
 </annotation>
diff --git a/drafter_3/annotations/C34_D2_P3.xml b/drafter_3/annotations/C34_D2_P3.xml
index 70ef73ce111fe40882af5b46655cc69ca821411a..acbc24755183fb4965993b9bf035bb4aa647307f 100644
--- a/drafter_3/annotations/C34_D2_P3.xml
+++ b/drafter_3/annotations/C34_D2_P3.xml
@@ -30,10 +30,10 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>287</xmin>
+			<xmin>281</xmin>
 			<ymin>138</ymin>
 			<xmax>487</xmax>
-			<ymax>321</ymax>
+			<ymax>322</ymax>
 		</bndbox>
 	</object>
 	<object>
@@ -206,4 +206,30 @@
 			<ymax>461</ymax>
 		</bndbox>
 	</object>
+	<object>
+		<name>inductor</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>283</xmin>
+			<ymin>157</ymin>
+			<xmax>378</xmax>
+			<ymax>315</ymax>
+			<rotation>79</rotation>
+		</bndbox>
+	</object>
+	<object>
+		<name>inductor</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>396</xmin>
+			<ymin>140</ymin>
+			<xmax>485</xmax>
+			<ymax>320</ymax>
+			<rotation>79</rotation>
+		</bndbox>
+	</object>
 </annotation>
diff --git a/drafter_3/annotations/C34_D2_P4.xml b/drafter_3/annotations/C34_D2_P4.xml
index b6596fcac5ca60d76fd05ad5c6c7ba18b72b0b53..4ec608c8bc5da6f76f72bf4710a27f8b9bbdd290 100644
--- a/drafter_3/annotations/C34_D2_P4.xml
+++ b/drafter_3/annotations/C34_D2_P4.xml
@@ -65,10 +65,10 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>340</xmin>
-			<ymin>169</ymin>
-			<xmax>603</xmax>
-			<ymax>492</ymax>
+			<xmin>337</xmin>
+			<ymin>170</ymin>
+			<xmax>607</xmax>
+			<ymax>496</ymax>
 		</bndbox>
 	</object>
 	<object>
@@ -206,4 +206,30 @@
 			<ymax>48</ymax>
 		</bndbox>
 	</object>
+	<object>
+		<name>inductor</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>340</xmin>
+			<ymin>181</ymin>
+			<xmax>448</xmax>
+			<ymax>481</ymax>
+			<rotation>90</rotation>
+		</bndbox>
+	</object>
+	<object>
+		<name>inductor</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>499</xmin>
+			<ymin>173</ymin>
+			<xmax>604</xmax>
+			<ymax>493</ymax>
+			<rotation>105</rotation>
+		</bndbox>
+	</object>
 </annotation>
diff --git a/drafter_3/annotations/C35_D1_P1.xml b/drafter_3/annotations/C35_D1_P1.xml
index 4dc4fb64b7752c0ddb49b6a318f6294b9f6ae43c..5676c0e87e0d75047f9c31bb21422bcec109fc14 100644
--- a/drafter_3/annotations/C35_D1_P1.xml
+++ b/drafter_3/annotations/C35_D1_P1.xml
@@ -21,7 +21,7 @@
 			<ymin>330</ymin>
 			<xmax>283</xmax>
 			<ymax>398</ymax>
-			<rotation>6</rotation>
+			<rotation>358</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -34,7 +34,7 @@
 			<ymin>595</ymin>
 			<xmax>258</xmax>
 			<ymax>658</ymax>
-			<rotation>5</rotation>
+			<rotation>358</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -60,7 +60,7 @@
 			<ymin>1213</ymin>
 			<xmax>1324</xmax>
 			<ymax>1298</ymax>
-			<rotation>111</rotation>
+			<rotation>96</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -86,7 +86,7 @@
 			<ymin>538</ymin>
 			<xmax>1281</xmax>
 			<ymax>573</ymax>
-			<rotation>84</rotation>
+			<rotation>92</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -99,6 +99,7 @@
 			<ymin>545</ymin>
 			<xmax>1468</xmax>
 			<ymax>621</ymax>
+			<rotation>10</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -111,6 +112,7 @@
 			<ymin>808</ymin>
 			<xmax>1508</xmax>
 			<ymax>920</ymax>
+			<rotation>8</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -123,7 +125,7 @@
 			<ymin>271</ymin>
 			<xmax>616</xmax>
 			<ymax>316</ymax>
-			<rotation>179</rotation>
+			<rotation>160</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -175,6 +177,7 @@
 			<ymin>738</ymin>
 			<xmax>646</xmax>
 			<ymax>799</ymax>
+			<rotation>347</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -196,9 +199,9 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>1231</xmin>
+			<xmin>1232</xmin>
 			<ymin>596</ymin>
-			<xmax>1281</xmax>
+			<xmax>1271</xmax>
 			<ymax>651</ymax>
 			<rotation>107</rotation>
 		</bndbox>
@@ -209,11 +212,11 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>1274</xmin>
+			<xmin>1271</xmin>
 			<ymin>905</ymin>
-			<xmax>1316</xmax>
+			<xmax>1310</xmax>
 			<ymax>1008</ymax>
-			<rotation>88</rotation>
+			<rotation>94</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -322,6 +325,7 @@
 			<ymin>1307</ymin>
 			<xmax>1303</xmax>
 			<ymax>1382</ymax>
+			<rotation>12</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -372,6 +376,7 @@
 			<ymin>373</ymin>
 			<xmax>852</xmax>
 			<ymax>489</ymax>
+			<rotation>356</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -384,6 +389,7 @@
 			<ymin>651</ymin>
 			<xmax>959</xmax>
 			<ymax>749</ymax>
+			<rotation>356</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -720,6 +726,7 @@
 			<ymin>172</ymin>
 			<xmax>1085</xmax>
 			<ymax>987</ymax>
+			<rotation>358</rotation>
 		</bndbox>
 	</object>
 </annotation>
diff --git a/drafter_3/annotations/C35_D1_P2.xml b/drafter_3/annotations/C35_D1_P2.xml
index a074bb3619288de7c3d8521d9f9d815017a21967..9b45736574f67b9f9c0f379e548037b9c30df09b 100644
--- a/drafter_3/annotations/C35_D1_P2.xml
+++ b/drafter_3/annotations/C35_D1_P2.xml
@@ -21,6 +21,7 @@
 			<ymin>412</ymin>
 			<xmax>602</xmax>
 			<ymax>518</ymax>
+			<rotation>2</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -33,6 +34,7 @@
 			<ymin>647</ymin>
 			<xmax>714</xmax>
 			<ymax>747</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -119,11 +121,11 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>1022</xmin>
+			<xmin>1029</xmin>
 			<ymin>482</ymin>
-			<xmax>1090</xmax>
+			<xmax>1079</xmax>
 			<ymax>550</ymax>
-			<rotation>110</rotation>
+			<rotation>108</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -136,7 +138,7 @@
 			<ymin>841</ymin>
 			<xmax>1140</xmax>
 			<ymax>944</ymax>
-			<rotation>86</rotation>
+			<rotation>96</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -289,6 +291,7 @@
 			<ymin>544</ymin>
 			<xmax>1127</xmax>
 			<ymax>606</ymax>
+			<rotation>12</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -301,6 +304,7 @@
 			<ymin>1006</ymin>
 			<xmax>1200</xmax>
 			<ymax>1101</ymax>
+			<rotation>10</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -313,6 +317,7 @@
 			<ymin>860</ymin>
 			<xmax>1434</xmax>
 			<ymax>950</ymax>
+			<rotation>10</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -325,6 +330,7 @@
 			<ymin>1301</ymin>
 			<xmax>1115</xmax>
 			<ymax>1388</ymax>
+			<rotation>8</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -650,6 +656,7 @@
 			<ymin>217</ymin>
 			<xmax>1024</xmax>
 			<ymax>300</ymax>
+			<rotation>10</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -710,6 +717,7 @@
 			<ymin>220</ymin>
 			<xmax>830</xmax>
 			<ymax>998</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 </annotation>
diff --git a/drafter_3/annotations/C35_D1_P3.xml b/drafter_3/annotations/C35_D1_P3.xml
index 761a937f45dc6bb1a1a2510ff4c37405a4414c95..1c6d0a9590e7f3af9ee1674ab43890a761763249 100644
--- a/drafter_3/annotations/C35_D1_P3.xml
+++ b/drafter_3/annotations/C35_D1_P3.xml
@@ -269,6 +269,7 @@
 			<ymin>225</ymin>
 			<xmax>694</xmax>
 			<ymax>304</ymax>
+			<rotation>358</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -331,6 +332,7 @@
 			<ymin>391</ymin>
 			<xmax>1171</xmax>
 			<ymax>425</ymax>
+			<rotation>8</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -343,6 +345,7 @@
 			<ymin>361</ymin>
 			<xmax>1359</xmax>
 			<ymax>412</ymax>
+			<rotation>10</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -355,6 +358,7 @@
 			<ymin>754</ymin>
 			<xmax>1298</xmax>
 			<ymax>832</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -367,6 +371,7 @@
 			<ymin>651</ymin>
 			<xmax>1478</xmax>
 			<ymax>714</ymax>
+			<rotation>13</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -379,6 +384,7 @@
 			<ymin>1018</ymin>
 			<xmax>1262</xmax>
 			<ymax>1100</ymax>
+			<rotation>8</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -703,6 +709,7 @@
 			<ymin>123</ymin>
 			<xmax>938</xmax>
 			<ymax>697</ymax>
+			<rotation>2</rotation>
 		</bndbox>
 	</object>
 </annotation>
diff --git a/drafter_3/annotations/C35_D1_P4.xml b/drafter_3/annotations/C35_D1_P4.xml
index 3c8992e4607100a1864173dd2e5bc132be0ad9c8..55ec14141ebb8b281b482a0ad776e68848236fae 100644
--- a/drafter_3/annotations/C35_D1_P4.xml
+++ b/drafter_3/annotations/C35_D1_P4.xml
@@ -59,6 +59,7 @@
 			<ymin>557</ymin>
 			<xmax>1244</xmax>
 			<ymax>607</ymax>
+			<rotation>6</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -71,6 +72,7 @@
 			<ymin>955</ymin>
 			<xmax>1301</xmax>
 			<ymax>1031</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -83,6 +85,7 @@
 			<ymin>521</ymin>
 			<xmax>1438</xmax>
 			<ymax>589</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -95,6 +98,7 @@
 			<ymin>851</ymin>
 			<xmax>1486</xmax>
 			<ymax>921</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -107,6 +111,7 @@
 			<ymin>1197</ymin>
 			<xmax>1220</xmax>
 			<ymax>1263</ymax>
+			<rotation>6</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -243,7 +248,7 @@
 			<ymin>815</ymin>
 			<xmax>1253</xmax>
 			<ymax>897</ymax>
-			<rotation>89</rotation>
+			<rotation>94</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -306,7 +311,7 @@
 			<ymin>717</ymin>
 			<xmax>1261</xmax>
 			<ymax>763</ymax>
-			<rotation>86</rotation>
+			<rotation>94</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -367,6 +372,7 @@
 			<ymin>420</ymin>
 			<xmax>1448</xmax>
 			<ymax>497</ymax>
+			<rotation>10</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -379,6 +385,7 @@
 			<ymin>697</ymin>
 			<xmax>1496</xmax>
 			<ymax>807</ymax>
+			<rotation>10</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -703,6 +710,7 @@
 			<ymin>192</ymin>
 			<xmax>993</xmax>
 			<ymax>893</ymax>
+			<rotation>2</rotation>
 		</bndbox>
 	</object>
 </annotation>
diff --git a/drafter_3/annotations/C35_D2_P1.xml b/drafter_3/annotations/C35_D2_P1.xml
index 02cff411581db5e5c40d815634b58103bc4f045c..75b9ac307c12a2d10fb757ab7dd48c8ecd6c99f7 100644
--- a/drafter_3/annotations/C35_D2_P1.xml
+++ b/drafter_3/annotations/C35_D2_P1.xml
@@ -82,7 +82,7 @@
 			<ymin>433</ymin>
 			<xmax>1265</xmax>
 			<ymax>466</ymax>
-			<rotation>81</rotation>
+			<rotation>94</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -204,11 +204,11 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>1205</xmin>
-			<ymin>466</ymin>
-			<xmax>1258</xmax>
-			<ymax>517</ymax>
-			<rotation>85</rotation>
+			<xmin>1211</xmin>
+			<ymin>476</ymin>
+			<xmax>1246</xmax>
+			<ymax>513</ymax>
+			<rotation>92</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -221,6 +221,7 @@
 			<ymin>417</ymin>
 			<xmax>1465</xmax>
 			<ymax>488</ymax>
+			<rotation>8</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -233,6 +234,7 @@
 			<ymin>658</ymin>
 			<xmax>1546</xmax>
 			<ymax>769</ymax>
+			<rotation>10</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -303,10 +305,10 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>1206</xmin>
-			<ymin>510</ymin>
-			<xmax>1287</xmax>
-			<ymax>557</ymax>
+			<xmin>1209</xmin>
+			<ymin>520</ymin>
+			<xmax>1277</xmax>
+			<ymax>559</ymax>
 		</bndbox>
 	</object>
 	<object>
@@ -331,6 +333,7 @@
 			<ymin>799</ymin>
 			<xmax>1549</xmax>
 			<ymax>879</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -343,6 +346,7 @@
 			<ymin>913</ymin>
 			<xmax>1302</xmax>
 			<ymax>989</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -355,6 +359,7 @@
 			<ymin>1288</ymin>
 			<xmax>1258</xmax>
 			<ymax>1371</ymax>
+			<rotation>8</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -667,6 +672,7 @@
 			<ymin>162</ymin>
 			<xmax>1087</xmax>
 			<ymax>904</ymax>
+			<rotation>2</rotation>
 		</bndbox>
 	</object>
 </annotation>
diff --git a/drafter_3/annotations/C35_D2_P2.xml b/drafter_3/annotations/C35_D2_P2.xml
index a08f926c68e665531b0c1def83ba688032f04295..d1d26a247380fc007e63d506b1b47ef23427a8fe 100644
--- a/drafter_3/annotations/C35_D2_P2.xml
+++ b/drafter_3/annotations/C35_D2_P2.xml
@@ -43,10 +43,11 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>1013</xmin>
-			<ymin>210</ymin>
+			<xmin>1007</xmin>
+			<ymin>206</ymin>
 			<xmax>1078</xmax>
 			<ymax>249</ymax>
+			<rotation>10</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -59,6 +60,7 @@
 			<ymin>486</ymin>
 			<xmax>1135</xmax>
 			<ymax>527</ymax>
+			<rotation>6</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -658,7 +660,7 @@
 			<ymin>434</ymin>
 			<xmax>1099</xmax>
 			<ymax>483</ymax>
-			<rotation>85</rotation>
+			<rotation>96</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -671,6 +673,7 @@
 			<ymin>218</ymin>
 			<xmax>863</xmax>
 			<ymax>933</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 </annotation>
diff --git a/drafter_3/annotations/C35_D2_P3.xml b/drafter_3/annotations/C35_D2_P3.xml
index a0afb6639f17ee83c709e8996b0ed2d426868554..537751cb469bbebe6037097b329ad4ee36365903 100644
--- a/drafter_3/annotations/C35_D2_P3.xml
+++ b/drafter_3/annotations/C35_D2_P3.xml
@@ -129,11 +129,11 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>507</xmin>
-			<ymin>275</ymin>
-			<xmax>568</xmax>
-			<ymax>336</ymax>
-			<rotation>84</rotation>
+			<xmin>512</xmin>
+			<ymin>285</ymin>
+			<xmax>557</xmax>
+			<ymax>325</ymax>
+			<rotation>94</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -143,9 +143,9 @@
 		<difficult>0</difficult>
 		<bndbox>
 			<xmin>519</xmin>
-			<ymin>347</ymin>
-			<xmax>573</xmax>
-			<ymax>404</ymax>
+			<ymin>357</ymin>
+			<xmax>561</xmax>
+			<ymax>400</ymax>
 			<rotation>90</rotation>
 		</bndbox>
 	</object>
@@ -667,6 +667,7 @@
 			<ymin>99</ymin>
 			<xmax>995</xmax>
 			<ymax>683</ymax>
+			<rotation>2</rotation>
 		</bndbox>
 	</object>
 </annotation>
diff --git a/drafter_3/annotations/C35_D2_P4.xml b/drafter_3/annotations/C35_D2_P4.xml
index 9670e093798debe10a337d3eba8e7dead482e15d..36aa4f18e08dc0b3529a341261ab2c5ef66d9241 100644
--- a/drafter_3/annotations/C35_D2_P4.xml
+++ b/drafter_3/annotations/C35_D2_P4.xml
@@ -43,9 +43,9 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>1117</xmin>
-			<ymin>821</ymin>
-			<xmax>1237</xmax>
+			<xmin>1125</xmin>
+			<ymin>837</ymin>
+			<xmax>1223</xmax>
 			<ymax>923</ymax>
 		</bndbox>
 	</object>
@@ -103,10 +103,11 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>1376</xmin>
+			<xmin>1374</xmin>
 			<ymin>401</ymin>
-			<xmax>1434</xmax>
+			<xmax>1423</xmax>
 			<ymax>457</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -140,10 +141,10 @@
 		<difficult>0</difficult>
 		<bndbox>
 			<xmin>533</xmin>
-			<ymin>391</ymin>
-			<xmax>583</xmax>
-			<ymax>455</ymax>
-			<rotation>79</rotation>
+			<ymin>403</ymin>
+			<xmax>579</xmax>
+			<ymax>449</ymax>
+			<rotation>96</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -152,10 +153,10 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>535</xmin>
-			<ymin>479</ymin>
-			<xmax>596</xmax>
-			<ymax>543</ymax>
+			<xmin>542</xmin>
+			<ymin>488</ymin>
+			<xmax>584</xmax>
+			<ymax>539</ymax>
 			<rotation>90</rotation>
 		</bndbox>
 	</object>
@@ -190,9 +191,9 @@
 		<difficult>0</difficult>
 		<bndbox>
 			<xmin>1145</xmin>
-			<ymin>397</ymin>
-			<xmax>1202</xmax>
-			<ymax>448</ymax>
+			<ymin>403</ymin>
+			<xmax>1186</xmax>
+			<ymax>442</ymax>
 			<rotation>87</rotation>
 		</bndbox>
 	</object>
@@ -243,7 +244,7 @@
 			<ymin>347</ymin>
 			<xmax>1212</xmax>
 			<ymax>397</ymax>
-			<rotation>85</rotation>
+			<rotation>98</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -667,6 +668,7 @@
 			<ymin>154</ymin>
 			<xmax>1003</xmax>
 			<ymax>831</ymax>
+			<rotation>2</rotation>
 		</bndbox>
 	</object>
 </annotation>
diff --git a/drafter_3/annotations/C36_D1_P1.xml b/drafter_3/annotations/C36_D1_P1.xml
index af09024bfb3febd9308cdcc6581c94c1419ccd47..dbf22748fd92ccbaefe5ef65efcde90f954e8a30 100644
--- a/drafter_3/annotations/C36_D1_P1.xml
+++ b/drafter_3/annotations/C36_D1_P1.xml
@@ -145,7 +145,7 @@
 			<ymin>313</ymin>
 			<xmax>1087</xmax>
 			<ymax>376</ymax>
-			<rotation>86</rotation>
+			<rotation>98</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -158,7 +158,7 @@
 			<ymin>421</ymin>
 			<xmax>1095</xmax>
 			<ymax>503</ymax>
-			<rotation>89</rotation>
+			<rotation>106</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -171,7 +171,7 @@
 			<ymin>601</ymin>
 			<xmax>1102</xmax>
 			<ymax>671</ymax>
-			<rotation>85</rotation>
+			<rotation>94</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -184,7 +184,7 @@
 			<ymin>742</ymin>
 			<xmax>1097</xmax>
 			<ymax>807</ymax>
-			<rotation>96</rotation>
+			<rotation>75</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_3/annotations/C36_D1_P2.xml b/drafter_3/annotations/C36_D1_P2.xml
index 3c71a2ac9a54bc91f237bdcf5b5c8dc8175f21e3..32999c893eafe35d7fd2fd4e1156c47725e1c322 100644
--- a/drafter_3/annotations/C36_D1_P2.xml
+++ b/drafter_3/annotations/C36_D1_P2.xml
@@ -251,6 +251,7 @@
 			<ymin>260</ymin>
 			<xmax>970</xmax>
 			<ymax>478</ymax>
+			<rotation>2</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_3/annotations/C36_D1_P3.xml b/drafter_3/annotations/C36_D1_P3.xml
index 28e7fa68fe030020a484e40b64f1da2df2095a76..8eaf638772048059b48907660563226725ae3cd3 100644
--- a/drafter_3/annotations/C36_D1_P3.xml
+++ b/drafter_3/annotations/C36_D1_P3.xml
@@ -203,6 +203,7 @@
 			<ymin>445</ymin>
 			<xmax>893</xmax>
 			<ymax>723</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_3/annotations/C36_D2_P1.xml b/drafter_3/annotations/C36_D2_P1.xml
index 210047c7cca247a3acf4043a05fa38d8c3b64a3c..0c96d12447c08e2ec0dcb2b3105e5457525e82ef 100644
--- a/drafter_3/annotations/C36_D2_P1.xml
+++ b/drafter_3/annotations/C36_D2_P1.xml
@@ -163,7 +163,7 @@
 			<ymin>580</ymin>
 			<xmax>522</xmax>
 			<ymax>619</ymax>
-			<rotation>171</rotation>
+			<rotation>185</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_3/annotations/C36_D2_P2.xml b/drafter_3/annotations/C36_D2_P2.xml
index e96d9b655609f6b6f4e73eca78f03d32e7c6c705..d321bf493489c9503b3066843265334e3512c32d 100644
--- a/drafter_3/annotations/C36_D2_P2.xml
+++ b/drafter_3/annotations/C36_D2_P2.xml
@@ -226,6 +226,7 @@
 			<ymin>296</ymin>
 			<xmax>984</xmax>
 			<ymax>546</ymax>
+			<rotation>2</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_3/annotations/C36_D2_P3.xml b/drafter_3/annotations/C36_D2_P3.xml
index dddc9df0d8b467bae78cc58f60bb0eee1ed0d43d..8baa5ae73f82adaac7b3e766f7f1d683c0f1d9b4 100644
--- a/drafter_3/annotations/C36_D2_P3.xml
+++ b/drafter_3/annotations/C36_D2_P3.xml
@@ -33,6 +33,7 @@
 			<ymin>435</ymin>
 			<xmax>845</xmax>
 			<ymax>724</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -58,7 +59,7 @@
 			<ymin>491</ymin>
 			<xmax>387</xmax>
 			<ymax>520</ymax>
-			<rotation>170</rotation>
+			<rotation>15</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -71,7 +72,7 @@
 			<ymin>681</ymin>
 			<xmax>390</xmax>
 			<ymax>711</ymax>
-			<rotation>164</rotation>
+			<rotation>15</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_3/annotations/C36_D2_P4.xml b/drafter_3/annotations/C36_D2_P4.xml
index 94003eaf4dccd41159b326189588dc8b714adf09..bdfee28b9973d777bc53a6bcde78564c0ab4bbe9 100644
--- a/drafter_3/annotations/C36_D2_P4.xml
+++ b/drafter_3/annotations/C36_D2_P4.xml
@@ -58,7 +58,7 @@
 			<ymin>178</ymin>
 			<xmax>1051</xmax>
 			<ymax>210</ymax>
-			<rotation>13</rotation>
+			<rotation>352</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -264,6 +264,7 @@
 			<ymin>462</ymin>
 			<xmax>1092</xmax>
 			<ymax>760</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_3/instances/C25_D1_P3.json b/drafter_3/instances/C25_D1_P3.json
index dd9feb07bb17ac3d9475bbce1a8f1e9b90cfdfd9..fa7bdfa63e682d08d5660dabbbca075a2faf2431 100644
--- a/drafter_3/instances/C25_D1_P3.json
+++ b/drafter_3/instances/C25_D1_P3.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.16.7",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
-      "label": "voltage.battery",
       "line_color": null,
       "fill_color": null,
+      "label": "voltage.battery",
       "points": [
         [
           183.0,
@@ -24,13 +24,15 @@
           174.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           347.0,
@@ -49,13 +51,15 @@
           209.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           602.0,
@@ -74,13 +78,15 @@
           182.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           819.0,
@@ -99,13 +105,15 @@
           170.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           334.0,
@@ -124,13 +132,15 @@
           446.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           324.0,
@@ -149,13 +159,15 @@
           692.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           316.0,
@@ -174,13 +186,15 @@
           766.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           495.0,
@@ -199,13 +213,15 @@
           1006.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           336.0,
@@ -224,13 +240,15 @@
           267.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           312.0,
@@ -249,13 +267,15 @@
           552.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           1203.0,
@@ -274,13 +294,15 @@
           357.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "capacitor.polarized",
       "line_color": null,
       "fill_color": null,
+      "label": "capacitor.polarized",
       "points": [
         [
           226.80412371134022,
@@ -299,13 +321,15 @@
           849.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "gnd",
       "line_color": null,
       "fill_color": null,
+      "label": "gnd",
       "points": [
         [
           456.0240963855421,
@@ -324,13 +348,15 @@
           1082.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "diode.light_emitting",
       "line_color": null,
       "fill_color": null,
+      "label": "diode.light_emitting",
       "points": [
         [
           1283.6363636363635,
@@ -377,13 +403,15 @@
           643.6363636363636
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "integrated_circuit",
       "line_color": null,
       "fill_color": null,
+      "label": "integrated_circuit",
       "points": [
         [
           563.0481927710842,
@@ -414,13 +442,15 @@
           346.9879518072289
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           103.0,
@@ -439,13 +469,15 @@
           168.07228915662648
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           53.0,
@@ -464,13 +496,15 @@
           234.33734939759034
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           211.0,
@@ -489,13 +523,15 @@
           305.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           203.0,
@@ -514,13 +550,15 @@
           602.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           101.0,
@@ -539,13 +577,15 @@
           884.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           530.0,
@@ -564,13 +604,15 @@
           666.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           522.2891566265059,
@@ -589,13 +631,15 @@
           749.3975903614457
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           701.0,
@@ -614,13 +658,15 @@
           747.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           879.0,
@@ -639,13 +685,15 @@
           712.6506024096385
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           552.4096385542168,
@@ -664,13 +712,15 @@
           447.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           602.4096385542168,
@@ -689,13 +739,15 @@
           394.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           806.0,
@@ -714,13 +766,15 @@
           397.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1345.0,
@@ -739,13 +793,15 @@
           361.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1383.0,
@@ -764,13 +820,15 @@
           659.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1193.0,
@@ -789,13 +847,15 @@
           146.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1048.0,
@@ -814,13 +874,15 @@
           859.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1035.0,
@@ -839,13 +901,15 @@
           732.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1263.0,
@@ -864,13 +928,15 @@
           870.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           289.0,
@@ -889,13 +955,15 @@
           989.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           690.0,
@@ -914,10 +982,16 @@
           1000.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
   ],
+  "imagePath": "../segmentation/C25_D1_P3.jpg",
+  "imageData": null,
+  "imageHeight": 1200,
+  "imageWidth": 1600,
   "lineColor": [
     0,
     255,
@@ -929,9 +1003,5 @@
     0,
     0,
     128
-  ],
-  "imagePath": "../segmentation/C25_D1_P3.jpg",
-  "imageData": null,
-  "imageHeight": 1200,
-  "imageWidth": 1600
+  ]
 }
\ No newline at end of file
diff --git a/drafter_3/instances/C26_D1_P2.json b/drafter_3/instances/C26_D1_P2.json
index 431a051365372fed2e35eff50c133377ee7d4707..040a52372083c0be810556cffcd0562126d092f3 100644
--- a/drafter_3/instances/C26_D1_P2.json
+++ b/drafter_3/instances/C26_D1_P2.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.16.7",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
-      "label": "diode",
       "line_color": null,
       "fill_color": null,
+      "label": "diode",
       "points": [
         [
           394.82608695652175,
@@ -24,13 +24,15 @@
           115.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "diode",
       "line_color": null,
       "fill_color": null,
+      "label": "diode",
       "points": [
         [
           1040.0,
@@ -49,13 +51,15 @@
           277.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "diode",
       "line_color": null,
       "fill_color": null,
+      "label": "diode",
       "points": [
         [
           1208.0,
@@ -82,13 +86,15 @@
           172.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           838.0,
@@ -107,13 +113,15 @@
           186.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           1269.0,
@@ -132,13 +140,15 @@
           332.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           130.0,
@@ -157,13 +167,15 @@
           129.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           1417.0,
@@ -182,13 +194,15 @@
           110.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           1350.0,
@@ -207,13 +221,15 @@
           479.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "capacitor.unpolarized",
       "line_color": null,
       "fill_color": null,
+      "label": "capacitor.unpolarized",
       "points": [
         [
           616.0,
@@ -232,13 +248,15 @@
           201.82608695652175
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           673.0,
@@ -257,13 +275,15 @@
           140.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           672.0,
@@ -282,13 +302,15 @@
           323.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           849.0,
@@ -307,13 +329,15 @@
           130.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           883.0,
@@ -332,13 +356,15 @@
           303.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1204.0,
@@ -357,13 +383,15 @@
           112.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1274.0,
@@ -382,13 +410,15 @@
           288.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "gnd",
       "line_color": null,
       "fill_color": null,
+      "label": "gnd",
       "points": [
         [
           848.0869565217391,
@@ -407,13 +437,15 @@
           352.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           71.0,
@@ -432,13 +464,15 @@
           331.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           1515.0,
@@ -457,10 +491,16 @@
           261.06666666666666
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
   ],
+  "imagePath": "../segmentation/C26_D1_P2.jpg",
+  "imageData": null,
+  "imageHeight": 611,
+  "imageWidth": 1600,
   "lineColor": [
     0,
     255,
@@ -472,9 +512,5 @@
     0,
     0,
     128
-  ],
-  "imagePath": "../segmentation/C26_D1_P2.jpg",
-  "imageData": null,
-  "imageHeight": 611,
-  "imageWidth": 1600
+  ]
 }
\ No newline at end of file
diff --git a/drafter_3/instances/C27_D1_P3.json b/drafter_3/instances/C27_D1_P3.json
index f0c5f305e0eef9d42816afdd5e0b4a3b3dbe31d4..fcc646d06aac9d235d651d01e65e5690e5c4a391 100644
--- a/drafter_3/instances/C27_D1_P3.json
+++ b/drafter_3/instances/C27_D1_P3.json
@@ -1,5 +1,5 @@
 {
-  "version": "5.0.1",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
@@ -25,6 +25,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -51,6 +52,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -77,6 +79,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -103,6 +106,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -129,6 +133,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -155,6 +160,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -181,6 +187,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -207,6 +214,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -233,6 +241,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -259,6 +268,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -285,6 +295,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -311,6 +322,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -337,6 +349,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -363,6 +376,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -389,6 +403,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -415,6 +430,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -441,6 +457,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -467,6 +484,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -493,6 +511,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -519,6 +538,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -545,6 +565,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -571,6 +592,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -597,6 +619,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -623,6 +646,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -657,6 +681,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -683,6 +708,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -709,6 +735,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -735,6 +762,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -761,6 +789,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -787,6 +816,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -813,6 +843,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
diff --git a/drafter_3/instances/C28_D1_P1.json b/drafter_3/instances/C28_D1_P1.json
index ed4d948e2fd36500a59cb243bbd8d19e7fbdd000..23c19d997dd131bf41c59ae82914053089768f27 100644
--- a/drafter_3/instances/C28_D1_P1.json
+++ b/drafter_3/instances/C28_D1_P1.json
@@ -1,5 +1,5 @@
 {
-  "version": "5.0.1",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
@@ -25,6 +25,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -51,6 +52,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -77,6 +79,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -86,8 +89,16 @@
       "label": "transformer",
       "points": [
         [
-          385.0,
-          396.0
+          427.3613138686132,
+          396.99270072992704
+        ],
+        [
+          429.551094890511,
+          413.78102189781026
+        ],
+        [
+          386.8503649635037,
+          413.78102189781026
         ],
         [
           385.0,
@@ -103,6 +114,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -137,6 +149,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -163,6 +176,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -189,6 +203,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -231,6 +246,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -257,6 +273,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -287,6 +304,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -313,6 +331,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -371,6 +390,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -397,6 +417,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -423,6 +444,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -449,6 +471,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -475,6 +498,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -501,6 +525,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -527,6 +552,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -553,6 +579,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -579,6 +606,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -605,6 +633,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -631,6 +660,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -657,6 +687,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -683,6 +714,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -709,6 +741,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -735,6 +768,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -769,6 +803,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -795,6 +830,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -825,6 +861,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -851,6 +888,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -877,6 +915,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -903,6 +942,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -929,6 +969,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -959,6 +1000,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -985,6 +1027,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1015,6 +1058,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1041,6 +1085,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1067,6 +1112,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1093,6 +1139,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1123,6 +1170,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1149,6 +1197,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1175,6 +1224,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1201,6 +1251,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1227,6 +1278,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1253,6 +1305,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1279,6 +1332,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1305,6 +1359,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1331,6 +1386,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1357,6 +1413,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1383,6 +1440,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1409,6 +1467,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1435,6 +1494,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1461,6 +1521,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1487,6 +1548,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1513,6 +1575,61 @@
         ]
       ],
       "group_id": null,
+      "description": null,
+      "shape_type": "polygon",
+      "flags": {}
+    },
+    {
+      "line_color": null,
+      "fill_color": null,
+      "label": "inductor",
+      "points": [
+        [
+          389.6463414634146,
+          417.56097560975616
+        ],
+        [
+          417.93902439024384,
+          417.07317073170736
+        ],
+        [
+          416.4756097560975,
+          515.1219512195122
+        ],
+        [
+          387.21532846715337,
+          514.1459854014599
+        ]
+      ],
+      "group_id": null,
+      "description": null,
+      "shape_type": "polygon",
+      "flags": {}
+    },
+    {
+      "line_color": null,
+      "fill_color": null,
+      "label": "inductor",
+      "points": [
+        [
+          432.4708029197081,
+          399.5474452554745
+        ],
+        [
+          468.602189781022,
+          399.18248175182487
+        ],
+        [
+          468.2372262773723,
+          515.2408759124088
+        ],
+        [
+          439.7700729927008,
+          513.0510948905111
+        ]
+      ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
diff --git a/drafter_3/instances/C29_D1_P1.json b/drafter_3/instances/C29_D1_P1.json
index 1602f225e13ba976afb46b08d5d51d1ddf9d28dd..d26ffd2cc8cbf3454e79d8904346631868201937 100644
--- a/drafter_3/instances/C29_D1_P1.json
+++ b/drafter_3/instances/C29_D1_P1.json
@@ -1,5 +1,5 @@
 {
-  "version": "5.0.1",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
@@ -25,6 +25,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -51,6 +52,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -77,6 +79,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -103,6 +106,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -149,6 +153,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -187,6 +192,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -217,6 +223,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -299,6 +306,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -325,6 +333,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -355,6 +364,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -381,6 +391,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -407,6 +418,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -433,6 +445,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -459,6 +472,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -485,6 +499,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -511,6 +526,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -537,6 +553,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -563,6 +580,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -589,6 +607,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -615,6 +634,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -641,6 +661,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -667,6 +688,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -693,6 +715,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -723,6 +746,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -753,6 +777,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -779,6 +804,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
diff --git a/drafter_3/instances/C29_D2_P4.json b/drafter_3/instances/C29_D2_P4.json
index 1a60944148c320f906cb572a296793ef53492ff3..4a1f57e2d006c768f5f871e04ffcfa773642714f 100644
--- a/drafter_3/instances/C29_D2_P4.json
+++ b/drafter_3/instances/C29_D2_P4.json
@@ -1,5 +1,5 @@
 {
-  "version": "5.0.1",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
@@ -45,6 +45,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -71,6 +72,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -101,6 +103,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -127,6 +130,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -153,6 +157,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -179,6 +184,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -205,6 +211,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -231,6 +238,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -265,6 +273,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -291,6 +300,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -317,6 +327,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -343,6 +354,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -369,6 +381,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -395,6 +408,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -421,6 +435,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -447,6 +462,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -473,6 +489,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -499,6 +516,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -525,6 +543,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -551,6 +570,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -577,6 +597,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -603,6 +624,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
diff --git a/drafter_3/instances/C30_D2_P4.json b/drafter_3/instances/C30_D2_P4.json
index 692cb42af2b144290da31091f7d2fcf88fc4db34..ae2c3e41866fac0a55e6b35b985a865bb54bd72a 100644
--- a/drafter_3/instances/C30_D2_P4.json
+++ b/drafter_3/instances/C30_D2_P4.json
@@ -1,5 +1,5 @@
 {
-  "version": "5.0.1",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
@@ -29,6 +29,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -55,6 +56,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -81,6 +83,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -107,6 +110,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -133,6 +137,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -159,6 +164,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -185,6 +191,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -211,6 +218,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -237,6 +245,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -263,6 +272,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -357,6 +367,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -419,6 +430,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -445,6 +457,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -471,6 +484,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -497,6 +511,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -527,6 +542,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -553,6 +569,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -579,6 +596,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -613,6 +631,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -647,6 +666,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -673,6 +693,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -699,6 +720,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -725,6 +747,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -751,6 +774,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -777,6 +801,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -803,6 +828,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -829,6 +855,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -855,6 +882,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -881,6 +909,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -907,6 +936,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -933,6 +963,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -959,6 +990,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -985,6 +1017,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1011,6 +1044,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
diff --git a/drafter_3/instances/C31_D2_P1.json b/drafter_3/instances/C31_D2_P1.json
index 4c5b84afc115c77bd423d441b6dd403bd9cc0424..2e911eb6331bf98a79d860a3c14dfa620558e73e 100644
--- a/drafter_3/instances/C31_D2_P1.json
+++ b/drafter_3/instances/C31_D2_P1.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.16.7",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
-      "label": "gnd",
       "line_color": null,
       "fill_color": null,
+      "label": "gnd",
       "points": [
         [
           102.0,
@@ -24,13 +24,15 @@
           375.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "gnd",
       "line_color": null,
       "fill_color": null,
+      "label": "gnd",
       "points": [
         [
           1375.2608695652173,
@@ -49,13 +51,15 @@
           318.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "diode.light_emitting",
       "line_color": null,
       "fill_color": null,
+      "label": "diode.light_emitting",
       "points": [
         [
           747.787610619469,
@@ -74,13 +78,15 @@
           174.78260869565213
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "voltage.dc",
       "line_color": null,
       "fill_color": null,
+      "label": "voltage.dc",
       "points": [
         [
           109.0,
@@ -99,13 +105,15 @@
           73.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "switch",
       "line_color": null,
       "fill_color": null,
+      "label": "switch",
       "points": [
         [
           413.0,
@@ -124,13 +132,15 @@
           195.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           964.0,
@@ -149,13 +159,15 @@
           243.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           32.0,
@@ -174,13 +186,15 @@
           29.368932038834952
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           454.0,
@@ -199,13 +213,15 @@
           122.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           800.4854368932039,
@@ -224,13 +240,15 @@
           95.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1019.8260869565217,
@@ -249,13 +267,15 @@
           359.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           173.0,
@@ -274,13 +294,15 @@
           282.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           172.0,
@@ -299,13 +321,15 @@
           198.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1417.0,
@@ -324,10 +348,16 @@
           266.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
   ],
+  "imagePath": "../segmentation/C31_D2_P1.jpg",
+  "imageData": null,
+  "imageHeight": 533,
+  "imageWidth": 1600,
   "lineColor": [
     0,
     255,
@@ -339,9 +369,5 @@
     0,
     0,
     128
-  ],
-  "imagePath": "../segmentation/C31_D2_P1.jpg",
-  "imageData": null,
-  "imageHeight": 533,
-  "imageWidth": 1600
+  ]
 }
\ No newline at end of file
diff --git a/drafter_3/instances/C32_D2_P4.json b/drafter_3/instances/C32_D2_P4.json
index 4bf954a3f94257b3e56e1ab0930ace6b1151f00a..814cfc4f08f181e39821530b807c77863d39f8ee 100644
--- a/drafter_3/instances/C32_D2_P4.json
+++ b/drafter_3/instances/C32_D2_P4.json
@@ -1,5 +1,5 @@
 {
-  "version": "5.0.1",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
@@ -29,6 +29,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -55,6 +56,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -81,6 +83,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -115,6 +118,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -141,6 +145,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -167,6 +172,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -193,6 +199,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -219,6 +226,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -245,6 +253,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -271,6 +280,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -313,6 +323,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -343,6 +354,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -369,6 +381,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -395,6 +408,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -421,6 +435,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -447,6 +462,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -473,6 +489,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -499,6 +516,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -525,6 +543,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -551,6 +570,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
diff --git a/drafter_3/instances/C33_D2_P2.json b/drafter_3/instances/C33_D2_P2.json
index 1ff1220ab07d7cbe7f969b7cab4036901dcbe336..714c39cb8c2a01661ff7051f0de1664be4bb8751 100644
--- a/drafter_3/instances/C33_D2_P2.json
+++ b/drafter_3/instances/C33_D2_P2.json
@@ -1,5 +1,5 @@
 {
-  "version": "5.0.1",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
@@ -25,6 +25,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -51,6 +52,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -77,6 +79,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -103,6 +106,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -129,6 +133,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -155,6 +160,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -181,6 +187,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -207,6 +214,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -237,6 +245,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -263,6 +272,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -289,6 +299,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -315,6 +326,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -341,6 +353,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -367,6 +380,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -393,6 +407,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -419,6 +434,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -449,6 +465,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -475,6 +492,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -501,6 +519,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -535,6 +554,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -561,6 +581,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -587,6 +608,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -613,6 +635,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -639,6 +662,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -665,6 +689,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -691,6 +716,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -717,6 +743,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -743,6 +770,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
diff --git a/drafter_3/instances/C34_D2_P3.json b/drafter_3/instances/C34_D2_P3.json
index 102f65125e0c4b42dce69e3a023a1f9cf9fdcbc3..34837d092809aae5953f8a44d53777feaf9bc6d8 100644
--- a/drafter_3/instances/C34_D2_P3.json
+++ b/drafter_3/instances/C34_D2_P3.json
@@ -1,5 +1,5 @@
 {
-  "version": "5.0.1",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
@@ -25,6 +25,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -34,23 +35,32 @@
       "label": "transformer",
       "points": [
         [
-          287.0,
-          138.0
+          408.9285714285714,
+          136.08928571428572
         ],
         [
-          276.271186440678,
-          322.55367231638417
+          404.46428571428567,
+          154.39285714285714
         ],
         [
-          487.0,
-          321.0
+          284.82142857142856,
+          153.5
         ],
         [
-          487.0,
-          138.0
+          276.33928571428567,
+          321.35714285714283
+        ],
+        [
+          480.8035714285714,
+          323.1428571428571
+        ],
+        [
+          492.4107142857142,
+          137.42857142857144
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -77,6 +87,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -103,6 +114,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -129,6 +141,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -155,6 +168,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -181,6 +195,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -207,6 +222,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -233,6 +249,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -259,6 +276,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -285,6 +303,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -311,6 +330,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -337,6 +357,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -363,6 +384,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -389,6 +411,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -415,6 +438,61 @@
         ]
       ],
       "group_id": null,
+      "description": null,
+      "shape_type": "polygon",
+      "flags": {}
+    },
+    {
+      "line_color": null,
+      "fill_color": null,
+      "label": "inductor",
+      "points": [
+        [
+          287.94642857142856,
+          158.41071428571428
+        ],
+        [
+          382.58928571428567,
+          157.07142857142858
+        ],
+        [
+          351.33928571428567,
+          315.10714285714283
+        ],
+        [
+          279.9107142857143,
+          317.3392857142857
+        ]
+      ],
+      "group_id": null,
+      "description": null,
+      "shape_type": "polygon",
+      "flags": {}
+    },
+    {
+      "line_color": null,
+      "fill_color": null,
+      "label": "inductor",
+      "points": [
+        [
+          390.62499999999994,
+          318.6785714285714
+        ],
+        [
+          475.8928571428571,
+          320.4642857142857
+        ],
+        [
+          489.73214285714283,
+          140.10714285714286
+        ],
+        [
+          414.2857142857142,
+          138.76785714285714
+        ]
+      ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
diff --git a/drafter_3/instances/C35_D1_P1.json b/drafter_3/instances/C35_D1_P1.json
index 94ce36c1f8e11bf5d31bda7f4c1a66129fb23504..46647ebc422dc59519228125a84a3fa98d054ba1 100644
--- a/drafter_3/instances/C35_D1_P1.json
+++ b/drafter_3/instances/C35_D1_P1.json
@@ -1,5 +1,5 @@
 {
-  "version": "5.0.1",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
@@ -25,6 +25,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -51,6 +52,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -77,6 +79,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -103,6 +106,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -129,6 +133,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -155,6 +160,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -197,6 +203,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -239,6 +246,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -265,6 +273,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -291,6 +300,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -317,6 +327,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -343,6 +354,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -369,6 +381,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -395,6 +408,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -421,6 +435,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -447,6 +462,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -473,6 +489,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -499,6 +516,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -525,6 +543,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -551,6 +570,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -577,6 +597,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -603,6 +624,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -629,6 +651,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -655,6 +678,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -681,6 +705,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -719,6 +744,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -745,6 +771,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -771,6 +798,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -797,6 +825,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -823,6 +852,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -849,6 +879,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -875,6 +906,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -901,6 +933,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -927,6 +960,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -953,6 +987,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -979,6 +1014,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1017,6 +1053,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1055,6 +1092,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1081,6 +1119,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1107,6 +1146,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1133,6 +1173,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1159,6 +1200,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1185,6 +1227,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1211,6 +1254,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1237,6 +1281,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1263,6 +1308,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1289,6 +1335,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1315,6 +1362,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1341,6 +1389,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1367,6 +1416,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1393,6 +1443,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1419,6 +1470,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1445,6 +1497,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1471,6 +1524,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1497,6 +1551,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1523,6 +1578,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1549,6 +1605,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1575,6 +1632,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1601,6 +1659,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1627,6 +1686,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1653,6 +1713,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1679,6 +1740,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1705,6 +1767,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1731,6 +1794,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1757,6 +1821,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1783,6 +1848,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1809,6 +1875,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1835,6 +1902,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1861,6 +1929,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
diff --git a/drafter_3/instances/C36_D1_P4.json b/drafter_3/instances/C36_D1_P4.json
index f69d481baadd862573ff90fa88f99499e07d38f3..5c9915361516ecefd73d7ae446c488a549ec92ab 100644
--- a/drafter_3/instances/C36_D1_P4.json
+++ b/drafter_3/instances/C36_D1_P4.json
@@ -1,5 +1,5 @@
 {
-  "version": "5.0.1",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
@@ -25,6 +25,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -51,6 +52,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -77,6 +79,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -103,6 +106,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -129,6 +133,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -155,6 +160,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -181,6 +187,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -207,6 +214,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -233,6 +241,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -259,6 +268,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -285,6 +295,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -311,6 +322,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -337,6 +349,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -363,6 +376,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -389,6 +403,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -447,6 +462,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -513,6 +529,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -539,6 +556,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -565,6 +583,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -591,6 +610,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -617,6 +637,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -643,6 +664,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -669,6 +691,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -695,6 +718,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -721,6 +745,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -747,6 +772,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -773,6 +799,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -799,6 +826,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -841,6 +869,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -871,6 +900,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -897,6 +927,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -923,6 +954,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -949,6 +981,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -975,6 +1008,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1025,6 +1059,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1051,6 +1086,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1077,6 +1113,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1103,6 +1140,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1129,6 +1167,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1155,6 +1194,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1181,6 +1221,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1207,6 +1248,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1233,6 +1275,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1259,6 +1302,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1285,6 +1329,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1311,6 +1356,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1337,6 +1383,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1363,6 +1410,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1389,6 +1437,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1415,6 +1464,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1441,6 +1491,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1471,6 +1522,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1497,6 +1549,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1535,6 +1588,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1569,6 +1623,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1595,6 +1650,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1621,6 +1677,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1647,6 +1704,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
diff --git a/drafter_4/annotations/C37_D1_P1.xml b/drafter_4/annotations/C37_D1_P1.xml
index 69db90fd6519d75df761effb9e793f1c3140fd90..41c2039a84f1f96e64a922608e31d980b05c373e 100644
--- a/drafter_4/annotations/C37_D1_P1.xml
+++ b/drafter_4/annotations/C37_D1_P1.xml
@@ -273,7 +273,6 @@
 			<ymin>834</ymin>
 			<xmax>718</xmax>
 			<ymax>883</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -286,7 +285,6 @@
 			<ymin>822</ymin>
 			<xmax>1223</xmax>
 			<ymax>874</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -338,7 +336,7 @@
 			<ymin>261</ymin>
 			<xmax>1579</xmax>
 			<ymax>381</ymax>
-			<rotation>86</rotation>
+			<rotation>94</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -521,7 +519,7 @@
 			<xmax>1668</xmax>
 			<ymax>194</ymax>
 		</bndbox>
-		<text>Vl</text>
+		<text>VL</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_4/annotations/C37_D1_P2.xml b/drafter_4/annotations/C37_D1_P2.xml
index f017702417a8acc7c16322385fdaa6c4ef033d44..ceb2d098aad2bb75904ef79cdcbeb2a224e665b9 100644
--- a/drafter_4/annotations/C37_D1_P2.xml
+++ b/drafter_4/annotations/C37_D1_P2.xml
@@ -249,7 +249,6 @@
 			<ymin>842</ymin>
 			<xmax>517</xmax>
 			<ymax>891</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -262,7 +261,6 @@
 			<ymin>835</ymin>
 			<xmax>1012</xmax>
 			<ymax>887</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -484,7 +482,7 @@
 			<xmax>1492</xmax>
 			<ymax>188</ymax>
 		</bndbox>
-		<text>Vl</text>
+		<text>VL</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_4/annotations/C37_D1_P3.xml b/drafter_4/annotations/C37_D1_P3.xml
index fa88f6f1162ae9e95b7d5198e60d5e5a904dbdd5..d86c8dee49c71e497a8a634eb0423459f1788082 100644
--- a/drafter_4/annotations/C37_D1_P3.xml
+++ b/drafter_4/annotations/C37_D1_P3.xml
@@ -249,7 +249,7 @@
 			<ymin>718</ymin>
 			<xmax>508</xmax>
 			<ymax>767</ymax>
-			<rotation>6</rotation>
+			<rotation>352</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -262,7 +262,7 @@
 			<ymin>736</ymin>
 			<xmax>991</xmax>
 			<ymax>788</ymax>
-			<rotation>8</rotation>
+			<rotation>352</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -275,7 +275,7 @@
 			<ymin>215</ymin>
 			<xmax>1062</xmax>
 			<ymax>349</ymax>
-			<rotation>91</rotation>
+			<rotation>81</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -497,7 +497,7 @@
 			<xmax>1469</xmax>
 			<ymax>180</ymax>
 		</bndbox>
-		<text>Vl</text>
+		<text>VL</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_4/annotations/C37_D1_P4.xml b/drafter_4/annotations/C37_D1_P4.xml
index 67113c944909c535468189189c77d7d7a33432e4..2868bb379dd9dc00daabedea7e4e987da8367fc6 100644
--- a/drafter_4/annotations/C37_D1_P4.xml
+++ b/drafter_4/annotations/C37_D1_P4.xml
@@ -261,7 +261,7 @@
 			<ymin>890</ymin>
 			<xmax>607</xmax>
 			<ymax>943</ymax>
-			<rotation>9</rotation>
+			<rotation>356</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -312,7 +312,7 @@
 			<ymin>250</ymin>
 			<xmax>565</xmax>
 			<ymax>378</ymax>
-			<rotation>93</rotation>
+			<rotation>79</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C37_D2_P1.xml b/drafter_4/annotations/C37_D2_P1.xml
index e0c8df01d87c9876d5782148dccff47d8925e3f3..09077712bcfbedcf92b37a12327e2bae0ecc2a3a 100644
--- a/drafter_4/annotations/C37_D2_P1.xml
+++ b/drafter_4/annotations/C37_D2_P1.xml
@@ -249,7 +249,6 @@
 			<ymin>821</ymin>
 			<xmax>398</xmax>
 			<ymax>891</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -262,7 +261,6 @@
 			<ymin>795</ymin>
 			<xmax>921</xmax>
 			<ymax>859</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -275,7 +273,7 @@
 			<ymin>254</ymin>
 			<xmax>994</xmax>
 			<ymax>403</ymax>
-			<rotation>90</rotation>
+			<rotation>81</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -367,7 +365,7 @@
 			<xmax>1448</xmax>
 			<ymax>223</ymax>
 		</bndbox>
-		<text>Vl</text>
+		<text>VL</text>
 	</object>
 	<object>
 		<name>terminal</name>
diff --git a/drafter_4/annotations/C37_D2_P2.xml b/drafter_4/annotations/C37_D2_P2.xml
index 5adf96449d36833cd30f4fb95c943fd056e4264c..a85feed3f8de996fcc3b035e30166334031c5efc 100644
--- a/drafter_4/annotations/C37_D2_P2.xml
+++ b/drafter_4/annotations/C37_D2_P2.xml
@@ -250,7 +250,6 @@
 			<ymin>808</ymin>
 			<xmax>1216</xmax>
 			<ymax>879</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -355,7 +354,7 @@
 			<xmax>1757</xmax>
 			<ymax>185</ymax>
 		</bndbox>
-		<text>Vl</text>
+		<text>VL</text>
 	</object>
 	<object>
 		<name>terminal</name>
diff --git a/drafter_4/annotations/C37_D2_P3.xml b/drafter_4/annotations/C37_D2_P3.xml
index 15630c2b23f9e51659684660454fede432649d32..1e83d10c922c1d514db979ea6d094dff548eb385 100644
--- a/drafter_4/annotations/C37_D2_P3.xml
+++ b/drafter_4/annotations/C37_D2_P3.xml
@@ -248,8 +248,8 @@
 			<xmin>205</xmin>
 			<ymin>749</ymin>
 			<xmax>342</xmax>
-			<ymax>819</ymax>
-			<rotation>173</rotation>
+			<ymax>815</ymax>
+			<rotation>185</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -272,7 +272,7 @@
 		<bndbox>
 			<xmin>885</xmin>
 			<ymin>217</ymin>
-			<xmax>943</xmax>
+			<xmax>931</xmax>
 			<ymax>350</ymax>
 			<rotation>78</rotation>
 		</bndbox>
@@ -285,9 +285,9 @@
 		<bndbox>
 			<xmin>587</xmin>
 			<ymin>227</ymin>
-			<xmax>652</xmax>
+			<xmax>642</xmax>
 			<ymax>365</ymax>
-			<rotation>90</rotation>
+			<rotation>75</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -298,9 +298,9 @@
 		<bndbox>
 			<xmin>269</xmin>
 			<ymin>235</ymin>
-			<xmax>321</xmax>
+			<xmax>314</xmax>
 			<ymax>353</ymax>
-			<rotation>90</rotation>
+			<rotation>75</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -366,7 +366,7 @@
 			<xmax>1388</xmax>
 			<ymax>176</ymax>
 		</bndbox>
-		<text>Vl</text>
+		<text>VL</text>
 	</object>
 	<object>
 		<name>terminal</name>
diff --git a/drafter_4/annotations/C37_D2_P4.xml b/drafter_4/annotations/C37_D2_P4.xml
index 6198fa2c647daa6ed7ce69430ac740517045b17b..bd325ef6bc8190f219751fa2a90540974fe35020 100644
--- a/drafter_4/annotations/C37_D2_P4.xml
+++ b/drafter_4/annotations/C37_D2_P4.xml
@@ -277,7 +277,7 @@
 			<ymin>282</ymin>
 			<xmax>1144</xmax>
 			<ymax>431</ymax>
-			<rotation>90</rotation>
+			<rotation>75</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -290,7 +290,7 @@
 			<ymin>288</ymin>
 			<xmax>789</xmax>
 			<ymax>426</ymax>
-			<rotation>90</rotation>
+			<rotation>77</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -303,7 +303,7 @@
 			<ymin>291</ymin>
 			<xmax>385</xmax>
 			<ymax>415</ymax>
-			<rotation>90</rotation>
+			<rotation>79</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -369,7 +369,7 @@
 			<xmax>1662</xmax>
 			<ymax>243</ymax>
 		</bndbox>
-		<text>Vl</text>
+		<text>VL</text>
 	</object>
 	<object>
 		<name>terminal</name>
diff --git a/drafter_4/annotations/C38_D1_P1.xml b/drafter_4/annotations/C38_D1_P1.xml
index c3812bda8e24c5b7c99502e0413995992237094d..513b3924c990984fb074c4eea1622364491de25f 100644
--- a/drafter_4/annotations/C38_D1_P1.xml
+++ b/drafter_4/annotations/C38_D1_P1.xml
@@ -17,10 +17,10 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>361</xmin>
-			<ymin>460</ymin>
-			<xmax>500</xmax>
-			<ymax>670</ymax>
+			<xmin>372</xmin>
+			<ymin>462</ymin>
+			<xmax>494</xmax>
+			<ymax>664</ymax>
 		</bndbox>
 	</object>
 	<object>
@@ -879,10 +879,10 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>414</xmin>
+			<xmin>415</xmin>
 			<ymin>464</ymin>
-			<xmax>460</xmax>
-			<ymax>660</ymax>
+			<xmax>458</xmax>
+			<ymax>662</ymax>
 		</bndbox>
 	</object>
 	<object>
@@ -891,10 +891,11 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>455</xmin>
+			<xmin>457</xmin>
 			<ymin>470</ymin>
 			<xmax>493</xmax>
 			<ymax>655</ymax>
+			<rotation>87</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -903,10 +904,11 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>373</xmin>
+			<xmin>374</xmin>
 			<ymin>473</ymin>
-			<xmax>413</xmax>
+			<xmax>414</xmax>
 			<ymax>662</ymax>
+			<rotation>85</rotation>
 		</bndbox>
 	</object>
 </annotation>
diff --git a/drafter_4/annotations/C38_D1_P2.xml b/drafter_4/annotations/C38_D1_P2.xml
index 08ecea0449478b73348f1234dfcc1a95af8acd13..4a6f4e45f59f13b1f3884ee19ec0c24acc6cfd7d 100644
--- a/drafter_4/annotations/C38_D1_P2.xml
+++ b/drafter_4/annotations/C38_D1_P2.xml
@@ -17,10 +17,10 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>344</xmin>
-			<ymin>435</ymin>
-			<xmax>475</xmax>
-			<ymax>648</ymax>
+			<xmin>350</xmin>
+			<ymin>433</ymin>
+			<xmax>469</xmax>
+			<ymax>642</ymax>
 		</bndbox>
 	</object>
 	<object>
@@ -894,6 +894,7 @@
 			<ymin>449</ymin>
 			<xmax>389</xmax>
 			<ymax>640</ymax>
+			<rotation>83</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -906,6 +907,7 @@
 			<ymin>448</ymin>
 			<xmax>467</xmax>
 			<ymax>640</ymax>
+			<rotation>83</rotation>
 		</bndbox>
 	</object>
 </annotation>
diff --git a/drafter_4/annotations/C38_D1_P3.xml b/drafter_4/annotations/C38_D1_P3.xml
index 927b9366aa24e53747b024695fc7b4c219c63109..ce209c7288a1293219202ca34c16cdfec6a9208d 100644
--- a/drafter_4/annotations/C38_D1_P3.xml
+++ b/drafter_4/annotations/C38_D1_P3.xml
@@ -17,10 +17,10 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>381</xmin>
+			<xmin>388</xmin>
 			<ymin>484</ymin>
-			<xmax>527</xmax>
-			<ymax>702</ymax>
+			<xmax>518</xmax>
+			<ymax>696</ymax>
 		</bndbox>
 	</object>
 	<object>
@@ -878,7 +878,7 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>431</xmin>
+			<xmin>432</xmin>
 			<ymin>487</ymin>
 			<xmax>490</xmax>
 			<ymax>693</ymax>
@@ -894,6 +894,7 @@
 			<ymin>491</ymin>
 			<xmax>515</xmax>
 			<ymax>686</ymax>
+			<rotation>75</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -904,8 +905,9 @@
 		<bndbox>
 			<xmin>391</xmin>
 			<ymin>497</ymin>
-			<xmax>438</xmax>
+			<xmax>440</xmax>
 			<ymax>691</ymax>
+			<rotation>77</rotation>
 		</bndbox>
 	</object>
 </annotation>
diff --git a/drafter_4/annotations/C38_D1_P4.xml b/drafter_4/annotations/C38_D1_P4.xml
index fd4732a48003c8aec5f38610a17615ce57d012d7..8c28327a1ff8cbd6a1765e99831faf6ac84494c5 100644
--- a/drafter_4/annotations/C38_D1_P4.xml
+++ b/drafter_4/annotations/C38_D1_P4.xml
@@ -17,10 +17,10 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>408</xmin>
-			<ymin>470</ymin>
-			<xmax>539</xmax>
-			<ymax>651</ymax>
+			<xmin>413</xmin>
+			<ymin>471</ymin>
+			<xmax>535</xmax>
+			<ymax>650</ymax>
 		</bndbox>
 	</object>
 	<object>
@@ -882,6 +882,7 @@
 			<ymin>480</ymin>
 			<xmax>532</xmax>
 			<ymax>642</ymax>
+			<rotation>77</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -890,10 +891,11 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>416</xmin>
+			<xmin>417</xmin>
 			<ymin>481</ymin>
-			<xmax>468</xmax>
+			<xmax>469</xmax>
 			<ymax>647</ymax>
+			<rotation>77</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C38_D2_P1.xml b/drafter_4/annotations/C38_D2_P1.xml
index 1d223b4d1b362d8d7abf39788b71a192aff5fa02..15bf61d2908a6c9bab9af7016a191edec4378fcb 100644
--- a/drafter_4/annotations/C38_D2_P1.xml
+++ b/drafter_4/annotations/C38_D2_P1.xml
@@ -17,10 +17,10 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>364</xmin>
-			<ymin>357</ymin>
-			<xmax>541</xmax>
-			<ymax>588</ymax>
+			<xmin>374</xmin>
+			<ymin>361</ymin>
+			<xmax>523</xmax>
+			<ymax>583</ymax>
 		</bndbox>
 	</object>
 	<object>
@@ -752,7 +752,8 @@
 			<xmin>472</xmin>
 			<ymin>370</ymin>
 			<xmax>520</xmax>
-			<ymax>573</ymax>
+			<ymax>574</ymax>
+			<rotation>79</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -763,8 +764,9 @@
 		<bndbox>
 			<xmin>377</xmin>
 			<ymin>369</ymin>
-			<xmax>429</xmax>
+			<xmax>432</xmax>
 			<ymax>581</ymax>
+			<rotation>79</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -773,7 +775,7 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>414</xmin>
+			<xmin>413</xmin>
 			<ymin>363</ymin>
 			<xmax>476</xmax>
 			<ymax>580</ymax>
diff --git a/drafter_4/annotations/C38_D2_P2.xml b/drafter_4/annotations/C38_D2_P2.xml
index d375231d39ea2c3dea48007ad5ff82565d5f2190..46fe1369a60974c402f2ba6765948419f38a9275 100644
--- a/drafter_4/annotations/C38_D2_P2.xml
+++ b/drafter_4/annotations/C38_D2_P2.xml
@@ -17,10 +17,10 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>355</xmin>
-			<ymin>250</ymin>
-			<xmax>515</xmax>
-			<ymax>495</ymax>
+			<xmin>364</xmin>
+			<ymin>252</ymin>
+			<xmax>509</xmax>
+			<ymax>494</ymax>
 		</bndbox>
 	</object>
 	<object>
@@ -752,6 +752,7 @@
 			<ymin>261</ymin>
 			<xmax>506</xmax>
 			<ymax>487</ymax>
+			<rotation>79</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -764,6 +765,7 @@
 			<ymin>258</ymin>
 			<xmax>416</xmax>
 			<ymax>489</ymax>
+			<rotation>75</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C38_D2_P3.xml b/drafter_4/annotations/C38_D2_P3.xml
index 162293e988f93025de53a60bd29cbd9ef6671fc4..67f3fe087c9a258dd92e4b5cb7bcfcd8e1711be5 100644
--- a/drafter_4/annotations/C38_D2_P3.xml
+++ b/drafter_4/annotations/C38_D2_P3.xml
@@ -17,10 +17,10 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>344</xmin>
-			<ymin>411</ymin>
-			<xmax>497</xmax>
-			<ymax>645</ymax>
+			<xmin>356</xmin>
+			<ymin>410</ymin>
+			<xmax>490</xmax>
+			<ymax>639</ymax>
 		</bndbox>
 	</object>
 	<object>
@@ -752,6 +752,7 @@
 			<ymin>419</ymin>
 			<xmax>486</xmax>
 			<ymax>628</ymax>
+			<rotation>83</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -760,10 +761,11 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>358</xmin>
+			<xmin>359</xmin>
 			<ymin>418</ymin>
-			<xmax>396</xmax>
+			<xmax>401</xmax>
 			<ymax>634</ymax>
+			<rotation>83</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -772,7 +774,7 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>388</xmin>
+			<xmin>390</xmin>
 			<ymin>412</ymin>
 			<xmax>442</xmax>
 			<ymax>636</ymax>
diff --git a/drafter_4/annotations/C38_D2_P4.xml b/drafter_4/annotations/C38_D2_P4.xml
index c7823e91ec031b6590355cd8f7d3001a69766177..c6b47ce53db35e10a7dc45789f268e8a01bc8d4c 100644
--- a/drafter_4/annotations/C38_D2_P4.xml
+++ b/drafter_4/annotations/C38_D2_P4.xml
@@ -17,10 +17,10 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>324</xmin>
-			<ymin>286</ymin>
-			<xmax>489</xmax>
-			<ymax>491</ymax>
+			<xmin>328</xmin>
+			<ymin>287</ymin>
+			<xmax>474</xmax>
+			<ymax>489</ymax>
 		</bndbox>
 	</object>
 	<object>
@@ -752,7 +752,8 @@
 			<xmin>418</xmin>
 			<ymin>292</ymin>
 			<xmax>470</xmax>
-			<ymax>486</ymax>
+			<ymax>482</ymax>
+			<rotation>81</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -763,8 +764,9 @@
 		<bndbox>
 			<xmin>332</xmin>
 			<ymin>293</ymin>
-			<xmax>387</xmax>
+			<xmax>390</xmax>
 			<ymax>486</ymax>
+			<rotation>71</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -775,7 +777,7 @@
 		<bndbox>
 			<xmin>366</xmin>
 			<ymin>290</ymin>
-			<xmax>428</xmax>
+			<xmax>430</xmax>
 			<ymax>484</ymax>
 		</bndbox>
 	</object>
diff --git a/drafter_4/annotations/C39_D1_P1.xml b/drafter_4/annotations/C39_D1_P1.xml
index 1926303d47813e5b4b28cfe39ac596daf0a39a9b..0e3baac1a0b9d252ea906d170554e2a79ac5f5a4 100644
--- a/drafter_4/annotations/C39_D1_P1.xml
+++ b/drafter_4/annotations/C39_D1_P1.xml
@@ -255,7 +255,7 @@
 			<xmax>649</xmax>
 			<ymax>106</ymax>
 		</bndbox>
-		<text>Engine Signal</text>
+		<text>ENGINE SIGNAL</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -294,7 +294,7 @@
 			<xmax>1056</xmax>
 			<ymax>220</ymax>
 		</bndbox>
-		<text>Beeper</text>
+		<text>BEEPER</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_4/annotations/C39_D1_P2.xml b/drafter_4/annotations/C39_D1_P2.xml
index b8aa35cb6fc057c2594b92fd77299a85eaec491b..0f5c0c9f80d9898ffba5d35453e435a58d92a48b 100644
--- a/drafter_4/annotations/C39_D1_P2.xml
+++ b/drafter_4/annotations/C39_D1_P2.xml
@@ -255,7 +255,7 @@
 			<xmax>753</xmax>
 			<ymax>136</ymax>
 		</bndbox>
-		<text>Engine Signal</text>
+		<text>ENGINE SIGNAL</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_4/annotations/C39_D1_P3.xml b/drafter_4/annotations/C39_D1_P3.xml
index 153320a557476524c553ec45ca36b1b350119544..63dbe7d96bf4f3591504755ec96f8148543e9bf6 100644
--- a/drafter_4/annotations/C39_D1_P3.xml
+++ b/drafter_4/annotations/C39_D1_P3.xml
@@ -21,6 +21,7 @@
 			<ymin>711</ymin>
 			<xmax>276</xmax>
 			<ymax>761</ymax>
+			<rotation>352</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -33,6 +34,7 @@
 			<ymin>816</ymin>
 			<xmax>597</xmax>
 			<ymax>866</ymax>
+			<rotation>354</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -95,7 +97,7 @@
 			<ymin>449</ymin>
 			<xmax>617</xmax>
 			<ymax>556</ymax>
-			<rotation>84</rotation>
+			<rotation>73</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -108,6 +110,7 @@
 			<ymin>359</ymin>
 			<xmax>850</xmax>
 			<ymax>442</ymax>
+			<rotation>356</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -120,6 +123,7 @@
 			<ymin>255</ymin>
 			<xmax>983</xmax>
 			<ymax>375</ymax>
+			<rotation>356</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -255,7 +259,7 @@
 			<xmax>794</xmax>
 			<ymax>130</ymax>
 		</bndbox>
-		<text>Engine Signal</text>
+		<text>ENGINE SIGNAL</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_4/annotations/C39_D1_P4.xml b/drafter_4/annotations/C39_D1_P4.xml
index 3e5612401a1aaa1b902eea2fbf33d3a42bf13637..758edfe6fb4ea0da1289309f66e894ae590a7425 100644
--- a/drafter_4/annotations/C39_D1_P4.xml
+++ b/drafter_4/annotations/C39_D1_P4.xml
@@ -82,7 +82,7 @@
 			<ymin>514</ymin>
 			<xmax>281</xmax>
 			<ymax>639</ymax>
-			<rotation>96</rotation>
+			<rotation>79</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -95,7 +95,7 @@
 			<ymin>553</ymin>
 			<xmax>667</xmax>
 			<ymax>683</ymax>
-			<rotation>90</rotation>
+			<rotation>79</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -255,7 +255,7 @@
 			<xmax>844</xmax>
 			<ymax>156</ymax>
 		</bndbox>
-		<text>Engine Signal</text>
+		<text>ENGINE SIGNAL</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_4/annotations/C39_D2_P1.xml b/drafter_4/annotations/C39_D2_P1.xml
index e0900cd2db6ea30e92bb8d21ea21c2503238d8b9..81aa1e0c2b72f8be4b532e1e1b0472e1c4a145ad 100644
--- a/drafter_4/annotations/C39_D2_P1.xml
+++ b/drafter_4/annotations/C39_D2_P1.xml
@@ -82,7 +82,7 @@
 			<ymin>434</ymin>
 			<xmax>336</xmax>
 			<ymax>571</ymax>
-			<rotation>96</rotation>
+			<rotation>81</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -95,7 +95,7 @@
 			<ymin>467</ymin>
 			<xmax>750</xmax>
 			<ymax>589</ymax>
-			<rotation>90</rotation>
+			<rotation>85</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -121,6 +121,7 @@
 			<ymin>182</ymin>
 			<xmax>1190</xmax>
 			<ymax>340</ymax>
+			<rotation>2</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -256,7 +257,7 @@
 			<xmax>816</xmax>
 			<ymax>146</ymax>
 		</bndbox>
-		<text>Engine Signal</text>
+		<text>ENGINE SIGNAL</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_4/annotations/C39_D2_P2.xml b/drafter_4/annotations/C39_D2_P2.xml
index 44be793de9f66bce1af4e09972f5ed926e127f7f..11ae1673c192db05411f48e3c9c76a41576bd3d4 100644
--- a/drafter_4/annotations/C39_D2_P2.xml
+++ b/drafter_4/annotations/C39_D2_P2.xml
@@ -82,7 +82,7 @@
 			<ymin>399</ymin>
 			<xmax>344</xmax>
 			<ymax>527</ymax>
-			<rotation>102</rotation>
+			<rotation>69</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -95,7 +95,7 @@
 			<ymin>439</ymin>
 			<xmax>720</xmax>
 			<ymax>561</ymax>
-			<rotation>90</rotation>
+			<rotation>83</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C39_D2_P4.xml b/drafter_4/annotations/C39_D2_P4.xml
index 63cb094c7de6e2b3f03da63db1de536de0b81fcf..5b7f69fff9f5e70fc1f91c55e7e5a6a3d97cdb1c 100644
--- a/drafter_4/annotations/C39_D2_P4.xml
+++ b/drafter_4/annotations/C39_D2_P4.xml
@@ -82,7 +82,7 @@
 			<ymin>463</ymin>
 			<xmax>324</xmax>
 			<ymax>622</ymax>
-			<rotation>97</rotation>
+			<rotation>81</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C40_D1_P1.xml b/drafter_4/annotations/C40_D1_P1.xml
index dddf737a9b2719cbdf7e634e23785fb648ebde7e..b2b7ef0a7c449b5583c8419647a5163c14907099 100644
--- a/drafter_4/annotations/C40_D1_P1.xml
+++ b/drafter_4/annotations/C40_D1_P1.xml
@@ -29,10 +29,10 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>292</xmin>
-			<ymin>335</ymin>
-			<xmax>420</xmax>
-			<ymax>519</ymax>
+			<xmin>297</xmin>
+			<ymin>334</ymin>
+			<xmax>415</xmax>
+			<ymax>517</ymax>
 		</bndbox>
 	</object>
 	<object>
@@ -45,6 +45,7 @@
 			<ymin>126</ymin>
 			<xmax>1612</xmax>
 			<ymax>277</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -438,12 +439,12 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>682</xmin>
+			<xmin>736</xmin>
 			<ymin>208</ymin>
 			<xmax>809</xmax>
-			<ymax>261</ymax>
+			<ymax>249</ymax>
 		</bndbox>
-		<text>1A 100V</text>
+		<text>100V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -1048,6 +1049,7 @@
 			<ymin>338</ymin>
 			<xmax>413</xmax>
 			<ymax>512</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -1060,6 +1062,7 @@
 			<ymin>339</ymin>
 			<xmax>338</xmax>
 			<ymax>515</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -1110,4 +1113,17 @@
 			<ymax>833</ymax>
 		</bndbox>
 	</object>
+	<object>
+		<name>text</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>681</xmin>
+			<ymin>230</ymin>
+			<xmax>718</xmax>
+			<ymax>263</ymax>
+		</bndbox>
+		<text>1A</text>
+	</object>
 </annotation>
diff --git a/drafter_4/annotations/C40_D1_P2.xml b/drafter_4/annotations/C40_D1_P2.xml
index 188f4a59f123ae8de87c564aad528e18603ef6f4..9f089b05def2692ea9d8572ed52176f9dd0cad90 100644
--- a/drafter_4/annotations/C40_D1_P2.xml
+++ b/drafter_4/annotations/C40_D1_P2.xml
@@ -45,6 +45,7 @@
 			<ymin>68</ymin>
 			<xmax>1744</xmax>
 			<ymax>236</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -437,12 +438,12 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>686</xmin>
+			<xmin>747</xmin>
 			<ymin>152</ymin>
 			<xmax>829</xmax>
-			<ymax>214</ymax>
+			<ymax>199</ymax>
 		</bndbox>
-		<text>1A 100V</text>
+		<text>100V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -1083,6 +1084,7 @@
 			<ymin>293</ymin>
 			<xmax>374</xmax>
 			<ymax>493</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -1095,6 +1097,7 @@
 			<ymin>294</ymin>
 			<xmax>295</xmax>
 			<ymax>487</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -1109,4 +1112,17 @@
 			<ymax>472</ymax>
 		</bndbox>
 	</object>
+	<object>
+		<name>text</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>686</xmin>
+			<ymin>172</ymin>
+			<xmax>728</xmax>
+			<ymax>208</ymax>
+		</bndbox>
+		<text>1A</text>
+	</object>
 </annotation>
diff --git a/drafter_4/annotations/C40_D1_P3.xml b/drafter_4/annotations/C40_D1_P3.xml
index d05d5158a195027c88c7720c9678d0959ea157e3..031dc6564df3b95c1890c32ab7a08e567be78fde 100644
--- a/drafter_4/annotations/C40_D1_P3.xml
+++ b/drafter_4/annotations/C40_D1_P3.xml
@@ -29,8 +29,8 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>328</xmin>
-			<ymin>257</ymin>
+			<xmin>331</xmin>
+			<ymin>258</ymin>
 			<xmax>448</xmax>
 			<ymax>436</ymax>
 		</bndbox>
@@ -45,6 +45,7 @@
 			<ymin>82</ymin>
 			<xmax>1659</xmax>
 			<ymax>221</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -439,12 +440,12 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>725</xmin>
+			<xmin>780</xmin>
 			<ymin>149</ymin>
 			<xmax>852</xmax>
-			<ymax>202</ymax>
+			<ymax>189</ymax>
 		</bndbox>
-		<text>1A 100V</text>
+		<text>100V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -1049,6 +1050,7 @@
 			<ymin>263</ymin>
 			<xmax>446</xmax>
 			<ymax>433</ymax>
+			<rotation>77</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -1061,6 +1063,7 @@
 			<ymin>261</ymin>
 			<xmax>374</xmax>
 			<ymax>428</ymax>
+			<rotation>79</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -1111,4 +1114,17 @@
 			<ymax>770</ymax>
 		</bndbox>
 	</object>
+	<object>
+		<name>text</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>727</xmin>
+			<ymin>169</ymin>
+			<xmax>762</xmax>
+			<ymax>201</ymax>
+		</bndbox>
+		<text>1A</text>
+	</object>
 </annotation>
diff --git a/drafter_4/annotations/C40_D1_P4.xml b/drafter_4/annotations/C40_D1_P4.xml
index 43384037411192c05f3e70f902a0707dc760b093..2ceee79388a5eb249ba498adb0924ad4a169b70d 100644
--- a/drafter_4/annotations/C40_D1_P4.xml
+++ b/drafter_4/annotations/C40_D1_P4.xml
@@ -29,9 +29,9 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>275</xmin>
+			<xmin>274</xmin>
 			<ymin>255</ymin>
-			<xmax>391</xmax>
+			<xmax>394</xmax>
 			<ymax>426</ymax>
 		</bndbox>
 	</object>
@@ -45,6 +45,7 @@
 			<ymin>75</ymin>
 			<xmax>1631</xmax>
 			<ymax>226</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -441,12 +442,12 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>679</xmin>
+			<xmin>734</xmin>
 			<ymin>144</ymin>
 			<xmax>804</xmax>
-			<ymax>194</ymax>
+			<ymax>184</ymax>
 		</bndbox>
-		<text>1A 100V</text>
+		<text>100V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -1061,8 +1062,9 @@
 		<bndbox>
 			<xmin>351</xmin>
 			<ymin>258</ymin>
-			<xmax>396</xmax>
+			<xmax>391</xmax>
 			<ymax>424</ymax>
+			<rotation>77</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -1075,6 +1077,7 @@
 			<ymin>256</ymin>
 			<xmax>317</xmax>
 			<ymax>423</ymax>
+			<rotation>75</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -1115,4 +1118,17 @@
 			<ymax>776</ymax>
 		</bndbox>
 	</object>
+	<object>
+		<name>text</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>681</xmin>
+			<ymin>162</ymin>
+			<xmax>713</xmax>
+			<ymax>193</ymax>
+		</bndbox>
+		<text>1A</text>
+	</object>
 </annotation>
diff --git a/drafter_4/annotations/C40_D2_P1.xml b/drafter_4/annotations/C40_D2_P1.xml
index 60a9ac9281afb81e8becbf921b80e4585c8c2763..67fe015405a5c221ba82c80e3d0a531fec16cbcc 100644
--- a/drafter_4/annotations/C40_D2_P1.xml
+++ b/drafter_4/annotations/C40_D2_P1.xml
@@ -21,6 +21,7 @@
 			<ymin>779</ymin>
 			<xmax>1558</xmax>
 			<ymax>987</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -29,9 +30,9 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>256</xmin>
-			<ymin>169</ymin>
-			<xmax>400</xmax>
+			<xmin>258</xmin>
+			<ymin>171</ymin>
+			<xmax>396</xmax>
 			<ymax>359</ymax>
 		</bndbox>
 	</object>
@@ -45,6 +46,7 @@
 			<ymin>31</ymin>
 			<xmax>1256</xmax>
 			<ymax>150</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -993,6 +995,7 @@
 			<ymin>177</ymin>
 			<xmax>392</xmax>
 			<ymax>350</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -1005,6 +1008,7 @@
 			<ymin>174</ymin>
 			<xmax>305</xmax>
 			<ymax>357</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C40_D2_P2.xml b/drafter_4/annotations/C40_D2_P2.xml
index dc138fc0b1da0523abf6a50f51bd32634173adb3..fdf36068c852085e92ee503be893430cf5b65e16 100644
--- a/drafter_4/annotations/C40_D2_P2.xml
+++ b/drafter_4/annotations/C40_D2_P2.xml
@@ -31,8 +31,8 @@
 		<bndbox>
 			<xmin>254</xmin>
 			<ymin>167</ymin>
-			<xmax>387</xmax>
-			<ymax>350</ymax>
+			<xmax>381</xmax>
+			<ymax>348</ymax>
 		</bndbox>
 	</object>
 	<object>
@@ -45,6 +45,7 @@
 			<ymin>71</ymin>
 			<xmax>1180</xmax>
 			<ymax>179</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -234,7 +235,7 @@
 			<ymin>1068</ymin>
 			<xmax>1149</xmax>
 			<ymax>1148</ymax>
-			<rotation>95</rotation>
+			<rotation>89</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -994,6 +995,7 @@
 			<ymin>179</ymin>
 			<xmax>377</xmax>
 			<ymax>343</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -1003,9 +1005,10 @@
 		<difficult>0</difficult>
 		<bndbox>
 			<xmin>258</xmin>
-			<ymin>167</ymin>
+			<ymin>171</ymin>
 			<xmax>296</xmax>
 			<ymax>343</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C40_D2_P3.xml b/drafter_4/annotations/C40_D2_P3.xml
index 5660d54ee46b61e5e632b0300070bc7cb4dfb9e6..7a720974d21b8bbcfc74b092fbe7f3f42e8a3eab 100644
--- a/drafter_4/annotations/C40_D2_P3.xml
+++ b/drafter_4/annotations/C40_D2_P3.xml
@@ -21,6 +21,7 @@
 			<ymin>666</ymin>
 			<xmax>1504</xmax>
 			<ymax>855</ymax>
+			<rotation>6</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -29,10 +30,10 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>305</xmin>
+			<xmin>308</xmin>
 			<ymin>116</ymin>
-			<xmax>449</xmax>
-			<ymax>283</ymax>
+			<xmax>439</xmax>
+			<ymax>281</ymax>
 		</bndbox>
 	</object>
 	<object>
@@ -45,6 +46,7 @@
 			<ymin>28</ymin>
 			<xmax>1218</xmax>
 			<ymax>116</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -993,6 +995,7 @@
 			<ymin>124</ymin>
 			<xmax>436</xmax>
 			<ymax>270</ymax>
+			<rotation>75</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -1005,6 +1008,7 @@
 			<ymin>121</ymin>
 			<xmax>359</xmax>
 			<ymax>278</ymax>
+			<rotation>73</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C40_D2_P4.xml b/drafter_4/annotations/C40_D2_P4.xml
index 0245d32901de05983ee4631431e1bebbf1d4145d..3a98adb3535a9ccbe22c2575658eba2b13541b5e 100644
--- a/drafter_4/annotations/C40_D2_P4.xml
+++ b/drafter_4/annotations/C40_D2_P4.xml
@@ -21,6 +21,7 @@
 			<ymin>668</ymin>
 			<xmax>1501</xmax>
 			<ymax>862</ymax>
+			<rotation>8</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -31,7 +32,7 @@
 		<bndbox>
 			<xmin>287</xmin>
 			<ymin>117</ymin>
-			<xmax>424</xmax>
+			<xmax>419</xmax>
 			<ymax>287</ymax>
 		</bndbox>
 	</object>
@@ -45,6 +46,7 @@
 			<ymin>6</ymin>
 			<xmax>1209</xmax>
 			<ymax>97</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -981,6 +983,7 @@
 			<ymin>121</ymin>
 			<xmax>416</xmax>
 			<ymax>274</ymax>
+			<rotation>83</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -989,10 +992,11 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>287</xmin>
+			<xmin>290</xmin>
 			<ymin>119</ymin>
 			<xmax>339</xmax>
 			<ymax>285</ymax>
+			<rotation>81</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C41_D1_P1.xml b/drafter_4/annotations/C41_D1_P1.xml
index f1f43b01ec5ca6e29f4fe348b258795d38392bda..069c2cc1ab3145198fc9cdbb80ef33e7e2358b68 100644
--- a/drafter_4/annotations/C41_D1_P1.xml
+++ b/drafter_4/annotations/C41_D1_P1.xml
@@ -71,7 +71,7 @@
 			<ymin>639</ymin>
 			<xmax>1301</xmax>
 			<ymax>717</ymax>
-			<rotation>95</rotation>
+			<rotation>77</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -84,7 +84,7 @@
 			<ymin>708</ymin>
 			<xmax>1037</xmax>
 			<ymax>743</ymax>
-			<rotation>11</rotation>
+			<rotation>354</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -97,7 +97,7 @@
 			<ymin>827</ymin>
 			<xmax>1046</xmax>
 			<ymax>860</ymax>
-			<rotation>7</rotation>
+			<rotation>354</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -110,7 +110,7 @@
 			<ymin>855</ymin>
 			<xmax>668</xmax>
 			<ymax>945</ymax>
-			<rotation>99</rotation>
+			<rotation>85</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -240,6 +240,7 @@
 			<ymin>469</ymin>
 			<xmax>1019</xmax>
 			<ymax>659</ymax>
+			<rotation>354</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -339,12 +340,12 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>386</xmin>
+			<xmin>383</xmin>
 			<ymin>213</ymin>
 			<xmax>443</xmax>
 			<ymax>244</ymax>
 		</bndbox>
-		<text>400v</text>
+		<text>400V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -370,7 +371,7 @@
 			<xmax>603</xmax>
 			<ymax>224</ymax>
 		</bndbox>
-		<text>8.2v</text>
+		<text>8.2V</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_4/annotations/C41_D1_P2.xml b/drafter_4/annotations/C41_D1_P2.xml
index e8c78bc43c97c7657324505e9e5f6c6c2c96d516..c4963f91fc85d856b0fb0cbaad39edcb0d7ebdff 100644
--- a/drafter_4/annotations/C41_D1_P2.xml
+++ b/drafter_4/annotations/C41_D1_P2.xml
@@ -110,7 +110,7 @@
 			<ymin>1033</ymin>
 			<xmax>870</xmax>
 			<ymax>1149</ymax>
-			<rotation>98</rotation>
+			<rotation>85</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -240,6 +240,7 @@
 			<ymin>549</ymin>
 			<xmax>1315</xmax>
 			<ymax>787</ymax>
+			<rotation>358</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -344,7 +345,7 @@
 			<xmax>589</xmax>
 			<ymax>275</ymax>
 		</bndbox>
-		<text>400v</text>
+		<text>400V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -370,7 +371,7 @@
 			<xmax>793</xmax>
 			<ymax>252</ymax>
 		</bndbox>
-		<text>8.2v</text>
+		<text>8.2V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -396,7 +397,7 @@
 			<xmax>231</xmax>
 			<ymax>331</ymax>
 		</bndbox>
-		<text>470&#181;F</text>
+		<text>470pF</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -435,7 +436,7 @@
 			<xmax>1818</xmax>
 			<ymax>812</ymax>
 		</bndbox>
-		<text>22K&#937;</text>
+		<text>22K</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -448,7 +449,7 @@
 			<xmax>1325</xmax>
 			<ymax>834</ymax>
 		</bndbox>
-		<text>10&#937;</text>
+		<text>10M</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_4/annotations/C41_D1_P3.xml b/drafter_4/annotations/C41_D1_P3.xml
index 9ddf93b5ce2d66dc99fcf1dc6a5018e7353d53fe..0952ced855423ad4f05c3fe97b5ccc86e57e5397 100644
--- a/drafter_4/annotations/C41_D1_P3.xml
+++ b/drafter_4/annotations/C41_D1_P3.xml
@@ -71,7 +71,7 @@
 			<ymin>655</ymin>
 			<xmax>1652</xmax>
 			<ymax>752</ymax>
-			<rotation>80</rotation>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -84,7 +84,7 @@
 			<ymin>751</ymin>
 			<xmax>1290</xmax>
 			<ymax>797</ymax>
-			<rotation>8</rotation>
+			<rotation>352</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -97,7 +97,7 @@
 			<ymin>903</ymin>
 			<xmax>1312</xmax>
 			<ymax>949</ymax>
-			<rotation>7</rotation>
+			<rotation>356</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -110,7 +110,7 @@
 			<ymin>941</ymin>
 			<xmax>793</xmax>
 			<ymax>1066</ymax>
-			<rotation>102</rotation>
+			<rotation>81</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -123,7 +123,7 @@
 			<ymin>377</ymin>
 			<xmax>838</xmax>
 			<ymax>481</ymax>
-			<rotation>98</rotation>
+			<rotation>77</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -239,6 +239,7 @@
 			<ymin>466</ymin>
 			<xmax>1262</xmax>
 			<ymax>692</ymax>
+			<rotation>358</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -251,7 +252,7 @@
 			<ymin>982</ymin>
 			<xmax>926</xmax>
 			<ymax>1035</ymax>
-			<rotation>90</rotation>
+			<rotation>87</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -304,7 +305,7 @@
 			<xmax>910</xmax>
 			<ymax>412</ymax>
 		</bndbox>
-		<text>4.7&#937;</text>
+		<text>4.7M</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -317,7 +318,7 @@
 			<xmax>767</xmax>
 			<ymax>398</ymax>
 		</bndbox>
-		<text>473&#937;</text>
+		<text>4738</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -343,7 +344,7 @@
 			<xmax>554</xmax>
 			<ymax>228</ymax>
 		</bndbox>
-		<text>400v</text>
+		<text>400V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -369,7 +370,7 @@
 			<xmax>746</xmax>
 			<ymax>206</ymax>
 		</bndbox>
-		<text>8.2v</text>
+		<text>8.2V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -421,7 +422,7 @@
 			<xmax>1578</xmax>
 			<ymax>690</ymax>
 		</bndbox>
-		<text>414&#937;</text>
+		<text>4148</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -434,7 +435,7 @@
 			<xmax>1783</xmax>
 			<ymax>707</ymax>
 		</bndbox>
-		<text>22K&#937;</text>
+		<text>22K</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -460,7 +461,7 @@
 			<xmax>1270</xmax>
 			<ymax>736</ymax>
 		</bndbox>
-		<text>10&#937;</text>
+		<text>10M</text>
 	</object>
 	<object>
 		<name>crossover</name>
@@ -833,7 +834,7 @@
 			<xmax>753</xmax>
 			<ymax>1036</ymax>
 		</bndbox>
-		<text>4.7&#937;</text>
+		<text>4.7m</text>
 	</object>
 	<object>
 		<name>terminal</name>
diff --git a/drafter_4/annotations/C41_D1_P4.xml b/drafter_4/annotations/C41_D1_P4.xml
index e28ac681abb1a4f114a0e4ff18a652b7dd40db91..aea32d5fd32e6755cba22824a09903d7f284a015 100644
--- a/drafter_4/annotations/C41_D1_P4.xml
+++ b/drafter_4/annotations/C41_D1_P4.xml
@@ -84,7 +84,7 @@
 			<ymin>826</ymin>
 			<xmax>1306</xmax>
 			<ymax>876</ymax>
-			<rotation>7</rotation>
+			<rotation>354</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -97,7 +97,7 @@
 			<ymin>990</ymin>
 			<xmax>1336</xmax>
 			<ymax>1037</ymax>
-			<rotation>4</rotation>
+			<rotation>356</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -110,7 +110,7 @@
 			<ymin>1030</ymin>
 			<xmax>797</xmax>
 			<ymax>1163</ymax>
-			<rotation>97</rotation>
+			<rotation>81</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -240,6 +240,7 @@
 			<ymin>523</ymin>
 			<xmax>1274</xmax>
 			<ymax>765</ymax>
+			<rotation>358</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -252,7 +253,7 @@
 			<ymin>1073</ymin>
 			<xmax>932</xmax>
 			<ymax>1127</ymax>
-			<rotation>90</rotation>
+			<rotation>89</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -305,7 +306,7 @@
 			<xmax>910</xmax>
 			<ymax>466</ymax>
 		</bndbox>
-		<text>4.7&#937;</text>
+		<text>4.7M</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -344,7 +345,7 @@
 			<xmax>531</xmax>
 			<ymax>260</ymax>
 		</bndbox>
-		<text>400v</text>
+		<text>400V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -370,7 +371,7 @@
 			<xmax>737</xmax>
 			<ymax>238</ymax>
 		</bndbox>
-		<text>8.2v</text>
+		<text>8.2V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -435,7 +436,7 @@
 			<xmax>1795</xmax>
 			<ymax>785</ymax>
 		</bndbox>
-		<text>22K&#937;</text>
+		<text>22K</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_4/annotations/C41_D2_P1.xml b/drafter_4/annotations/C41_D2_P1.xml
index 5d1c74e9a5134c8c56e747fd9a1b3a6bfef971e9..ff388d26cfd958dd06fac609fd815dcf9ab34d2d 100644
--- a/drafter_4/annotations/C41_D2_P1.xml
+++ b/drafter_4/annotations/C41_D2_P1.xml
@@ -159,7 +159,7 @@
 			<ymin>987</ymin>
 			<xmax>896</xmax>
 			<ymax>1107</ymax>
-			<rotation>90</rotation>
+			<rotation>79</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -172,7 +172,7 @@
 			<ymin>889</ymin>
 			<xmax>1394</xmax>
 			<ymax>936</ymax>
-			<rotation>172</rotation>
+			<rotation>185</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C41_D2_P2.xml b/drafter_4/annotations/C41_D2_P2.xml
index fcd7dba5ae75c22cc133ededd9f84ac6945d5421..9ce9d747a0838efe91daeb9ce33ea5cb880b672f 100644
--- a/drafter_4/annotations/C41_D2_P2.xml
+++ b/drafter_4/annotations/C41_D2_P2.xml
@@ -60,7 +60,7 @@
 			<xmax>1406</xmax>
 			<ymax>675</ymax>
 		</bndbox>
-		<text>10&#937;</text>
+		<text>10M</text>
 	</object>
 	<object>
 		<name>diode.zener</name>
@@ -159,7 +159,7 @@
 			<ymin>921</ymin>
 			<xmax>902</xmax>
 			<ymax>1041</ymax>
-			<rotation>90</rotation>
+			<rotation>75</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -751,7 +751,7 @@
 			<xmax>826</xmax>
 			<ymax>179</ymax>
 		</bndbox>
-		<text>8.2v</text>
+		<text>8.2V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -852,7 +852,7 @@
 			<xmax>592</xmax>
 			<ymax>181</ymax>
 		</bndbox>
-		<text>400v</text>
+		<text>400V</text>
 	</object>
 	<object>
 		<name>diode</name>
diff --git a/drafter_4/annotations/C41_D2_P3.xml b/drafter_4/annotations/C41_D2_P3.xml
index cc19361dd73a8c812442920e11f195d22bb40248..c3fcb5092e4cfe8ea1c34594a2c360ebd62ae406 100644
--- a/drafter_4/annotations/C41_D2_P3.xml
+++ b/drafter_4/annotations/C41_D2_P3.xml
@@ -726,7 +726,7 @@
 			<xmax>1026</xmax>
 			<ymax>401</ymax>
 		</bndbox>
-		<text>4.7&#937;</text>
+		<text>4.7M</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -853,7 +853,7 @@
 			<xmax>563</xmax>
 			<ymax>206</ymax>
 		</bndbox>
-		<text>400v</text>
+		<text>400V</text>
 	</object>
 	<object>
 		<name>diode</name>
diff --git a/drafter_4/annotations/C41_D2_P4.xml b/drafter_4/annotations/C41_D2_P4.xml
index 3fdc0124786512e3d2155a01bdb896c2a6ec0020..78450fe3e4b7d523e2cb0102056fd636bdf4a8e4 100644
--- a/drafter_4/annotations/C41_D2_P4.xml
+++ b/drafter_4/annotations/C41_D2_P4.xml
@@ -172,7 +172,7 @@
 			<ymin>892</ymin>
 			<xmax>1465</xmax>
 			<ymax>939</ymax>
-			<rotation>170</rotation>
+			<rotation>187</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -648,7 +648,7 @@
 			<xmax>1519</xmax>
 			<ymax>984</ymax>
 		</bndbox>
-		<text>68K&#937;</text>
+		<text>68K</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -674,7 +674,7 @@
 			<xmax>1928</xmax>
 			<ymax>754</ymax>
 		</bndbox>
-		<text>22K&#937;</text>
+		<text>22K</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -752,7 +752,7 @@
 			<xmax>868</xmax>
 			<ymax>180</ymax>
 		</bndbox>
-		<text>8.2v</text>
+		<text>8.2V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -853,7 +853,7 @@
 			<xmax>609</xmax>
 			<ymax>189</ymax>
 		</bndbox>
-		<text>400v</text>
+		<text>400V</text>
 	</object>
 	<object>
 		<name>diode</name>
diff --git a/drafter_4/annotations/C42_D1_P2.xml b/drafter_4/annotations/C42_D1_P2.xml
index a19b5874b3ade7ddc6cacb535b21e576de060fac..b2805a9e0c41cfeb53d0a1df01e19bcdcf68fe63 100644
--- a/drafter_4/annotations/C42_D1_P2.xml
+++ b/drafter_4/annotations/C42_D1_P2.xml
@@ -429,9 +429,9 @@
 		<bndbox>
 			<xmin>1118</xmin>
 			<ymin>330</ymin>
-			<xmax>1175</xmax>
+			<xmax>1167</xmax>
 			<ymax>453</ymax>
-			<rotation>82</rotation>
+			<rotation>96</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C42_D1_P3.xml b/drafter_4/annotations/C42_D1_P3.xml
index ebb9135b87e9f742ae200668ed3f8369ad9eee1b..9c1730015e3a2610085f1c0bc0df7aa38c0e5347 100644
--- a/drafter_4/annotations/C42_D1_P3.xml
+++ b/drafter_4/annotations/C42_D1_P3.xml
@@ -224,7 +224,7 @@
 			<ymin>588</ymin>
 			<xmax>660</xmax>
 			<ymax>701</ymax>
-			<rotation>102</rotation>
+			<rotation>79</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -237,7 +237,7 @@
 			<ymin>507</ymin>
 			<xmax>539</xmax>
 			<ymax>608</ymax>
-			<rotation>86</rotation>
+			<rotation>81</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -460,6 +460,7 @@
 			<ymin>371</ymin>
 			<xmax>986</xmax>
 			<ymax>609</ymax>
+			<rotation>356</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C42_D2_P1.xml b/drafter_4/annotations/C42_D2_P1.xml
index 903dd2560d2812d328e34b6a95e7ed77de7a9e3e..c028780affc0940449114a4bc577273998740727 100644
--- a/drafter_4/annotations/C42_D2_P1.xml
+++ b/drafter_4/annotations/C42_D2_P1.xml
@@ -21,6 +21,7 @@
 			<ymin>327</ymin>
 			<xmax>1088</xmax>
 			<ymax>599</ymax>
+			<rotation>6</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C42_D2_P2.xml b/drafter_4/annotations/C42_D2_P2.xml
index f766640ac46856d5139a097f46d981c966e30be1..64d2c467b656c0242df1647dd9d063ba9ae1d3ef 100644
--- a/drafter_4/annotations/C42_D2_P2.xml
+++ b/drafter_4/annotations/C42_D2_P2.xml
@@ -87,7 +87,7 @@
 			<xmax>881</xmax>
 			<ymax>762</ymax>
 		</bndbox>
-		<text>10K&#937;</text>
+		<text>10K</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -446,7 +446,7 @@
 			<ymin>151</ymin>
 			<xmax>1306</xmax>
 			<ymax>265</ymax>
-			<rotation>98</rotation>
+			<rotation>75</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C42_D2_P3.xml b/drafter_4/annotations/C42_D2_P3.xml
index ea251a993ab78f31cc9eeb70821dc917d8722ad7..ee3be6134a34ab24b0129c183e5f46d5069603e0 100644
--- a/drafter_4/annotations/C42_D2_P3.xml
+++ b/drafter_4/annotations/C42_D2_P3.xml
@@ -97,7 +97,7 @@
 			<xmax>1279</xmax>
 			<ymax>267</ymax>
 		</bndbox>
-		<text>1K&#937;</text>
+		<text>1K</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -265,7 +265,7 @@
 			<ymin>196</ymin>
 			<xmax>1202</xmax>
 			<ymax>297</ymax>
-			<rotation>100</rotation>
+			<rotation>75</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -291,6 +291,7 @@
 			<ymin>325</ymin>
 			<xmax>1024</xmax>
 			<ymax>601</ymax>
+			<rotation>2</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -544,6 +545,7 @@
 			<ymin>814</ymin>
 			<xmax>636</xmax>
 			<ymax>926</ymax>
+			<rotation>179</rotation>
 		</bndbox>
 	</object>
 </annotation>
diff --git a/drafter_4/annotations/C42_D2_P4.xml b/drafter_4/annotations/C42_D2_P4.xml
index da5616b89367972974d14c97074650523443e7c0..540cd563f84cab359fcdbc4d80db2e384043044e 100644
--- a/drafter_4/annotations/C42_D2_P4.xml
+++ b/drafter_4/annotations/C42_D2_P4.xml
@@ -21,6 +21,7 @@
 			<ymin>319</ymin>
 			<xmax>1050</xmax>
 			<ymax>546</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -95,7 +96,7 @@
 			<ymin>246</ymin>
 			<xmax>611</xmax>
 			<ymax>337</ymax>
-			<rotation>80</rotation>
+			<rotation>102</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -173,7 +174,7 @@
 			<ymin>608</ymin>
 			<xmax>790</xmax>
 			<ymax>682</ymax>
-			<rotation>96</rotation>
+			<rotation>77</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -198,7 +199,7 @@
 			<ymin>479</ymin>
 			<xmax>597</xmax>
 			<ymax>569</ymax>
-			<rotation>100</rotation>
+			<rotation>79</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C43_D1_P1.xml b/drafter_4/annotations/C43_D1_P1.xml
index ab217d9087d73a3800033468516e150ad1c938d2..7c9b18255df95a882e1d78d29b632e85117448ab 100644
--- a/drafter_4/annotations/C43_D1_P1.xml
+++ b/drafter_4/annotations/C43_D1_P1.xml
@@ -46,6 +46,7 @@
 			<ymin>406</ymin>
 			<xmax>987</xmax>
 			<ymax>590</ymax>
+			<rotation>8</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C43_D1_P2.xml b/drafter_4/annotations/C43_D1_P2.xml
index a99a5b9ccd28882fda834a2ce8ee065e3b1f1e51..e9eb9a7aa607a4c5302c047d66235af9187302f8 100644
--- a/drafter_4/annotations/C43_D1_P2.xml
+++ b/drafter_4/annotations/C43_D1_P2.xml
@@ -165,7 +165,7 @@
 			<ymin>239</ymin>
 			<xmax>523</xmax>
 			<ymax>285</ymax>
-			<rotation>95</rotation>
+			<rotation>83</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -178,7 +178,7 @@
 			<ymin>230</ymin>
 			<xmax>261</xmax>
 			<ymax>277</ymax>
-			<rotation>94</rotation>
+			<rotation>85</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -243,7 +243,7 @@
 			<xmax>668</xmax>
 			<ymax>759</ymax>
 		</bndbox>
-		<text>39K&#937;</text>
+		<text>39K</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -256,7 +256,7 @@
 			<xmax>561</xmax>
 			<ymax>570</ymax>
 		</bndbox>
-		<text>10K&#937;</text>
+		<text>10K</text>
 	</object>
 	<object>
 		<name>resistor.adjustable</name>
@@ -281,6 +281,7 @@
 			<ymin>423</ymin>
 			<xmax>1012</xmax>
 			<ymax>606</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -563,7 +564,7 @@
 			<xmax>591</xmax>
 			<ymax>288</ymax>
 		</bndbox>
-		<text>10mF</text>
+		<text>10&#181;F</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -663,7 +664,7 @@
 			<ymin>669</ymin>
 			<xmax>591</xmax>
 			<ymax>776</ymax>
-			<rotation>86</rotation>
+			<rotation>73</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -676,7 +677,7 @@
 			<ymin>299</ymin>
 			<xmax>1221</xmax>
 			<ymax>336</ymax>
-			<rotation>6</rotation>
+			<rotation>350</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C43_D1_P3.xml b/drafter_4/annotations/C43_D1_P3.xml
index a8d9ac7cfdbee08dfba02d2018085a0f6b8e506a..f9b7e655516ae60025896751fcd03cd14694cc17 100644
--- a/drafter_4/annotations/C43_D1_P3.xml
+++ b/drafter_4/annotations/C43_D1_P3.xml
@@ -84,7 +84,7 @@
 			<xmax>781</xmax>
 			<ymax>807</ymax>
 		</bndbox>
-		<text>39K&#937;</text>
+		<text>39K</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -97,7 +97,7 @@
 			<xmax>646</xmax>
 			<ymax>595</ymax>
 		</bndbox>
-		<text>10k&#937;</text>
+		<text>10k</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -323,7 +323,7 @@
 			<ymin>217</ymin>
 			<xmax>573</xmax>
 			<ymax>272</ymax>
-			<rotation>94</rotation>
+			<rotation>87</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -374,6 +374,7 @@
 			<ymin>422</ymin>
 			<xmax>1137</xmax>
 			<ymax>631</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C43_D1_P4.xml b/drafter_4/annotations/C43_D1_P4.xml
index 8d500ddf5c9ad052875a9da32b5cf855c3a81a1e..02ff01dddfb021be4a9631bd48c03445b21fb58c 100644
--- a/drafter_4/annotations/C43_D1_P4.xml
+++ b/drafter_4/annotations/C43_D1_P4.xml
@@ -208,7 +208,7 @@
 			<xmax>942</xmax>
 			<ymax>281</ymax>
 		</bndbox>
-		<text>10K&#937;</text>
+		<text>10K</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -247,7 +247,7 @@
 			<xmax>557</xmax>
 			<ymax>581</ymax>
 		</bndbox>
-		<text>39K&#937;</text>
+		<text>39K</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -260,7 +260,7 @@
 			<xmax>471</xmax>
 			<ymax>442</ymax>
 		</bndbox>
-		<text>10K&#937;</text>
+		<text>10K</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -480,6 +480,7 @@
 			<ymin>321</ymin>
 			<xmax>793</xmax>
 			<ymax>461</ymax>
+			<rotation>6</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -519,7 +520,7 @@
 			<xmax>585</xmax>
 			<ymax>235</ymax>
 		</bndbox>
-		<text>0.1&#181;F</text>
+		<text>.1&#181;F</text>
 	</object>
 	<object>
 		<name>junction</name>
diff --git a/drafter_4/annotations/C43_D2_P1.xml b/drafter_4/annotations/C43_D2_P1.xml
index 97f832a8b21a6905ca2186b422990c528fae11a1..17e741b652d7ea7b485db35a6c1878595b12a22d 100644
--- a/drafter_4/annotations/C43_D2_P1.xml
+++ b/drafter_4/annotations/C43_D2_P1.xml
@@ -302,6 +302,7 @@
 			<ymin>386</ymin>
 			<xmax>1186</xmax>
 			<ymax>582</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -376,7 +377,7 @@
 			<xmax>863</xmax>
 			<ymax>305</ymax>
 		</bndbox>
-		<text>0.1&#181;F</text>
+		<text>.1&#181;F</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_4/annotations/C43_D2_P2.xml b/drafter_4/annotations/C43_D2_P2.xml
index 75314c5593200496ca0d6d6c45e38fd1f6b4af72..f61419be9882746cb398b00142804c84f5e84a05 100644
--- a/drafter_4/annotations/C43_D2_P2.xml
+++ b/drafter_4/annotations/C43_D2_P2.xml
@@ -216,6 +216,7 @@
 			<ymin>402</ymin>
 			<xmax>1113</xmax>
 			<ymax>594</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -266,7 +267,7 @@
 			<xmax>799</xmax>
 			<ymax>329</ymax>
 		</bndbox>
-		<text>0.1pF</text>
+		<text>.1pF</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_4/annotations/C43_D2_P3.xml b/drafter_4/annotations/C43_D2_P3.xml
index 8131b866f4033fe0f5e6a418558eebf89034d377..1ae87c98f357d4f916a3e5e6b7f43e73fb03a0dc 100644
--- a/drafter_4/annotations/C43_D2_P3.xml
+++ b/drafter_4/annotations/C43_D2_P3.xml
@@ -119,10 +119,10 @@
 		<bndbox>
 			<xmin>739</xmin>
 			<ymin>262</ymin>
-			<xmax>805</xmax>
+			<xmax>802</xmax>
 			<ymax>307</ymax>
 		</bndbox>
-		<text>0.1&#181;F</text>
+		<text>.1pF</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -310,7 +310,7 @@
 			<ymin>681</ymin>
 			<xmax>685</xmax>
 			<ymax>810</ymax>
-			<rotation>94</rotation>
+			<rotation>77</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -627,6 +627,7 @@
 			<ymin>378</ymin>
 			<xmax>1110</xmax>
 			<ymax>555</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C43_D2_P4.xml b/drafter_4/annotations/C43_D2_P4.xml
index e787d87ea6c6104ec984def78bd4563aef5a6ece..58a6b5a131351533c12a50795b48875bc1515a63 100644
--- a/drafter_4/annotations/C43_D2_P4.xml
+++ b/drafter_4/annotations/C43_D2_P4.xml
@@ -231,7 +231,7 @@
 			<xmax>756</xmax>
 			<ymax>247</ymax>
 		</bndbox>
-		<text>0.1&#181;F</text>
+		<text>.1&#181;F</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -639,6 +639,7 @@
 			<ymin>310</ymin>
 			<xmax>1075</xmax>
 			<ymax>483</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C44_D1_P1.xml b/drafter_4/annotations/C44_D1_P1.xml
index c92531b3e64b220943ef92e603fe583493e11796..7081611008035699d65d6a5e1f4be6ff2e57fee4 100644
--- a/drafter_4/annotations/C44_D1_P1.xml
+++ b/drafter_4/annotations/C44_D1_P1.xml
@@ -525,7 +525,7 @@
 			<xmax>1006</xmax>
 			<ymax>781</ymax>
 		</bndbox>
-		<text>100&#181;F</text>
+		<text>100uF</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -627,7 +627,7 @@
 			<xmax>1183</xmax>
 			<ymax>481</ymax>
 		</bndbox>
-		<text>100K&#937;</text>
+		<text>100K</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_4/annotations/C44_D1_P2.xml b/drafter_4/annotations/C44_D1_P2.xml
index ef3ee172416c5a9dd72b10eb67ee34ac332a4c46..4f7acd969cff1ab0b512efcdfb779afbb8c8a424 100644
--- a/drafter_4/annotations/C44_D1_P2.xml
+++ b/drafter_4/annotations/C44_D1_P2.xml
@@ -271,6 +271,7 @@
 			<ymin>309</ymin>
 			<xmax>1340</xmax>
 			<ymax>439</ymax>
+			<rotation>358</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -829,7 +830,7 @@
 			<xmax>778</xmax>
 			<ymax>628</ymax>
 		</bndbox>
-		<text>100&#181;F</text>
+		<text>100uF</text>
 	</object>
 	<object>
 		<name>junction</name>
diff --git a/drafter_4/annotations/C44_D1_P3.xml b/drafter_4/annotations/C44_D1_P3.xml
index b41934a6529373a534b321923b427857e3f7f008..f4f70bacc00f678a9221ab76698ae95b0fb5d1b7 100644
--- a/drafter_4/annotations/C44_D1_P3.xml
+++ b/drafter_4/annotations/C44_D1_P3.xml
@@ -214,7 +214,7 @@
 			<xmax>1031</xmax>
 			<ymax>745</ymax>
 		</bndbox>
-		<text>100&#181;F</text>
+		<text>100uF</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_4/annotations/C44_D1_P4.xml b/drafter_4/annotations/C44_D1_P4.xml
index bfc306faff1ffd43d73c16c9e6801bd136282c26..010916636a1ff421ca9cd34d16c3f305ddab3f00 100644
--- a/drafter_4/annotations/C44_D1_P4.xml
+++ b/drafter_4/annotations/C44_D1_P4.xml
@@ -456,7 +456,7 @@
 			<xmax>1082</xmax>
 			<ymax>356</ymax>
 		</bndbox>
-		<text>100K&#937;</text>
+		<text>100K</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -508,7 +508,7 @@
 			<xmax>924</xmax>
 			<ymax>593</ymax>
 		</bndbox>
-		<text>100&#181;F</text>
+		<text>100uF</text>
 	</object>
 	<object>
 		<name>junction</name>
diff --git a/drafter_4/annotations/C44_D2_P1.xml b/drafter_4/annotations/C44_D2_P1.xml
index 69ed358f2a76ad51d5c63894786a66422208d5e3..bb44c9b93707a568447a4df579bd794f2a989cd2 100644
--- a/drafter_4/annotations/C44_D2_P1.xml
+++ b/drafter_4/annotations/C44_D2_P1.xml
@@ -110,6 +110,7 @@
 			<ymin>370</ymin>
 			<xmax>1715</xmax>
 			<ymax>485</ymax>
+			<rotation>2</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C44_D2_P2.xml b/drafter_4/annotations/C44_D2_P2.xml
index 7c8ac56d974fb88eb061584b9940a7a3e3daf4a0..2eff57d57bf74b625aff0ca13878b3372030b6c7 100644
--- a/drafter_4/annotations/C44_D2_P2.xml
+++ b/drafter_4/annotations/C44_D2_P2.xml
@@ -226,6 +226,7 @@
 			<ymin>347</ymin>
 			<xmax>1589</xmax>
 			<ymax>457</ymax>
+			<rotation>2</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C44_D2_P3.xml b/drafter_4/annotations/C44_D2_P3.xml
index a24c35be4fd423c2530de543f7a02c23a738b9fb..9a61eb229377697e88792fdbfaf709dc1023a54c 100644
--- a/drafter_4/annotations/C44_D2_P3.xml
+++ b/drafter_4/annotations/C44_D2_P3.xml
@@ -202,6 +202,7 @@
 			<ymin>323</ymin>
 			<xmax>1613</xmax>
 			<ymax>431</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -537,7 +538,7 @@
 			<ymin>384</ymin>
 			<xmax>1019</xmax>
 			<ymax>475</ymax>
-			<rotation>101</rotation>
+			<rotation>92</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C44_D2_P4.xml b/drafter_4/annotations/C44_D2_P4.xml
index 1fad6a8f770e67fb0f440e8ee9d44d8169090055..069b2ada80879cb15c460fce4e5fcd88725afc38 100644
--- a/drafter_4/annotations/C44_D2_P4.xml
+++ b/drafter_4/annotations/C44_D2_P4.xml
@@ -714,6 +714,7 @@
 			<ymin>342</ymin>
 			<xmax>1514</xmax>
 			<ymax>440</ymax>
+			<rotation>6</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C45_D1_P1.xml b/drafter_4/annotations/C45_D1_P1.xml
index 6d1a820b543476ae43639cf3e79c24d3273c5cb7..1743a488406ee6d0ca32087c473f444e93d0b692 100644
--- a/drafter_4/annotations/C45_D1_P1.xml
+++ b/drafter_4/annotations/C45_D1_P1.xml
@@ -21,6 +21,7 @@
 			<ymin>339</ymin>
 			<xmax>904</xmax>
 			<ymax>450</ymax>
+			<rotation>89</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -110,7 +111,6 @@
 			<ymin>495</ymin>
 			<xmax>504</xmax>
 			<ymax>568</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -123,7 +123,6 @@
 			<ymin>493</ymin>
 			<xmax>633</xmax>
 			<ymax>573</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -356,7 +355,7 @@
 			<ymin>626</ymin>
 			<xmax>533</xmax>
 			<ymax>672</ymax>
-			<rotation>7</rotation>
+			<rotation>352</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C45_D1_P2.xml b/drafter_4/annotations/C45_D1_P2.xml
index 7ef454fff1c526cff210e7da2311d75312b34c1e..60e99aaac010ac6da544dc204d2a30083fbbc57d 100644
--- a/drafter_4/annotations/C45_D1_P2.xml
+++ b/drafter_4/annotations/C45_D1_P2.xml
@@ -34,7 +34,6 @@
 			<ymin>385</ymin>
 			<xmax>612</xmax>
 			<ymax>459</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -47,7 +46,6 @@
 			<ymin>375</ymin>
 			<xmax>763</xmax>
 			<ymax>458</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -72,6 +70,7 @@
 			<ymin>213</ymin>
 			<xmax>1076</xmax>
 			<ymax>320</ymax>
+			<rotation>92</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -356,7 +355,6 @@
 			<ymin>522</ymin>
 			<xmax>644</xmax>
 			<ymax>567</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C45_D1_P3.xml b/drafter_4/annotations/C45_D1_P3.xml
index 436c22a7190990a0dd0cc4759c067eac8ff8176e..1b3453b0feaccaea8ad38a4372fc1496c511f1db 100644
--- a/drafter_4/annotations/C45_D1_P3.xml
+++ b/drafter_4/annotations/C45_D1_P3.xml
@@ -125,7 +125,6 @@
 			<ymin>678</ymin>
 			<xmax>867</xmax>
 			<ymax>800</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -138,7 +137,6 @@
 			<ymin>664</ymin>
 			<xmax>1081</xmax>
 			<ymax>803</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -164,6 +162,7 @@
 			<ymin>404</ymin>
 			<xmax>1500</xmax>
 			<ymax>583</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -332,7 +331,6 @@
 			<ymin>897</ymin>
 			<xmax>917</xmax>
 			<ymax>969</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C45_D1_P4.xml b/drafter_4/annotations/C45_D1_P4.xml
index f9ec3407a603ae8f92c70332936a84e913da8f61..6e35e222f8f7e974230e81cfa7ac271b113f5e16 100644
--- a/drafter_4/annotations/C45_D1_P4.xml
+++ b/drafter_4/annotations/C45_D1_P4.xml
@@ -125,7 +125,7 @@
 			<ymin>707</ymin>
 			<xmax>796</xmax>
 			<ymax>773</ymax>
-			<rotation>5</rotation>
+			<rotation>354</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -150,7 +150,6 @@
 			<ymin>508</ymin>
 			<xmax>953</xmax>
 			<ymax>628</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -163,7 +162,6 @@
 			<ymin>514</ymin>
 			<xmax>757</xmax>
 			<ymax>624</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -189,6 +187,7 @@
 			<ymin>295</ymin>
 			<xmax>1346</xmax>
 			<ymax>452</ymax>
+			<rotation>89</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C45_D2_P1.xml b/drafter_4/annotations/C45_D2_P1.xml
index be36e53f1c8f99ec5375bc2b3d3a5747075a5661..544c9fc211229c785b54a9742a4897114c0226c4 100644
--- a/drafter_4/annotations/C45_D2_P1.xml
+++ b/drafter_4/annotations/C45_D2_P1.xml
@@ -282,6 +282,7 @@
 			<ymin>505</ymin>
 			<xmax>1630</xmax>
 			<ymax>687</ymax>
+			<rotation>92</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C45_D2_P2.xml b/drafter_4/annotations/C45_D2_P2.xml
index dace97b02b0b0831e8b2d23ead6c5afe1e4bd878..1aa7adc167ad890c28597477662c430deffde3de 100644
--- a/drafter_4/annotations/C45_D2_P2.xml
+++ b/drafter_4/annotations/C45_D2_P2.xml
@@ -110,7 +110,6 @@
 			<ymin>951</ymin>
 			<xmax>1139</xmax>
 			<ymax>1039</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -123,7 +122,6 @@
 			<ymin>951</ymin>
 			<xmax>1020</xmax>
 			<ymax>1036</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -185,7 +183,6 @@
 			<ymin>1059</ymin>
 			<xmax>1031</xmax>
 			<ymax>1106</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -318,6 +315,7 @@
 			<ymin>736</ymin>
 			<xmax>1467</xmax>
 			<ymax>881</ymax>
+			<rotation>92</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C45_D2_P3.xml b/drafter_4/annotations/C45_D2_P3.xml
index c8c005159afdca3020221ef4fa6c3376f7f11381..bff7b15484eb7f6a9b28be68894f6e05b3eaacb0 100644
--- a/drafter_4/annotations/C45_D2_P3.xml
+++ b/drafter_4/annotations/C45_D2_P3.xml
@@ -242,7 +242,6 @@
 			<ymin>870</ymin>
 			<xmax>992</xmax>
 			<ymax>991</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -255,7 +254,6 @@
 			<ymin>873</ymin>
 			<xmax>1145</xmax>
 			<ymax>993</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -293,7 +291,6 @@
 			<ymin>1024</ymin>
 			<xmax>1009</xmax>
 			<ymax>1100</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -318,6 +315,7 @@
 			<ymin>571</ymin>
 			<xmax>1572</xmax>
 			<ymax>759</ymax>
+			<rotation>94</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C45_D2_P4.xml b/drafter_4/annotations/C45_D2_P4.xml
index b69f5dce389dcaf71de754d8025770580086b7ef..2739fb1037287f11d8ff0b0f2ca63228122e0523 100644
--- a/drafter_4/annotations/C45_D2_P4.xml
+++ b/drafter_4/annotations/C45_D2_P4.xml
@@ -72,6 +72,7 @@
 			<ymin>451</ymin>
 			<xmax>1404</xmax>
 			<ymax>601</ymax>
+			<rotation>96</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -123,7 +124,6 @@
 			<ymin>690</ymin>
 			<xmax>927</xmax>
 			<ymax>787</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -136,7 +136,6 @@
 			<ymin>686</ymin>
 			<xmax>1054</xmax>
 			<ymax>785</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -161,7 +160,6 @@
 			<ymin>815</ymin>
 			<xmax>940</xmax>
 			<ymax>880</ymax>
-			<rotation>0</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C46_D1_P1.xml b/drafter_4/annotations/C46_D1_P1.xml
index 9c6a3ae1db49077c03a9de33f9f5d688bf78ebc5..677b70661906ee6a5759331d9ac43d61f616c9b5 100644
--- a/drafter_4/annotations/C46_D1_P1.xml
+++ b/drafter_4/annotations/C46_D1_P1.xml
@@ -153,7 +153,7 @@
 		</bndbox>
 	</object>
 	<object>
-		<name>transistor.fet</name>
+		<name>transistor.bjt</name>
 		<pose>Unspecified</pose>
 		<truncated>0</truncated>
 		<difficult>0</difficult>
@@ -162,6 +162,7 @@
 			<ymin>276</ymin>
 			<xmax>937</xmax>
 			<ymax>329</ymax>
+			<rotation>270</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -237,6 +238,7 @@
 			<ymin>790</ymin>
 			<xmax>176</xmax>
 			<ymax>854</ymax>
+			<rotation>89</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C46_D1_P2.xml b/drafter_4/annotations/C46_D1_P2.xml
index 16d10c8399b9bd0f47771b88c40967007e5421db..19213be6e2890b0eb92d499b3d2f04f0edea0f4a 100644
--- a/drafter_4/annotations/C46_D1_P2.xml
+++ b/drafter_4/annotations/C46_D1_P2.xml
@@ -135,7 +135,7 @@
 			<ymin>745</ymin>
 			<xmax>1763</xmax>
 			<ymax>835</ymax>
-			<rotation>95</rotation>
+			<rotation>92</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -277,6 +277,7 @@
 			<ymin>1096</ymin>
 			<xmax>262</xmax>
 			<ymax>1189</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -564,7 +565,7 @@
 		</bndbox>
 	</object>
 	<object>
-		<name>transistor.fet</name>
+		<name>transistor.bjt</name>
 		<pose>Unspecified</pose>
 		<truncated>0</truncated>
 		<difficult>0</difficult>
@@ -573,6 +574,7 @@
 			<ymin>389</ymin>
 			<xmax>1372</xmax>
 			<ymax>472</ymax>
+			<rotation>270</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C46_D1_P3.xml b/drafter_4/annotations/C46_D1_P3.xml
index dc7a54f3e85ccb11c07363559351b2fcb177c65c..8a36a254bfc141acefd78e7caec44be0136ecc16 100644
--- a/drafter_4/annotations/C46_D1_P3.xml
+++ b/drafter_4/annotations/C46_D1_P3.xml
@@ -12,7 +12,7 @@
 	</size>
 	<segmented>0</segmented>
 	<object>
-		<name>transistor.fet</name>
+		<name>transistor.bjt</name>
 		<pose>Unspecified</pose>
 		<truncated>0</truncated>
 		<difficult>0</difficult>
@@ -21,6 +21,7 @@
 			<ymin>383</ymin>
 			<xmax>1430</xmax>
 			<ymax>436</ymax>
+			<rotation>270</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -772,6 +773,7 @@
 			<ymin>912</ymin>
 			<xmax>443</xmax>
 			<ymax>994</ymax>
+			<rotation>87</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -824,7 +826,7 @@
 			<xmax>634</xmax>
 			<ymax>747</ymax>
 		</bndbox>
-		<text>470&#937;</text>
+		<text>470</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_4/annotations/C46_D1_P4.xml b/drafter_4/annotations/C46_D1_P4.xml
index ce1d5ff1b74f83e58a959227a09fee2a14875c9c..d4da85c286894068d54987787059c73dd5568240 100644
--- a/drafter_4/annotations/C46_D1_P4.xml
+++ b/drafter_4/annotations/C46_D1_P4.xml
@@ -361,7 +361,7 @@
 		</bndbox>
 	</object>
 	<object>
-		<name>transistor.fet</name>
+		<name>transistor.bjt</name>
 		<pose>Unspecified</pose>
 		<truncated>0</truncated>
 		<difficult>0</difficult>
@@ -370,6 +370,7 @@
 			<ymin>411</ymin>
 			<xmax>1366</xmax>
 			<ymax>478</ymax>
+			<rotation>270</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -699,6 +700,7 @@
 			<ymin>1084</ymin>
 			<xmax>248</xmax>
 			<ymax>1178</ymax>
+			<rotation>96</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C46_D2_P1.xml b/drafter_4/annotations/C46_D2_P1.xml
index ac4307edb59c454085d093c3965ff6556b630cfa..a1ea3bbfa1f53e1641f067c05df87be4f285e9d9 100644
--- a/drafter_4/annotations/C46_D2_P1.xml
+++ b/drafter_4/annotations/C46_D2_P1.xml
@@ -322,7 +322,7 @@
 		</bndbox>
 	</object>
 	<object>
-		<name>transistor.fet</name>
+		<name>transistor.bjt</name>
 		<pose>Unspecified</pose>
 		<truncated>0</truncated>
 		<difficult>0</difficult>
@@ -357,7 +357,7 @@
 			<ymin>535</ymin>
 			<xmax>815</xmax>
 			<ymax>577</ymax>
-			<rotation>7</rotation>
+			<rotation>350</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -434,6 +434,7 @@
 			<ymin>1047</ymin>
 			<xmax>209</xmax>
 			<ymax>1137</ymax>
+			<rotation>92</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -822,7 +823,7 @@
 			<ymin>517</ymin>
 			<xmax>642</xmax>
 			<ymax>587</ymax>
-			<rotation>5</rotation>
+			<rotation>356</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C46_D2_P2.xml b/drafter_4/annotations/C46_D2_P2.xml
index c155cfc47b5db6eadac5a0f2691b45b396e414c0..243001ac91a5c4a0f3e049e32506659f5012529c 100644
--- a/drafter_4/annotations/C46_D2_P2.xml
+++ b/drafter_4/annotations/C46_D2_P2.xml
@@ -72,7 +72,7 @@
 			<ymin>724</ymin>
 			<xmax>481</xmax>
 			<ymax>811</ymax>
-			<rotation>90</rotation>
+			<rotation>75</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -185,6 +185,7 @@
 			<ymin>1055</ymin>
 			<xmax>246</xmax>
 			<ymax>1153</ymax>
+			<rotation>94</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -614,7 +615,7 @@
 		</bndbox>
 	</object>
 	<object>
-		<name>transistor.fet</name>
+		<name>transistor.bjt</name>
 		<pose>Unspecified</pose>
 		<truncated>0</truncated>
 		<difficult>0</difficult>
@@ -623,6 +624,7 @@
 			<ymin>386</ymin>
 			<xmax>1449</xmax>
 			<ymax>478</ymax>
+			<rotation>270</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C46_D2_P3.xml b/drafter_4/annotations/C46_D2_P3.xml
index 177da9ce4a5d7586241186aa52ec5a6794c52f15..010f08b4b78fbabf987ea1d1a59b1b06d8e8d2fd 100644
--- a/drafter_4/annotations/C46_D2_P3.xml
+++ b/drafter_4/annotations/C46_D2_P3.xml
@@ -426,7 +426,7 @@
 		</bndbox>
 	</object>
 	<object>
-		<name>transistor.fet</name>
+		<name>transistor.bjt</name>
 		<pose>Unspecified</pose>
 		<truncated>0</truncated>
 		<difficult>0</difficult>
@@ -435,6 +435,7 @@
 			<ymin>347</ymin>
 			<xmax>1332</xmax>
 			<ymax>425</ymax>
+			<rotation>270</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -495,6 +496,7 @@
 			<ymin>876</ymin>
 			<xmax>278</xmax>
 			<ymax>958</ymax>
+			<rotation>96</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -759,6 +761,7 @@
 			<ymin>490</ymin>
 			<xmax>886</xmax>
 			<ymax>541</ymax>
+			<rotation>170</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C46_D2_P4.xml b/drafter_4/annotations/C46_D2_P4.xml
index 268b66daa74b5111f8278309252892d6e02ec895..0676436100cc2f336baf9c167e68ea10c5f4cf11 100644
--- a/drafter_4/annotations/C46_D2_P4.xml
+++ b/drafter_4/annotations/C46_D2_P4.xml
@@ -21,6 +21,7 @@
 			<ymin>917</ymin>
 			<xmax>238</xmax>
 			<ymax>1008</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -135,7 +136,7 @@
 			<xmax>1091</xmax>
 			<ymax>766</ymax>
 		</bndbox>
-		<text>470K&#937;</text>
+		<text>470K</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -161,7 +162,7 @@
 			<xmax>680</xmax>
 			<ymax>807</ymax>
 		</bndbox>
-		<text>180&#937;</text>
+		<text>180</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -404,7 +405,7 @@
 			<ymin>869</ymin>
 			<xmax>1395</xmax>
 			<ymax>918</ymax>
-			<rotation>90</rotation>
+			<rotation>96</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -456,7 +457,7 @@
 			<ymin>594</ymin>
 			<xmax>463</xmax>
 			<ymax>672</ymax>
-			<rotation>94</rotation>
+			<rotation>81</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -1108,7 +1109,7 @@
 		</bndbox>
 	</object>
 	<object>
-		<name>transistor.fet</name>
+		<name>transistor.bjt</name>
 		<pose>Unspecified</pose>
 		<truncated>0</truncated>
 		<difficult>0</difficult>
@@ -1117,6 +1118,7 @@
 			<ymin>269</ymin>
 			<xmax>1339</xmax>
 			<ymax>342</ymax>
+			<rotation>270</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C47_D1_P1.xml b/drafter_4/annotations/C47_D1_P1.xml
index e9f05f2611828762523452bc2c58853a44849764..07c6df7dddf4ae4b5c33928b4f88fbfd9113e7e7 100644
--- a/drafter_4/annotations/C47_D1_P1.xml
+++ b/drafter_4/annotations/C47_D1_P1.xml
@@ -85,6 +85,7 @@
 			<ymin>247</ymin>
 			<xmax>579</xmax>
 			<ymax>353</ymax>
+			<rotation>179</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -97,6 +98,7 @@
 			<ymin>716</ymin>
 			<xmax>561</xmax>
 			<ymax>816</ymax>
+			<rotation>179</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -109,6 +111,7 @@
 			<ymin>694</ymin>
 			<xmax>994</xmax>
 			<ymax>793</ymax>
+			<rotation>358</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -233,7 +236,7 @@
 			<xmax>1457</xmax>
 			<ymax>970</ymax>
 		</bndbox>
-		<text>100K&#937;</text>
+		<text>100K</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -337,7 +340,7 @@
 			<xmax>810</xmax>
 			<ymax>488</ymax>
 		</bndbox>
-		<text>220K&#937;</text>
+		<text>220K</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -738,6 +741,7 @@
 			<ymin>862</ymin>
 			<xmax>269</xmax>
 			<ymax>970</ymax>
+			<rotation>96</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -774,6 +778,7 @@
 			<ymin>454</ymin>
 			<xmax>349</xmax>
 			<ymax>657</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C47_D1_P2.xml b/drafter_4/annotations/C47_D1_P2.xml
index ed0cfbf5bd0a693ff444edbd9829154631bfdc1a..a254ff40e5e6c3a3364830e905987c6f2d5cd8eb 100644
--- a/drafter_4/annotations/C47_D1_P2.xml
+++ b/drafter_4/annotations/C47_D1_P2.xml
@@ -21,6 +21,7 @@
 			<ymin>590</ymin>
 			<xmax>289</xmax>
 			<ymax>682</ymax>
+			<rotation>89</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -135,7 +136,7 @@
 			<xmax>1243</xmax>
 			<ymax>440</ymax>
 		</bndbox>
-		<text>74</text>
+		<text>74C14</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -277,6 +278,7 @@
 			<ymin>127</ymin>
 			<xmax>625</xmax>
 			<ymax>199</ymax>
+			<rotation>177</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -289,6 +291,7 @@
 			<ymin>475</ymin>
 			<xmax>578</xmax>
 			<ymax>556</ymax>
+			<rotation>179</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -301,6 +304,7 @@
 			<ymin>269</ymin>
 			<xmax>396</xmax>
 			<ymax>425</ymax>
+			<rotation>83</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C47_D1_P3.xml b/drafter_4/annotations/C47_D1_P3.xml
index 438f2d5a6cfcc7897518b3cf72e5dbe6bf2ae140..e0ac307359b171be5e006f09d8b37c02197bd7bf 100644
--- a/drafter_4/annotations/C47_D1_P3.xml
+++ b/drafter_4/annotations/C47_D1_P3.xml
@@ -21,6 +21,7 @@
 			<ymin>902</ymin>
 			<xmax>244</xmax>
 			<ymax>1019</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -83,6 +84,7 @@
 			<ymin>495</ymin>
 			<xmax>337</xmax>
 			<ymax>691</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -119,6 +121,7 @@
 			<ymin>291</ymin>
 			<xmax>572</xmax>
 			<ymax>382</ymax>
+			<rotation>179</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -131,6 +134,7 @@
 			<ymin>743</ymin>
 			<xmax>559</xmax>
 			<ymax>843</ymax>
+			<rotation>180</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C47_D1_P4.xml b/drafter_4/annotations/C47_D1_P4.xml
index b548001bfe134ac3533f2c4470ff20b0cd63dcfc..04be52d0c0bcd099cbdcd144d680bfbac0085152 100644
--- a/drafter_4/annotations/C47_D1_P4.xml
+++ b/drafter_4/annotations/C47_D1_P4.xml
@@ -21,6 +21,7 @@
 			<ymin>189</ymin>
 			<xmax>435</xmax>
 			<ymax>267</ymax>
+			<rotation>180</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -33,6 +34,7 @@
 			<ymin>546</ymin>
 			<xmax>438</xmax>
 			<ymax>619</ymax>
+			<rotation>180</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -45,6 +47,7 @@
 			<ymin>523</ymin>
 			<xmax>756</xmax>
 			<ymax>595</ymax>
+			<rotation>358</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -312,6 +315,7 @@
 			<ymin>352</ymin>
 			<xmax>280</xmax>
 			<ymax>505</ymax>
+			<rotation>94</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -324,6 +328,7 @@
 			<ymin>659</ymin>
 			<xmax>231</xmax>
 			<ymax>735</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C47_D2_P1.xml b/drafter_4/annotations/C47_D2_P1.xml
index f74073c65f72473317823bf2d205dd7a128aeab1..ce463bbc25f241f9dfdb49d4ed851a7cc8b4b72d 100644
--- a/drafter_4/annotations/C47_D2_P1.xml
+++ b/drafter_4/annotations/C47_D2_P1.xml
@@ -45,6 +45,7 @@
 			<ymin>173</ymin>
 			<xmax>540</xmax>
 			<ymax>286</ymax>
+			<rotation>180</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -57,6 +58,7 @@
 			<ymin>593</ymin>
 			<xmax>508</xmax>
 			<ymax>698</ymax>
+			<rotation>180</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -69,7 +71,7 @@
 			<ymin>372</ymin>
 			<xmax>717</xmax>
 			<ymax>472</ymax>
-			<rotation>101</rotation>
+			<rotation>75</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -94,6 +96,7 @@
 			<ymin>377</ymin>
 			<xmax>352</xmax>
 			<ymax>480</ymax>
+			<rotation>87</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -560,6 +563,7 @@
 			<ymin>707</ymin>
 			<xmax>238</xmax>
 			<ymax>802</ymax>
+			<rotation>89</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C47_D2_P2.xml b/drafter_4/annotations/C47_D2_P2.xml
index 1c714c63b081699e3bffeb5d9cc284b955d9e7f2..abccbcb983f9791f76c68fad7137c83e2f51887b 100644
--- a/drafter_4/annotations/C47_D2_P2.xml
+++ b/drafter_4/annotations/C47_D2_P2.xml
@@ -21,6 +21,7 @@
 			<ymin>696</ymin>
 			<xmax>224</xmax>
 			<ymax>790</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -33,6 +34,7 @@
 			<ymin>365</ymin>
 			<xmax>340</xmax>
 			<ymax>462</ymax>
+			<rotation>89</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -93,6 +95,7 @@
 			<ymin>582</ymin>
 			<xmax>497</xmax>
 			<ymax>687</ymax>
+			<rotation>180</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -105,6 +108,7 @@
 			<ymin>157</ymin>
 			<xmax>527</xmax>
 			<ymax>267</ymax>
+			<rotation>180</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -444,7 +448,7 @@
 			<ymin>364</ymin>
 			<xmax>708</xmax>
 			<ymax>463</ymax>
-			<rotation>103</rotation>
+			<rotation>77</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C47_D2_P3.xml b/drafter_4/annotations/C47_D2_P3.xml
index 40b9f527452be964429e49c61618092fe6aab90c..859f33b8a012fbb71468d30f3764a41669b2b617 100644
--- a/drafter_4/annotations/C47_D2_P3.xml
+++ b/drafter_4/annotations/C47_D2_P3.xml
@@ -61,7 +61,7 @@
 			<xmax>680</xmax>
 			<ymax>312</ymax>
 		</bndbox>
-		<text>220K&#937;</text>
+		<text>220K</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -264,6 +264,7 @@
 			<ymin>601</ymin>
 			<xmax>226</xmax>
 			<ymax>697</ymax>
+			<rotation>94</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -348,6 +349,7 @@
 			<ymin>484</ymin>
 			<xmax>495</xmax>
 			<ymax>585</ymax>
+			<rotation>180</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -396,7 +398,7 @@
 			<ymin>271</ymin>
 			<xmax>720</xmax>
 			<ymax>364</ymax>
-			<rotation>102</rotation>
+			<rotation>79</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -445,6 +447,7 @@
 			<ymin>94</ymin>
 			<xmax>550</xmax>
 			<ymax>194</ymax>
+			<rotation>180</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -481,6 +484,7 @@
 			<ymin>285</ymin>
 			<xmax>364</xmax>
 			<ymax>380</ymax>
+			<rotation>87</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C47_D2_P4.xml b/drafter_4/annotations/C47_D2_P4.xml
index 35799313df650c23705d75e9c74b0ceba11e2ee8..46f0273d8c5fa98d8e2e37d6cd1ceb7e786f1111 100644
--- a/drafter_4/annotations/C47_D2_P4.xml
+++ b/drafter_4/annotations/C47_D2_P4.xml
@@ -34,7 +34,7 @@
 			<ymin>690</ymin>
 			<xmax>1658</xmax>
 			<ymax>751</ymax>
-			<rotation>84</rotation>
+			<rotation>94</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -60,7 +60,7 @@
 			<ymin>373</ymin>
 			<xmax>693</xmax>
 			<ymax>476</ymax>
-			<rotation>94</rotation>
+			<rotation>77</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -73,7 +73,7 @@
 			<ymin>641</ymin>
 			<xmax>1450</xmax>
 			<ymax>687</ymax>
-			<rotation>181</rotation>
+			<rotation>10</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -644,6 +644,7 @@
 			<ymin>409</ymin>
 			<xmax>324</xmax>
 			<ymax>514</ymax>
+			<rotation>89</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -817,6 +818,7 @@
 			<ymin>748</ymin>
 			<xmax>214</xmax>
 			<ymax>846</ymax>
+			<rotation>92</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C48_D1_P1.xml b/drafter_4/annotations/C48_D1_P1.xml
index 2ce5d0fbcf37c41361a2c27286ca6f5d8c491364..511bcbdb803d53a1adfe1657c9746fab0d927109 100644
--- a/drafter_4/annotations/C48_D1_P1.xml
+++ b/drafter_4/annotations/C48_D1_P1.xml
@@ -17,10 +17,11 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>1361</xmin>
+			<xmin>1367</xmin>
 			<ymin>330</ymin>
 			<xmax>1404</xmax>
 			<ymax>453</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -33,6 +34,7 @@
 			<ymin>326</ymin>
 			<xmax>1481</xmax>
 			<ymax>448</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -147,7 +149,7 @@
 			<xmax>1354</xmax>
 			<ymax>208</ymax>
 		</bndbox>
-		<text>+12v</text>
+		<text>+12V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -225,7 +227,7 @@
 			<xmax>309</xmax>
 			<ymax>729</ymax>
 		</bndbox>
-		<text>+12v</text>
+		<text>+12V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -277,7 +279,7 @@
 			<xmax>198</xmax>
 			<ymax>1124</ymax>
 		</bndbox>
-		<text>25v</text>
+		<text>25V</text>
 	</object>
 	<object>
 		<name>gnd</name>
@@ -432,7 +434,7 @@
 			<xmax>239</xmax>
 			<ymax>131</ymax>
 		</bndbox>
-		<text>+12v</text>
+		<text>+12V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -457,6 +459,7 @@
 			<ymin>93</ymin>
 			<xmax>521</xmax>
 			<ymax>176</ymax>
+			<rotation>358</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -469,6 +472,7 @@
 			<ymin>898</ymin>
 			<xmax>644</xmax>
 			<ymax>1008</ymax>
+			<rotation>180</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -481,6 +485,7 @@
 			<ymin>909</ymin>
 			<xmax>896</xmax>
 			<ymax>999</ymax>
+			<rotation>180</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -602,7 +607,7 @@
 			<ymin>804</ymin>
 			<xmax>298</xmax>
 			<ymax>913</ymax>
-			<rotation>96</rotation>
+			<rotation>85</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -615,7 +620,7 @@
 			<ymin>494</ymin>
 			<xmax>149</xmax>
 			<ymax>626</ymax>
-			<rotation>95</rotation>
+			<rotation>83</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_4/annotations/C48_D1_P2.xml b/drafter_4/annotations/C48_D1_P2.xml
index 4989e590f3619ec1655ee6244d96040652e75bcf..fd1aa0106276655db2cba88596888f8409d35a5c 100644
--- a/drafter_4/annotations/C48_D1_P2.xml
+++ b/drafter_4/annotations/C48_D1_P2.xml
@@ -132,6 +132,7 @@
 			<ymin>303</ymin>
 			<xmax>1462</xmax>
 			<ymax>431</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -144,6 +145,7 @@
 			<ymin>301</ymin>
 			<xmax>1375</xmax>
 			<ymax>434</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -242,7 +244,7 @@
 			<xmax>1330</xmax>
 			<ymax>180</ymax>
 		</bndbox>
-		<text>+12v</text>
+		<text>+12V</text>
 	</object>
 	<object>
 		<name>terminal</name>
@@ -267,7 +269,7 @@
 			<xmax>1178</xmax>
 			<ymax>733</ymax>
 		</bndbox>
-		<text>3.3K&#937;</text>
+		<text>3.3K</text>
 	</object>
 	<object>
 		<name>junction</name>
@@ -604,7 +606,7 @@
 			<xmax>412</xmax>
 			<ymax>931</ymax>
 		</bndbox>
-		<text>12K&#937;</text>
+		<text>12K</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -630,7 +632,7 @@
 			<xmax>171</xmax>
 			<ymax>1135</ymax>
 		</bndbox>
-		<text>25v</text>
+		<text>25V</text>
 	</object>
 	<object>
 		<name>capacitor.unpolarized</name>
@@ -717,7 +719,7 @@
 			<xmax>809</xmax>
 			<ymax>1103</ymax>
 		</bndbox>
-		<text>10K&#937;</text>
+		<text>10K</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -815,6 +817,7 @@
 			<ymin>896</ymin>
 			<xmax>625</xmax>
 			<ymax>1007</ymax>
+			<rotation>180</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -853,6 +856,7 @@
 			<ymin>908</ymin>
 			<xmax>886</xmax>
 			<ymax>996</ymax>
+			<rotation>180</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -993,7 +997,7 @@
 			<xmax>182</xmax>
 			<ymax>125</ymax>
 		</bndbox>
-		<text>+12v</text>
+		<text>+12V</text>
 	</object>
 	<object>
 		<name>terminal</name>
@@ -1151,6 +1155,18 @@
 			<xmax>272</xmax>
 			<ymax>729</ymax>
 		</bndbox>
-		<text>+12v</text>
+		<text>+12V</text>
+	</object>
+	<object>
+		<name>transformer</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>1337</xmin>
+			<ymin>299</ymin>
+			<xmax>1464</xmax>
+			<ymax>437</ymax>
+		</bndbox>
 	</object>
 </annotation>
diff --git a/drafter_4/annotations/C48_D1_P3.xml b/drafter_4/annotations/C48_D1_P3.xml
index a3221c961de995ac9289d3fa395e7bb219f67c37..bc2ad4a6683b34210fae52152f4ff885e3a16f8c 100644
--- a/drafter_4/annotations/C48_D1_P3.xml
+++ b/drafter_4/annotations/C48_D1_P3.xml
@@ -29,10 +29,11 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>1044</xmin>
+			<xmin>1046</xmin>
 			<ymin>290</ymin>
-			<xmax>1083</xmax>
+			<xmax>1076</xmax>
 			<ymax>396</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -45,6 +46,7 @@
 			<ymin>286</ymin>
 			<xmax>1148</xmax>
 			<ymax>390</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -58,7 +60,7 @@
 			<xmax>116</xmax>
 			<ymax>98</ymax>
 		</bndbox>
-		<text>+12v</text>
+		<text>+12V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -123,7 +125,7 @@
 			<xmax>578</xmax>
 			<ymax>124</ymax>
 		</bndbox>
-		<text>+12v</text>
+		<text>+12V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -175,7 +177,7 @@
 			<xmax>462</xmax>
 			<ymax>511</ymax>
 		</bndbox>
-		<text>680K&#937;</text>
+		<text>680K</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -214,7 +216,7 @@
 			<xmax>222</xmax>
 			<ymax>619</ymax>
 		</bndbox>
-		<text>+12v</text>
+		<text>+12V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -240,7 +242,7 @@
 			<xmax>330</xmax>
 			<ymax>773</ymax>
 		</bndbox>
-		<text>12K&#937;</text>
+		<text>12K</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -279,7 +281,7 @@
 			<xmax>149</xmax>
 			<ymax>918</ymax>
 		</bndbox>
-		<text>25v</text>
+		<text>25V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -318,7 +320,7 @@
 			<xmax>712</xmax>
 			<ymax>1057</ymax>
 		</bndbox>
-		<text>220K&#937;</text>
+		<text>220K</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -344,7 +346,7 @@
 			<xmax>915</xmax>
 			<ymax>626</ymax>
 		</bndbox>
-		<text>3.3K&#937;</text>
+		<text>3.3K</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -422,7 +424,7 @@
 			<xmax>1045</xmax>
 			<ymax>189</ymax>
 		</bndbox>
-		<text>+12v</text>
+		<text>+12V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -842,11 +844,11 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>39</xmin>
+			<xmin>45</xmin>
 			<ymin>422</ymin>
-			<xmax>84</xmax>
+			<xmax>80</xmax>
 			<ymax>537</ymax>
-			<rotation>84</rotation>
+			<rotation>94</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -881,10 +883,11 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>259</xmin>
-			<ymin>200</ymin>
-			<xmax>330</xmax>
-			<ymax>245</ymax>
+			<xmin>263</xmin>
+			<ymin>202</ymin>
+			<xmax>327</xmax>
+			<ymax>241</ymax>
+			<rotation>356</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -969,6 +972,7 @@
 			<ymin>759</ymin>
 			<xmax>679</xmax>
 			<ymax>826</ymax>
+			<rotation>180</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -981,6 +985,7 @@
 			<ymin>749</ymin>
 			<xmax>490</xmax>
 			<ymax>833</ymax>
+			<rotation>180</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -1062,10 +1067,10 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>292</xmin>
+			<xmin>301</xmin>
 			<ymin>71</ymin>
-			<xmax>366</xmax>
-			<ymax>153</ymax>
+			<xmax>357</xmax>
+			<ymax>148</ymax>
 		</bndbox>
 	</object>
 	<object>
@@ -1152,4 +1157,16 @@
 			<ymax>399</ymax>
 		</bndbox>
 	</object>
+	<object>
+		<name>transformer</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>1043</xmin>
+			<ymin>284</ymin>
+			<xmax>1150</xmax>
+			<ymax>398</ymax>
+		</bndbox>
+	</object>
 </annotation>
diff --git a/drafter_4/annotations/C48_D1_P4.xml b/drafter_4/annotations/C48_D1_P4.xml
index 5742072cd6a1a4cd84ea84ec777cbf05cc2d554e..0393a3d90a93f8e0a385018410c35d748706b853 100644
--- a/drafter_4/annotations/C48_D1_P4.xml
+++ b/drafter_4/annotations/C48_D1_P4.xml
@@ -69,6 +69,7 @@
 			<ymin>692</ymin>
 			<xmax>733</xmax>
 			<ymax>785</ymax>
+			<rotation>179</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -81,6 +82,7 @@
 			<ymin>709</ymin>
 			<xmax>948</xmax>
 			<ymax>782</ymax>
+			<rotation>177</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -117,6 +119,7 @@
 			<ymin>232</ymin>
 			<xmax>1491</xmax>
 			<ymax>327</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -129,6 +132,7 @@
 			<ymin>230</ymin>
 			<xmax>1411</xmax>
 			<ymax>331</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -575,7 +579,7 @@
 			<xmax>464</xmax>
 			<ymax>102</ymax>
 		</bndbox>
-		<text>+12v</text>
+		<text>+12V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -635,7 +639,7 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>554</xmin>
+			<xmin>552</xmin>
 			<ymin>245</ymin>
 			<xmax>640</xmax>
 			<ymax>276</ymax>
@@ -705,7 +709,7 @@
 			<xmax>464</xmax>
 			<ymax>552</ymax>
 		</bndbox>
-		<text>+12v</text>
+		<text>+12V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -770,7 +774,7 @@
 			<xmax>332</xmax>
 			<ymax>870</ymax>
 		</bndbox>
-		<text>25v</text>
+		<text>25V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -783,7 +787,7 @@
 			<xmax>883</xmax>
 			<ymax>99</ymax>
 		</bndbox>
-		<text>+12v</text>
+		<text>+12V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -887,7 +891,7 @@
 			<xmax>1231</xmax>
 			<ymax>569</ymax>
 		</bndbox>
-		<text>3.3K&#937;</text>
+		<text>3.3K</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -939,7 +943,7 @@
 			<xmax>1375</xmax>
 			<ymax>145</ymax>
 		</bndbox>
-		<text>+12v</text>
+		<text>+12V</text>
 	</object>
 	<object>
 		<name>resistor</name>
@@ -1153,4 +1157,16 @@
 		</bndbox>
 		<text>4069</text>
 	</object>
+	<object>
+		<name>transformer</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>1377</xmin>
+			<ymin>228</ymin>
+			<xmax>1492</xmax>
+			<ymax>333</ymax>
+		</bndbox>
+	</object>
 </annotation>
diff --git a/drafter_4/annotations/C48_D2_P1.xml b/drafter_4/annotations/C48_D2_P1.xml
index e8ca0c3c294262cf08a1d30d6195b16c1d0859c8..3b1e3a3d5dd9ebb7da4ddff76e8fe2576a153d33 100644
--- a/drafter_4/annotations/C48_D2_P1.xml
+++ b/drafter_4/annotations/C48_D2_P1.xml
@@ -21,6 +21,7 @@
 			<ymin>408</ymin>
 			<xmax>1402</xmax>
 			<ymax>558</ymax>
+			<rotation>8</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -86,7 +87,7 @@
 			<xmax>1052</xmax>
 			<ymax>858</ymax>
 		</bndbox>
-		<text>10K&#937;</text>
+		<text>10K</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -190,7 +191,7 @@
 			<xmax>379</xmax>
 			<ymax>894</ymax>
 		</bndbox>
-		<text>10&#194;F</text>
+		<text>10&#181;F</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -216,7 +217,7 @@
 			<xmax>1202</xmax>
 			<ymax>1050</ymax>
 		</bndbox>
-		<text>220K&#937;</text>
+		<text>220K</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -242,7 +243,7 @@
 			<xmax>1398</xmax>
 			<ymax>83</ymax>
 		</bndbox>
-		<text>+12v</text>
+		<text>+12V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -333,7 +334,7 @@
 			<xmax>589</xmax>
 			<ymax>321</ymax>
 		</bndbox>
-		<text>150PF</text>
+		<text>150pF</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -482,6 +483,7 @@
 			<ymin>328</ymin>
 			<xmax>737</xmax>
 			<ymax>413</ymax>
+			<rotation>8</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -506,6 +508,7 @@
 			<ymin>484</ymin>
 			<xmax>975</xmax>
 			<ymax>573</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -518,6 +521,7 @@
 			<ymin>671</ymin>
 			<xmax>1146</xmax>
 			<ymax>757</ymax>
+			<rotation>187</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -530,6 +534,7 @@
 			<ymin>672</ymin>
 			<xmax>849</xmax>
 			<ymax>761</ymax>
+			<rotation>185</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -592,7 +597,7 @@
 			<ymin>640</ymin>
 			<xmax>440</xmax>
 			<ymax>731</ymax>
-			<rotation>93</rotation>
+			<rotation>85</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -1005,6 +1010,7 @@
 			<ymin>151</ymin>
 			<xmax>1441</xmax>
 			<ymax>276</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -1017,6 +1023,7 @@
 			<ymin>144</ymin>
 			<xmax>1542</xmax>
 			<ymax>281</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -1128,4 +1135,16 @@
 			<ymax>81</ymax>
 		</bndbox>
 	</object>
+	<object>
+		<name>transformer</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>1399</xmin>
+			<ymin>140</ymin>
+			<xmax>1544</xmax>
+			<ymax>283</ymax>
+		</bndbox>
+	</object>
 </annotation>
diff --git a/drafter_4/annotations/C48_D2_P2.xml b/drafter_4/annotations/C48_D2_P2.xml
index fc8aa19302a9fbbaae84927b239f725a982c5900..8b48ea5b8815902e6c2e3aac081a2e3d4925098f 100644
--- a/drafter_4/annotations/C48_D2_P2.xml
+++ b/drafter_4/annotations/C48_D2_P2.xml
@@ -99,7 +99,7 @@
 			<xmax>1287</xmax>
 			<ymax>108</ymax>
 		</bndbox>
-		<text>+12v</text>
+		<text>+12V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -281,7 +281,7 @@
 			<xmax>211</xmax>
 			<ymax>572</ymax>
 		</bndbox>
-		<text>680K&#937;</text>
+		<text>680K</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -359,7 +359,7 @@
 			<xmax>1035</xmax>
 			<ymax>1143</ymax>
 		</bndbox>
-		<text>220K&#937;</text>
+		<text>220K</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -623,7 +623,7 @@
 			<ymin>746</ymin>
 			<xmax>987</xmax>
 			<ymax>833</ymax>
-			<rotation>191</rotation>
+			<rotation>187</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -661,6 +661,7 @@
 			<ymin>177</ymin>
 			<xmax>1329</xmax>
 			<ymax>320</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -673,6 +674,7 @@
 			<ymin>174</ymin>
 			<xmax>1441</xmax>
 			<ymax>323</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -1023,7 +1025,7 @@
 			<ymin>765</ymin>
 			<xmax>467</xmax>
 			<ymax>812</ymax>
-			<rotation>174</rotation>
+			<rotation>191</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -1036,7 +1038,7 @@
 			<ymin>695</ymin>
 			<xmax>267</xmax>
 			<ymax>784</ymax>
-			<rotation>90</rotation>
+			<rotation>79</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -1045,11 +1047,11 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>79</xmin>
+			<xmin>85</xmin>
 			<ymin>479</ymin>
-			<xmax>126</xmax>
+			<xmax>128</xmax>
 			<ymax>587</ymax>
-			<rotation>97</rotation>
+			<rotation>83</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -1139,4 +1141,16 @@
 			<ymax>121</ymax>
 		</bndbox>
 	</object>
+	<object>
+		<name>transformer</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>1283</xmin>
+			<ymin>171</ymin>
+			<xmax>1444</xmax>
+			<ymax>326</ymax>
+		</bndbox>
+	</object>
 </annotation>
diff --git a/drafter_4/annotations/C48_D2_P3.xml b/drafter_4/annotations/C48_D2_P3.xml
index be68478664c1b7aaf59eee6cc8bdc5ac310fbf03..41cb9b2b5acae1e0af23f8365e579a622748462c 100644
--- a/drafter_4/annotations/C48_D2_P3.xml
+++ b/drafter_4/annotations/C48_D2_P3.xml
@@ -203,7 +203,7 @@
 			<xmax>170</xmax>
 			<ymax>527</ymax>
 		</bndbox>
-		<text>680K&#937;</text>
+		<text>680K</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -216,7 +216,7 @@
 			<xmax>197</xmax>
 			<ymax>635</ymax>
 		</bndbox>
-		<text>+12v</text>
+		<text>+12V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -268,7 +268,7 @@
 			<xmax>1037</xmax>
 			<ymax>1052</ymax>
 		</bndbox>
-		<text>220K&#937;</text>
+		<text>220K</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -281,7 +281,7 @@
 			<xmax>874</xmax>
 			<ymax>852</ymax>
 		</bndbox>
-		<text>10K&#937;</text>
+		<text>10K</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -346,7 +346,7 @@
 			<xmax>113</xmax>
 			<ymax>97</ymax>
 		</bndbox>
-		<text>+12v</text>
+		<text>+12V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -398,7 +398,7 @@
 			<xmax>1217</xmax>
 			<ymax>59</ymax>
 		</bndbox>
-		<text>+12v</text>
+		<text>+12V</text>
 	</object>
 	<object>
 		<name>capacitor.unpolarized</name>
@@ -511,7 +511,7 @@
 			<ymin>937</ymin>
 			<xmax>973</xmax>
 			<ymax>990</ymax>
-			<rotation>171</rotation>
+			<rotation>187</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -563,6 +563,7 @@
 			<ymin>128</ymin>
 			<xmax>1265</xmax>
 			<ymax>244</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -575,6 +576,7 @@
 			<ymin>119</ymin>
 			<xmax>1367</xmax>
 			<ymax>247</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -599,6 +601,7 @@
 			<ymin>333</ymin>
 			<xmax>540</xmax>
 			<ymax>416</ymax>
+			<rotation>8</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -623,6 +626,7 @@
 			<ymin>473</ymin>
 			<xmax>785</xmax>
 			<ymax>559</ymax>
+			<rotation>6</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -635,6 +639,7 @@
 			<ymin>663</ymin>
 			<xmax>648</xmax>
 			<ymax>748</ymax>
+			<rotation>187</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -647,6 +652,7 @@
 			<ymin>653</ymin>
 			<xmax>974</xmax>
 			<ymax>739</ymax>
+			<rotation>187</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -791,7 +797,7 @@
 			<ymin>644</ymin>
 			<xmax>228</xmax>
 			<ymax>735</ymax>
-			<rotation>95</rotation>
+			<rotation>77</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -1130,4 +1136,16 @@
 			<ymax>158</ymax>
 		</bndbox>
 	</object>
+	<object>
+		<name>transformer</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>1223</xmin>
+			<ymin>116</ymin>
+			<xmax>1369</xmax>
+			<ymax>249</ymax>
+		</bndbox>
+	</object>
 </annotation>
diff --git a/drafter_4/annotations/C48_D2_P4.xml b/drafter_4/annotations/C48_D2_P4.xml
index 7a0bb747d523070b59e997402945d793d84a6716..f5f750b409b3a1ef6ab96070db1601fd684532d9 100644
--- a/drafter_4/annotations/C48_D2_P4.xml
+++ b/drafter_4/annotations/C48_D2_P4.xml
@@ -22,7 +22,7 @@
 			<xmax>228</xmax>
 			<ymax>66</ymax>
 		</bndbox>
-		<text>+12v</text>
+		<text>+12V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -282,7 +282,7 @@
 			<xmax>944</xmax>
 			<ymax>867</ymax>
 		</bndbox>
-		<text>10K&#937;</text>
+		<text>10K</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -347,7 +347,7 @@
 			<xmax>1331</xmax>
 			<ymax>89</ymax>
 		</bndbox>
-		<text>+12v</text>
+		<text>+12V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -531,6 +531,7 @@
 			<ymin>471</ymin>
 			<xmax>876</xmax>
 			<ymax>560</ymax>
+			<rotation>6</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -543,6 +544,7 @@
 			<ymin>658</ymin>
 			<xmax>723</xmax>
 			<ymax>751</ymax>
+			<rotation>183</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -555,6 +557,7 @@
 			<ymin>667</ymin>
 			<xmax>1050</xmax>
 			<ymax>754</ymax>
+			<rotation>185</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -567,6 +570,7 @@
 			<ymin>158</ymin>
 			<xmax>1379</xmax>
 			<ymax>280</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -579,6 +583,7 @@
 			<ymin>155</ymin>
 			<xmax>1474</xmax>
 			<ymax>292</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -591,6 +596,7 @@
 			<ymin>468</ymin>
 			<xmax>1090</xmax>
 			<ymax>522</ymax>
+			<rotation>6</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -1128,4 +1134,16 @@
 			<ymax>89</ymax>
 		</bndbox>
 	</object>
+	<object>
+		<name>transformer</name>
+		<pose>Unspecified</pose>
+		<truncated>0</truncated>
+		<difficult>0</difficult>
+		<bndbox>
+			<xmin>1323</xmin>
+			<ymin>153</ymin>
+			<xmax>1476</xmax>
+			<ymax>294</ymax>
+		</bndbox>
+	</object>
 </annotation>
diff --git a/drafter_4/instances/C37_D2_P4.json b/drafter_4/instances/C37_D2_P4.json
index c566b133eee934141bab2c9842c0248001c6da94..2fffedb089b7c47f17c5f511ba5e169ddc59b379 100644
--- a/drafter_4/instances/C37_D2_P4.json
+++ b/drafter_4/instances/C37_D2_P4.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.16.7",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1314.0,
@@ -24,13 +24,15 @@
           606.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           333.62831858407077,
@@ -49,13 +51,15 @@
           430.97345132743357
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           474.0,
@@ -74,13 +78,15 @@
           576.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           728.0,
@@ -99,13 +105,15 @@
           467.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           831.0,
@@ -124,13 +132,15 @@
           614.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           750.0,
@@ -149,13 +159,15 @@
           175.92592592592592
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           361.0,
@@ -174,13 +186,15 @@
           170.37037037037035
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           100.0,
@@ -199,13 +213,15 @@
           597.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           35.1063829787234,
@@ -224,13 +240,15 @@
           955.3191489361701
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           830.0,
@@ -249,13 +267,15 @@
           933.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1300.0,
@@ -274,13 +294,15 @@
           914.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           477.0,
@@ -299,13 +321,15 @@
           434.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1090.0,
@@ -324,13 +348,15 @@
           447.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1559.0551181102362,
@@ -349,13 +375,15 @@
           424.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1108.0,
@@ -374,13 +402,15 @@
           183.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "transistor.fet",
       "line_color": null,
       "fill_color": null,
+      "label": "transistor.fet",
       "points": [
         [
           146.0,
@@ -399,13 +429,15 @@
           546.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "transistor.fet",
       "line_color": null,
       "fill_color": null,
+      "label": "transistor.fet",
       "points": [
         [
           566.0,
@@ -424,13 +456,15 @@
           543.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "transistor.fet",
       "line_color": null,
       "fill_color": null,
+      "label": "transistor.fet",
       "points": [
         [
           937.0,
@@ -449,13 +483,15 @@
           552.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "transistor.fet",
       "line_color": null,
       "fill_color": null,
+      "label": "transistor.fet",
       "points": [
         [
           1466.0,
@@ -474,13 +510,15 @@
           553.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           233.0,
@@ -499,13 +537,15 @@
           912.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           908.0,
@@ -524,13 +564,15 @@
           896.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           1087.0,
@@ -549,13 +591,15 @@
           282.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           724.0,
@@ -574,13 +618,15 @@
           288.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           327.0,
@@ -599,13 +645,15 @@
           291.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           1528.0,
@@ -624,13 +672,15 @@
           281.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "capacitor.unpolarized",
       "line_color": null,
       "fill_color": null,
+      "label": "capacitor.unpolarized",
       "points": [
         [
           779.0,
@@ -649,13 +699,15 @@
           797.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           774.0,
@@ -674,13 +726,15 @@
           87.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1728.0,
@@ -699,13 +753,15 @@
           466.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1579.591836734694,
@@ -724,13 +780,15 @@
           181.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           1687.0,
@@ -749,13 +807,15 @@
           420.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           1540.0,
@@ -774,13 +834,15 @@
           212.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "gnd",
       "line_color": null,
       "fill_color": null,
+      "label": "gnd",
       "points": [
         [
           1583.0,
@@ -799,13 +861,15 @@
           735.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "gnd",
       "line_color": null,
       "fill_color": null,
+      "label": "gnd",
       "points": [
         [
           1047.0,
@@ -824,13 +888,15 @@
           755.5
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "gnd",
       "line_color": null,
       "fill_color": null,
+      "label": "gnd",
       "points": [
         [
           285.03401360544217,
@@ -849,13 +915,15 @@
           734.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "gnd",
       "line_color": null,
       "fill_color": null,
+      "label": "gnd",
       "points": [
         [
           673.0,
@@ -874,13 +942,15 @@
           740.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           825.0,
@@ -899,13 +969,15 @@
           473.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1311.0,
@@ -924,10 +996,16 @@
           459.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
   ],
+  "imagePath": "../segmentation/C37_D2_P4.jpg",
+  "imageData": null,
+  "imageHeight": 1500,
+  "imageWidth": 2000,
   "lineColor": [
     0,
     255,
@@ -939,9 +1017,5 @@
     0,
     0,
     128
-  ],
-  "imagePath": "../segmentation/C37_D2_P4.jpg",
-  "imageData": null,
-  "imageHeight": 1500,
-  "imageWidth": 2000
+  ]
 }
\ No newline at end of file
diff --git a/drafter_4/instances/C38_D2_P4.json b/drafter_4/instances/C38_D2_P4.json
index c7356bf5f4b7f256c35bff4e56dfe819c071fe17..901c61a633e011ba41ce79ec9df55208dcf5e868 100644
--- a/drafter_4/instances/C38_D2_P4.json
+++ b/drafter_4/instances/C38_D2_P4.json
@@ -1,5 +1,5 @@
 {
-  "version": "5.0.1",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
@@ -8,39 +8,28 @@
       "label": "transformer",
       "points": [
         [
-          340.2298850574713,
-          292.5287356321839
+          342.48927038626607,
+          287.9828326180257
         ],
         [
-          346.83544303797464,
-          324.05063291139237
-        ],
-        [
-          334.1772151898734,
-          394.9367088607595
+          345.49356223175965,
+          346.7811158798283
         ],
         [
           324.0,
           491.0
         ],
         [
-          472.0,
-          491.0
-        ],
-        [
-          454.4303797468354,
-          450.63291139240505
+          455.793991416309,
+          487.9828326180257
         ],
         [
-          472.15189873417717,
-          339.2405063291139
-        ],
-        [
-          472.0,
-          292.0
+          474.6781115879828,
+          293.56223175965664
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -79,6 +68,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -105,6 +95,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -131,6 +122,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -157,6 +149,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -183,6 +176,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -209,6 +203,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -235,6 +230,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -261,6 +257,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -287,6 +284,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -313,6 +311,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -343,6 +342,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -369,6 +369,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -395,6 +396,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -429,6 +431,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -455,6 +458,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -481,6 +485,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -507,6 +512,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -533,6 +539,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -559,6 +566,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -585,6 +593,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -611,6 +620,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -637,6 +647,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -663,6 +674,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -689,6 +701,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -715,6 +728,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -741,6 +755,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -767,6 +782,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -793,6 +809,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -819,6 +836,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -845,6 +863,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -883,6 +902,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -909,6 +929,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -947,6 +968,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -985,6 +1007,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1011,6 +1034,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1037,6 +1061,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1063,6 +1088,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1089,6 +1115,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1115,6 +1142,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1141,6 +1169,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1167,6 +1196,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1193,6 +1223,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1219,6 +1250,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1245,6 +1277,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1271,6 +1304,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1291,12 +1325,17 @@
           545.0,
           312.0
         ],
+        [
+          543.979057591623,
+          306.28272251308897
+        ],
         [
           545.0,
           291.0
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1323,6 +1362,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1349,6 +1389,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1375,6 +1416,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1401,6 +1443,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1427,6 +1470,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1453,6 +1497,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1479,6 +1524,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1505,6 +1551,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1531,6 +1578,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1569,6 +1617,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1595,6 +1644,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1621,6 +1671,120 @@
         ]
       ],
       "group_id": null,
+      "description": null,
+      "shape_type": "polygon",
+      "flags": {}
+    },
+    {
+      "line_color": null,
+      "fill_color": null,
+      "label": "inductor",
+      "points": [
+        [
+          349.7854077253219,
+          292.27467811158795
+        ],
+        [
+          349.7854077253219,
+          345.92274678111585
+        ],
+        [
+          339.91416309012874,
+          408.58369098712444
+        ],
+        [
+          329.18454935622316,
+          462.23175965665234
+        ],
+        [
+          327.0386266094421,
+          487.9828326180257
+        ],
+        [
+          356.22317596566523,
+          486.26609442060084
+        ],
+        [
+          368.6695278969957,
+          427.038626609442
+        ],
+        [
+          376.2532981530343,
+          395.25065963060683
+        ],
+        [
+          380.2158273381295,
+          377.87769784172656
+        ],
+        [
+          392.27467811158795,
+          296.5665236051502
+        ]
+      ],
+      "group_id": null,
+      "description": null,
+      "shape_type": "polygon",
+      "flags": {}
+    },
+    {
+      "line_color": null,
+      "fill_color": null,
+      "label": "inductor",
+      "points": [
+        [
+          436.48068669527896,
+          295.7081545064378
+        ],
+        [
+          411.587982832618,
+          481.9742489270386
+        ],
+        [
+          453.6480686695279,
+          481.1158798283262
+        ],
+        [
+          454.93562231759654,
+          449.7854077253219
+        ],
+        [
+          470.8154506437768,
+          296.9957081545064
+        ]
+      ],
+      "group_id": null,
+      "description": null,
+      "shape_type": "polygon",
+      "flags": {}
+    },
+    {
+      "line_color": null,
+      "fill_color": null,
+      "label": "magnetic",
+      "points": [
+        [
+          379.4964028776978,
+          390.2877697841726
+        ],
+        [
+          394.4206008583691,
+          292.7038626609442
+        ],
+        [
+          432.18884120171674,
+          293.9914163090129
+        ],
+        [
+          408.273381294964,
+          487.5899280575539
+        ],
+        [
+          360.9442060085837,
+          478.96995708154503
+        ]
+      ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
diff --git a/drafter_4/instances/C39_D2_P1.json b/drafter_4/instances/C39_D2_P1.json
index 43ac4c263438723c545a39e866c18e109e10afaf..3e1629be78f1a740f4b3cf3068b538012e9c8e1d 100644
--- a/drafter_4/instances/C39_D2_P1.json
+++ b/drafter_4/instances/C39_D2_P1.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.16.7",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
-      "label": "gnd",
       "line_color": null,
       "fill_color": null,
+      "label": "gnd",
       "points": [
         [
           169.0,
@@ -24,13 +24,15 @@
           837.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "gnd",
       "line_color": null,
       "fill_color": null,
+      "label": "gnd",
       "points": [
         [
           719.753086419753,
@@ -53,13 +55,15 @@
           908.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           460.0,
@@ -78,13 +82,15 @@
           165.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "vss",
       "line_color": null,
       "fill_color": null,
+      "label": "vss",
       "points": [
         [
           993.0,
@@ -103,13 +109,15 @@
           86.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "diode.light_emitting",
       "line_color": null,
       "fill_color": null,
+      "label": "diode.light_emitting",
       "points": [
         [
           358.02469135802465,
@@ -132,13 +140,15 @@
           646.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           285.0,
@@ -157,13 +167,15 @@
           434.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           688.0,
@@ -182,13 +194,15 @@
           467.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "transistor.fet",
       "line_color": null,
       "fill_color": null,
+      "label": "transistor.fet",
       "points": [
         [
           939.0,
@@ -207,13 +221,15 @@
           329.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "speaker",
       "line_color": null,
       "fill_color": null,
+      "label": "speaker",
       "points": [
         [
           1066.0,
@@ -232,13 +248,15 @@
           182.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           315.0,
@@ -257,13 +275,15 @@
           305.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           330.0,
@@ -282,13 +302,15 @@
           184.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           714.0,
@@ -307,13 +329,15 @@
           314.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           705.0,
@@ -332,13 +356,15 @@
           419.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           699.0,
@@ -357,13 +383,15 @@
           634.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1046.0,
@@ -382,13 +410,15 @@
           626.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1026.0,
@@ -407,13 +437,15 @@
           271.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1021.0,
@@ -432,13 +464,15 @@
           232.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           177.0,
@@ -457,13 +491,15 @@
           492.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           374.0,
@@ -482,13 +518,15 @@
           644.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           449.0,
@@ -507,13 +545,15 @@
           82.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1042.0,
@@ -532,13 +572,15 @@
           54.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1184.0,
@@ -557,13 +599,15 @@
           185.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1294.0,
@@ -582,13 +626,15 @@
           182.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1080.0,
@@ -607,13 +653,15 @@
           376.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           754.0,
@@ -632,13 +680,15 @@
           496.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           105.0,
@@ -657,13 +707,15 @@
           965.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           154.0,
@@ -682,10 +734,16 @@
           1046.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
   ],
+  "imagePath": "../segmentation/C39_D2_P1.jpg",
+  "imageData": null,
+  "imageHeight": 1500,
+  "imageWidth": 2000,
   "lineColor": [
     0,
     255,
@@ -697,9 +755,5 @@
     0,
     0,
     128
-  ],
-  "imagePath": "../segmentation/C39_D2_P1.jpg",
-  "imageData": null,
-  "imageHeight": 1500,
-  "imageWidth": 2000
+  ]
 }
\ No newline at end of file
diff --git a/drafter_4/instances/C40_D1_P4.json b/drafter_4/instances/C40_D1_P4.json
index cbd4c9d03f75ca7304a66a78fca559551ea63497..037640f177b282b73774e788c2f389c2a5442e6e 100644
--- a/drafter_4/instances/C40_D1_P4.json
+++ b/drafter_4/instances/C40_D1_P4.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.16.7",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
-      "label": "speaker",
       "line_color": null,
       "fill_color": null,
+      "label": "speaker",
       "points": [
         [
           1433.0,
@@ -24,13 +24,15 @@
           924.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "optocoupler",
       "line_color": null,
       "fill_color": null,
+      "label": "optocoupler",
       "points": [
         [
           894.0,
@@ -49,38 +51,66 @@
           677.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "transformer",
       "line_color": null,
       "fill_color": null,
+      "label": "transformer",
       "points": [
         [
-          275.0,
-          255.0
+          367.92079207920796,
+          256.23762376237624
         ],
         [
-          275.0,
-          426.0
+          367.3267326732673,
+          267.5247524752475
         ],
         [
-          391.0,
-          426.0
+          322.3762376237624,
+          264.950495049505
+        ],
+        [
+          322.5742574257426,
+          254.85148514851485
+        ],
+        [
+          287.7227722772277,
+          253.86138613861388
+        ],
+        [
+          273.26732673267327,
+          403.76237623762376
+        ],
+        [
+          345.54455445544556,
+          407.3267326732673
+        ],
+        [
+          342.1782178217822,
+          423.16831683168317
+        ],
+        [
+          373.86138613861385,
+          427.1287128712871
         ],
         [
-          391.0,
-          255.0
+          398.81188118811883,
+          260.990099009901
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "speaker",
       "line_color": null,
       "fill_color": null,
+      "label": "speaker",
       "points": [
         [
           1474.0,
@@ -99,13 +129,15 @@
           75.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "switch",
       "line_color": null,
       "fill_color": null,
+      "label": "switch",
       "points": [
         [
           1664.0,
@@ -124,13 +156,15 @@
           294.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "capacitor.unpolarized",
       "line_color": null,
       "fill_color": null,
+      "label": "capacitor.unpolarized",
       "points": [
         [
           649.0,
@@ -149,13 +183,15 @@
           841.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "capacitor.unpolarized",
       "line_color": null,
       "fill_color": null,
+      "label": "capacitor.unpolarized",
       "points": [
         [
           1070.0,
@@ -174,13 +210,15 @@
           1196.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "transistor.fet",
       "line_color": null,
       "fill_color": null,
+      "label": "transistor.fet",
       "points": [
         [
           1330.0,
@@ -199,13 +237,15 @@
           1055.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "diode",
       "line_color": null,
       "fill_color": null,
+      "label": "diode",
       "points": [
         [
           597.008547008547,
@@ -240,13 +280,15 @@
           301.70940170940173
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "diode",
       "line_color": null,
       "fill_color": null,
+      "label": "diode",
       "points": [
         [
           669.6581196581197,
@@ -281,13 +323,15 @@
           270.34068136272543
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "diode",
       "line_color": null,
       "fill_color": null,
+      "label": "diode",
       "points": [
         [
           577.5641025641027,
@@ -318,13 +362,15 @@
           350.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "diode",
       "line_color": null,
       "fill_color": null,
+      "label": "diode",
       "points": [
         [
           669.2307692307693,
@@ -351,13 +397,15 @@
           385.8974358974359
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "diode",
       "line_color": null,
       "fill_color": null,
+      "label": "diode",
       "points": [
         [
           981.0055865921787,
@@ -376,13 +424,15 @@
           363.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "diode",
       "line_color": null,
       "fill_color": null,
+      "label": "diode",
       "points": [
         [
           907.0,
@@ -401,13 +451,15 @@
           467.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "diode",
       "line_color": null,
       "fill_color": null,
+      "label": "diode",
       "points": [
         [
           1069.0,
@@ -426,13 +478,15 @@
           470.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "socket",
       "line_color": null,
       "fill_color": null,
+      "label": "socket",
       "points": [
         [
           119.0,
@@ -451,13 +505,15 @@
           261.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           819.0,
@@ -476,13 +532,15 @@
           584.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           1159.0,
@@ -501,13 +559,15 @@
           1106.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           1244.0,
@@ -526,13 +586,15 @@
           1183.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1488.0,
@@ -551,13 +613,15 @@
           40.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1709.0,
@@ -576,13 +640,15 @@
           283.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1717.0,
@@ -601,13 +667,15 @@
           318.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1727.0,
@@ -626,13 +694,15 @@
           356.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1185.0,
@@ -651,13 +721,15 @@
           1069.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1285.0,
@@ -676,13 +748,15 @@
           1225.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1132.0,
@@ -701,13 +775,15 @@
           1249.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1403.0,
@@ -726,13 +802,15 @@
           1106.7375886524824
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1550.0,
@@ -751,13 +829,15 @@
           931.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           857.0,
@@ -784,13 +864,15 @@
           439.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1039.0,
@@ -809,13 +891,15 @@
           439.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1055.0,
@@ -834,13 +918,15 @@
           732.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           89.0,
@@ -859,13 +945,15 @@
           218.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           317.0,
@@ -884,13 +972,15 @@
           201.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           717.0,
@@ -909,13 +999,15 @@
           272.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           679.0,
@@ -934,13 +1026,15 @@
           144.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1040.0,
@@ -959,13 +1053,15 @@
           309.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           904.0,
@@ -984,13 +1080,15 @@
           666.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1026.0,
@@ -1009,13 +1107,15 @@
           675.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           889.0,
@@ -1034,13 +1134,15 @@
           810.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           992.0,
@@ -1059,13 +1161,15 @@
           814.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "gnd",
       "line_color": null,
       "fill_color": null,
+      "label": "gnd",
       "points": [
         [
           420.0,
@@ -1084,13 +1188,15 @@
           924.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "gnd",
       "line_color": null,
       "fill_color": null,
+      "label": "gnd",
       "points": [
         [
           661.0,
@@ -1109,13 +1215,15 @@
           918.1208053691275
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "gnd",
       "line_color": null,
       "fill_color": null,
+      "label": "gnd",
       "points": [
         [
           1084.0,
@@ -1134,13 +1242,15 @@
           1327.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "gnd",
       "line_color": null,
       "fill_color": null,
+      "label": "gnd",
       "points": [
         [
           1236.0,
@@ -1159,13 +1269,15 @@
           1333.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "gnd",
       "line_color": null,
       "fill_color": null,
+      "label": "gnd",
       "points": [
         [
           1370.0,
@@ -1184,13 +1296,15 @@
           1353.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           812.0,
@@ -1209,13 +1323,15 @@
           790.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           691.0,
@@ -1234,13 +1350,15 @@
           785.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           814.0,
@@ -1259,13 +1377,15 @@
           870.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1121.0,
@@ -1284,13 +1404,15 @@
           802.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           831.0,
@@ -1309,13 +1431,15 @@
           702.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1142.0,
@@ -1334,13 +1458,15 @@
           712.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1154.0,
@@ -1359,13 +1485,15 @@
           494.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           830.0,
@@ -1384,13 +1512,15 @@
           482.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           834.0,
@@ -1409,13 +1539,15 @@
           390.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1159.0,
@@ -1434,13 +1566,15 @@
           387.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           726.0,
@@ -1459,13 +1593,15 @@
           344.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           615.7863247863247,
@@ -1484,13 +1620,15 @@
           418.5726495726495
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           611.0,
@@ -1509,13 +1647,15 @@
           470.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           435.0,
@@ -1534,13 +1674,15 @@
           216.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           431.0,
@@ -1559,13 +1701,15 @@
           256.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           412.0,
@@ -1584,13 +1728,15 @@
           413.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           408.0,
@@ -1609,13 +1755,15 @@
           469.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           231.0,
@@ -1634,13 +1782,15 @@
           404.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           236.0,
@@ -1659,13 +1809,15 @@
           367.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           242.0,
@@ -1684,13 +1836,15 @@
           282.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           246.0,
@@ -1709,13 +1863,15 @@
           251.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           618.0,
@@ -1734,13 +1890,15 @@
           211.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1660.0,
@@ -1759,13 +1917,15 @@
           197.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1678.0,
@@ -1784,13 +1944,15 @@
           487.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1376.0,
@@ -1809,13 +1971,15 @@
           883.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1113.0,
@@ -1834,13 +1998,15 @@
           1112.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "crossover",
       "line_color": null,
       "fill_color": null,
+      "label": "crossover",
       "points": [
         [
           1119.0,
@@ -1859,13 +2025,15 @@
           874.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "crossover",
       "line_color": null,
       "fill_color": null,
+      "label": "crossover",
       "points": [
         [
           716.0,
@@ -1884,13 +2052,15 @@
           478.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "crossover",
       "line_color": null,
       "fill_color": null,
+      "label": "crossover",
       "points": [
         [
           488.0,
@@ -1909,13 +2079,15 @@
           466.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           503.0,
@@ -1934,13 +2106,15 @@
           336.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1381.0,
@@ -1959,13 +2133,15 @@
           998.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1381.0,
@@ -1984,13 +2160,15 @@
           964.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1249.0,
@@ -2009,13 +2187,15 @@
           1119.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           537.1794871794872,
@@ -2034,13 +2214,15 @@
           338.03418803418805
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           618.5042735042734,
@@ -2059,13 +2241,15 @@
           261.78632478632477
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           693.1452991452992,
@@ -2084,13 +2268,15 @@
           339.07692307692304
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           100.0,
@@ -2109,13 +2295,15 @@
           279.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           88.0,
@@ -2134,10 +2322,97 @@
           363.0
         ]
       ],
+      "group_id": null,
+      "description": null,
+      "shape_type": "polygon",
+      "flags": {}
+    },
+    {
+      "line_color": null,
+      "fill_color": null,
+      "label": "magnetic",
+      "points": [
+        [
+          320.5940594059406,
+          271.2871287128713
+        ],
+        [
+          351.8811881188119,
+          268.31683168316835
+        ],
+        [
+          339.4059405940594,
+          403.56435643564356
+        ],
+        [
+          306.13861386138615,
+          401.980198019802
+        ]
+      ],
+      "group_id": null,
+      "description": null,
+      "shape_type": "polygon",
+      "flags": {}
+    },
+    {
+      "line_color": null,
+      "fill_color": null,
+      "label": "inductor",
+      "points": [
+        [
+          290.2970297029703,
+          256.43564356435644
+        ],
+        [
+          320.5940594059406,
+          258.01980198019805
+        ],
+        [
+          303.76237623762376,
+          404.3564356435644
+        ],
+        [
+          275.64356435643566,
+          400.7920792079208
+        ]
+      ],
+      "group_id": null,
+      "description": null,
+      "shape_type": "polygon",
+      "flags": {}
+    },
+    {
+      "line_color": null,
+      "fill_color": null,
+      "label": "inductor",
+      "points": [
+        [
+          370.0990099009901,
+          259.009900990099
+        ],
+        [
+          397.029702970297,
+          261.980198019802
+        ],
+        [
+          371.6831683168317,
+          423.96039603960395
+        ],
+        [
+          345.34653465346537,
+          421.5841584158416
+        ]
+      ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
   ],
+  "imagePath": "../segmentation/C40_D1_P4.jpg",
+  "imageData": null,
+  "imageHeight": 1500,
+  "imageWidth": 2000,
   "lineColor": [
     0,
     255,
@@ -2149,9 +2424,5 @@
     0,
     0,
     128
-  ],
-  "imagePath": "../segmentation/C40_D1_P4.jpg",
-  "imageData": null,
-  "imageHeight": 1500,
-  "imageWidth": 2000
+  ]
 }
\ No newline at end of file
diff --git a/drafter_4/instances/C41_D2_P3.json b/drafter_4/instances/C41_D2_P3.json
index 88d67fc1439a00e2219e8d8fe8c1a7e56a0afaf0..c4ecf1005909df42a08633aa8cbd79d2ba4a4042 100644
--- a/drafter_4/instances/C41_D2_P3.json
+++ b/drafter_4/instances/C41_D2_P3.json
@@ -1,5 +1,5 @@
 {
-  "version": "5.0.1",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
@@ -41,6 +41,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -71,6 +72,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -97,6 +99,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -123,6 +126,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -157,6 +161,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -183,6 +188,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -209,6 +215,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -251,6 +258,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -277,6 +285,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -303,6 +312,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -329,6 +339,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -355,6 +366,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -381,6 +393,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -407,6 +420,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -433,6 +447,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -459,6 +474,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -485,6 +501,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -511,6 +528,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -537,6 +555,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -563,6 +582,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -589,6 +609,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -615,6 +636,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -641,6 +663,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -667,6 +690,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -693,6 +717,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -719,6 +744,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -745,6 +771,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -771,6 +798,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -797,6 +825,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -823,6 +852,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -849,6 +879,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -875,6 +906,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -901,6 +933,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -927,6 +960,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -953,6 +987,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -983,6 +1018,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1009,6 +1045,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1035,6 +1072,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1061,6 +1099,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1087,6 +1126,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1113,6 +1153,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1139,6 +1180,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1165,6 +1207,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1191,6 +1234,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1217,6 +1261,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1243,6 +1288,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1269,6 +1315,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1295,6 +1342,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1321,6 +1369,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1347,6 +1396,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1373,6 +1423,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1399,6 +1450,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1433,6 +1485,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1459,6 +1512,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1485,6 +1539,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1511,6 +1566,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1537,6 +1593,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1563,6 +1620,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1589,6 +1647,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1615,6 +1674,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1641,6 +1701,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1667,6 +1728,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1693,6 +1755,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1719,6 +1782,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1745,6 +1809,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1771,6 +1836,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1797,6 +1863,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1823,6 +1890,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1857,6 +1925,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1895,6 +1964,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1929,6 +1999,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1963,6 +2034,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1993,6 +2065,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2019,6 +2092,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2045,6 +2119,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2071,6 +2146,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
diff --git a/drafter_4/instances/C42_D2_P1.json b/drafter_4/instances/C42_D2_P1.json
index d6ace842e0faa951c80c2a037e45049ab63af4cd..50cb3876dbd7288f235644692404b2cb8818a80b 100644
--- a/drafter_4/instances/C42_D2_P1.json
+++ b/drafter_4/instances/C42_D2_P1.json
@@ -1,5 +1,5 @@
 {
-  "version": "5.0.1",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
@@ -45,6 +45,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -71,6 +72,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -97,6 +99,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -123,6 +126,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -157,6 +161,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -207,6 +212,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -241,6 +247,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -267,6 +274,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -293,6 +301,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -319,6 +328,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -345,6 +355,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -371,6 +382,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -397,6 +409,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -423,6 +436,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -449,6 +463,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -483,6 +498,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -509,6 +525,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -535,6 +552,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -561,6 +579,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -587,6 +606,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -613,6 +633,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -639,6 +660,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -669,6 +691,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -695,6 +718,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -721,6 +745,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -747,6 +772,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -773,6 +799,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -799,6 +826,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -825,6 +853,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -851,6 +880,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -877,6 +907,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -903,6 +934,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -929,6 +961,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -955,6 +988,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -981,6 +1015,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1007,6 +1042,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1033,6 +1069,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1059,6 +1096,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1085,6 +1123,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1111,6 +1150,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1137,6 +1177,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1163,6 +1204,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1189,6 +1231,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
diff --git a/drafter_4/instances/C43_D1_P1.json b/drafter_4/instances/C43_D1_P1.json
index ccf0cfad4b86ba2d8483eb1d85d11f12550779eb..1abc0122c625692f57f52222436f666d1317a26b 100644
--- a/drafter_4/instances/C43_D1_P1.json
+++ b/drafter_4/instances/C43_D1_P1.json
@@ -1,5 +1,5 @@
 {
-  "version": "5.0.1",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
@@ -25,6 +25,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -51,6 +52,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -105,6 +107,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -131,6 +134,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -157,6 +161,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -191,6 +196,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -217,6 +223,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -243,6 +250,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -269,6 +277,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -295,6 +304,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -321,6 +331,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -347,6 +358,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -373,6 +385,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -399,6 +412,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -425,6 +439,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -451,6 +466,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -477,6 +493,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -503,6 +520,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -529,6 +547,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -555,6 +574,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -597,6 +617,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -627,6 +648,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -653,6 +675,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -679,6 +702,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -705,6 +729,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -731,6 +756,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -757,6 +783,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -783,6 +810,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -809,6 +837,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -835,6 +864,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -861,6 +891,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -887,6 +918,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -913,6 +945,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -939,6 +972,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -965,6 +999,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -991,6 +1026,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1017,6 +1053,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1043,6 +1080,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1069,6 +1107,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1095,6 +1134,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1121,6 +1161,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1147,6 +1188,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1173,6 +1215,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1199,6 +1242,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1225,6 +1269,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1251,6 +1296,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1277,6 +1323,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1303,6 +1350,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1329,6 +1377,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1359,6 +1408,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1385,6 +1435,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1419,6 +1470,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1445,6 +1497,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1471,6 +1524,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1497,6 +1551,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1527,6 +1582,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1553,6 +1609,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1579,6 +1636,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1605,6 +1663,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1635,6 +1694,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1661,6 +1721,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
diff --git a/drafter_4/instances/C44_D2_P3.json b/drafter_4/instances/C44_D2_P3.json
index bb8dd4c1f604c7ff11b887a1e4c699261bb1dc5d..87cdabc131d2ead0287200b34f4d8c641557349b 100644
--- a/drafter_4/instances/C44_D2_P3.json
+++ b/drafter_4/instances/C44_D2_P3.json
@@ -1,5 +1,5 @@
 {
-  "version": "5.0.1",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
@@ -41,6 +41,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -67,6 +68,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -93,6 +95,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -119,6 +122,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -145,6 +149,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -171,6 +176,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -197,6 +203,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -223,6 +230,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -249,6 +257,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -275,6 +284,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -305,6 +315,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -335,6 +346,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -361,6 +373,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -387,6 +400,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -413,6 +427,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -439,6 +454,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -465,6 +481,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -491,6 +508,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -517,6 +535,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -543,6 +562,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -569,6 +589,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -595,6 +616,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -621,6 +643,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -647,6 +670,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -673,6 +697,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -699,6 +724,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -725,6 +751,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -751,6 +778,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -777,6 +805,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -803,6 +832,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -829,6 +859,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -855,6 +886,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -881,6 +913,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -915,6 +948,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -949,6 +983,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -991,6 +1026,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1017,6 +1053,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1043,6 +1080,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1069,6 +1107,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1095,6 +1134,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1121,6 +1161,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1163,6 +1204,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1189,6 +1231,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1215,6 +1258,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1241,6 +1285,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1267,6 +1312,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1293,6 +1339,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1323,6 +1370,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1349,6 +1397,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1375,6 +1424,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1401,6 +1451,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1427,6 +1478,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1453,6 +1505,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1487,6 +1540,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1517,6 +1571,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1543,6 +1598,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1569,6 +1625,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1595,6 +1652,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1621,6 +1679,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1647,6 +1706,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1673,6 +1733,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1699,6 +1760,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1725,6 +1787,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1751,6 +1814,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1781,6 +1845,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1807,6 +1872,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1833,6 +1899,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1859,6 +1926,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
diff --git a/drafter_4/instances/C45_D2_P1.json b/drafter_4/instances/C45_D2_P1.json
index 34ffed7f09e0918c408026d106b25615bf203e3d..db3d2b226c68000b6b503c1a59b0967e4974d4ff 100644
--- a/drafter_4/instances/C45_D2_P1.json
+++ b/drafter_4/instances/C45_D2_P1.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.16.7",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           469.0,
@@ -24,13 +24,15 @@
           392.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1050.0,
@@ -49,13 +51,15 @@
           559.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1622.0,
@@ -74,13 +78,15 @@
           417.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1746.0,
@@ -99,13 +105,15 @@
           573.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           931.0,
@@ -124,13 +132,15 @@
           1029.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "diode.light_emitting",
       "line_color": null,
       "fill_color": null,
+      "label": "diode.light_emitting",
       "points": [
         [
           1162.0,
@@ -149,13 +159,15 @@
           948.030303030303
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "diode",
       "line_color": null,
       "fill_color": null,
+      "label": "diode",
       "points": [
         [
           1036.0,
@@ -174,13 +186,15 @@
           641.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "diode",
       "line_color": null,
       "fill_color": null,
+      "label": "diode",
       "points": [
         [
           966.0,
@@ -199,13 +213,15 @@
           798.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "diode",
       "line_color": null,
       "fill_color": null,
+      "label": "diode",
       "points": [
         [
           1118.0,
@@ -224,13 +240,15 @@
           790.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "socket",
       "line_color": null,
       "fill_color": null,
+      "label": "socket",
       "points": [
         [
           563.060606060606,
@@ -261,13 +279,15 @@
           517.7272727272727
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           723.0,
@@ -286,13 +306,15 @@
           719.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           727.0,
@@ -311,13 +333,15 @@
           857.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           881.0,
@@ -336,13 +360,15 @@
           842.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           874.0,
@@ -361,13 +387,15 @@
           970.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1281.0,
@@ -386,13 +414,15 @@
           814.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1419.0,
@@ -411,13 +441,15 @@
           809.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1431.0,
@@ -436,13 +468,15 @@
           622.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1431.0,
@@ -461,13 +495,15 @@
           544.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1413.0,
@@ -486,13 +522,15 @@
           402.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           724.0,
@@ -511,13 +549,15 @@
           412.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           891.0,
@@ -536,13 +576,15 @@
           674.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "lamp",
       "line_color": null,
       "fill_color": null,
+      "label": "lamp",
       "points": [
         [
           1480.0,
@@ -561,13 +603,15 @@
           505.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           945.0,
@@ -586,13 +630,15 @@
           950.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1287.0,
@@ -611,13 +657,15 @@
           657.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           734.0,
@@ -636,13 +684,15 @@
           553.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           467.0,
@@ -661,13 +711,15 @@
           565.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           438.0,
@@ -686,10 +738,16 @@
           715.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
   ],
+  "imagePath": "../segmentation/C45_D2_P1.jpg",
+  "imageData": null,
+  "imageHeight": 1500,
+  "imageWidth": 2000,
   "lineColor": [
     0,
     255,
@@ -701,9 +759,5 @@
     0,
     0,
     128
-  ],
-  "imagePath": "../segmentation/C45_D2_P1.jpg",
-  "imageData": null,
-  "imageHeight": 1500,
-  "imageWidth": 2000
+  ]
 }
\ No newline at end of file
diff --git a/drafter_4/instances/C46_D2_P1.json b/drafter_4/instances/C46_D2_P1.json
index ba737565c6f21e5e720c85f99c55f0f2115e4c66..61e434117e385cad03cd0fd94cb524561ebe602d 100644
--- a/drafter_4/instances/C46_D2_P1.json
+++ b/drafter_4/instances/C46_D2_P1.json
@@ -1,5 +1,5 @@
 {
-  "version": "5.0.1",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
@@ -33,6 +33,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -59,6 +60,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -85,6 +87,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -111,6 +114,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -137,6 +141,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -163,6 +168,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -189,6 +195,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -219,6 +226,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -245,6 +253,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -271,6 +280,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -297,6 +307,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -323,6 +334,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -349,6 +361,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -375,6 +388,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -405,6 +419,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -439,6 +454,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -469,6 +485,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -495,6 +512,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -533,6 +551,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -559,6 +578,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -585,6 +605,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -611,6 +632,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -637,6 +659,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -663,6 +686,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -689,6 +713,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -727,6 +752,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -753,6 +779,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -779,6 +806,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -805,6 +833,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -831,6 +860,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -857,6 +887,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -883,6 +914,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -909,6 +941,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -935,6 +968,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -961,6 +995,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -987,6 +1022,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1013,6 +1049,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1039,6 +1076,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1065,6 +1103,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1091,6 +1130,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1117,6 +1157,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1143,6 +1184,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1169,6 +1211,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1195,6 +1238,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1221,6 +1265,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1247,6 +1292,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1273,6 +1319,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1299,6 +1346,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1325,6 +1373,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1351,6 +1400,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1377,6 +1427,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1403,6 +1454,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1429,6 +1481,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1455,6 +1508,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1481,6 +1535,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1515,6 +1570,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1541,6 +1597,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1567,6 +1624,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1593,6 +1651,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1619,6 +1678,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1645,6 +1705,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1671,6 +1732,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1697,6 +1759,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1723,6 +1786,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1749,6 +1813,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1779,6 +1844,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1809,6 +1875,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1839,6 +1906,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1865,6 +1933,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1891,6 +1960,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1917,6 +1987,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1951,6 +2022,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1977,6 +2049,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2003,6 +2076,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2029,6 +2103,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2055,6 +2130,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2081,6 +2157,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2107,6 +2184,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2133,6 +2211,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2159,6 +2238,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2185,6 +2265,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2211,6 +2292,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2237,6 +2319,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2263,6 +2346,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2289,6 +2373,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2315,6 +2400,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2341,6 +2427,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2367,6 +2454,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2393,6 +2481,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2419,6 +2508,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2445,6 +2535,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2471,6 +2562,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2497,6 +2589,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2523,6 +2616,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2549,6 +2643,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2575,6 +2670,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2605,6 +2701,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2631,6 +2728,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2657,6 +2755,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2683,6 +2782,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2709,6 +2809,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
diff --git a/drafter_4/instances/C47_D2_P4.json b/drafter_4/instances/C47_D2_P4.json
index f9c9042b1ce61324e2e6ddbd6a5ae0225bf3fc85..092ea2c58b85327d3c210a4f8a7dcdfbd98b143f 100644
--- a/drafter_4/instances/C47_D2_P4.json
+++ b/drafter_4/instances/C47_D2_P4.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.16.7",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
-      "label": "operational_amplifier.schmitt_trigger",
       "line_color": null,
       "fill_color": null,
+      "label": "operational_amplifier.schmitt_trigger",
       "points": [
         [
           1143.6170212765958,
@@ -44,13 +44,15 @@
           512.7659574468084
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "capacitor.unpolarized",
       "line_color": null,
       "fill_color": null,
+      "label": "capacitor.unpolarized",
       "points": [
         [
           915.0,
@@ -69,13 +71,15 @@
           592.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "varistor",
       "line_color": null,
       "fill_color": null,
+      "label": "varistor",
       "points": [
         [
           202.0,
@@ -94,13 +98,15 @@
           409.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "capacitor.unpolarized",
       "line_color": null,
       "fill_color": null,
+      "label": "capacitor.unpolarized",
       "points": [
         [
           1579.0,
@@ -119,13 +125,15 @@
           690.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "capacitor.unpolarized",
       "line_color": null,
       "fill_color": null,
+      "label": "capacitor.unpolarized",
       "points": [
         [
           959.0,
@@ -144,13 +152,15 @@
           385.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           656.0,
@@ -169,13 +179,15 @@
           373.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           1362.0,
@@ -194,13 +206,15 @@
           641.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "diode",
       "line_color": null,
       "fill_color": null,
+      "label": "diode",
       "points": [
         [
           1645.0,
@@ -219,13 +233,15 @@
           464.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1565.0,
@@ -244,13 +260,15 @@
           506.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1581.0,
@@ -269,13 +287,15 @@
           632.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1256.0,
@@ -294,13 +314,15 @@
           668.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1238.0,
@@ -319,13 +341,15 @@
           551.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1221.0,
@@ -344,13 +368,15 @@
           374.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           750.0,
@@ -369,13 +395,15 @@
           427.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           723.0,
@@ -394,13 +422,15 @@
           428.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           880.0,
@@ -419,13 +449,15 @@
           420.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           815.0,
@@ -444,13 +476,15 @@
           369.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           817.0,
@@ -469,13 +503,15 @@
           312.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           670.0,
@@ -494,13 +530,15 @@
           313.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           552.0,
@@ -519,13 +557,15 @@
           320.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           650.0,
@@ -544,13 +584,15 @@
           551.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           801.0,
@@ -569,13 +611,15 @@
           545.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           807.0,
@@ -594,13 +638,15 @@
           491.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           404.0,
@@ -619,13 +665,15 @@
           562.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           544.0,
@@ -644,13 +692,15 @@
           615.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           401.0,
@@ -669,13 +719,15 @@
           723.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           223.0,
@@ -694,13 +746,15 @@
           732.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           230.0,
@@ -719,13 +773,15 @@
           767.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           232.0,
@@ -744,13 +800,15 @@
           803.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           231.0,
@@ -769,13 +827,15 @@
           838.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           338.0,
@@ -794,13 +854,15 @@
           838.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "transistor.fet",
       "line_color": null,
       "fill_color": null,
+      "label": "transistor.fet",
       "points": [
         [
           400.0,
@@ -819,13 +881,15 @@
           612.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           438.28828828828824,
@@ -844,13 +908,15 @@
           723.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           89.0,
@@ -869,13 +935,15 @@
           696.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           7.0,
@@ -894,13 +962,15 @@
           909.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           150.2820512820513,
@@ -919,13 +989,15 @@
           412.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           115.0,
@@ -944,13 +1016,15 @@
           458.5470085470086
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           126.0,
@@ -969,13 +1043,15 @@
           114.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           99.0,
@@ -994,13 +1070,15 @@
           164.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           1346.0,
@@ -1019,13 +1097,15 @@
           275.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           1787.0,
@@ -1044,13 +1124,15 @@
           438.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "gnd",
       "line_color": null,
       "fill_color": null,
+      "label": "gnd",
       "points": [
         [
           1586.0,
@@ -1069,13 +1151,15 @@
           819.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1367.0,
@@ -1094,13 +1178,15 @@
           708.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1828.0,
@@ -1119,13 +1205,15 @@
           469.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1872.0,
@@ -1144,13 +1232,15 @@
           526.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1591.0,
@@ -1169,13 +1259,15 @@
           401.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1038.0,
@@ -1198,13 +1290,15 @@
           475.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           911.0,
@@ -1223,13 +1317,15 @@
           668.0638297872341
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           588.0,
@@ -1248,13 +1344,15 @@
           388.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           538.0,
@@ -1273,13 +1371,15 @@
           181.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           974.0,
@@ -1298,13 +1398,15 @@
           318.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           1367.0,
@@ -1323,13 +1425,15 @@
           203.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           244.0,
@@ -1348,13 +1452,15 @@
           170.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           415.0,
@@ -1373,13 +1479,15 @@
           154.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           548.0,
@@ -1398,13 +1506,15 @@
           267.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "transistor.fet",
       "line_color": null,
       "fill_color": null,
+      "label": "transistor.fet",
       "points": [
         [
           415.0,
@@ -1423,13 +1533,15 @@
           196.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "crossover",
       "line_color": null,
       "fill_color": null,
+      "label": "crossover",
       "points": [
         [
           543.0,
@@ -1448,13 +1560,15 @@
           555.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "crossover",
       "line_color": null,
       "fill_color": null,
+      "label": "crossover",
       "points": [
         [
           727.0,
@@ -1473,13 +1587,15 @@
           544.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           742.0,
@@ -1498,13 +1614,15 @@
           646.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "operational_amplifier.schmitt_trigger",
       "line_color": null,
       "fill_color": null,
+      "label": "operational_amplifier.schmitt_trigger",
       "points": [
         [
           1459.5744680851062,
@@ -1547,13 +1665,15 @@
           465.9574468085106
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "diode",
       "line_color": null,
       "fill_color": null,
+      "label": "diode",
       "points": [
         [
           773.0,
@@ -1572,13 +1692,15 @@
           378.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "diode",
       "line_color": null,
       "fill_color": null,
+      "label": "diode",
       "points": [
         [
           862.0386643233743,
@@ -1597,13 +1719,15 @@
           392.4428822495606
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "diode",
       "line_color": null,
       "fill_color": null,
+      "label": "diode",
       "points": [
         [
           787.3462214411247,
@@ -1622,13 +1746,15 @@
           471.7047451669595
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "diode",
       "line_color": null,
       "fill_color": null,
+      "label": "diode",
       "points": [
         [
           864.4991212653778,
@@ -1647,13 +1773,15 @@
           465.72934973637956
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "lamp",
       "line_color": null,
       "fill_color": null,
+      "label": "lamp",
       "points": [
         [
           106.0,
@@ -1672,13 +1800,15 @@
           748.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           50.0,
@@ -1697,10 +1827,16 @@
           832.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
   ],
+  "imagePath": "../segmentation/C47_D2_P4.jpg",
+  "imageData": null,
+  "imageHeight": 1500,
+  "imageWidth": 2000,
   "lineColor": [
     0,
     255,
@@ -1712,9 +1848,5 @@
     0,
     0,
     128
-  ],
-  "imagePath": "../segmentation/C47_D2_P4.jpg",
-  "imageData": null,
-  "imageHeight": 1500,
-  "imageWidth": 2000
+  ]
 }
\ No newline at end of file
diff --git a/drafter_4/instances/C48_D2_P2.json b/drafter_4/instances/C48_D2_P2.json
index 32acd66730c6eaed53af910bd705e8383651a736..87d1d0359132c2d9b246883b7b8b8cee49290af1 100644
--- a/drafter_4/instances/C48_D2_P2.json
+++ b/drafter_4/instances/C48_D2_P2.json
@@ -1,5 +1,5 @@
 {
-  "version": "5.0.1",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
@@ -41,6 +41,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -67,6 +68,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -93,6 +95,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -119,6 +122,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -145,6 +149,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -154,23 +159,24 @@
       "label": "text",
       "points": [
         [
-          1443.0,
-          213.0
+          1444.3579766536966,
+          215.95330739299604
         ],
         [
-          1564.0,
-          213.0
+          1552.1400778210118,
+          221.0116731517509
         ],
         [
-          1564.0,
-          273.0
+          1554.863813229572,
+          263.8132295719843
         ],
         [
-          1443.0,
-          273.0
+          1443.968871595331,
+          258.3657587548637
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -205,6 +211,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -231,6 +238,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -269,6 +277,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -299,6 +308,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -329,6 +339,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -359,6 +370,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -385,6 +397,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -411,6 +424,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -437,6 +451,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -471,6 +486,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -497,6 +513,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -523,6 +540,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -549,6 +567,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -583,6 +602,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -609,6 +629,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -639,6 +660,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -665,6 +687,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -691,6 +714,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -717,6 +741,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -743,6 +768,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -769,6 +795,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -795,6 +822,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -821,6 +849,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -847,6 +876,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -873,6 +903,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -899,6 +930,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -925,6 +957,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -959,6 +992,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -993,6 +1027,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1027,6 +1062,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1069,6 +1105,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1095,6 +1132,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1121,6 +1159,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1147,6 +1186,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1173,6 +1213,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1199,6 +1240,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1225,6 +1267,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1251,6 +1294,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1277,6 +1321,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1311,6 +1356,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1337,6 +1383,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1367,6 +1414,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1401,6 +1449,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1439,6 +1488,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1455,6 +1505,10 @@
           1329.0,
           177.0
         ],
+        [
+          1332.4607329842931,
+          258.6387434554974
+        ],
         [
           1329.0,
           320.0
@@ -1465,6 +1519,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1478,12 +1533,12 @@
           174.0
         ],
         [
-          1441.0,
-          174.0
+          1439.6887159533076,
+          173.15175097276258
         ],
         [
-          1440.909090909091,
-          324.3801652892562
+          1438.910505836576,
+          324.5136186770427
         ],
         [
           1395.4545454545455,
@@ -1491,6 +1546,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1517,6 +1573,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1543,6 +1600,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1569,6 +1627,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1595,6 +1654,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1621,6 +1681,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1647,6 +1708,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1673,6 +1735,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1699,6 +1762,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1725,6 +1789,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1751,6 +1816,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1777,6 +1843,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1803,6 +1870,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1829,6 +1897,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1855,6 +1924,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1881,6 +1951,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1907,6 +1978,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1933,6 +2005,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1959,6 +2032,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1985,6 +2059,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2011,6 +2086,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2037,6 +2113,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2063,6 +2140,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2089,6 +2167,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2115,6 +2194,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2141,6 +2221,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2167,6 +2248,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2193,6 +2275,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2219,6 +2302,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2245,6 +2329,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2271,6 +2356,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2297,6 +2383,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2323,6 +2410,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2349,6 +2437,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2375,6 +2464,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2401,6 +2491,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2427,6 +2518,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2469,6 +2561,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -2495,6 +2588,34 @@
         ]
       ],
       "group_id": null,
+      "description": null,
+      "shape_type": "polygon",
+      "flags": {}
+    },
+    {
+      "line_color": null,
+      "fill_color": null,
+      "label": "transformer",
+      "points": [
+        [
+          1284.8249027237355,
+          173.54085603112833
+        ],
+        [
+          1442.4124513618679,
+          168.48249027237347
+        ],
+        [
+          1441.2451361867704,
+          328.01556420233453
+        ],
+        [
+          1284.4357976653698,
+          323.34630350194544
+        ]
+      ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
diff --git a/drafter_5/annotations/C49_D1_P2.xml b/drafter_5/annotations/C49_D1_P2.xml
index efbff7407ec30dccba60e22ec2080a5e1f0dbd00..2be6a96cfccb76e3a5af2c77540a91c76fa88d91 100644
--- a/drafter_5/annotations/C49_D1_P2.xml
+++ b/drafter_5/annotations/C49_D1_P2.xml
@@ -327,6 +327,7 @@
 			<ymin>266</ymin>
 			<xmax>634</xmax>
 			<ymax>421</ymax>
+			<rotation>10</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C49_D1_P3.xml b/drafter_5/annotations/C49_D1_P3.xml
index 0f2a25f16554fb4bbad916a60a29c98d734f62e5..3a0e81cd7b9826da8e6e659cc402b23dcd62ed7a 100644
--- a/drafter_5/annotations/C49_D1_P3.xml
+++ b/drafter_5/annotations/C49_D1_P3.xml
@@ -69,6 +69,7 @@
 			<ymin>237</ymin>
 			<xmax>808</xmax>
 			<ymax>373</ymax>
+			<rotation>356</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C49_D2_P1.xml b/drafter_5/annotations/C49_D2_P1.xml
index f2a3f5d099c40b8e0524f696915821bdeed8101e..e480f598285cce1e6b8669b63cde95f055e43433 100644
--- a/drafter_5/annotations/C49_D2_P1.xml
+++ b/drafter_5/annotations/C49_D2_P1.xml
@@ -21,6 +21,7 @@
 			<ymin>263</ymin>
 			<xmax>840</xmax>
 			<ymax>427</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C49_D2_P2.xml b/drafter_5/annotations/C49_D2_P2.xml
index b65061237638883068b4a23fcc4544f356c12a26..56332bb2afece5e35b368d555a771027b36dc691 100644
--- a/drafter_5/annotations/C49_D2_P2.xml
+++ b/drafter_5/annotations/C49_D2_P2.xml
@@ -21,6 +21,7 @@
 			<ymin>204</ymin>
 			<xmax>883</xmax>
 			<ymax>364</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C49_D2_P3.xml b/drafter_5/annotations/C49_D2_P3.xml
index 0a4d5fc2517e19c2d3aa2f4882c132ed94134ce6..e728f92d4a18664bd15e5c69229c7f841347d259 100644
--- a/drafter_5/annotations/C49_D2_P3.xml
+++ b/drafter_5/annotations/C49_D2_P3.xml
@@ -482,6 +482,7 @@
 			<ymin>216</ymin>
 			<xmax>830</xmax>
 			<ymax>381</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C49_D2_P4.xml b/drafter_5/annotations/C49_D2_P4.xml
index 3e85c5b565611ee7bca560461079395bb1d68473..905252f9cc5a35f3253955fff32604369143c587 100644
--- a/drafter_5/annotations/C49_D2_P4.xml
+++ b/drafter_5/annotations/C49_D2_P4.xml
@@ -560,6 +560,7 @@
 			<ymin>248</ymin>
 			<xmax>804</xmax>
 			<ymax>437</ymax>
+			<rotation>6</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C50_D1_P1.xml b/drafter_5/annotations/C50_D1_P1.xml
index 033a48bdb9a83ba462f03284ccbab20c5819bee1..5bcd41f538d2cbd5a31709dc8bc6d6c92b4d981a 100644
--- a/drafter_5/annotations/C50_D1_P1.xml
+++ b/drafter_5/annotations/C50_D1_P1.xml
@@ -268,7 +268,7 @@
 			<xmax>157</xmax>
 			<ymax>459</ymax>
 		</bndbox>
-		<text>1&#956;</text>
+		<text>1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -294,7 +294,7 @@
 			<xmax>649</xmax>
 			<ymax>517</ymax>
 		</bndbox>
-		<text>47&#956;</text>
+		<text>47&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -320,7 +320,7 @@
 			<xmax>525</xmax>
 			<ymax>361</ymax>
 		</bndbox>
-		<text>1&#956;F</text>
+		<text>1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_5/annotations/C50_D1_P2.xml b/drafter_5/annotations/C50_D1_P2.xml
index ae13fbd3e971a37488618bcb54fd1c494c9763a7..be6fa3b7ab7fa1e2a0d7f8901ac00238b3e64f58 100644
--- a/drafter_5/annotations/C50_D1_P2.xml
+++ b/drafter_5/annotations/C50_D1_P2.xml
@@ -255,7 +255,7 @@
 			<xmax>688</xmax>
 			<ymax>522</ymax>
 		</bndbox>
-		<text>47&#956;</text>
+		<text>47&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -281,7 +281,7 @@
 			<xmax>145</xmax>
 			<ymax>467</ymax>
 		</bndbox>
-		<text>1&#956;</text>
+		<text>1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -359,7 +359,7 @@
 			<xmax>552</xmax>
 			<ymax>353</ymax>
 		</bndbox>
-		<text>1&#956;</text>
+		<text>1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_5/annotations/C50_D1_P3.xml b/drafter_5/annotations/C50_D1_P3.xml
index 45f436c348ef094cdda09828cb778a014c4f83e2..a6fc2f0cba6d6f16cfcf3a7d9633ae82ba1ef819 100644
--- a/drafter_5/annotations/C50_D1_P3.xml
+++ b/drafter_5/annotations/C50_D1_P3.xml
@@ -241,7 +241,7 @@
 			<xmax>210</xmax>
 			<ymax>440</ymax>
 		</bndbox>
-		<text>1&#956;</text>
+		<text>1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -306,7 +306,7 @@
 			<xmax>574</xmax>
 			<ymax>320</ymax>
 		</bndbox>
-		<text>1&#956;</text>
+		<text>1&#181;</text>
 	</object>
 	<object>
 		<name>gnd</name>
diff --git a/drafter_5/annotations/C50_D1_P4.xml b/drafter_5/annotations/C50_D1_P4.xml
index c6fc72fdcbbf8cde94c40583ed93e31937be7fac..239ed376e404e26280195e4e2f2016ca887d13b7 100644
--- a/drafter_5/annotations/C50_D1_P4.xml
+++ b/drafter_5/annotations/C50_D1_P4.xml
@@ -121,7 +121,7 @@
 			<xmax>635</xmax>
 			<ymax>349</ymax>
 		</bndbox>
-		<text>1&#956;</text>
+		<text>1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -147,7 +147,7 @@
 			<xmax>312</xmax>
 			<ymax>455</ymax>
 		</bndbox>
-		<text>1&#956;</text>
+		<text>1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -186,7 +186,7 @@
 			<xmax>716</xmax>
 			<ymax>485</ymax>
 		</bndbox>
-		<text>47&#956;</text>
+		<text>47&#181;</text>
 	</object>
 	<object>
 		<name>gnd</name>
diff --git a/drafter_5/annotations/C50_D2_P1.xml b/drafter_5/annotations/C50_D2_P1.xml
index 1a1c6616ae7f9800469f956166952557916f3cfe..240bd3dace8b6893a50d9c7d3071089d640c8bdb 100644
--- a/drafter_5/annotations/C50_D2_P1.xml
+++ b/drafter_5/annotations/C50_D2_P1.xml
@@ -35,7 +35,7 @@
 			<xmax>238</xmax>
 			<ymax>307</ymax>
 		</bndbox>
-		<text>1&#956;</text>
+		<text>1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -87,7 +87,7 @@
 			<xmax>662</xmax>
 			<ymax>419</ymax>
 		</bndbox>
-		<text>47&#956;</text>
+		<text>47&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -113,7 +113,7 @@
 			<xmax>633</xmax>
 			<ymax>241</ymax>
 		</bndbox>
-		<text>1&#956;F</text>
+		<text>1&#181;F</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_5/annotations/C50_D2_P2.xml b/drafter_5/annotations/C50_D2_P2.xml
index 075ef17d352c8465294ed26b1b03bcbb3d125dfe..5e6f16f6e89556c34b54ff309f0c6a840b06b2a3 100644
--- a/drafter_5/annotations/C50_D2_P2.xml
+++ b/drafter_5/annotations/C50_D2_P2.xml
@@ -139,7 +139,7 @@
 			<xmax>659</xmax>
 			<ymax>240</ymax>
 		</bndbox>
-		<text>1&#956;</text>
+		<text>1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -165,7 +165,7 @@
 			<xmax>660</xmax>
 			<ymax>404</ymax>
 		</bndbox>
-		<text>47&#956;</text>
+		<text>47&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -204,7 +204,7 @@
 			<xmax>230</xmax>
 			<ymax>304</ymax>
 		</bndbox>
-		<text>1&#956;</text>
+		<text>1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_5/annotations/C50_D2_P3.xml b/drafter_5/annotations/C50_D2_P3.xml
index 2e4bdee82a5f8b8e714ca7e0b9f6ee33c0628d4b..0ca8edbb10e5b02dbda5070f4f23d873f3913de4 100644
--- a/drafter_5/annotations/C50_D2_P3.xml
+++ b/drafter_5/annotations/C50_D2_P3.xml
@@ -108,7 +108,7 @@
 			<xmax>661</xmax>
 			<ymax>330</ymax>
 		</bndbox>
-		<text>1&#956;</text>
+		<text>1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -147,7 +147,7 @@
 			<xmax>294</xmax>
 			<ymax>318</ymax>
 		</bndbox>
-		<text>1&#956;</text>
+		<text>1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -199,7 +199,7 @@
 			<xmax>659</xmax>
 			<ymax>486</ymax>
 		</bndbox>
-		<text>47&#956;</text>
+		<text>47&#181;</text>
 	</object>
 	<object>
 		<name>gnd</name>
diff --git a/drafter_5/annotations/C50_D2_P4.xml b/drafter_5/annotations/C50_D2_P4.xml
index 27f030b258d7a1413e31d98437dbf85c9d7507c1..87e3d2dec3e93a01824de04c1f97b5958a6584c2 100644
--- a/drafter_5/annotations/C50_D2_P4.xml
+++ b/drafter_5/annotations/C50_D2_P4.xml
@@ -35,7 +35,7 @@
 			<xmax>569</xmax>
 			<ymax>473</ymax>
 		</bndbox>
-		<text>47&#956;</text>
+		<text>47&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -48,7 +48,7 @@
 			<xmax>576</xmax>
 			<ymax>312</ymax>
 		</bndbox>
-		<text>1&#956;</text>
+		<text>1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -100,7 +100,7 @@
 			<xmax>227</xmax>
 			<ymax>266</ymax>
 		</bndbox>
-		<text>1&#956;</text>
+		<text>1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_5/annotations/C51_D1_P1.xml b/drafter_5/annotations/C51_D1_P1.xml
index e7274a3efe28a990d901f1fe990219fc2efc161a..7feb7de0fadfce73a8827074fa2471991de32d0d 100644
--- a/drafter_5/annotations/C51_D1_P1.xml
+++ b/drafter_5/annotations/C51_D1_P1.xml
@@ -19,8 +19,8 @@
 		<bndbox>
 			<xmin>60</xmin>
 			<ymin>362</ymin>
-			<xmax>133</xmax>
-			<ymax>441</ymax>
+			<xmax>127</xmax>
+			<ymax>440</ymax>
 		</bndbox>
 	</object>
 	<object>
@@ -198,7 +198,7 @@
 			<xmax>296</xmax>
 			<ymax>528</ymax>
 		</bndbox>
-		<text>1&#956;</text>
+		<text>1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -237,7 +237,7 @@
 			<xmax>294</xmax>
 			<ymax>246</ymax>
 		</bndbox>
-		<text>47&#956;</text>
+		<text>47&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -276,7 +276,7 @@
 			<xmax>651</xmax>
 			<ymax>424</ymax>
 		</bndbox>
-		<text>1&#956;</text>
+		<text>1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -300,7 +300,7 @@
 			<xmin>367</xmin>
 			<ymin>318</ymin>
 			<xmax>449</xmax>
-			<ymax>381</ymax>
+			<ymax>367</ymax>
 			<rotation>91</rotation>
 		</bndbox>
 	</object>
@@ -530,6 +530,7 @@
 			<ymin>365</ymin>
 			<xmax>124</xmax>
 			<ymax>433</ymax>
+			<rotation>95</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -542,6 +543,7 @@
 			<ymin>367</ymin>
 			<xmax>91</xmax>
 			<ymax>438</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C51_D1_P2.xml b/drafter_5/annotations/C51_D1_P2.xml
index b16d512fda21e148ab667b26d5c3166a26e5112f..02e30b5a1a41d16365cfc9d1049be388dd880fcd 100644
--- a/drafter_5/annotations/C51_D1_P2.xml
+++ b/drafter_5/annotations/C51_D1_P2.xml
@@ -17,10 +17,10 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>71</xmin>
-			<ymin>327</ymin>
-			<xmax>140</xmax>
-			<ymax>406</ymax>
+			<xmin>74</xmin>
+			<ymin>329</ymin>
+			<xmax>137</xmax>
+			<ymax>404</ymax>
 		</bndbox>
 	</object>
 	<object>
@@ -331,7 +331,7 @@
 			<xmax>300</xmax>
 			<ymax>495</ymax>
 		</bndbox>
-		<text>1&#956;</text>
+		<text>1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -370,7 +370,7 @@
 			<xmax>297</xmax>
 			<ymax>217</ymax>
 		</bndbox>
-		<text>47&#956;</text>
+		<text>47&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -396,7 +396,7 @@
 			<xmax>658</xmax>
 			<ymax>393</ymax>
 		</bndbox>
-		<text>1&#956;</text>
+		<text>1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -466,9 +466,9 @@
 		<difficult>0</difficult>
 		<bndbox>
 			<xmin>369</xmin>
-			<ymin>285</ymin>
+			<ymin>290</ymin>
 			<xmax>450</xmax>
-			<ymax>344</ymax>
+			<ymax>335</ymax>
 			<rotation>93</rotation>
 		</bndbox>
 	</object>
@@ -530,6 +530,7 @@
 			<ymin>332</ymin>
 			<xmax>135</xmax>
 			<ymax>398</ymax>
+			<rotation>95</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -542,6 +543,7 @@
 			<ymin>336</ymin>
 			<xmax>101</xmax>
 			<ymax>402</ymax>
+			<rotation>95</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C51_D1_P3.xml b/drafter_5/annotations/C51_D1_P3.xml
index b4de0e9114984d0617be976592067f11b0e45ab1..5e65423ef05c502171765939c4b806e0f4bffb96 100644
--- a/drafter_5/annotations/C51_D1_P3.xml
+++ b/drafter_5/annotations/C51_D1_P3.xml
@@ -234,10 +234,10 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>67</xmin>
-			<ymin>371</ymin>
-			<xmax>133</xmax>
-			<ymax>454</ymax>
+			<xmin>69</xmin>
+			<ymin>373</ymin>
+			<xmax>129</xmax>
+			<ymax>451</ymax>
 		</bndbox>
 	</object>
 	<object>
@@ -427,7 +427,7 @@
 			<xmax>293</xmax>
 			<ymax>529</ymax>
 		</bndbox>
-		<text>1&#956;</text>
+		<text>1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -518,7 +518,7 @@
 			<xmax>659</xmax>
 			<ymax>397</ymax>
 		</bndbox>
-		<text>1&#956;</text>
+		<text>1&#181;</text>
 	</object>
 	<object>
 		<name>inductor</name>
@@ -530,6 +530,7 @@
 			<ymin>376</ymin>
 			<xmax>127</xmax>
 			<ymax>442</ymax>
+			<rotation>100</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -542,6 +543,7 @@
 			<ymin>382</ymin>
 			<xmax>97</xmax>
 			<ymax>448</ymax>
+			<rotation>100</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C51_D1_P4.xml b/drafter_5/annotations/C51_D1_P4.xml
index cc7900a675540f40d3f638d282c0c122b5112dee..15d0b168918e86046da30c6fbb96ec9b62fc6c4e 100644
--- a/drafter_5/annotations/C51_D1_P4.xml
+++ b/drafter_5/annotations/C51_D1_P4.xml
@@ -346,9 +346,9 @@
 		<difficult>0</difficult>
 		<bndbox>
 			<xmin>94</xmin>
-			<ymin>349</ymin>
-			<xmax>185</xmax>
-			<ymax>445</ymax>
+			<ymin>351</ymin>
+			<xmax>183</xmax>
+			<ymax>440</ymax>
 		</bndbox>
 	</object>
 	<object>
@@ -410,9 +410,9 @@
 		<difficult>0</difficult>
 		<bndbox>
 			<xmin>453</xmin>
-			<ymin>312</ymin>
+			<ymin>316</ymin>
 			<xmax>530</xmax>
-			<ymax>373</ymax>
+			<ymax>365</ymax>
 			<rotation>87</rotation>
 		</bndbox>
 	</object>
@@ -427,7 +427,7 @@
 			<xmax>370</xmax>
 			<ymax>535</ymax>
 		</bndbox>
-		<text>1&#956;</text>
+		<text>1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -466,7 +466,7 @@
 			<xmax>383</xmax>
 			<ymax>227</ymax>
 		</bndbox>
-		<text>47&#956;</text>
+		<text>47&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -505,7 +505,7 @@
 			<xmax>702</xmax>
 			<ymax>421</ymax>
 		</bndbox>
-		<text>1&#956;</text>
+		<text>1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -530,6 +530,7 @@
 			<ymin>354</ymin>
 			<xmax>177</xmax>
 			<ymax>429</ymax>
+			<rotation>96</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -542,6 +543,7 @@
 			<ymin>356</ymin>
 			<xmax>135</xmax>
 			<ymax>437</ymax>
+			<rotation>90</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C51_D2_P1.xml b/drafter_5/annotations/C51_D2_P1.xml
index 21f54f4f568913e95865548c3cb8b06e917bfc68..0b6b0ac3031757bf3fdbfd34077f835169bb38f6 100644
--- a/drafter_5/annotations/C51_D2_P1.xml
+++ b/drafter_5/annotations/C51_D2_P1.xml
@@ -17,10 +17,10 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>110</xmin>
-			<ymin>275</ymin>
-			<xmax>202</xmax>
-			<ymax>366</ymax>
+			<xmin>112</xmin>
+			<ymin>280</ymin>
+			<xmax>199</xmax>
+			<ymax>363</ymax>
 		</bndbox>
 	</object>
 	<object>
@@ -288,7 +288,7 @@
 			<xmax>731</xmax>
 			<ymax>312</ymax>
 		</bndbox>
-		<text>1&#956;</text>
+		<text>1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -314,7 +314,7 @@
 			<xmax>378</xmax>
 			<ymax>397</ymax>
 		</bndbox>
-		<text>1&#956;</text>
+		<text>1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -353,7 +353,7 @@
 			<xmax>352</xmax>
 			<ymax>126</ymax>
 		</bndbox>
-		<text>47&#956;</text>
+		<text>47&#181;</text>
 	</object>
 	<object>
 		<name>resistor</name>
@@ -465,9 +465,9 @@
 		<difficult>0</difficult>
 		<bndbox>
 			<xmin>421</xmin>
-			<ymin>218</ymin>
+			<ymin>222</ymin>
 			<xmax>512</xmax>
-			<ymax>282</ymax>
+			<ymax>275</ymax>
 			<rotation>91</rotation>
 		</bndbox>
 	</object>
@@ -505,6 +505,7 @@
 			<ymin>283</ymin>
 			<xmax>197</xmax>
 			<ymax>354</ymax>
+			<rotation>108</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -517,6 +518,7 @@
 			<ymin>285</ymin>
 			<xmax>161</xmax>
 			<ymax>358</ymax>
+			<rotation>106</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C51_D2_P2.xml b/drafter_5/annotations/C51_D2_P2.xml
index 4a2958a12acca2e384b69706803a96a6976664b6..828a9813a7c12f53dacd4d536f6c7d092dfad57d 100644
--- a/drafter_5/annotations/C51_D2_P2.xml
+++ b/drafter_5/annotations/C51_D2_P2.xml
@@ -17,10 +17,10 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>149</xmin>
-			<ymin>280</ymin>
-			<xmax>233</xmax>
-			<ymax>361</ymax>
+			<xmin>152</xmin>
+			<ymin>281</ymin>
+			<xmax>230</xmax>
+			<ymax>357</ymax>
 		</bndbox>
 	</object>
 	<object>
@@ -133,7 +133,7 @@
 			<xmax>348</xmax>
 			<ymax>129</ymax>
 		</bndbox>
-		<text>47&#956;</text>
+		<text>47&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -159,7 +159,7 @@
 			<xmax>395</xmax>
 			<ymax>385</ymax>
 		</bndbox>
-		<text>1&#956;</text>
+		<text>1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -220,10 +220,10 @@
 		<difficult>0</difficult>
 		<bndbox>
 			<xmin>288</xmin>
-			<ymin>205</ymin>
+			<ymin>207</ymin>
 			<xmax>351</xmax>
-			<ymax>239</ymax>
-			<rotation>360</rotation>
+			<ymax>238</ymax>
+			<rotation>6</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -493,7 +493,7 @@
 			<xmax>752</xmax>
 			<ymax>294</ymax>
 		</bndbox>
-		<text>1&#956;</text>
+		<text>1&#181;</text>
 	</object>
 	<object>
 		<name>inductor</name>
@@ -505,6 +505,7 @@
 			<ymin>284</ymin>
 			<xmax>228</xmax>
 			<ymax>353</ymax>
+			<rotation>110</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -517,6 +518,7 @@
 			<ymin>291</ymin>
 			<xmax>197</xmax>
 			<ymax>354</ymax>
+			<rotation>105</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C51_D2_P3.xml b/drafter_5/annotations/C51_D2_P3.xml
index 642fdc4fa6b7e4449d76a755bada29f7d9c951a3..6d3f9990539dd89ed86babf44f3962e3aa8432e5 100644
--- a/drafter_5/annotations/C51_D2_P3.xml
+++ b/drafter_5/annotations/C51_D2_P3.xml
@@ -121,7 +121,7 @@
 			<xmax>393</xmax>
 			<ymax>120</ymax>
 		</bndbox>
-		<text>47&#956;</text>
+		<text>47&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -147,7 +147,7 @@
 			<xmax>368</xmax>
 			<ymax>384</ymax>
 		</bndbox>
-		<text>1&#956;</text>
+		<text>1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -168,10 +168,10 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>87</xmin>
-			<ymin>254</ymin>
-			<xmax>188</xmax>
-			<ymax>342</ymax>
+			<xmin>91</xmin>
+			<ymin>258</ymin>
+			<xmax>184</xmax>
+			<ymax>340</ymax>
 		</bndbox>
 	</object>
 	<object>
@@ -466,7 +466,7 @@
 			<ymin>196</ymin>
 			<xmax>362</xmax>
 			<ymax>233</ymax>
-			<rotation>178</rotation>
+			<rotation>171</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -480,7 +480,7 @@
 			<xmax>702</xmax>
 			<ymax>326</ymax>
 		</bndbox>
-		<text>1&#956;</text>
+		<text>1&#181;</text>
 	</object>
 	<object>
 		<name>transistor.bjt</name>
@@ -505,6 +505,7 @@
 			<ymin>260</ymin>
 			<xmax>181</xmax>
 			<ymax>333</ymax>
+			<rotation>100</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -517,6 +518,7 @@
 			<ymin>263</ymin>
 			<xmax>140</xmax>
 			<ymax>337</ymax>
+			<rotation>100</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C51_D2_P4.xml b/drafter_5/annotations/C51_D2_P4.xml
index d6d124deaaca949b90aeaf32552f65d5fe02f258..cff70ed6a25fed740c43f70303de7fb1a323cd66 100644
--- a/drafter_5/annotations/C51_D2_P4.xml
+++ b/drafter_5/annotations/C51_D2_P4.xml
@@ -18,9 +18,9 @@
 		<difficult>0</difficult>
 		<bndbox>
 			<xmin>455</xmin>
-			<ymin>241</ymin>
+			<ymin>244</ymin>
 			<xmax>543</xmax>
-			<ymax>299</ymax>
+			<ymax>296</ymax>
 			<rotation>89</rotation>
 		</bndbox>
 	</object>
@@ -264,7 +264,7 @@
 			<xmax>750</xmax>
 			<ymax>326</ymax>
 		</bndbox>
-		<text>1&#956;F</text>
+		<text>1&#181;F</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -316,7 +316,7 @@
 			<xmax>395</xmax>
 			<ymax>424</ymax>
 		</bndbox>
-		<text>1&#956;</text>
+		<text>1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -342,7 +342,7 @@
 			<xmax>387</xmax>
 			<ymax>137</ymax>
 		</bndbox>
-		<text>47&#956;</text>
+		<text>47&#181;</text>
 	</object>
 	<object>
 		<name>capacitor.polarized</name>
@@ -489,10 +489,10 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>93</xmin>
-			<ymin>301</ymin>
-			<xmax>198</xmax>
-			<ymax>405</ymax>
+			<xmin>96</xmin>
+			<ymin>307</ymin>
+			<xmax>194</xmax>
+			<ymax>394</ymax>
 		</bndbox>
 	</object>
 	<object>
@@ -501,10 +501,11 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>141</xmin>
+			<xmin>138</xmin>
 			<ymin>309</ymin>
 			<xmax>192</xmax>
 			<ymax>389</ymax>
+			<rotation>100</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -515,8 +516,9 @@
 		<bndbox>
 			<xmin>99</xmin>
 			<ymin>313</ymin>
-			<xmax>147</xmax>
+			<xmax>151</xmax>
 			<ymax>391</ymax>
+			<rotation>100</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C52_D1_P1.xml b/drafter_5/annotations/C52_D1_P1.xml
index 38cd968ea27216e54c13548c29777d9e59153691..dd3bf98ebef83769652d7ff31621d7ed67ecc5d9 100644
--- a/drafter_5/annotations/C52_D1_P1.xml
+++ b/drafter_5/annotations/C52_D1_P1.xml
@@ -107,7 +107,7 @@
 			<ymin>262</ymin>
 			<xmax>291</xmax>
 			<ymax>334</ymax>
-			<rotation>360</rotation>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -322,7 +322,7 @@
 			<xmax>646</xmax>
 			<ymax>343</ymax>
 		</bndbox>
-		<text>1&#956;</text>
+		<text>1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -361,7 +361,7 @@
 			<xmax>302</xmax>
 			<ymax>400</ymax>
 		</bndbox>
-		<text>0,1&#956;</text>
+		<text>0,1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_5/annotations/C52_D1_P2.xml b/drafter_5/annotations/C52_D1_P2.xml
index 7ae3d9ccf90ee8baba33eaa06ef41b72d8f5cb4a..88d7901b11f5a24551cae77e21b3a7fa08f8f710 100644
--- a/drafter_5/annotations/C52_D1_P2.xml
+++ b/drafter_5/annotations/C52_D1_P2.xml
@@ -296,7 +296,7 @@
 			<xmax>294</xmax>
 			<ymax>363</ymax>
 		</bndbox>
-		<text>0,1&#956;</text>
+		<text>0,1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -348,7 +348,7 @@
 			<xmax>641</xmax>
 			<ymax>339</ymax>
 		</bndbox>
-		<text>1&#956;</text>
+		<text>1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_5/annotations/C52_D1_P3.xml b/drafter_5/annotations/C52_D1_P3.xml
index 829ca00e8ddaf7bf0c78e7730047d3bcada9c87a..deac7e048680213059c0c36e8c057959c588fcf0 100644
--- a/drafter_5/annotations/C52_D1_P3.xml
+++ b/drafter_5/annotations/C52_D1_P3.xml
@@ -48,7 +48,7 @@
 			<xmax>343</xmax>
 			<ymax>411</ymax>
 		</bndbox>
-		<text>0,1&#956;</text>
+		<text>0,1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -87,7 +87,7 @@
 			<xmax>663</xmax>
 			<ymax>341</ymax>
 		</bndbox>
-		<text>1&#956;</text>
+		<text>1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_5/annotations/C52_D1_P4.xml b/drafter_5/annotations/C52_D1_P4.xml
index 42c757d6109a8028fc7dce9ceddefdeac1b929d7..4bc7ce699f539993435403e127c98659ad4eb6a4 100644
--- a/drafter_5/annotations/C52_D1_P4.xml
+++ b/drafter_5/annotations/C52_D1_P4.xml
@@ -48,7 +48,7 @@
 			<xmax>335</xmax>
 			<ymax>353</ymax>
 		</bndbox>
-		<text>0.1&#956;</text>
+		<text>0.1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -87,7 +87,7 @@
 			<xmax>626</xmax>
 			<ymax>314</ymax>
 		</bndbox>
-		<text>1&#956;</text>
+		<text>1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -173,9 +173,9 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>464</xmin>
+			<xmin>473</xmin>
 			<ymin>204</ymin>
-			<xmax>536</xmax>
+			<xmax>532</xmax>
 			<ymax>300</ymax>
 			<rotation>9</rotation>
 		</bndbox>
diff --git a/drafter_5/annotations/C52_D2_P1.xml b/drafter_5/annotations/C52_D2_P1.xml
index 7a3a0149ffb8a24a448c7046d8c741ebe9b3724a..97ede79fbb7bd70440827304cf0a850ee9b32ffc 100644
--- a/drafter_5/annotations/C52_D2_P1.xml
+++ b/drafter_5/annotations/C52_D2_P1.xml
@@ -35,7 +35,7 @@
 			<xmax>444</xmax>
 			<ymax>302</ymax>
 		</bndbox>
-		<text>0,1&#956;</text>
+		<text>0,1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -139,7 +139,7 @@
 			<xmax>693</xmax>
 			<ymax>368</ymax>
 		</bndbox>
-		<text>1&#956;</text>
+		<text>1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -177,7 +177,7 @@
 			<ymin>294</ymin>
 			<xmax>598</xmax>
 			<ymax>358</ymax>
-			<rotation>5</rotation>
+			<rotation>356</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -373,7 +373,7 @@
 			<ymin>260</ymin>
 			<xmax>531</xmax>
 			<ymax>316</ymax>
-			<rotation>95</rotation>
+			<rotation>87</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C52_D2_P2.xml b/drafter_5/annotations/C52_D2_P2.xml
index b57e77995d6a50da1b3a44761416d5ee6d026498..c3573c29a0d032e1b0c9a41598f1c6710320b252 100644
--- a/drafter_5/annotations/C52_D2_P2.xml
+++ b/drafter_5/annotations/C52_D2_P2.xml
@@ -74,7 +74,7 @@
 			<xmax>449</xmax>
 			<ymax>300</ymax>
 		</bndbox>
-		<text>0,1&#956;</text>
+		<text>0,1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -139,7 +139,7 @@
 			<xmax>794</xmax>
 			<ymax>463</ymax>
 		</bndbox>
-		<text>OV</text>
+		<text>0V</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -165,7 +165,7 @@
 			<xmax>697</xmax>
 			<ymax>329</ymax>
 		</bndbox>
-		<text>1&#956;</text>
+		<text>1&#181;</text>
 	</object>
 	<object>
 		<name>capacitor.unpolarized</name>
diff --git a/drafter_5/annotations/C52_D2_P3.xml b/drafter_5/annotations/C52_D2_P3.xml
index 7d829c0c733df97cc95f16beb99d0a82990cc7b6..9e7397683a4c5cabb3893dcd6911869b20a3b7e5 100644
--- a/drafter_5/annotations/C52_D2_P3.xml
+++ b/drafter_5/annotations/C52_D2_P3.xml
@@ -48,7 +48,7 @@
 			<xmax>483</xmax>
 			<ymax>300</ymax>
 		</bndbox>
-		<text>0,1&#956;</text>
+		<text>0,1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -87,7 +87,7 @@
 			<xmax>721</xmax>
 			<ymax>374</ymax>
 		</bndbox>
-		<text>1&#956;</text>
+		<text>1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_5/annotations/C52_D2_P4.xml b/drafter_5/annotations/C52_D2_P4.xml
index 2fb1e91baafbb1c7be10ff7b0006014164728898..f0176c6e2a4aad7c415ea23092e62984ab8c87fd 100644
--- a/drafter_5/annotations/C52_D2_P4.xml
+++ b/drafter_5/annotations/C52_D2_P4.xml
@@ -48,7 +48,7 @@
 			<xmax>710</xmax>
 			<ymax>361</ymax>
 		</bndbox>
-		<text>1&#956;</text>
+		<text>1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -126,7 +126,7 @@
 			<xmax>473</xmax>
 			<ymax>339</ymax>
 		</bndbox>
-		<text>0,1&#956;</text>
+		<text>0,1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_5/annotations/C53_D1_P1.xml b/drafter_5/annotations/C53_D1_P1.xml
index 9f647f1c888339ca9b26606e8631d0f5651ec5cb..122c27b59353652738fa5987a977e41b1d8e33d1 100644
--- a/drafter_5/annotations/C53_D1_P1.xml
+++ b/drafter_5/annotations/C53_D1_P1.xml
@@ -21,6 +21,7 @@
 			<ymin>85</ymin>
 			<xmax>752</xmax>
 			<ymax>125</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -756,6 +757,7 @@
 			<ymin>287</ymin>
 			<xmax>615</xmax>
 			<ymax>333</ymax>
+			<rotation>100</rotation>
 		</bndbox>
 	</object>
 </annotation>
diff --git a/drafter_5/annotations/C53_D1_P2.xml b/drafter_5/annotations/C53_D1_P2.xml
index 7e14cde9cd8f9a7c63d5bd622ba0916811442684..0a0fa6f614f525bf2165223e92e5b2498bbc8aef 100644
--- a/drafter_5/annotations/C53_D1_P2.xml
+++ b/drafter_5/annotations/C53_D1_P2.xml
@@ -216,6 +216,7 @@
 			<ymin>181</ymin>
 			<xmax>746</xmax>
 			<ymax>223</ymax>
+			<rotation>2</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -720,6 +721,7 @@
 			<ymin>364</ymin>
 			<xmax>601</xmax>
 			<ymax>408</ymax>
+			<rotation>98</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C53_D1_P3.xml b/drafter_5/annotations/C53_D1_P3.xml
index 056300b87437bb05954bde2cbe4cbd8ff0ade42c..34cc42062bc4304e996832d18ee80b9b42524855 100644
--- a/drafter_5/annotations/C53_D1_P3.xml
+++ b/drafter_5/annotations/C53_D1_P3.xml
@@ -626,11 +626,11 @@
 		<truncated>0</truncated>
 		<difficult>0</difficult>
 		<bndbox>
-			<xmin>162</xmin>
+			<xmin>161</xmin>
 			<ymin>159</ymin>
-			<xmax>209</xmax>
-			<ymax>184</ymax>
-			<rotation>360</rotation>
+			<xmax>207</xmax>
+			<ymax>183</ymax>
+			<rotation>8</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -756,6 +756,7 @@
 			<ymin>346</ymin>
 			<xmax>583</xmax>
 			<ymax>385</ymax>
+			<rotation>95</rotation>
 		</bndbox>
 	</object>
 </annotation>
diff --git a/drafter_5/annotations/C53_D1_P4.xml b/drafter_5/annotations/C53_D1_P4.xml
index 212b733bffe093e498b04b361e8c2c73920f8ef6..30b56c03219f29077f47d045f63584e44ee8771f 100644
--- a/drafter_5/annotations/C53_D1_P4.xml
+++ b/drafter_5/annotations/C53_D1_P4.xml
@@ -264,6 +264,7 @@
 			<ymin>355</ymin>
 			<xmax>597</xmax>
 			<ymax>401</ymax>
+			<rotation>98</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C53_D2_P1.xml b/drafter_5/annotations/C53_D2_P1.xml
index 6db74e651a8c05ec65b6d91194a0e884f3f4c389..0e2df73785917b8ee789cf1287c186594905e4a7 100644
--- a/drafter_5/annotations/C53_D2_P1.xml
+++ b/drafter_5/annotations/C53_D2_P1.xml
@@ -86,6 +86,7 @@
 			<ymin>329</ymin>
 			<xmax>639</xmax>
 			<ymax>369</ymax>
+			<rotation>95</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -135,6 +136,7 @@
 			<ymin>163</ymin>
 			<xmax>745</xmax>
 			<ymax>202</ymax>
+			<rotation>8</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C53_D2_P2.xml b/drafter_5/annotations/C53_D2_P2.xml
index 2edb149aebe1722070ff1506d061af2f0f3f5801..1c3e61b99381898d18fd98a4eaee92798322cd20 100644
--- a/drafter_5/annotations/C53_D2_P2.xml
+++ b/drafter_5/annotations/C53_D2_P2.xml
@@ -137,6 +137,7 @@
 			<ymin>284</ymin>
 			<xmax>648</xmax>
 			<ymax>327</ymax>
+			<rotation>105</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -633,6 +634,7 @@
 			<ymin>122</ymin>
 			<xmax>737</xmax>
 			<ymax>160</ymax>
+			<rotation>12</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C53_D2_P3.xml b/drafter_5/annotations/C53_D2_P3.xml
index bbe48e889d0bf7aa226aedd690ed4132ca31c4a2..c375dab8c5d85a04788ca2161935cf71975aa0c8 100644
--- a/drafter_5/annotations/C53_D2_P3.xml
+++ b/drafter_5/annotations/C53_D2_P3.xml
@@ -86,6 +86,7 @@
 			<ymin>64</ymin>
 			<xmax>653</xmax>
 			<ymax>108</ymax>
+			<rotation>8</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -530,6 +531,7 @@
 			<ymin>242</ymin>
 			<xmax>544</xmax>
 			<ymax>288</ymax>
+			<rotation>100</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C53_D2_P4.xml b/drafter_5/annotations/C53_D2_P4.xml
index 02aac413b83140ec57eea8ce0f62675e8d9a6dba..9461cb1c511eb066d8e261ef89ca4ff6704cd1a6 100644
--- a/drafter_5/annotations/C53_D2_P4.xml
+++ b/drafter_5/annotations/C53_D2_P4.xml
@@ -302,6 +302,7 @@
 			<ymin>323</ymin>
 			<xmax>616</xmax>
 			<ymax>367</ymax>
+			<rotation>95</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -311,9 +312,9 @@
 		<difficult>0</difficult>
 		<bndbox>
 			<xmin>115</xmin>
-			<ymin>143</ymin>
+			<ymin>144</ymin>
 			<xmax>166</xmax>
-			<ymax>172</ymax>
+			<ymax>169</ymax>
 			<rotation>360</rotation>
 		</bndbox>
 	</object>
@@ -572,6 +573,7 @@
 			<ymin>156</ymin>
 			<xmax>734</xmax>
 			<ymax>197</ymax>
+			<rotation>8</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -584,7 +586,7 @@
 			<ymin>205</ymin>
 			<xmax>104</xmax>
 			<ymax>260</ymax>
-			<rotation>180</rotation>
+			<rotation>183</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C55_D1_P1.xml b/drafter_5/annotations/C55_D1_P1.xml
index a0edd30eb201da0692b58c09614f0e431c2303fb..e9065ccb71866dc7730126036019f09ef888beb4 100644
--- a/drafter_5/annotations/C55_D1_P1.xml
+++ b/drafter_5/annotations/C55_D1_P1.xml
@@ -21,6 +21,7 @@
 			<ymin>282</ymin>
 			<xmax>387</xmax>
 			<ymax>336</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -202,6 +203,7 @@
 			<ymin>59</ymin>
 			<xmax>399</xmax>
 			<ymax>95</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C55_D1_P2.xml b/drafter_5/annotations/C55_D1_P2.xml
index e9a487fc307eb6f63ed07508730d4c6f6e49cc37..b65f476ef6ce6fe2953c4b021fc5c6997fed11f2 100644
--- a/drafter_5/annotations/C55_D1_P2.xml
+++ b/drafter_5/annotations/C55_D1_P2.xml
@@ -21,7 +21,7 @@
 			<ymin>207</ymin>
 			<xmax>365</xmax>
 			<ymax>252</ymax>
-			<rotation>3</rotation>
+			<rotation>10</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -288,7 +288,7 @@
 			<xmax>559</xmax>
 			<ymax>304</ymax>
 		</bndbox>
-		<text>CS&#956;F</text>
+		<text>CS&#181;F</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -537,6 +537,7 @@
 			<ymin>38</ymin>
 			<xmax>360</xmax>
 			<ymax>65</ymax>
+			<rotation>8</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C55_D1_P3.xml b/drafter_5/annotations/C55_D1_P3.xml
index 1f6a8606b5cea6c4728844caaf5b80f64c3a9029..1b2cec7b920c516dcc181c936c28713632483281 100644
--- a/drafter_5/annotations/C55_D1_P3.xml
+++ b/drafter_5/annotations/C55_D1_P3.xml
@@ -21,6 +21,7 @@
 			<ymin>257</ymin>
 			<xmax>344</xmax>
 			<ymax>300</ymax>
+			<rotation>10</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -33,6 +34,7 @@
 			<ymin>75</ymin>
 			<xmax>323</xmax>
 			<ymax>107</ymax>
+			<rotation>12</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C55_D1_P4.xml b/drafter_5/annotations/C55_D1_P4.xml
index 913c53566d719030e747249e6f9ed4e23d05c656..180cb44458aa8e962b7571b796a2947fc4c21169 100644
--- a/drafter_5/annotations/C55_D1_P4.xml
+++ b/drafter_5/annotations/C55_D1_P4.xml
@@ -315,6 +315,7 @@
 			<ymin>475</ymin>
 			<xmax>509</xmax>
 			<ymax>494</ymax>
+			<rotation>2</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -327,6 +328,7 @@
 			<ymin>126</ymin>
 			<xmax>538</xmax>
 			<ymax>157</ymax>
+			<rotation>356</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C55_D2_P1.xml b/drafter_5/annotations/C55_D2_P1.xml
index 81a6ed490c0d326bfd239c1f75dfbfc060f1fcf0..f21a9e884f4e6302aa9b4a35a5a4779e1d111fc6 100644
--- a/drafter_5/annotations/C55_D2_P1.xml
+++ b/drafter_5/annotations/C55_D2_P1.xml
@@ -239,7 +239,7 @@
 			<ymin>245</ymin>
 			<xmax>380</xmax>
 			<ymax>298</ymax>
-			<rotation>95</rotation>
+			<rotation>83</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -252,7 +252,7 @@
 			<ymin>241</ymin>
 			<xmax>472</xmax>
 			<ymax>281</ymax>
-			<rotation>96</rotation>
+			<rotation>83</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C55_D2_P2.xml b/drafter_5/annotations/C55_D2_P2.xml
index f3a4c28d600bb57b1eb653b3dc3d8122b0925e63..b25c65a8581cd28deb2f489a438cecb1f34702d7 100644
--- a/drafter_5/annotations/C55_D2_P2.xml
+++ b/drafter_5/annotations/C55_D2_P2.xml
@@ -465,6 +465,7 @@
 			<ymin>249</ymin>
 			<xmax>491</xmax>
 			<ymax>288</ymax>
+			<rotation>6</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C55_D2_P3.xml b/drafter_5/annotations/C55_D2_P3.xml
index d73e65c84616800289511d28ff2d4616899c45aa..236a681554509a24c860adc0a3db96c8a010a2f9 100644
--- a/drafter_5/annotations/C55_D2_P3.xml
+++ b/drafter_5/annotations/C55_D2_P3.xml
@@ -153,6 +153,7 @@
 			<ymin>257</ymin>
 			<xmax>432</xmax>
 			<ymax>298</ymax>
+			<rotation>17</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -525,6 +526,7 @@
 			<ymin>147</ymin>
 			<xmax>359</xmax>
 			<ymax>166</ymax>
+			<rotation>13</rotation>
 		</bndbox>
 	</object>
 </annotation>
diff --git a/drafter_5/annotations/C56_D1_P1.xml b/drafter_5/annotations/C56_D1_P1.xml
index b8d20e444269c17f2ffd72958c1ca3a4c97f860d..4b8c989c0acb591b8195a87f2444ebce7936fc68 100644
--- a/drafter_5/annotations/C56_D1_P1.xml
+++ b/drafter_5/annotations/C56_D1_P1.xml
@@ -126,7 +126,7 @@
 			<xmax>88</xmax>
 			<ymax>376</ymax>
 		</bndbox>
-		<text>OV</text>
+		<text>0V</text>
 	</object>
 	<object>
 		<name>transistor.bjt</name>
@@ -164,6 +164,7 @@
 			<ymin>130</ymin>
 			<xmax>646</xmax>
 			<ymax>247</ymax>
+			<rotation>6</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C56_D1_P2.xml b/drafter_5/annotations/C56_D1_P2.xml
index 0f3866866218fdb5cf9961ff7ede093504677f8e..72a08f69cf4a8a46d5fc7fd9c03b81c87f4a929c 100644
--- a/drafter_5/annotations/C56_D1_P2.xml
+++ b/drafter_5/annotations/C56_D1_P2.xml
@@ -190,6 +190,7 @@
 			<ymin>186</ymin>
 			<xmax>629</xmax>
 			<ymax>289</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C56_D1_P3.xml b/drafter_5/annotations/C56_D1_P3.xml
index 9f3573e6524d3730fdfe54d2b6d7d5ae5a886708..4d7a70dc8f5173fb07578c0cd39fe3a41d7d439b 100644
--- a/drafter_5/annotations/C56_D1_P3.xml
+++ b/drafter_5/annotations/C56_D1_P3.xml
@@ -47,6 +47,7 @@
 			<ymin>153</ymin>
 			<xmax>692</xmax>
 			<ymax>256</ymax>
+			<rotation>6</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -343,7 +344,7 @@
 			<xmax>96</xmax>
 			<ymax>396</ymax>
 		</bndbox>
-		<text>OV</text>
+		<text>0V</text>
 	</object>
 	<object>
 		<name>junction</name>
diff --git a/drafter_5/annotations/C56_D1_P4.xml b/drafter_5/annotations/C56_D1_P4.xml
index ff09219e1727a32c91c9ed96facee269c577112b..2ee71394e6ffe2d364f17923750165f6c73769de 100644
--- a/drafter_5/annotations/C56_D1_P4.xml
+++ b/drafter_5/annotations/C56_D1_P4.xml
@@ -21,7 +21,7 @@
 			<ymin>123</ymin>
 			<xmax>698</xmax>
 			<ymax>261</ymax>
-			<rotation>2</rotation>
+			<rotation>6</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -83,7 +83,7 @@
 			<xmax>62</xmax>
 			<ymax>426</ymax>
 		</bndbox>
-		<text>OV</text>
+		<text>0V</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_5/annotations/C56_D2_P1.xml b/drafter_5/annotations/C56_D2_P1.xml
index f37c4be3554df14d5bed9dc1d92fb61fde04dab0..5d2dceda7d36b9f02090e625f31dc286ef6a7c60 100644
--- a/drafter_5/annotations/C56_D2_P1.xml
+++ b/drafter_5/annotations/C56_D2_P1.xml
@@ -358,7 +358,7 @@
 			<ymin>131</ymin>
 			<xmax>680</xmax>
 			<ymax>235</ymax>
-			<rotation>2</rotation>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C56_D2_P2.xml b/drafter_5/annotations/C56_D2_P2.xml
index 28c3075b20f82673877936b1f1bdd992f028ad26..275454ec56d37356d8851e183e8b4dbd86458f06 100644
--- a/drafter_5/annotations/C56_D2_P2.xml
+++ b/drafter_5/annotations/C56_D2_P2.xml
@@ -21,6 +21,7 @@
 			<ymin>137</ymin>
 			<xmax>707</xmax>
 			<ymax>234</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C56_D2_P3.xml b/drafter_5/annotations/C56_D2_P3.xml
index 0fcbb5a6edaaa2ffc2118e5eaaa76b756b5dfd1d..18d1efc097586fa1969a7a8423cb6830eef06377 100644
--- a/drafter_5/annotations/C56_D2_P3.xml
+++ b/drafter_5/annotations/C56_D2_P3.xml
@@ -238,7 +238,7 @@
 			<ymin>160</ymin>
 			<xmax>384</xmax>
 			<ymax>234</ymax>
-			<rotation>3</rotation>
+			<rotation>6</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -420,6 +420,7 @@
 			<ymin>101</ymin>
 			<xmax>684</xmax>
 			<ymax>200</ymax>
+			<rotation>12</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C56_D2_P4.xml b/drafter_5/annotations/C56_D2_P4.xml
index 5750211a1afca2a0b936491f5101274ce4610fc1..b7aebe6d3a8c4485d6fa0582c15115114f140ab4 100644
--- a/drafter_5/annotations/C56_D2_P4.xml
+++ b/drafter_5/annotations/C56_D2_P4.xml
@@ -21,6 +21,7 @@
 			<ymin>129</ymin>
 			<xmax>728</xmax>
 			<ymax>215</ymax>
+			<rotation>6</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C57_D1_P1.xml b/drafter_5/annotations/C57_D1_P1.xml
index 5e0fbc79c309250cd714f5da11ab7aa26b1acc86..20846af030ea791aa0ace58512ab2967f84fc4a2 100644
--- a/drafter_5/annotations/C57_D1_P1.xml
+++ b/drafter_5/annotations/C57_D1_P1.xml
@@ -331,7 +331,7 @@
 			<xmax>574</xmax>
 			<ymax>543</ymax>
 		</bndbox>
-		<text>0,1&#956;</text>
+		<text>0,1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -344,7 +344,7 @@
 			<xmax>673</xmax>
 			<ymax>426</ymax>
 		</bndbox>
-		<text>0,1&#956;</text>
+		<text>0,1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_5/annotations/C57_D1_P2.xml b/drafter_5/annotations/C57_D1_P2.xml
index 65fb7c498d1feeb2a12b881cf7576362c1098c68..6cd5b62eb7885cd0c0ef1be6052ac7165f7de33d 100644
--- a/drafter_5/annotations/C57_D1_P2.xml
+++ b/drafter_5/annotations/C57_D1_P2.xml
@@ -318,7 +318,7 @@
 			<xmax>693</xmax>
 			<ymax>503</ymax>
 		</bndbox>
-		<text>0,1&#956;</text>
+		<text>0,1&#181;</text>
 	</object>
 	<object>
 		<name>junction</name>
@@ -368,7 +368,7 @@
 			<xmax>587</xmax>
 			<ymax>610</ymax>
 		</bndbox>
-		<text>0,1&#956;</text>
+		<text>0,1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_5/annotations/C57_D1_P3.xml b/drafter_5/annotations/C57_D1_P3.xml
index 87831313fef6ef29e79dfbb3a5dc690e92595ecb..959c5095cf623bac6e605e7ad951aeea0e7c09de 100644
--- a/drafter_5/annotations/C57_D1_P3.xml
+++ b/drafter_5/annotations/C57_D1_P3.xml
@@ -317,7 +317,7 @@
 			<xmax>601</xmax>
 			<ymax>504</ymax>
 		</bndbox>
-		<text>0,1&#956;</text>
+		<text>0,1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -330,7 +330,7 @@
 			<xmax>210</xmax>
 			<ymax>543</ymax>
 		</bndbox>
-		<text>OV</text>
+		<text>0V</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_5/annotations/C57_D1_P4.xml b/drafter_5/annotations/C57_D1_P4.xml
index d40d75ee505d303d26c62c3d58406640611c9b9b..fc3f293ceea1e64548914fbcb28b0acc8f55d400 100644
--- a/drafter_5/annotations/C57_D1_P4.xml
+++ b/drafter_5/annotations/C57_D1_P4.xml
@@ -254,7 +254,7 @@
 			<xmax>726</xmax>
 			<ymax>393</ymax>
 		</bndbox>
-		<text>0,1&#956;</text>
+		<text>0,1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -280,7 +280,7 @@
 			<xmax>623</xmax>
 			<ymax>483</ymax>
 		</bndbox>
-		<text>0,1&#956;</text>
+		<text>0,1&#181;</text>
 	</object>
 	<object>
 		<name>capacitor.unpolarized</name>
diff --git a/drafter_5/annotations/C57_D2_P1.xml b/drafter_5/annotations/C57_D2_P1.xml
index 4d21fc4cb64bf306a5f38d163d29c7006e54518f..d653c31698109cc06cb01cf8756a602627e14cd9 100644
--- a/drafter_5/annotations/C57_D2_P1.xml
+++ b/drafter_5/annotations/C57_D2_P1.xml
@@ -320,7 +320,7 @@
 			<xmax>658</xmax>
 			<ymax>483</ymax>
 		</bndbox>
-		<text>0,1&#956;</text>
+		<text>0,1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -333,7 +333,7 @@
 			<xmax>720</xmax>
 			<ymax>311</ymax>
 		</bndbox>
-		<text>0,1&#956;</text>
+		<text>0,1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_5/annotations/C57_D2_P2.xml b/drafter_5/annotations/C57_D2_P2.xml
index f34c28a5b033b79a5b499a17ebf03a0b1bd1cb3f..c51e823704a35e6c76efdd450040c499bfe1ca6c 100644
--- a/drafter_5/annotations/C57_D2_P2.xml
+++ b/drafter_5/annotations/C57_D2_P2.xml
@@ -61,7 +61,7 @@
 			<xmax>741</xmax>
 			<ymax>357</ymax>
 		</bndbox>
-		<text>0,1&#956;</text>
+		<text>0,1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -100,7 +100,7 @@
 			<xmax>664</xmax>
 			<ymax>511</ymax>
 		</bndbox>
-		<text>0,1&#956;</text>
+		<text>0,1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_5/annotations/C57_D2_P3.xml b/drafter_5/annotations/C57_D2_P3.xml
index 1ffb770d72bfd5d620da3cc6d76275ecb0800ada..0c9b156ef0d565919dd4189f25b356feddd12ed3 100644
--- a/drafter_5/annotations/C57_D2_P3.xml
+++ b/drafter_5/annotations/C57_D2_P3.xml
@@ -48,7 +48,7 @@
 			<xmax>698</xmax>
 			<ymax>468</ymax>
 		</bndbox>
-		<text>0,1&#956;</text>
+		<text>0,1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -87,7 +87,7 @@
 			<xmax>755</xmax>
 			<ymax>319</ymax>
 		</bndbox>
-		<text>0,1&#956;</text>
+		<text>0,1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_5/annotations/C57_D2_P4.xml b/drafter_5/annotations/C57_D2_P4.xml
index 6c34d942afeb3adbd422e7273363d8c0b8cbd5f4..2eaddf54389e62fccc514b971ba9cc8aac59560a 100644
--- a/drafter_5/annotations/C57_D2_P4.xml
+++ b/drafter_5/annotations/C57_D2_P4.xml
@@ -110,7 +110,7 @@
 			<ymin>256</ymin>
 			<xmax>598</xmax>
 			<ymax>340</ymax>
-			<rotation>89</rotation>
+			<rotation>85</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -176,7 +176,7 @@
 			<xmax>842</xmax>
 			<ymax>354</ymax>
 		</bndbox>
-		<text>0,1&#956;</text>
+		<text>0,1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -189,7 +189,7 @@
 			<xmax>738</xmax>
 			<ymax>521</ymax>
 		</bndbox>
-		<text>0,1&#956;</text>
+		<text>0,1&#181;</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_5/annotations/C58_D1_P1.xml b/drafter_5/annotations/C58_D1_P1.xml
index 152a6ea19bc1d50d75c6900412d1465cb371c746..2c14d6736c79f13b1b20be2dc87590f2c0e0f27a 100644
--- a/drafter_5/annotations/C58_D1_P1.xml
+++ b/drafter_5/annotations/C58_D1_P1.xml
@@ -496,6 +496,7 @@
 			<ymin>259</ymin>
 			<xmax>816</xmax>
 			<ymax>339</ymax>
+			<rotation>98</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C58_D1_P2.xml b/drafter_5/annotations/C58_D1_P2.xml
index 05f9e175af76a4539672dd7672e3c589eb8f3404..59c3c4edf0fa561b0742cabc579b089dcfe95422 100644
--- a/drafter_5/annotations/C58_D1_P2.xml
+++ b/drafter_5/annotations/C58_D1_P2.xml
@@ -410,6 +410,7 @@
 			<ymin>265</ymin>
 			<xmax>784</xmax>
 			<ymax>339</ymax>
+			<rotation>106</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C58_D1_P3.xml b/drafter_5/annotations/C58_D1_P3.xml
index 5f4042ee9c5c2c9159b941576f573b6518dd4b57..1f5dc6d288799be1874fe760ef1fcd8094b73559 100644
--- a/drafter_5/annotations/C58_D1_P3.xml
+++ b/drafter_5/annotations/C58_D1_P3.xml
@@ -300,6 +300,7 @@
 			<ymin>299</ymin>
 			<xmax>824</xmax>
 			<ymax>366</ymax>
+			<rotation>100</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C58_D1_P4.xml b/drafter_5/annotations/C58_D1_P4.xml
index 700766a522f851b59cf71f6c273598cb57813435..96842c17ce064a67153d649f7e59b3118cb94cd4 100644
--- a/drafter_5/annotations/C58_D1_P4.xml
+++ b/drafter_5/annotations/C58_D1_P4.xml
@@ -401,6 +401,7 @@
 			<ymin>255</ymin>
 			<xmax>816</xmax>
 			<ymax>328</ymax>
+			<rotation>106</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C58_D2_P1.xml b/drafter_5/annotations/C58_D2_P1.xml
index e8075db2f5f06e287717da4f35498e4fb21fb016..a43d0657c03b7c91ebe59cb0ccd5f85a0ce67931 100644
--- a/drafter_5/annotations/C58_D2_P1.xml
+++ b/drafter_5/annotations/C58_D2_P1.xml
@@ -254,6 +254,7 @@
 			<ymin>182</ymin>
 			<xmax>838</xmax>
 			<ymax>237</ymax>
+			<rotation>100</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C58_D2_P2.xml b/drafter_5/annotations/C58_D2_P2.xml
index 2acb7066cc6bdbb0958ce7b755182abde6995773..2bf0eef083fbf677d4d74eb837c35e1e47a74988 100644
--- a/drafter_5/annotations/C58_D2_P2.xml
+++ b/drafter_5/annotations/C58_D2_P2.xml
@@ -21,6 +21,7 @@
 			<ymin>302</ymin>
 			<xmax>832</xmax>
 			<ymax>356</ymax>
+			<rotation>100</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C58_D2_P3.xml b/drafter_5/annotations/C58_D2_P3.xml
index bb092079fd75b1adc3b21f4711657dc3e46113a8..cb1fb91c0673d3743f3ffeb7c8e39cc9dec463ee 100644
--- a/drafter_5/annotations/C58_D2_P3.xml
+++ b/drafter_5/annotations/C58_D2_P3.xml
@@ -392,6 +392,7 @@
 			<ymin>245</ymin>
 			<xmax>758</xmax>
 			<ymax>299</ymax>
+			<rotation>102</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C58_D2_P4.xml b/drafter_5/annotations/C58_D2_P4.xml
index 569dadf4c795baf383e8adcde97c7c8da9140d18..aef60caf35434c45fd6258a52f55c368bca76376 100644
--- a/drafter_5/annotations/C58_D2_P4.xml
+++ b/drafter_5/annotations/C58_D2_P4.xml
@@ -21,6 +21,7 @@
 			<ymin>132</ymin>
 			<xmax>840</xmax>
 			<ymax>184</ymax>
+			<rotation>102</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C59_D1_P1.xml b/drafter_5/annotations/C59_D1_P1.xml
index abedc9a3349d3015ffe4a0e30dd78f8ee909f3f2..09d4910accf7575231ed8798f854c5e09ea584a4 100644
--- a/drafter_5/annotations/C59_D1_P1.xml
+++ b/drafter_5/annotations/C59_D1_P1.xml
@@ -306,7 +306,7 @@
 			<ymin>368</ymin>
 			<xmax>452</xmax>
 			<ymax>410</ymax>
-			<rotation>94</rotation>
+			<rotation>85</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -685,7 +685,7 @@
 			<ymin>346</ymin>
 			<xmax>593</xmax>
 			<ymax>384</ymax>
-			<rotation>94</rotation>
+			<rotation>81</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C59_D1_P2.xml b/drafter_5/annotations/C59_D1_P2.xml
index 45e7be230d52cef2adf417c563c2e689facbd152..3f5bf7e40f505bab87d68ae2063c5f4538cf2ca6 100644
--- a/drafter_5/annotations/C59_D1_P2.xml
+++ b/drafter_5/annotations/C59_D1_P2.xml
@@ -700,7 +700,7 @@
 			<xmax>818</xmax>
 			<ymax>493</ymax>
 		</bndbox>
-		<text>1K&#937;</text>
+		<text>1K</text>
 	</object>
 	<object>
 		<name>junction</name>
diff --git a/drafter_5/annotations/C59_D1_P3.xml b/drafter_5/annotations/C59_D1_P3.xml
index cf2c8005bbf630640130c5b0dfe0a61b08dbaa0a..6b065a9af568386c994acde4ceeacf31379fe265 100644
--- a/drafter_5/annotations/C59_D1_P3.xml
+++ b/drafter_5/annotations/C59_D1_P3.xml
@@ -543,7 +543,7 @@
 			<ymin>314</ymin>
 			<xmax>397</xmax>
 			<ymax>342</ymax>
-			<rotation>355</rotation>
+			<rotation>2</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C59_D1_P4.xml b/drafter_5/annotations/C59_D1_P4.xml
index 3dd8ab25c5947b27ece74f7b8f3dde52fd0520f2..5ac0eb294323a15232749f1182b1f4d31caba109 100644
--- a/drafter_5/annotations/C59_D1_P4.xml
+++ b/drafter_5/annotations/C59_D1_P4.xml
@@ -139,7 +139,7 @@
 			<xmax>435</xmax>
 			<ymax>219</ymax>
 		</bndbox>
-		<text>1N&#956;F</text>
+		<text>1n</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -405,6 +405,7 @@
 			<ymin>298</ymin>
 			<xmax>809</xmax>
 			<ymax>352</ymax>
+			<rotation>352</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -649,7 +650,7 @@
 			<ymin>416</ymin>
 			<xmax>721</xmax>
 			<ymax>445</ymax>
-			<rotation>360</rotation>
+			<rotation>350</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -711,7 +712,7 @@
 			<ymin>330</ymin>
 			<xmax>508</xmax>
 			<ymax>361</ymax>
-			<rotation>93</rotation>
+			<rotation>83</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C59_D2_P1.xml b/drafter_5/annotations/C59_D2_P1.xml
index 3a54b21106f55120f7d2721ae0fe97f77823c1e2..fba8cac75a8317bcb10517fbf33f49bb94ff647c 100644
--- a/drafter_5/annotations/C59_D2_P1.xml
+++ b/drafter_5/annotations/C59_D2_P1.xml
@@ -48,7 +48,7 @@
 			<xmax>784</xmax>
 			<ymax>206</ymax>
 		</bndbox>
-		<text>1N&#956;F</text>
+		<text>1n</text>
 	</object>
 	<object>
 		<name>text</name>
@@ -242,6 +242,7 @@
 			<ymin>160</ymin>
 			<xmax>971</xmax>
 			<ymax>244</ymax>
+			<rotation>4</rotation>
 		</bndbox>
 	</object>
 	<object>
@@ -497,7 +498,7 @@
 			<ymin>203</ymin>
 			<xmax>579</xmax>
 			<ymax>262</ymax>
-			<rotation>360</rotation>
+			<rotation>8</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C59_D2_P2.xml b/drafter_5/annotations/C59_D2_P2.xml
index 4fcd432f53511282fdbb4c1c821ca2f476ab0a9b..1910183cb175f6382e3153d7cb58b887ca5eed4a 100644
--- a/drafter_5/annotations/C59_D2_P2.xml
+++ b/drafter_5/annotations/C59_D2_P2.xml
@@ -333,6 +333,7 @@
 			<ymin>137</ymin>
 			<xmax>851</xmax>
 			<ymax>210</ymax>
+			<rotation>6</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C59_D2_P3.xml b/drafter_5/annotations/C59_D2_P3.xml
index 5efcf7a7b8e04cc2ba939b8ad2da98a1b5420232..81b5409184158d13ddb376092ee71c4d8482ed23 100644
--- a/drafter_5/annotations/C59_D2_P3.xml
+++ b/drafter_5/annotations/C59_D2_P3.xml
@@ -34,6 +34,7 @@
 			<ymin>178</ymin>
 			<xmax>891</xmax>
 			<ymax>247</ymax>
+			<rotation>8</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C59_D2_P4.xml b/drafter_5/annotations/C59_D2_P4.xml
index 035ba686ab80a11c986066ceef5d63a08434665f..15f8690c1e3334e59fbfa52eb3a05b3977729205 100644
--- a/drafter_5/annotations/C59_D2_P4.xml
+++ b/drafter_5/annotations/C59_D2_P4.xml
@@ -661,7 +661,7 @@
 			<xmax>94</xmax>
 			<ymax>485</ymax>
 		</bndbox>
-		<text>OV</text>
+		<text>0V</text>
 	</object>
 	<object>
 		<name>text</name>
diff --git a/drafter_5/annotations/C60_D1_P1.xml b/drafter_5/annotations/C60_D1_P1.xml
index 2dbfdf9cd197c378cec5d38de4aef50053ffa50c..9d6aa4d539fa227f05db8f9812873841d8638917 100644
--- a/drafter_5/annotations/C60_D1_P1.xml
+++ b/drafter_5/annotations/C60_D1_P1.xml
@@ -21,6 +21,7 @@
 			<ymin>186</ymin>
 			<xmax>635</xmax>
 			<ymax>387</ymax>
+			<rotation>6</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C60_D1_P2.xml b/drafter_5/annotations/C60_D1_P2.xml
index 51e0192a8372022d17626cbfec13b40f4ecf2320..8283647024ad2bcb825d41eda81df93c4ad78603 100644
--- a/drafter_5/annotations/C60_D1_P2.xml
+++ b/drafter_5/annotations/C60_D1_P2.xml
@@ -21,6 +21,7 @@
 			<ymin>254</ymin>
 			<xmax>604</xmax>
 			<ymax>395</ymax>
+			<rotation>10</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C60_D1_P4.xml b/drafter_5/annotations/C60_D1_P4.xml
index 3acce228add1f4ceaeb5074da690e5c2b6d8138f..24c886bc857474495a5fb8c716deea4056618a32 100644
--- a/drafter_5/annotations/C60_D1_P4.xml
+++ b/drafter_5/annotations/C60_D1_P4.xml
@@ -294,6 +294,7 @@
 			<ymin>172</ymin>
 			<xmax>655</xmax>
 			<ymax>369</ymax>
+			<rotation>6</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C60_D2_P1.xml b/drafter_5/annotations/C60_D2_P1.xml
index 4c9be2dfc0025d0e13f69f101a3c9466661a0be0..d39c53b79361c973f99732e93a19545c52670866 100644
--- a/drafter_5/annotations/C60_D2_P1.xml
+++ b/drafter_5/annotations/C60_D2_P1.xml
@@ -21,7 +21,7 @@
 			<ymin>178</ymin>
 			<xmax>805</xmax>
 			<ymax>343</ymax>
-			<rotation>3</rotation>
+			<rotation>2</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C60_D2_P2.xml b/drafter_5/annotations/C60_D2_P2.xml
index 7f7ca7f7bc3b59539d273125c4a6ad843c0b51ff..4d5bca7bd9d2f9588fbc9d47464b1ff116c200a5 100644
--- a/drafter_5/annotations/C60_D2_P2.xml
+++ b/drafter_5/annotations/C60_D2_P2.xml
@@ -257,6 +257,7 @@
 			<ymin>25</ymin>
 			<xmax>925</xmax>
 			<ymax>253</ymax>
+			<rotation>356</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/annotations/C60_D2_P3.xml b/drafter_5/annotations/C60_D2_P3.xml
index 3c3e9f54c19c9057facc48217881e519917320b9..429eb8151abed20f1683f4b903c81d7e481d5bfa 100644
--- a/drafter_5/annotations/C60_D2_P3.xml
+++ b/drafter_5/annotations/C60_D2_P3.xml
@@ -183,7 +183,7 @@
 			<ymin>325</ymin>
 			<xmax>645</xmax>
 			<ymax>354</ymax>
-			<rotation>2</rotation>
+			<rotation>13</rotation>
 		</bndbox>
 	</object>
 	<object>
diff --git a/drafter_5/instances/C49_D1_P4.json b/drafter_5/instances/C49_D1_P4.json
index 19538ccad503e99f80e591b4c5c9a2e37ffcf0df..16871f6ff3027c3aff4ec70e0935960098484d80 100644
--- a/drafter_5/instances/C49_D1_P4.json
+++ b/drafter_5/instances/C49_D1_P4.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.16.7",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
-      "label": "integrated_circuit",
       "line_color": null,
       "fill_color": null,
+      "label": "integrated_circuit",
       "points": [
         [
           636.7272727272727,
@@ -64,13 +64,15 @@
           314.1491395793499
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           1246.0,
@@ -89,13 +91,15 @@
           290.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           1167.0,
@@ -114,13 +118,15 @@
           706.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           80.0,
@@ -139,13 +145,15 @@
           671.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           1.0,
@@ -164,13 +172,15 @@
           87.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           444.0,
@@ -189,13 +199,15 @@
           118.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           541.0,
@@ -214,13 +226,15 @@
           111.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           254.0,
@@ -239,13 +253,15 @@
           381.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           304.0,
@@ -264,13 +280,15 @@
           673.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           499.0,
@@ -289,13 +307,15 @@
           700.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           554.0,
@@ -314,13 +334,15 @@
           701.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           485.0,
@@ -339,13 +361,15 @@
           568.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           549.0,
@@ -364,13 +388,15 @@
           562.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           707.0,
@@ -389,13 +415,15 @@
           562.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           847.0,
@@ -414,13 +442,15 @@
           567.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           849.0,
@@ -439,13 +469,15 @@
           407.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           656.0,
@@ -464,13 +496,15 @@
           550.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           866.0,
@@ -489,13 +523,15 @@
           362.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           873.0,
@@ -514,13 +550,15 @@
           308.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           871.0,
@@ -539,13 +577,15 @@
           239.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           711.0,
@@ -564,13 +604,15 @@
           239.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1119.0,
@@ -589,13 +631,15 @@
           302.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           1120.0,
@@ -614,13 +658,15 @@
           405.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           1067.6895306859205,
@@ -647,13 +693,15 @@
           296.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           843.0,
@@ -672,13 +720,15 @@
           476.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           487.0,
@@ -697,13 +747,15 @@
           628.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           470.0,
@@ -722,13 +774,15 @@
           485.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "capacitor.unpolarized",
       "line_color": null,
       "fill_color": null,
+      "label": "capacitor.unpolarized",
       "points": [
         [
           529.0,
@@ -747,13 +801,15 @@
           593.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "capacitor.unpolarized",
       "line_color": null,
       "fill_color": null,
+      "label": "capacitor.unpolarized",
       "points": [
         [
           687.0,
@@ -772,13 +828,15 @@
           493.93579072532697
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           402.0,
@@ -797,13 +855,15 @@
           509.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           989.0,
@@ -830,13 +890,15 @@
           224.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           752.0,
@@ -855,13 +917,15 @@
           329.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           733.0,
@@ -880,13 +944,15 @@
           265.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           515.0,
@@ -905,13 +971,15 @@
           344.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           582.0,
@@ -938,13 +1006,15 @@
           242.36711281070745
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           482.0,
@@ -963,13 +1033,15 @@
           264.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           393.0,
@@ -988,13 +1060,15 @@
           374.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           506.5,
@@ -1021,13 +1095,15 @@
           448.9839539763549
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           568.2048192771084,
@@ -1046,13 +1122,15 @@
           444.84775465498353
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           620.0,
@@ -1071,13 +1149,15 @@
           451.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           719.0,
@@ -1096,13 +1176,15 @@
           456.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           763.2727272727273,
@@ -1125,13 +1207,15 @@
           425.8181818181818
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           751.8430439952438,
@@ -1158,13 +1242,15 @@
           485.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           891.0,
@@ -1183,13 +1269,15 @@
           484.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           596.0,
@@ -1208,13 +1296,15 @@
           597.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           418.0,
@@ -1233,10 +1323,16 @@
           626.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
   ],
+  "imagePath": "../segmentation/C49_D1_P4.jpg",
+  "imageData": null,
+  "imageHeight": 972,
+  "imageWidth": 1296,
   "lineColor": [
     0,
     255,
@@ -1248,9 +1344,5 @@
     0,
     0,
     128
-  ],
-  "imagePath": "../segmentation/C49_D1_P4.jpg",
-  "imageData": null,
-  "imageHeight": 972,
-  "imageWidth": 1296
+  ]
 }
\ No newline at end of file
diff --git a/drafter_5/instances/C50_D2_P4.json b/drafter_5/instances/C50_D2_P4.json
index 88053325223e0621041f0927e46335054ac219c2..8408016eea810b338eeca3dd3089bf0ad83ccd45 100644
--- a/drafter_5/instances/C50_D2_P4.json
+++ b/drafter_5/instances/C50_D2_P4.json
@@ -1,5 +1,5 @@
 {
-  "version": "5.0.1",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
@@ -25,6 +25,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -51,6 +52,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -81,6 +83,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -107,6 +110,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -133,6 +137,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -159,6 +164,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -185,6 +191,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -215,6 +222,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -241,6 +249,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -267,6 +276,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -293,6 +303,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -319,6 +330,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -345,6 +357,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -371,6 +384,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -397,6 +411,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -423,6 +438,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -457,6 +473,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -483,6 +500,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -509,6 +527,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -535,6 +554,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -561,6 +581,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -587,6 +608,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -613,6 +635,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -639,6 +662,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -665,6 +689,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -691,6 +716,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -717,6 +743,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -743,6 +770,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -769,6 +797,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -795,6 +824,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -821,6 +851,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -851,6 +882,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -877,6 +909,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -903,6 +936,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
diff --git a/drafter_5/instances/C51_D1_P2.json b/drafter_5/instances/C51_D1_P2.json
index 0dd6677f0ac1bc5d4f5a461c5b81e27d592a8d00..d8faa064d1651fea130a7f28aea0e92b58315e8a 100644
--- a/drafter_5/instances/C51_D1_P2.json
+++ b/drafter_5/instances/C51_D1_P2.json
@@ -1,36 +1,38 @@
 {
-  "version": "3.16.7",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
-      "label": "transformer",
       "line_color": null,
       "fill_color": null,
+      "label": "transformer",
       "points": [
         [
-          73.0,
-          331.0
+          76.4,
+          334.7
         ],
         [
-          73.0,
-          406.0
+          75.3,
+          406.4
         ],
         [
-          137.0,
-          406.0
+          136.2,
+          401.0
         ],
         [
-          137.0,
-          331.0
+          131.7,
+          330.4
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           217.0,
@@ -49,13 +51,15 @@
           274.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "capacitor.polarized",
       "line_color": null,
       "fill_color": null,
+      "label": "capacitor.polarized",
       "points": [
         [
           266.3,
@@ -86,13 +90,15 @@
           218.47438016528926
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "capacitor.unpolarized",
       "line_color": null,
       "fill_color": null,
+      "label": "capacitor.unpolarized",
       "points": [
         [
           595.0,
@@ -111,13 +117,15 @@
           276.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           515.0,
@@ -136,13 +144,15 @@
           174.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           443.0,
@@ -161,13 +171,15 @@
           167.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           397.0,
@@ -186,13 +198,15 @@
           434.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "gnd",
       "line_color": null,
       "fill_color": null,
+      "label": "gnd",
       "points": [
         [
           365.0,
@@ -211,13 +225,15 @@
           562.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           318.0,
@@ -236,13 +252,15 @@
           518.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           420.0,
@@ -261,13 +279,15 @@
           522.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           375.0,
@@ -286,13 +306,15 @@
           520.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           167.0,
@@ -311,13 +333,15 @@
           514.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           162.0,
@@ -336,13 +360,15 @@
           385.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           152.0,
@@ -361,13 +387,15 @@
           328.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           150.0,
@@ -386,13 +414,15 @@
           284.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           178.0,
@@ -411,13 +441,15 @@
           283.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           301.0,
@@ -436,13 +468,15 @@
           284.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           299.0,
@@ -461,13 +495,15 @@
           229.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           181.0,
@@ -486,13 +522,15 @@
           230.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           18.0,
@@ -511,13 +549,15 @@
           330.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           19.0,
@@ -536,13 +576,15 @@
           386.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           769.0,
@@ -561,13 +603,15 @@
           284.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           780.0,
@@ -586,13 +630,15 @@
           506.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "capacitor.unpolarized",
       "line_color": null,
       "fill_color": null,
+      "label": "capacitor.unpolarized",
       "points": [
         [
           299.5,
@@ -611,13 +657,15 @@
           436.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           435.0,
@@ -636,13 +684,15 @@
           439.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           246.0,
@@ -661,13 +711,15 @@
           427.2
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           228.0,
@@ -686,13 +738,15 @@
           309.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           382.0,
@@ -711,13 +765,15 @@
           182.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           219.0,
@@ -744,13 +800,15 @@
           161.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           550.0,
@@ -769,13 +827,15 @@
           175.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           589.0,
@@ -794,13 +854,15 @@
           331.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           646.0,
@@ -819,13 +881,15 @@
           86.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           651.0,
@@ -844,13 +908,15 @@
           130.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           521.0,
@@ -869,13 +935,15 @@
           133.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           445.0,
@@ -894,13 +962,15 @@
           134.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           457.0,
@@ -919,13 +989,15 @@
           291.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "transistor.bjt",
       "line_color": null,
       "fill_color": null,
+      "label": "transistor.bjt",
       "points": [
         [
           432.03267973856214,
@@ -980,13 +1052,15 @@
           285.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           403.0,
@@ -1005,13 +1079,15 @@
           392.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           312.0,
@@ -1030,13 +1106,15 @@
           396.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           537.0,
@@ -1055,13 +1133,15 @@
           394.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "crossover",
       "line_color": null,
       "fill_color": null,
+      "label": "crossover",
       "points": [
         [
           530.0,
@@ -1080,10 +1160,97 @@
           292.0
         ]
       ],
+      "group_id": null,
+      "description": null,
+      "shape_type": "polygon",
+      "flags": {}
+    },
+    {
+      "line_color": null,
+      "fill_color": null,
+      "label": "magnetic",
+      "points": [
+        [
+          98.9,
+          336.6
+        ],
+        [
+          109.5,
+          336.0
+        ],
+        [
+          113.5,
+          397.1
+        ],
+        [
+          102.8,
+          398.4
+        ]
+      ],
+      "group_id": null,
+      "description": null,
+      "shape_type": "polygon",
+      "flags": {}
+    },
+    {
+      "line_color": null,
+      "fill_color": null,
+      "label": "inductor",
+      "points": [
+        [
+          114.4,
+          399.6
+        ],
+        [
+          110.0,
+          333.3
+        ],
+        [
+          130.4,
+          332.2
+        ],
+        [
+          134.7,
+          399.5
+        ]
+      ],
+      "group_id": null,
+      "description": null,
+      "shape_type": "polygon",
+      "flags": {}
+    },
+    {
+      "line_color": null,
+      "fill_color": null,
+      "label": "inductor",
+      "points": [
+        [
+          77.9,
+          335.9
+        ],
+        [
+          98.4,
+          334.2
+        ],
+        [
+          102.7,
+          402.2
+        ],
+        [
+          76.7,
+          404.2
+        ]
+      ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
   ],
+  "imagePath": "../segmentation/C51_D1_P2.jpg",
+  "imageData": null,
+  "imageHeight": 648,
+  "imageWidth": 864,
   "lineColor": [
     0,
     255,
@@ -1095,9 +1262,5 @@
     0,
     0,
     128
-  ],
-  "imagePath": "../segmentation/C51_D1_P2.jpg",
-  "imageData": null,
-  "imageHeight": 648,
-  "imageWidth": 864
+  ]
 }
\ No newline at end of file
diff --git a/drafter_5/instances/C52_D1_P3.json b/drafter_5/instances/C52_D1_P3.json
index 40c96ed5d6b12995d9caa6b5937149e88bc2ba15..7f31eef4b3214305b74730a4b729966b6745292c 100644
--- a/drafter_5/instances/C52_D1_P3.json
+++ b/drafter_5/instances/C52_D1_P3.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.16.7",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           106.0,
@@ -24,13 +24,15 @@
           289.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           334.0,
@@ -49,13 +51,15 @@
           192.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           248.0,
@@ -74,13 +78,15 @@
           352.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           400.0,
@@ -99,13 +105,15 @@
           440.08207934336525
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           516.0,
@@ -124,13 +132,15 @@
           440.08207934336525
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           607.0,
@@ -149,13 +159,15 @@
           293.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           753.0,
@@ -178,13 +190,15 @@
           302.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           784.0,
@@ -203,13 +217,15 @@
           512.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           153.0,
@@ -228,13 +244,15 @@
           522.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "gnd",
       "line_color": null,
       "fill_color": null,
+      "label": "gnd",
       "points": [
         [
           527.0,
@@ -253,13 +271,15 @@
           561.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           557.0,
@@ -278,13 +298,15 @@
           414.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           457.04514363885085,
@@ -303,13 +325,15 @@
           420.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           410.0,
@@ -328,13 +352,15 @@
           177.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "capacitor.unpolarized",
       "line_color": null,
       "fill_color": null,
+      "label": "capacitor.unpolarized",
       "points": [
         [
           265.0,
@@ -353,13 +379,15 @@
           285.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "capacitor.unpolarized",
       "line_color": null,
       "fill_color": null,
+      "label": "capacitor.unpolarized",
       "points": [
         [
           589.0,
@@ -378,13 +406,15 @@
           343.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           624.0,
@@ -403,13 +433,15 @@
           114.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           747.2257551669318,
@@ -428,13 +460,15 @@
           355.64387917329094
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           738.0,
@@ -453,13 +487,15 @@
           520.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           226.0,
@@ -478,13 +514,15 @@
           530.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           176.0,
@@ -503,13 +541,15 @@
           312.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           439.0,
@@ -528,13 +568,15 @@
           288.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           552.0,
@@ -553,13 +595,15 @@
           365.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           509.0,
@@ -578,13 +622,15 @@
           123.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           416.0,
@@ -603,13 +649,15 @@
           140.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "transistor.bjt",
       "line_color": null,
       "fill_color": null,
+      "label": "transistor.bjt",
       "points": [
         [
           498.0,
@@ -628,13 +676,15 @@
           233.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           578.0,
@@ -653,13 +703,15 @@
           528.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           477.0,
@@ -678,13 +730,15 @@
           531.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           636.0,
@@ -703,13 +757,15 @@
           47.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           536.0,
@@ -728,10 +784,16 @@
           531.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
   ],
+  "imagePath": "../segmentation/C52_D1_P3.jpg",
+  "imageData": null,
+  "imageHeight": 648,
+  "imageWidth": 864,
   "lineColor": [
     0,
     255,
@@ -743,9 +805,5 @@
     0,
     0,
     128
-  ],
-  "imagePath": "../segmentation/C52_D1_P3.jpg",
-  "imageData": null,
-  "imageHeight": 648,
-  "imageWidth": 864
+  ]
 }
\ No newline at end of file
diff --git a/drafter_5/instances/C53_D1_P4.json b/drafter_5/instances/C53_D1_P4.json
index 991d749b2adcdba9af8add3e3888ce81b6dc1333..76a77744a60dbcd8dac9e8613f4044c6931e68b3 100644
--- a/drafter_5/instances/C53_D1_P4.json
+++ b/drafter_5/instances/C53_D1_P4.json
@@ -1,5 +1,5 @@
 {
-  "version": "5.0.1",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
@@ -29,6 +29,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -55,6 +56,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -81,6 +83,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -111,6 +114,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -149,6 +153,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -187,6 +192,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -217,6 +223,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -251,6 +258,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -301,6 +309,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -335,6 +344,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -361,6 +371,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -387,6 +398,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -413,6 +425,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -439,6 +452,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -465,6 +479,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -491,6 +506,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -517,6 +533,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -543,6 +560,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -569,6 +587,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -595,6 +614,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -621,6 +641,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -651,6 +672,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -677,6 +699,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -707,6 +730,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -737,6 +761,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -763,6 +788,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -793,6 +819,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -819,6 +846,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -845,6 +873,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -871,6 +900,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -897,6 +927,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -923,6 +954,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -949,6 +981,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -975,6 +1008,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1001,6 +1035,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1027,6 +1062,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1053,6 +1089,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1079,6 +1116,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1105,6 +1143,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1131,6 +1170,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1157,6 +1197,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1183,6 +1224,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1209,6 +1251,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1267,6 +1310,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1293,6 +1337,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1319,6 +1364,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1349,6 +1395,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1375,6 +1422,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1401,6 +1449,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1427,6 +1476,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1453,6 +1503,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1479,6 +1530,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1505,6 +1557,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1531,6 +1584,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1557,6 +1611,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1603,6 +1658,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1629,6 +1685,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1655,6 +1712,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1689,6 +1747,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1723,6 +1782,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
diff --git a/drafter_5/instances/C54_D1_P3.json b/drafter_5/instances/C54_D1_P3.json
index 3a3561d29d34819ac314d6b531f067123620e7f8..14464154ab87e6e9b40461f9384af63d3175a7fc 100644
--- a/drafter_5/instances/C54_D1_P3.json
+++ b/drafter_5/instances/C54_D1_P3.json
@@ -1,5 +1,5 @@
 {
-  "version": "5.0.1",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
@@ -25,6 +25,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -51,6 +52,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -77,6 +79,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -103,6 +106,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -129,6 +133,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -155,6 +160,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -181,6 +187,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -207,6 +214,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -233,6 +241,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -259,6 +268,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -285,6 +295,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -311,6 +322,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -337,6 +349,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -363,6 +376,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -389,6 +403,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -415,6 +430,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -441,6 +457,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -467,6 +484,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -493,6 +511,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -519,6 +538,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -545,6 +565,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -571,6 +592,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -597,6 +619,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -623,6 +646,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -649,6 +673,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -675,6 +700,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
diff --git a/drafter_5/instances/C54_D2_P2.json b/drafter_5/instances/C54_D2_P2.json
index f5724acf4fed73631fe18ff9b2eac882d9bc84e4..9a94c7d3bdc149fda93e59844fd06eaa6b77b9d6 100644
--- a/drafter_5/instances/C54_D2_P2.json
+++ b/drafter_5/instances/C54_D2_P2.json
@@ -1,5 +1,5 @@
 {
-  "version": "5.0.1",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
@@ -25,6 +25,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -51,6 +52,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -77,6 +79,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -103,6 +106,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -129,6 +133,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -155,6 +160,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -181,6 +187,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -207,6 +214,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -233,6 +241,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -259,6 +268,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -285,6 +295,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -311,6 +322,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -337,6 +349,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -363,6 +376,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -389,6 +403,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -415,6 +430,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -441,6 +457,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -467,6 +484,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -493,6 +511,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -519,6 +538,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -545,6 +565,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -571,6 +592,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -597,6 +619,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -623,6 +646,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -649,6 +673,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -675,6 +700,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
diff --git a/drafter_5/instances/C55_D1_P2.json b/drafter_5/instances/C55_D1_P2.json
index edb6af712f7409cb6fadcaebb13ce8fd8f613705..525cd5e30eefdbd87768097ab1ada85b72b67fb9 100644
--- a/drafter_5/instances/C55_D1_P2.json
+++ b/drafter_5/instances/C55_D1_P2.json
@@ -1,5 +1,5 @@
 {
-  "version": "5.0.1",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
@@ -49,6 +49,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -75,6 +76,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -101,6 +103,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -127,6 +130,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -153,6 +157,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -179,6 +184,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -205,6 +211,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -231,6 +238,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -257,6 +265,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -283,6 +292,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -309,6 +319,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -335,6 +346,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -361,6 +373,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -387,6 +400,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -413,6 +427,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -443,6 +458,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -469,6 +485,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -495,6 +512,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -521,6 +539,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -547,6 +566,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -573,6 +593,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -599,6 +620,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -625,6 +647,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -651,6 +674,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -677,6 +701,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -703,6 +728,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -729,6 +755,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -755,6 +782,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -781,6 +809,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -807,6 +836,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -833,6 +863,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -859,6 +890,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -885,6 +917,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -911,6 +944,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -937,6 +971,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -963,6 +998,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -989,6 +1025,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1015,6 +1052,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1041,6 +1079,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1067,6 +1106,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1093,6 +1133,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1119,6 +1160,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1145,6 +1187,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1171,6 +1214,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
diff --git a/drafter_5/instances/C56_D1_P4.json b/drafter_5/instances/C56_D1_P4.json
index 5f69e0bf52cc351dd86ef1ee46515c362ce72ef5..7f7abbc22472a10cc2f5b700fe77a25cdad7ed89 100644
--- a/drafter_5/instances/C56_D1_P4.json
+++ b/drafter_5/instances/C56_D1_P4.json
@@ -1,5 +1,5 @@
 {
-  "version": "5.0.1",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
@@ -57,6 +57,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -83,6 +84,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -109,6 +111,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -135,6 +138,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -161,6 +165,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -187,6 +192,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -213,6 +219,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -239,6 +246,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -265,6 +273,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -291,6 +300,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -317,6 +327,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -343,6 +354,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -369,6 +381,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -395,6 +408,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -421,6 +435,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -447,6 +462,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -473,6 +489,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -499,6 +516,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -525,6 +543,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -551,6 +570,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -577,6 +597,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -603,6 +624,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -629,6 +651,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -655,6 +678,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -681,6 +705,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -707,6 +732,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -733,6 +759,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -759,6 +786,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -785,6 +813,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -811,6 +840,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -837,6 +867,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -863,6 +894,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -889,6 +921,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -915,6 +948,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -941,6 +975,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -967,6 +1002,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -993,6 +1029,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
diff --git a/drafter_5/instances/C56_D2_P1.json b/drafter_5/instances/C56_D2_P1.json
index deac150d8fea086ab92b5b5eaaaf38b7e1ba33f0..9b502dab797a9e9827d32b0be40ef2849a5dcb54 100644
--- a/drafter_5/instances/C56_D2_P1.json
+++ b/drafter_5/instances/C56_D2_P1.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.16.7",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           178.0,
@@ -24,13 +24,15 @@
           155.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           630.0,
@@ -49,13 +51,15 @@
           229.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           558.0,
@@ -74,13 +78,15 @@
           262.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "capacitor.unpolarized",
       "line_color": null,
       "fill_color": null,
+      "label": "capacitor.unpolarized",
       "points": [
         [
           195.0,
@@ -99,13 +105,15 @@
           201.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           124.0,
@@ -124,13 +132,15 @@
           159.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           122.0,
@@ -149,13 +159,15 @@
           314.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           725.0,
@@ -174,13 +186,15 @@
           307.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           728.0,
@@ -199,13 +213,15 @@
           158.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           712.0,
@@ -224,13 +240,15 @@
           120.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           444.0,
@@ -249,13 +267,15 @@
           112.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           301.0,
@@ -274,13 +294,15 @@
           253.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           204.0,
@@ -299,13 +321,15 @@
           249.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           72.0,
@@ -324,13 +348,15 @@
           306.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           60.0,
@@ -349,13 +375,15 @@
           145.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           159.0,
@@ -374,13 +402,15 @@
           215.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           155.0,
@@ -399,13 +429,15 @@
           163.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           245.0,
@@ -424,13 +456,15 @@
           161.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           248.0,
@@ -449,13 +483,15 @@
           214.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           290.0,
@@ -474,13 +510,15 @@
           205.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           282.0,
@@ -499,13 +537,15 @@
           160.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           349.0,
@@ -524,13 +564,15 @@
           156.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           408.0,
@@ -549,13 +591,15 @@
           234.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           407.0,
@@ -574,13 +618,15 @@
           202.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           465.0,
@@ -599,13 +645,15 @@
           154.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           462.0,
@@ -624,13 +672,15 @@
           232.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "transistor.bjt",
       "line_color": null,
       "fill_color": null,
+      "label": "transistor.bjt",
       "points": [
         [
           431.0,
@@ -649,13 +699,15 @@
           175.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "transistor.bjt",
       "line_color": null,
       "fill_color": null,
+      "label": "transistor.bjt",
       "points": [
         [
           315.1685393258427,
@@ -674,13 +726,15 @@
           173.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "operational_amplifier",
       "line_color": null,
       "fill_color": null,
+      "label": "operational_amplifier",
       "points": [
         [
           637.9150326797386,
@@ -735,13 +789,15 @@
           152.59477124183007
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           560.0,
@@ -760,13 +816,15 @@
           206.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           563.0,
@@ -785,13 +843,15 @@
           241.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           699.0,
@@ -810,13 +870,15 @@
           168.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           699.0,
@@ -835,13 +897,15 @@
           234.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           571.0,
@@ -860,13 +924,15 @@
           323.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           523.0,
@@ -885,13 +951,15 @@
           272.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           648.0,
@@ -910,13 +978,15 @@
           262.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           191.0,
@@ -935,10 +1005,16 @@
           117.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
   ],
+  "imagePath": "../segmentation/C56_D2_P1.jpg",
+  "imageData": null,
+  "imageHeight": 648,
+  "imageWidth": 864,
   "lineColor": [
     0,
     255,
@@ -950,9 +1026,5 @@
     0,
     0,
     128
-  ],
-  "imagePath": "../segmentation/C56_D2_P1.jpg",
-  "imageData": null,
-  "imageHeight": 648,
-  "imageWidth": 864
+  ]
 }
\ No newline at end of file
diff --git a/drafter_5/instances/C57_D1_P2.json b/drafter_5/instances/C57_D1_P2.json
index e361b32906ccc275b7cb9140ec0efcfc5ee0bff7..96ae27f783a9be17c312e506077e049b2980468d 100644
--- a/drafter_5/instances/C57_D1_P2.json
+++ b/drafter_5/instances/C57_D1_P2.json
@@ -1,5 +1,5 @@
 {
-  "version": "5.0.1",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
@@ -25,6 +25,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -51,6 +52,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -77,6 +79,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -103,6 +106,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -129,6 +133,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -155,6 +160,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -181,6 +187,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -207,6 +214,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -233,6 +241,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -259,6 +268,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -285,6 +295,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -311,6 +322,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -337,6 +349,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -363,6 +376,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -389,6 +403,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -415,6 +430,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -441,6 +457,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -467,6 +484,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -493,6 +511,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -527,6 +546,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -553,6 +573,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -579,6 +600,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -605,6 +627,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -631,6 +654,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -657,6 +681,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -683,6 +708,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -709,6 +735,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -735,6 +762,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -761,6 +789,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -787,6 +816,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -813,6 +843,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -839,6 +870,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -865,6 +897,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -891,6 +924,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -917,6 +951,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -943,6 +978,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
diff --git a/drafter_5/instances/C58_D1_P3.json b/drafter_5/instances/C58_D1_P3.json
index d7174ad15d157aea0d23226d3f991d1fbf7f67c0..41e9e0861013788cbaef258c00800e61dd9af8f8 100644
--- a/drafter_5/instances/C58_D1_P3.json
+++ b/drafter_5/instances/C58_D1_P3.json
@@ -1,5 +1,5 @@
 {
-  "version": "5.0.1",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
@@ -25,6 +25,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -51,6 +52,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -77,6 +79,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -103,6 +106,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -129,6 +133,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -155,6 +160,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -181,6 +187,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -207,6 +214,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -233,6 +241,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -259,6 +268,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -285,6 +295,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -311,6 +322,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -337,6 +349,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -363,6 +376,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -389,6 +403,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -415,6 +430,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -441,6 +457,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -467,6 +484,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -493,6 +511,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -519,6 +538,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -545,6 +565,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -571,6 +592,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -597,6 +619,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -623,6 +646,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -649,6 +673,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -683,6 +708,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -709,6 +735,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -735,6 +762,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -761,6 +789,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -787,6 +816,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -813,6 +843,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -839,6 +870,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -865,6 +897,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -891,6 +924,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -917,6 +951,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -943,6 +978,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -969,6 +1005,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -995,6 +1032,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1021,6 +1059,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1047,6 +1086,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1073,6 +1113,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1099,6 +1140,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1125,6 +1167,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1151,6 +1194,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1177,6 +1221,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1203,6 +1248,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1229,6 +1275,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1255,6 +1302,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1281,6 +1329,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1307,6 +1356,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1333,6 +1383,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
diff --git a/drafter_5/instances/C59_D1_P3.json b/drafter_5/instances/C59_D1_P3.json
index c2da83eb82e090994cfcc01d8845cca6e33a973d..7f2a2e084dec868ccefaf8a82c74b48a61568dca 100644
--- a/drafter_5/instances/C59_D1_P3.json
+++ b/drafter_5/instances/C59_D1_P3.json
@@ -1,5 +1,5 @@
 {
-  "version": "5.0.1",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
@@ -25,6 +25,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -51,6 +52,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -77,6 +79,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -115,6 +118,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -141,6 +145,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -187,6 +192,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -213,6 +219,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -239,6 +246,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -265,6 +273,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -291,6 +300,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -317,6 +327,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -343,6 +354,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -369,6 +381,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -395,6 +408,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -421,6 +435,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -455,6 +470,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -481,6 +497,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -507,6 +524,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -533,6 +551,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -559,6 +578,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -585,6 +605,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -611,6 +632,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -637,6 +659,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -663,6 +686,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -689,6 +713,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -715,6 +740,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -741,6 +767,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -779,6 +806,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -805,6 +833,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -831,6 +860,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -857,6 +887,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -883,6 +914,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -909,6 +941,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -935,6 +968,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -961,6 +995,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -987,6 +1022,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1013,6 +1049,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1039,6 +1076,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1065,6 +1103,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1091,6 +1130,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1117,6 +1157,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1143,6 +1184,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1169,6 +1211,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1195,6 +1238,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1221,6 +1265,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1247,6 +1292,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1273,6 +1319,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1299,6 +1346,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1325,6 +1373,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1351,6 +1400,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1377,6 +1427,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1403,6 +1454,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1429,6 +1481,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1455,6 +1508,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1481,6 +1535,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1507,6 +1562,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1533,6 +1589,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -1559,6 +1616,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
diff --git a/drafter_5/instances/C59_D2_P4.json b/drafter_5/instances/C59_D2_P4.json
index 21219712a5808dc6fb2d40b70eced06fc4731152..986db6e172fa52ade8b77c4a292f1dc59860d443 100644
--- a/drafter_5/instances/C59_D2_P4.json
+++ b/drafter_5/instances/C59_D2_P4.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.16.7",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
-      "label": "capacitor.unpolarized",
       "line_color": null,
       "fill_color": null,
+      "label": "capacitor.unpolarized",
       "points": [
         [
           680.0,
@@ -24,13 +24,15 @@
           239.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "capacitor.unpolarized",
       "line_color": null,
       "fill_color": null,
+      "label": "capacitor.unpolarized",
       "points": [
         [
           507.0,
@@ -49,13 +51,15 @@
           364.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "capacitor.unpolarized",
       "line_color": null,
       "fill_color": null,
+      "label": "capacitor.unpolarized",
       "points": [
         [
           300.0,
@@ -74,13 +78,15 @@
           273.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           254.0,
@@ -99,13 +105,15 @@
           346.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           392.0,
@@ -124,13 +132,15 @@
           324.0845070422535
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           424.36619718309856,
@@ -149,13 +159,15 @@
           325.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           473.0,
@@ -178,13 +190,15 @@
           229.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           307.0,
@@ -203,13 +217,15 @@
           321.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           216.0,
@@ -228,13 +244,15 @@
           370.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           176.0,
@@ -253,13 +271,15 @@
           183.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           448.0,
@@ -278,13 +298,15 @@
           158.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           603.0,
@@ -303,13 +325,15 @@
           194.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           709.0,
@@ -328,13 +352,15 @@
           215.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           602.0,
@@ -353,13 +379,15 @@
           304.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           518.0,
@@ -378,13 +406,15 @@
           334.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           788.3521126760564,
@@ -411,13 +441,15 @@
           284.2767295597484
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           854.225352112676,
@@ -444,13 +476,15 @@
           402.3521126760563
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           939.0,
@@ -469,13 +503,15 @@
           312.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           850.0,
@@ -494,13 +530,15 @@
           161.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "transistor.fet",
       "line_color": null,
       "fill_color": null,
+      "label": "transistor.fet",
       "points": [
         [
           853.0,
@@ -519,13 +557,15 @@
           200.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "capacitor.unpolarized",
       "line_color": null,
       "fill_color": null,
+      "label": "capacitor.unpolarized",
       "points": [
         [
           424.28169014084506,
@@ -544,13 +584,15 @@
           174.1830608314768
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "transistor.bjt",
       "line_color": null,
       "fill_color": null,
+      "label": "transistor.bjt",
       "points": [
         [
           201.33333333333334,
@@ -569,13 +611,15 @@
           200.44444444444446
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           101.0,
@@ -594,13 +638,15 @@
           248.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           103.55987055016182,
@@ -619,13 +665,15 @@
           148.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           106.0,
@@ -644,13 +692,15 @@
           453.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           114.44444444444444,
@@ -669,13 +719,15 @@
           556.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           927.0,
@@ -694,13 +746,15 @@
           358.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           815.0,
@@ -731,13 +785,15 @@
           358.0281690140845
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           760.0,
@@ -764,13 +820,15 @@
           287.18309859154925
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           568.0,
@@ -789,13 +847,15 @@
           307.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           265.0,
@@ -814,13 +874,15 @@
           434.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           252.0,
@@ -839,13 +901,15 @@
           294.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           248.0,
@@ -864,13 +928,15 @@
           145.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           348.0,
@@ -889,13 +955,15 @@
           193.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "crossover",
       "line_color": null,
       "fill_color": null,
+      "label": "crossover",
       "points": [
         [
           352.0,
@@ -914,13 +982,15 @@
           285.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           372.0,
@@ -939,13 +1009,15 @@
           423.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           412.0,
@@ -964,13 +1036,15 @@
           416.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           488.0,
@@ -989,13 +1063,15 @@
           409.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           485.0,
@@ -1014,13 +1090,15 @@
           382.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           579.0,
@@ -1039,13 +1117,15 @@
           366.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "crossover",
       "line_color": null,
       "fill_color": null,
+      "label": "crossover",
       "points": [
         [
           591.0,
@@ -1064,13 +1144,15 @@
           401.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           397.0,
@@ -1089,13 +1171,15 @@
           283.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           562.0,
@@ -1114,13 +1198,15 @@
           162.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           567.0,
@@ -1139,13 +1225,15 @@
           260.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "diode",
       "line_color": null,
       "fill_color": null,
+      "label": "diode",
       "points": [
         [
           516.338028169014,
@@ -1168,13 +1256,15 @@
           251.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "diode",
       "line_color": null,
       "fill_color": null,
+      "label": "diode",
       "points": [
         [
           549.0,
@@ -1193,13 +1283,15 @@
           183.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           768.0,
@@ -1218,13 +1310,15 @@
           246.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           776.0,
@@ -1243,13 +1337,15 @@
           372.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           907.0,
@@ -1268,13 +1364,15 @@
           365.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           906.0,
@@ -1293,13 +1391,15 @@
           137.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           557.0,
@@ -1318,13 +1418,15 @@
           136.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           51.0,
@@ -1343,13 +1445,15 @@
           447.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           42.0,
@@ -1368,13 +1472,15 @@
           235.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           51.0,
@@ -1393,13 +1499,15 @@
           134.789644012945
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           612.0,
@@ -1418,13 +1526,15 @@
           519.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           32.0,
@@ -1443,13 +1553,15 @@
           552.8888888888889
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           69.0,
@@ -1468,10 +1580,16 @@
           604.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
   ],
+  "imagePath": "../segmentation/C59_D2_P4.jpg",
+  "imageData": null,
+  "imageHeight": 810,
+  "imageWidth": 1080,
   "lineColor": [
     0,
     255,
@@ -1483,9 +1601,5 @@
     0,
     0,
     128
-  ],
-  "imagePath": "../segmentation/C59_D2_P4.jpg",
-  "imageData": null,
-  "imageHeight": 810,
-  "imageWidth": 1080
+  ]
 }
\ No newline at end of file
diff --git a/drafter_5/instances/C60_D1_P3.json b/drafter_5/instances/C60_D1_P3.json
index 005d1ee511f3b717d22794985528d9edfa035988..0e23962706ad774b9f9f481bf03f0c1d0caaa096 100644
--- a/drafter_5/instances/C60_D1_P3.json
+++ b/drafter_5/instances/C60_D1_P3.json
@@ -1,5 +1,5 @@
 {
-  "version": "5.0.1",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
@@ -25,6 +25,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -51,6 +52,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -77,6 +79,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -107,6 +110,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -133,6 +137,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -159,6 +164,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -185,6 +191,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -211,6 +218,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -237,6 +245,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -263,6 +272,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -289,6 +299,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -319,6 +330,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -345,6 +357,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -375,6 +388,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -401,6 +415,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -427,6 +442,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -453,6 +469,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -499,6 +516,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -525,6 +543,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -551,6 +570,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -577,6 +597,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -603,6 +624,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -629,6 +651,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -655,6 +678,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
diff --git a/drafter_5/instances/C60_D2_P1.json b/drafter_5/instances/C60_D2_P1.json
index 95f8a002887fac800eef4f1aff7cd53d5ceae362..c7ada3b200fd1e50dbcec536038f81f822585129 100644
--- a/drafter_5/instances/C60_D2_P1.json
+++ b/drafter_5/instances/C60_D2_P1.json
@@ -1,11 +1,11 @@
 {
-  "version": "3.16.7",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
-      "label": "operational_amplifier",
       "line_color": null,
       "fill_color": null,
+      "label": "operational_amplifier",
       "points": [
         [
           715.4471544715448,
@@ -56,13 +56,15 @@
           217.8861788617886
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           914.0,
@@ -81,13 +83,15 @@
           228.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           901.0,
@@ -106,13 +110,15 @@
           174.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "capacitor.unpolarized",
       "line_color": null,
       "fill_color": null,
+      "label": "capacitor.unpolarized",
       "points": [
         [
           678.0,
@@ -131,13 +137,15 @@
           411.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           730.3030303030303,
@@ -160,13 +168,15 @@
           368.48484848484844
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           131.0,
@@ -185,13 +195,15 @@
           266.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           149.0,
@@ -210,13 +222,15 @@
           468.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           428.0,
@@ -235,13 +249,15 @@
           318.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           713.0,
@@ -260,13 +276,15 @@
           439.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           731.0,
@@ -289,13 +307,15 @@
           335.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "text",
       "line_color": null,
       "fill_color": null,
+      "label": "text",
       "points": [
         [
           959.0,
@@ -314,13 +334,15 @@
           439.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           908.0,
@@ -339,13 +361,15 @@
           460.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           227.0,
@@ -364,13 +388,15 @@
           280.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "terminal",
       "line_color": null,
       "fill_color": null,
+      "label": "terminal",
       "points": [
         [
           236.0,
@@ -389,13 +415,15 @@
           477.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           850.0,
@@ -414,13 +442,15 @@
           352.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           836.0,
@@ -439,13 +469,15 @@
           237.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           858.0,
@@ -464,13 +496,15 @@
           412.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           557.0,
@@ -489,13 +523,15 @@
           438.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           540.0,
@@ -514,13 +550,15 @@
           375.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           527.0,
@@ -539,13 +577,15 @@
           292.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           338.0,
@@ -564,13 +604,15 @@
           229.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "junction",
       "line_color": null,
       "fill_color": null,
+      "label": "junction",
       "points": [
         [
           340.0,
@@ -589,13 +631,15 @@
           482.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "crossover",
       "line_color": null,
       "fill_color": null,
+      "label": "crossover",
       "points": [
         [
           337.0,
@@ -614,13 +658,15 @@
           288.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
     {
-      "label": "resistor",
       "line_color": null,
       "fill_color": null,
+      "label": "resistor",
       "points": [
         [
           412.0,
@@ -639,10 +685,16 @@
           282.0
         ]
       ],
+      "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }
   ],
+  "imagePath": "../segmentation/C60_D2_P1.jpg",
+  "imageData": null,
+  "imageHeight": 810,
+  "imageWidth": 1080,
   "lineColor": [
     0,
     255,
@@ -654,9 +706,5 @@
     0,
     0,
     128
-  ],
-  "imagePath": "../segmentation/C60_D2_P1.jpg",
-  "imageData": null,
-  "imageHeight": 810,
-  "imageWidth": 1080
+  ]
 }
\ No newline at end of file
diff --git a/drafter_5/instances/C60_D2_P3.json b/drafter_5/instances/C60_D2_P3.json
index 9901beba346043c591b9eb117acffe508068a95b..a72c9e26357783539ef55297cf94265fd5febdb7 100644
--- a/drafter_5/instances/C60_D2_P3.json
+++ b/drafter_5/instances/C60_D2_P3.json
@@ -1,5 +1,5 @@
 {
-  "version": "5.0.1",
+  "version": "5.2.0",
   "flags": {},
   "shapes": [
     {
@@ -25,6 +25,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -51,6 +52,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -77,6 +79,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -103,6 +106,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -129,6 +133,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -155,6 +160,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -181,6 +187,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -211,6 +218,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -237,6 +245,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -263,6 +272,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -289,6 +299,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -315,6 +326,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -341,6 +353,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -371,6 +384,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -413,6 +427,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -439,6 +454,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -465,6 +481,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -491,6 +508,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -517,6 +535,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -543,6 +562,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -569,6 +589,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -619,6 +640,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -645,6 +667,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     },
@@ -671,6 +694,7 @@
         ]
       ],
       "group_id": null,
+      "description": null,
       "shape_type": "polygon",
       "flags": {}
     }