diff --git a/docs/parser_classes.gaphor b/docs/parser_classes.gaphor
index 9762866b..fe74d8b1 100644
--- a/docs/parser_classes.gaphor
+++ b/docs/parser_classes.gaphor
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<gaphor xmlns="http://gaphor.sourceforge.net/model" version="3.0" gaphor-version="2.27.0">
-<StyleSheet id="58d6989a-66f8-11ec-b4c8-0456e5e540ed"/>
-<Package id="58d6c2e8-66f8-11ec-b4c8-0456e5e540ed">
+<gaphor xmlns="https://gaphor.org/model" xmlns:Core="https://gaphor.org/modelinglanguage/Core" xmlns:UML="https://gaphor.org/modelinglanguage/UML" xmlns:general="https://gaphor.org/modelinglanguage/general" version="4" gaphor-version="3.1.0">
+<model>
+<Core:StyleSheet id="58d6989a-66f8-11ec-b4c8-0456e5e540ed"/>
+<UML:Package id="58d6c2e8-66f8-11ec-b4c8-0456e5e540ed">
 <name>
 <val>Новая модель</val>
 </name>
@@ -12,18 +13,26 @@
 </ownedDiagram>
 <ownedType>
 <reflist>
-<ref refid="09af424e-f59d-11ef-bfb1-4cbb5880a0b8"/>
 <ref refid="0b54a350-f59d-11ef-bfb1-4cbb5880a0b8"/>
 <ref refid="a300f58a-f5bd-11ef-9ec2-4cbb5880a0b8"/>
 <ref refid="ad4c68d0-f5bd-11ef-9ec2-4cbb5880a0b8"/>
 <ref refid="198a3108-f5be-11ef-9ec2-4cbb5880a0b8"/>
-<ref refid="19926dcc-f5bf-11ef-9ec2-4cbb5880a0b8"/>
-<ref refid="1fd15964-f5bf-11ef-9ec2-4cbb5880a0b8"/>
 <ref refid="32081654-f5bf-11ef-9ec2-4cbb5880a0b8"/>
 </reflist>
 </ownedType>
-</Package>
-<Diagram id="58d6c536-66f8-11ec-b4c8-0456e5e540ed">
+<packagedElement>
+<reflist>
+<ref refid="0b54a350-f59d-11ef-bfb1-4cbb5880a0b8"/>
+<ref refid="a300f58a-f5bd-11ef-9ec2-4cbb5880a0b8"/>
+<ref refid="ad4c68d0-f5bd-11ef-9ec2-4cbb5880a0b8"/>
+<ref refid="198a3108-f5be-11ef-9ec2-4cbb5880a0b8"/>
+<ref refid="32081654-f5bf-11ef-9ec2-4cbb5880a0b8"/>
+<ref refid="25a17c58-f5be-11ef-9ec2-4cbb5880a0b8"/>
+<ref refid="41318a02-f5bf-11ef-9ec2-4cbb5880a0b8"/>
+</reflist>
+</packagedElement>
+</UML:Package>
+<UML:Diagram id="58d6c536-66f8-11ec-b4c8-0456e5e540ed">
 <element>
 <ref refid="58d6c2e8-66f8-11ec-b4c8-0456e5e540ed"/>
 </element>
@@ -32,96 +41,30 @@
 </name>
 <ownedPresentation>
 <reflist>
-<ref refid="09af94d8-f59d-11ef-bfb1-4cbb5880a0b8"/>
 <ref refid="0b54edc4-f59d-11ef-bfb1-4cbb5880a0b8"/>
 <ref refid="a3018fc2-f5bd-11ef-9ec2-4cbb5880a0b8"/>
 <ref refid="ad4d2aae-f5bd-11ef-9ec2-4cbb5880a0b8"/>
 <ref refid="198aace6-f5be-11ef-9ec2-4cbb5880a0b8"/>
-<ref refid="1993dcde-f5bf-11ef-9ec2-4cbb5880a0b8"/>
-<ref refid="1fd2144e-f5bf-11ef-9ec2-4cbb5880a0b8"/>
 <ref refid="320868c0-f5bf-11ef-9ec2-4cbb5880a0b8"/>
 <ref refid="b760bcd4-f5bf-11ef-9ec2-4cbb5880a0b8"/>
 <ref refid="bff32eae-f5bf-11ef-9ec2-4cbb5880a0b8"/>
 <ref refid="d5113ca4-f5bf-11ef-9ec2-4cbb5880a0b8"/>
 <ref refid="e8042ad8-f5bf-11ef-9ec2-4cbb5880a0b8"/>
-<ref refid="369e14a6-f5c0-11ef-9ec2-4cbb5880a0b8"/>
 <ref refid="531831f2-f5c0-11ef-9ec2-4cbb5880a0b8"/>
 <ref refid="5ccae8d4-f5c0-11ef-9ec2-4cbb5880a0b8"/>
 <ref refid="b6e0240e-f5bd-11ef-9ec2-4cbb5880a0b8"/>
 <ref refid="254e40f6-f5be-11ef-9ec2-4cbb5880a0b8"/>
-<ref refid="28ad4224-f5be-11ef-9ec2-4cbb5880a0b8"/>
-<ref refid="27d24920-f5bf-11ef-9ec2-4cbb5880a0b8"/>
-<ref refid="29a5452c-f5bf-11ef-9ec2-4cbb5880a0b8"/>
 <ref refid="2bb6e87a-f5bf-11ef-9ec2-4cbb5880a0b8"/>
 <ref refid="40e36d2c-f5bf-11ef-9ec2-4cbb5880a0b8"/>
 <ref refid="bcc07c64-f5bf-11ef-9ec2-4cbb5880a0b8"/>
 <ref refid="f6b48e4c-f5bf-11ef-9ec2-4cbb5880a0b8"/>
 <ref refid="f89ba010-f5bf-11ef-9ec2-4cbb5880a0b8"/>
 <ref refid="fabe0540-f5bf-11ef-9ec2-4cbb5880a0b8"/>
-<ref refid="43ac1e04-f5c0-11ef-9ec2-4cbb5880a0b8"/>
 <ref refid="6f993af6-f5c0-11ef-9ec2-4cbb5880a0b8"/>
 </reflist>
 </ownedPresentation>
-</Diagram>
-<Class id="09af424e-f59d-11ef-bfb1-4cbb5880a0b8">
-<clientDependency>
-<reflist>
-<ref refid="292dbad0-f5be-11ef-9ec2-4cbb5880a0b8"/>
-</reflist>
-</clientDependency>
-<comment>
-<reflist>
-<ref refid="369e0038-f5c0-11ef-9ec2-4cbb5880a0b8"/>
-</reflist>
-</comment>
-<isAbstract>
-<val>1</val>
-</isAbstract>
-<name>
-<val>LegacyMangaParser</val>
-</name>
-<package>
-<ref refid="58d6c2e8-66f8-11ec-b4c8-0456e5e540ed"/>
-</package>
-<presentation>
-<reflist>
-<ref refid="09af94d8-f59d-11ef-bfb1-4cbb5880a0b8"/>
-</reflist>
-</presentation>
-<specialization>
-<reflist>
-<ref refid="2857a660-f5bf-11ef-9ec2-4cbb5880a0b8"/>
-<ref refid="2a398a7a-f5bf-11ef-9ec2-4cbb5880a0b8"/>
-</reflist>
-</specialization>
-</Class>
-<ClassItem id="09af94d8-f59d-11ef-bfb1-4cbb5880a0b8">
-<matrix>
-<val>(1.0, 0.0, 0.0, 1.0, 107.50391387939453, 388.8671875)</val>
-</matrix>
-<top-left>
-<val>(0.0, 0.0)</val>
-</top-left>
-<width>
-<val>147.0</val>
-</width>
-<height>
-<val>60.0</val>
-</height>
-<diagram>
-<ref refid="58d6c536-66f8-11ec-b4c8-0456e5e540ed"/>
-</diagram>
-<show_attributes>
-<val>0</val>
-</show_attributes>
-<show_operations>
-<val>0</val>
-</show_operations>
-<subject>
-<ref refid="09af424e-f59d-11ef-bfb1-4cbb5880a0b8"/>
-</subject>
-</ClassItem>
-<Class id="0b54a350-f59d-11ef-bfb1-4cbb5880a0b8">
+</UML:Diagram>
+<UML:Class id="0b54a350-f59d-11ef-bfb1-4cbb5880a0b8">
 <clientDependency>
 <reflist>
 <ref refid="25a17c58-f5be-11ef-9ec2-4cbb5880a0b8"/>
@@ -138,6 +81,9 @@
 <name>
 <val>AbstractMangaParser</val>
 </name>
+<owningPackage>
+<ref refid="58d6c2e8-66f8-11ec-b4c8-0456e5e540ed"/>
+</owningPackage>
 <package>
 <ref refid="58d6c2e8-66f8-11ec-b4c8-0456e5e540ed"/>
 </package>
@@ -152,8 +98,8 @@
 <ref refid="2c236356-f5bf-11ef-9ec2-4cbb5880a0b8"/>
 </reflist>
 </specialization>
-</Class>
-<ClassItem id="0b54edc4-f59d-11ef-bfb1-4cbb5880a0b8">
+</UML:Class>
+<UML:ClassItem id="0b54edc4-f59d-11ef-bfb1-4cbb5880a0b8">
 <matrix>
 <val>(1.0, 0.0, 0.0, 1.0, 405.16796875, 388.8671875)</val>
 </matrix>
@@ -178,8 +124,8 @@
 <subject>
 <ref refid="0b54a350-f59d-11ef-bfb1-4cbb5880a0b8"/>
 </subject>
-</ClassItem>
-<Class id="a300f58a-f5bd-11ef-9ec2-4cbb5880a0b8">
+</UML:ClassItem>
+<UML:Class id="a300f58a-f5bd-11ef-9ec2-4cbb5880a0b8">
 <comment>
 <reflist>
 <ref refid="d5112a70-f5bf-11ef-9ec2-4cbb5880a0b8"/>
@@ -196,6 +142,9 @@
 <name>
 <val>PagedMangaParser</val>
 </name>
+<owningPackage>
+<ref refid="58d6c2e8-66f8-11ec-b4c8-0456e5e540ed"/>
+</owningPackage>
 <package>
 <ref refid="58d6c2e8-66f8-11ec-b4c8-0456e5e540ed"/>
 </package>
@@ -204,8 +153,8 @@
 <ref refid="a3018fc2-f5bd-11ef-9ec2-4cbb5880a0b8"/>
 </reflist>
 </presentation>
-</Class>
-<ClassItem id="a3018fc2-f5bd-11ef-9ec2-4cbb5880a0b8">
+</UML:Class>
+<UML:ClassItem id="a3018fc2-f5bd-11ef-9ec2-4cbb5880a0b8">
 <matrix>
 <val>(1.0, 0.0, 0.0, 1.0, 476.3368367667698, 525.76953125)</val>
 </matrix>
@@ -230,8 +179,8 @@
 <subject>
 <ref refid="a300f58a-f5bd-11ef-9ec2-4cbb5880a0b8"/>
 </subject>
-</ClassItem>
-<Class id="ad4c68d0-f5bd-11ef-9ec2-4cbb5880a0b8">
+</UML:ClassItem>
+<UML:Class id="ad4c68d0-f5bd-11ef-9ec2-4cbb5880a0b8">
 <comment>
 <reflist>
 <ref refid="e80418f4-f5bf-11ef-9ec2-4cbb5880a0b8"/>
@@ -248,6 +197,9 @@
 <name>
 <val>SinglePageMangaParser</val>
 </name>
+<owningPackage>
+<ref refid="58d6c2e8-66f8-11ec-b4c8-0456e5e540ed"/>
+</owningPackage>
 <package>
 <ref refid="58d6c2e8-66f8-11ec-b4c8-0456e5e540ed"/>
 </package>
@@ -256,8 +208,8 @@
 <ref refid="ad4d2aae-f5bd-11ef-9ec2-4cbb5880a0b8"/>
 </reflist>
 </presentation>
-</Class>
-<ClassItem id="ad4d2aae-f5bd-11ef-9ec2-4cbb5880a0b8">
+</UML:Class>
+<UML:ClassItem id="ad4d2aae-f5bd-11ef-9ec2-4cbb5880a0b8">
 <matrix>
 <val>(1.0, 0.0, 0.0, 1.0, 405.16796875, 627.46875)</val>
 </matrix>
@@ -282,16 +234,16 @@
 <subject>
 <ref refid="ad4c68d0-f5bd-11ef-9ec2-4cbb5880a0b8"/>
 </subject>
-</ClassItem>
-<GeneralizationItem id="b6e0240e-f5bd-11ef-9ec2-4cbb5880a0b8">
+</UML:ClassItem>
+<UML:GeneralizationItem id="b6e0240e-f5bd-11ef-9ec2-4cbb5880a0b8">
 <diagram>
 <ref refid="58d6c536-66f8-11ec-b4c8-0456e5e540ed"/>
 </diagram>
 <horizontal>
-<val>0</val>
+<val>False</val>
 </horizontal>
 <orthogonal>
-<val>0</val>
+<val>False</val>
 </orthogonal>
 <subject>
 <ref refid="b969dac6-f5bd-11ef-9ec2-4cbb5880a0b8"/>
@@ -308,8 +260,8 @@
 <tail-connection>
 <ref refid="0b54edc4-f59d-11ef-bfb1-4cbb5880a0b8"/>
 </tail-connection>
-</GeneralizationItem>
-<Generalization id="b969dac6-f5bd-11ef-9ec2-4cbb5880a0b8">
+</UML:GeneralizationItem>
+<UML:Generalization id="b969dac6-f5bd-11ef-9ec2-4cbb5880a0b8">
 <general>
 <ref refid="0b54a350-f59d-11ef-bfb1-4cbb5880a0b8"/>
 </general>
@@ -321,11 +273,14 @@
 <specific>
 <ref refid="a300f58a-f5bd-11ef-9ec2-4cbb5880a0b8"/>
 </specific>
-</Generalization>
-<Interface id="198a3108-f5be-11ef-9ec2-4cbb5880a0b8">
+</UML:Generalization>
+<UML:Interface id="198a3108-f5be-11ef-9ec2-4cbb5880a0b8">
 <name>
 <val>MangaParser</val>
 </name>
+<owningPackage>
+<ref refid="58d6c2e8-66f8-11ec-b4c8-0456e5e540ed"/>
+</owningPackage>
 <package>
 <ref refid="58d6c2e8-66f8-11ec-b4c8-0456e5e540ed"/>
 </package>
@@ -337,12 +292,11 @@
 <supplierDependency>
 <reflist>
 <ref refid="25a17c58-f5be-11ef-9ec2-4cbb5880a0b8"/>
-<ref refid="292dbad0-f5be-11ef-9ec2-4cbb5880a0b8"/>
 <ref refid="41318a02-f5bf-11ef-9ec2-4cbb5880a0b8"/>
 </reflist>
 </supplierDependency>
-</Interface>
-<InterfaceItem id="198aace6-f5be-11ef-9ec2-4cbb5880a0b8">
+</UML:Interface>
+<UML:InterfaceItem id="198aace6-f5be-11ef-9ec2-4cbb5880a0b8">
 <matrix>
 <val>(1.0, 0.0, 0.0, 1.0, 278.00391387939453, 232.92578125)</val>
 </matrix>
@@ -370,16 +324,16 @@
 <folded>
 <val>0</val>
 </folded>
-</InterfaceItem>
-<InterfaceRealizationItem id="254e40f6-f5be-11ef-9ec2-4cbb5880a0b8">
+</UML:InterfaceItem>
+<UML:InterfaceRealizationItem id="254e40f6-f5be-11ef-9ec2-4cbb5880a0b8">
 <diagram>
 <ref refid="58d6c536-66f8-11ec-b4c8-0456e5e540ed"/>
 </diagram>
 <horizontal>
-<val>0</val>
+<val>False</val>
 </horizontal>
 <orthogonal>
-<val>0</val>
+<val>False</val>
 </orthogonal>
 <subject>
 <ref refid="25a17c58-f5be-11ef-9ec2-4cbb5880a0b8"/>
@@ -396,237 +350,36 @@
 <tail-connection>
 <ref refid="0b54edc4-f59d-11ef-bfb1-4cbb5880a0b8"/>
 </tail-connection>
-</InterfaceRealizationItem>
-<InterfaceRealization id="25a17c58-f5be-11ef-9ec2-4cbb5880a0b8">
+</UML:InterfaceRealizationItem>
+<UML:InterfaceRealization id="25a17c58-f5be-11ef-9ec2-4cbb5880a0b8">
 <client>
+<reflist>
 <ref refid="0b54a350-f59d-11ef-bfb1-4cbb5880a0b8"/>
+</reflist>
 </client>
+<owningPackage>
+<ref refid="58d6c2e8-66f8-11ec-b4c8-0456e5e540ed"/>
+</owningPackage>
 <presentation>
 <reflist>
 <ref refid="254e40f6-f5be-11ef-9ec2-4cbb5880a0b8"/>
 </reflist>
 </presentation>
 <supplier>
-<ref refid="198a3108-f5be-11ef-9ec2-4cbb5880a0b8"/>
-</supplier>
-</InterfaceRealization>
-<InterfaceRealizationItem id="28ad4224-f5be-11ef-9ec2-4cbb5880a0b8">
-<diagram>
-<ref refid="58d6c536-66f8-11ec-b4c8-0456e5e540ed"/>
-</diagram>
-<horizontal>
-<val>0</val>
-</horizontal>
-<orthogonal>
-<val>0</val>
-</orthogonal>
-<subject>
-<ref refid="292dbad0-f5be-11ef-9ec2-4cbb5880a0b8"/>
-</subject>
-<matrix>
-<val>(1.0, 0.0, 0.0, 1.0, 289.0820617675781, 276.40625)</val>
-</matrix>
-<points>
-<val>[(-0.2702028783513697, 36.51953125), (-89.14763215970096, 112.4609375)]</val>
-</points>
-<head-connection>
-<ref refid="198aace6-f5be-11ef-9ec2-4cbb5880a0b8"/>
-</head-connection>
-<tail-connection>
-<ref refid="09af94d8-f59d-11ef-bfb1-4cbb5880a0b8"/>
-</tail-connection>
-</InterfaceRealizationItem>
-<InterfaceRealization id="292dbad0-f5be-11ef-9ec2-4cbb5880a0b8">
-<client>
-<ref refid="09af424e-f59d-11ef-bfb1-4cbb5880a0b8"/>
-</client>
-<presentation>
 <reflist>
-<ref refid="28ad4224-f5be-11ef-9ec2-4cbb5880a0b8"/>
-</reflist>
-</presentation>
-<supplier>
 <ref refid="198a3108-f5be-11ef-9ec2-4cbb5880a0b8"/>
-</supplier>
-</InterfaceRealization>
-<Class id="19926dcc-f5bf-11ef-9ec2-4cbb5880a0b8">
-<generalization>
-<reflist>
-<ref refid="2857a660-f5bf-11ef-9ec2-4cbb5880a0b8"/>
-</reflist>
-</generalization>
-<name>
-<val>LegacyPagedMangaParser</val>
-</name>
-<note>
-<val></val>
-</note>
-<package>
-<ref refid="58d6c2e8-66f8-11ec-b4c8-0456e5e540ed"/>
-</package>
-<presentation>
-<reflist>
-<ref refid="1993dcde-f5bf-11ef-9ec2-4cbb5880a0b8"/>
-</reflist>
-</presentation>
-</Class>
-<ClassItem id="1993dcde-f5bf-11ef-9ec2-4cbb5880a0b8">
-<matrix>
-<val>(1.0, 0.0, 0.0, 1.0, 159.50391387939453, 521.75390625)</val>
-</matrix>
-<top-left>
-<val>(0.0, 0.0)</val>
-</top-left>
-<width>
-<val>190.0</val>
-</width>
-<height>
-<val>60.0</val>
-</height>
-<diagram>
-<ref refid="58d6c536-66f8-11ec-b4c8-0456e5e540ed"/>
-</diagram>
-<show_attributes>
-<val>0</val>
-</show_attributes>
-<show_operations>
-<val>0</val>
-</show_operations>
-<subject>
-<ref refid="19926dcc-f5bf-11ef-9ec2-4cbb5880a0b8"/>
-</subject>
-</ClassItem>
-<Class id="1fd15964-f5bf-11ef-9ec2-4cbb5880a0b8">
-<generalization>
-<reflist>
-<ref refid="2a398a7a-f5bf-11ef-9ec2-4cbb5880a0b8"/>
-</reflist>
-</generalization>
-<name>
-<val>LegacySinglePageMangaParser</val>
-</name>
-<package>
-<ref refid="58d6c2e8-66f8-11ec-b4c8-0456e5e540ed"/>
-</package>
-<presentation>
-<reflist>
-<ref refid="1fd2144e-f5bf-11ef-9ec2-4cbb5880a0b8"/>
-</reflist>
-</presentation>
-</Class>
-<ClassItem id="1fd2144e-f5bf-11ef-9ec2-4cbb5880a0b8">
-<matrix>
-<val>(1.0, 0.0, 0.0, 1.0, 107.50391387939453, 627.46875)</val>
-</matrix>
-<top-left>
-<val>(0.0, 0.0)</val>
-</top-left>
-<width>
-<val>223.0</val>
-</width>
-<height>
-<val>60.0</val>
-</height>
-<diagram>
-<ref refid="58d6c536-66f8-11ec-b4c8-0456e5e540ed"/>
-</diagram>
-<show_attributes>
-<val>0</val>
-</show_attributes>
-<show_operations>
-<val>0</val>
-</show_operations>
-<subject>
-<ref refid="1fd15964-f5bf-11ef-9ec2-4cbb5880a0b8"/>
-</subject>
-</ClassItem>
-<GeneralizationItem id="27d24920-f5bf-11ef-9ec2-4cbb5880a0b8">
-<diagram>
-<ref refid="58d6c536-66f8-11ec-b4c8-0456e5e540ed"/>
-</diagram>
-<horizontal>
-<val>0</val>
-</horizontal>
-<orthogonal>
-<val>0</val>
-</orthogonal>
-<subject>
-<ref refid="2857a660-f5bf-11ef-9ec2-4cbb5880a0b8"/>
-</subject>
-<matrix>
-<val>(1.0, 0.0, 0.0, 1.0, 175.87969633151002, 433.1640319824219)</val>
-</matrix>
-<points>
-<val>[(20.67503694485717, 88.58987426757812), (20.67503694485717, 15.703155517578125)]</val>
-</points>
-<head-connection>
-<ref refid="1993dcde-f5bf-11ef-9ec2-4cbb5880a0b8"/>
-</head-connection>
-<tail-connection>
-<ref refid="09af94d8-f59d-11ef-bfb1-4cbb5880a0b8"/>
-</tail-connection>
-</GeneralizationItem>
-<Generalization id="2857a660-f5bf-11ef-9ec2-4cbb5880a0b8">
-<general>
-<ref refid="09af424e-f59d-11ef-bfb1-4cbb5880a0b8"/>
-</general>
-<presentation>
-<reflist>
-<ref refid="27d24920-f5bf-11ef-9ec2-4cbb5880a0b8"/>
-</reflist>
-</presentation>
-<specific>
-<ref refid="19926dcc-f5bf-11ef-9ec2-4cbb5880a0b8"/>
-</specific>
-</Generalization>
-<GeneralizationItem id="29a5452c-f5bf-11ef-9ec2-4cbb5880a0b8">
-<diagram>
-<ref refid="58d6c536-66f8-11ec-b4c8-0456e5e540ed"/>
-</diagram>
-<horizontal>
-<val>0</val>
-</horizontal>
-<orthogonal>
-<val>0</val>
-</orthogonal>
-<subject>
-<ref refid="2a398a7a-f5bf-11ef-9ec2-4cbb5880a0b8"/>
-</subject>
-<matrix>
-<val>(1.0, 0.0, 0.0, 1.0, 148.88671875, 427.8085632324219)</val>
-</matrix>
-<points>
-<val>[(0.5527361628988388, 199.66018676757812), (0.5527361628988459, 21.058624267578125)]</val>
-</points>
-<head-connection>
-<ref refid="1fd2144e-f5bf-11ef-9ec2-4cbb5880a0b8"/>
-</head-connection>
-<tail-connection>
-<ref refid="09af94d8-f59d-11ef-bfb1-4cbb5880a0b8"/>
-</tail-connection>
-</GeneralizationItem>
-<Generalization id="2a398a7a-f5bf-11ef-9ec2-4cbb5880a0b8">
-<general>
-<ref refid="09af424e-f59d-11ef-bfb1-4cbb5880a0b8"/>
-</general>
-<presentation>
-<reflist>
-<ref refid="29a5452c-f5bf-11ef-9ec2-4cbb5880a0b8"/>
 </reflist>
-</presentation>
-<specific>
-<ref refid="1fd15964-f5bf-11ef-9ec2-4cbb5880a0b8"/>
-</specific>
-</Generalization>
-<GeneralizationItem id="2bb6e87a-f5bf-11ef-9ec2-4cbb5880a0b8">
+</supplier>
+</UML:InterfaceRealization>
+<UML:GeneralizationItem id="2bb6e87a-f5bf-11ef-9ec2-4cbb5880a0b8">
 <diagram>
 <ref refid="58d6c536-66f8-11ec-b4c8-0456e5e540ed"/>
 </diagram>
 <horizontal>
-<val>0</val>
+<val>False</val>
 </horizontal>
 <orthogonal>
-<val>0</val>
+<val>False</val>
 </orthogonal>
 <subject>
 <ref refid="2c236356-f5bf-11ef-9ec2-4cbb5880a0b8"/>
@@ -643,8 +396,8 @@
 <tail-connection>
 <ref refid="0b54edc4-f59d-11ef-bfb1-4cbb5880a0b8"/>
 </tail-connection>
-</GeneralizationItem>
-<Generalization id="2c236356-f5bf-11ef-9ec2-4cbb5880a0b8">
+</UML:GeneralizationItem>
+<UML:Generalization id="2c236356-f5bf-11ef-9ec2-4cbb5880a0b8">
 <general>
 <ref refid="0b54a350-f59d-11ef-bfb1-4cbb5880a0b8"/>
 </general>
@@ -656,24 +409,22 @@
 <specific>
 <ref refid="ad4c68d0-f5bd-11ef-9ec2-4cbb5880a0b8"/>
 </specific>
-</Generalization>
-<Class id="32081654-f5bf-11ef-9ec2-4cbb5880a0b8">
+</UML:Generalization>
+<UML:Class id="32081654-f5bf-11ef-9ec2-4cbb5880a0b8">
 <clientDependency>
 <reflist>
 <ref refid="41318a02-f5bf-11ef-9ec2-4cbb5880a0b8"/>
 </reflist>
 </clientDependency>
-<comment>
-<reflist>
-<ref refid="b760ac44-f5bf-11ef-9ec2-4cbb5880a0b8"/>
-</reflist>
-</comment>
 <name>
 <val>MangaParserWrapper</val>
 </name>
 <note>
 <val></val>
 </note>
+<owningPackage>
+<ref refid="58d6c2e8-66f8-11ec-b4c8-0456e5e540ed"/>
+</owningPackage>
 <package>
 <ref refid="58d6c2e8-66f8-11ec-b4c8-0456e5e540ed"/>
 </package>
@@ -682,10 +433,10 @@
 <ref refid="320868c0-f5bf-11ef-9ec2-4cbb5880a0b8"/>
 </reflist>
 </presentation>
-</Class>
-<ClassItem id="320868c0-f5bf-11ef-9ec2-4cbb5880a0b8">
+</UML:Class>
+<UML:ClassItem id="320868c0-f5bf-11ef-9ec2-4cbb5880a0b8">
 <matrix>
-<val>(1.0, 0.0, 0.0, 1.0, 452.6727742667698, 236.1809574894652)</val>
+<val>(1.0, 0.0, 0.0, 1.0, 128.5008992667698, 410.48990205860804)</val>
 </matrix>
 <top-left>
 <val>(0.0, 0.0)</val>
@@ -708,16 +459,16 @@
 <subject>
 <ref refid="32081654-f5bf-11ef-9ec2-4cbb5880a0b8"/>
 </subject>
-</ClassItem>
-<InterfaceRealizationItem id="40e36d2c-f5bf-11ef-9ec2-4cbb5880a0b8">
+</UML:ClassItem>
+<UML:InterfaceRealizationItem id="40e36d2c-f5bf-11ef-9ec2-4cbb5880a0b8">
 <diagram>
 <ref refid="58d6c536-66f8-11ec-b4c8-0456e5e540ed"/>
 </diagram>
 <horizontal>
-<val>0</val>
+<val>False</val>
 </horizontal>
 <orthogonal>
-<val>0</val>
+<val>False</val>
 </orthogonal>
 <subject>
 <ref refid="41318a02-f5bf-11ef-9ec2-4cbb5880a0b8"/>
@@ -726,7 +477,7 @@
 <val>(1.0, 0.0, 0.0, 1.0, 306.0585632324219, 249.69920349121094)</val>
 </matrix>
 <points>
-<val>[(76.94535064697266, 12.615185431614634), (146.61421103434793, 16.200927328075977)]</val>
+<val>[(11.759223915218172, 63.22657775878906), (-98.55766396565207, 160.7906985673971)]</val>
 </points>
 <head-connection>
 <ref refid="198aace6-f5be-11ef-9ec2-4cbb5880a0b8"/>
@@ -734,26 +485,28 @@
 <tail-connection>
 <ref refid="320868c0-f5bf-11ef-9ec2-4cbb5880a0b8"/>
 </tail-connection>
-</InterfaceRealizationItem>
-<InterfaceRealization id="41318a02-f5bf-11ef-9ec2-4cbb5880a0b8">
+</UML:InterfaceRealizationItem>
+<UML:InterfaceRealization id="41318a02-f5bf-11ef-9ec2-4cbb5880a0b8">
 <client>
+<reflist>
 <ref refid="32081654-f5bf-11ef-9ec2-4cbb5880a0b8"/>
+</reflist>
 </client>
+<owningPackage>
+<ref refid="58d6c2e8-66f8-11ec-b4c8-0456e5e540ed"/>
+</owningPackage>
 <presentation>
 <reflist>
 <ref refid="40e36d2c-f5bf-11ef-9ec2-4cbb5880a0b8"/>
 </reflist>
 </presentation>
 <supplier>
-<ref refid="198a3108-f5be-11ef-9ec2-4cbb5880a0b8"/>
-</supplier>
-</InterfaceRealization>
-<Comment id="b760ac44-f5bf-11ef-9ec2-4cbb5880a0b8">
-<annotatedElement>
 <reflist>
-<ref refid="32081654-f5bf-11ef-9ec2-4cbb5880a0b8"/>
+<ref refid="198a3108-f5be-11ef-9ec2-4cbb5880a0b8"/>
 </reflist>
-</annotatedElement>
+</supplier>
+</UML:InterfaceRealization>
+<UML:Comment id="b760ac44-f5bf-11ef-9ec2-4cbb5880a0b8">
 <body>
 <val>Used for providing external api. Do not use this class directly</val>
 </body>
@@ -762,10 +515,10 @@
 <ref refid="b760bcd4-f5bf-11ef-9ec2-4cbb5880a0b8"/>
 </reflist>
 </presentation>
-</Comment>
-<CommentItem id="b760bcd4-f5bf-11ef-9ec2-4cbb5880a0b8">
+</UML:Comment>
+<UML:CommentItem id="b760bcd4-f5bf-11ef-9ec2-4cbb5880a0b8">
 <matrix>
-<val>(1.0, 0.0, 0.0, 1.0, 445.4868312390082, 128.1331358519086)</val>
+<val>(1.0, 0.0, 0.0, 1.0, 108.0561294327963, 550.1347579956054)</val>
 </matrix>
 <top-left>
 <val>(0.0, 0.0)</val>
@@ -782,31 +535,28 @@
 <subject>
 <ref refid="b760ac44-f5bf-11ef-9ec2-4cbb5880a0b8"/>
 </subject>
-</CommentItem>
-<CommentLineItem id="bcc07c64-f5bf-11ef-9ec2-4cbb5880a0b8">
+</UML:CommentItem>
+<UML:CommentLineItem id="bcc07c64-f5bf-11ef-9ec2-4cbb5880a0b8">
 <diagram>
 <ref refid="58d6c536-66f8-11ec-b4c8-0456e5e540ed"/>
 </diagram>
 <horizontal>
-<val>0</val>
+<val>False</val>
 </horizontal>
 <orthogonal>
-<val>0</val>
+<val>False</val>
 </orthogonal>
 <matrix>
-<val>(1.0, 0.0, 0.0, 1.0, 550.2876124890082, 278.05499559311954)</val>
+<val>(1.0, 0.0, 0.0, 1.0, 549.205520203852, 278.05499559311954)</val>
 </matrix>
 <points>
-<val>[(0.8567782509883415, -41.87403810365436), (0.5, -58.683563232421875)]</val>
+<val>[(-349.5400462886338, 192.4349064654885), (-349.5400462886338, 272.0797624024858)]</val>
 </points>
-<head-connection>
-<ref refid="320868c0-f5bf-11ef-9ec2-4cbb5880a0b8"/>
-</head-connection>
 <tail-connection>
 <ref refid="b760bcd4-f5bf-11ef-9ec2-4cbb5880a0b8"/>
 </tail-connection>
-</CommentLineItem>
-<Comment id="bff31afe-f5bf-11ef-9ec2-4cbb5880a0b8">
+</UML:CommentLineItem>
+<UML:Comment id="bff31afe-f5bf-11ef-9ec2-4cbb5880a0b8">
 <annotatedElement>
 <reflist>
 <ref refid="0b54a350-f59d-11ef-bfb1-4cbb5880a0b8"/>
@@ -820,8 +570,8 @@
 <ref refid="bff32eae-f5bf-11ef-9ec2-4cbb5880a0b8"/>
 </reflist>
 </presentation>
-</Comment>
-<CommentItem id="bff32eae-f5bf-11ef-9ec2-4cbb5880a0b8">
+</UML:Comment>
+<UML:CommentItem id="bff32eae-f5bf-11ef-9ec2-4cbb5880a0b8">
 <matrix>
 <val>(1.0, 0.0, 0.0, 1.0, 673.0610499890082, 367.0515553989646)</val>
 </matrix>
@@ -840,8 +590,8 @@
 <subject>
 <ref refid="bff31afe-f5bf-11ef-9ec2-4cbb5880a0b8"/>
 </subject>
-</CommentItem>
-<Comment id="d5112a70-f5bf-11ef-9ec2-4cbb5880a0b8">
+</UML:CommentItem>
+<UML:Comment id="d5112a70-f5bf-11ef-9ec2-4cbb5880a0b8">
 <annotatedElement>
 <reflist>
 <ref refid="a300f58a-f5bd-11ef-9ec2-4cbb5880a0b8"/>
@@ -855,8 +605,8 @@
 <ref refid="d5113ca4-f5bf-11ef-9ec2-4cbb5880a0b8"/>
 </reflist>
 </presentation>
-</Comment>
-<CommentItem id="d5113ca4-f5bf-11ef-9ec2-4cbb5880a0b8">
+</UML:Comment>
+<UML:CommentItem id="d5113ca4-f5bf-11ef-9ec2-4cbb5880a0b8">
 <matrix>
 <val>(1.0, 0.0, 0.0, 1.0, 666.7924311664914, 507.7539062499999)</val>
 </matrix>
@@ -875,8 +625,8 @@
 <subject>
 <ref refid="d5112a70-f5bf-11ef-9ec2-4cbb5880a0b8"/>
 </subject>
-</CommentItem>
-<Comment id="e80418f4-f5bf-11ef-9ec2-4cbb5880a0b8">
+</UML:CommentItem>
+<UML:Comment id="e80418f4-f5bf-11ef-9ec2-4cbb5880a0b8">
 <annotatedElement>
 <reflist>
 <ref refid="ad4c68d0-f5bd-11ef-9ec2-4cbb5880a0b8"/>
@@ -890,8 +640,8 @@
 <ref refid="e8042ad8-f5bf-11ef-9ec2-4cbb5880a0b8"/>
 </reflist>
 </presentation>
-</Comment>
-<CommentItem id="e8042ad8-f5bf-11ef-9ec2-4cbb5880a0b8">
+</UML:Comment>
+<UML:CommentItem id="e8042ad8-f5bf-11ef-9ec2-4cbb5880a0b8">
 <matrix>
 <val>(1.0, 0.0, 0.0, 1.0, 666.7924311664914, 560.9671898788581)</val>
 </matrix>
@@ -910,16 +660,16 @@
 <subject>
 <ref refid="e80418f4-f5bf-11ef-9ec2-4cbb5880a0b8"/>
 </subject>
-</CommentItem>
-<CommentLineItem id="f6b48e4c-f5bf-11ef-9ec2-4cbb5880a0b8">
+</UML:CommentItem>
+<UML:CommentLineItem id="f6b48e4c-f5bf-11ef-9ec2-4cbb5880a0b8">
 <diagram>
 <ref refid="58d6c536-66f8-11ec-b4c8-0456e5e540ed"/>
 </diagram>
 <horizontal>
-<val>0</val>
+<val>False</val>
 </horizontal>
 <orthogonal>
-<val>0</val>
+<val>False</val>
 </orthogonal>
 <matrix>
 <val>(1.0, 0.0, 0.0, 1.0, 561.8951626340418, 549.6101338901756)</val>
@@ -933,16 +683,16 @@
 <tail-connection>
 <ref refid="d5113ca4-f5bf-11ef-9ec2-4cbb5880a0b8"/>
 </tail-connection>
-</CommentLineItem>
-<CommentLineItem id="f89ba010-f5bf-11ef-9ec2-4cbb5880a0b8">
+</UML:CommentLineItem>
+<UML:CommentLineItem id="f89ba010-f5bf-11ef-9ec2-4cbb5880a0b8">
 <diagram>
 <ref refid="58d6c536-66f8-11ec-b4c8-0456e5e540ed"/>
 </diagram>
 <horizontal>
-<val>0</val>
+<val>False</val>
 </horizontal>
 <orthogonal>
-<val>0</val>
+<val>False</val>
 </orthogonal>
 <matrix>
 <val>(1.0, 0.0, 0.0, 1.0, 559.3873501340418, 413.0007588901755)</val>
@@ -956,16 +706,16 @@
 <tail-connection>
 <ref refid="bff32eae-f5bf-11ef-9ec2-4cbb5880a0b8"/>
 </tail-connection>
-</CommentLineItem>
-<CommentLineItem id="fabe0540-f5bf-11ef-9ec2-4cbb5880a0b8">
+</UML:CommentLineItem>
+<UML:CommentLineItem id="fabe0540-f5bf-11ef-9ec2-4cbb5880a0b8">
 <diagram>
 <ref refid="58d6c536-66f8-11ec-b4c8-0456e5e540ed"/>
 </diagram>
 <horizontal>
-<val>0</val>
+<val>False</val>
 </horizontal>
 <orthogonal>
-<val>0</val>
+<val>False</val>
 </orthogonal>
 <matrix>
 <val>(1.0, 0.0, 0.0, 1.0, 522.3600063840418, 652.6882588901756)</val>
@@ -979,66 +729,8 @@
 <tail-connection>
 <ref refid="e8042ad8-f5bf-11ef-9ec2-4cbb5880a0b8"/>
 </tail-connection>
-</CommentLineItem>
-<Comment id="369e0038-f5c0-11ef-9ec2-4cbb5880a0b8">
-<annotatedElement>
-<reflist>
-<ref refid="09af424e-f59d-11ef-bfb1-4cbb5880a0b8"/>
-</reflist>
-</annotatedElement>
-<body>
-<val>Do not use these classes for new parsers</val>
-</body>
-<presentation>
-<reflist>
-<ref refid="369e14a6-f5c0-11ef-9ec2-4cbb5880a0b8"/>
-</reflist>
-</presentation>
-</Comment>
-<CommentItem id="369e14a6-f5c0-11ef-9ec2-4cbb5880a0b8">
-<matrix>
-<val>(1.0, 0.0, 0.0, 1.0, 59.50391387939453, 301.16000020170736)</val>
-</matrix>
-<top-left>
-<val>(-58.93360137939453, 0.0)</val>
-</top-left>
-<width>
-<val>144.78774075904175</val>
-</width>
-<height>
-<val>68.0</val>
-</height>
-<diagram>
-<ref refid="58d6c536-66f8-11ec-b4c8-0456e5e540ed"/>
-</diagram>
-<subject>
-<ref refid="369e0038-f5c0-11ef-9ec2-4cbb5880a0b8"/>
-</subject>
-</CommentItem>
-<CommentLineItem id="43ac1e04-f5c0-11ef-9ec2-4cbb5880a0b8">
-<diagram>
-<ref refid="58d6c536-66f8-11ec-b4c8-0456e5e540ed"/>
-</diagram>
-<horizontal>
-<val>0</val>
-</horizontal>
-<orthogonal>
-<val>0</val>
-</orthogonal>
-<matrix>
-<val>(1.0, 0.0, 0.0, 1.0, 65.93617825904175, 335.96078145170736)</val>
-</matrix>
-<points>
-<val>[(40.6686968734994, 33.19921875), (64.01299389673568, 52.90640604829264)]</val>
-</points>
-<head-connection>
-<ref refid="369e14a6-f5c0-11ef-9ec2-4cbb5880a0b8"/>
-</head-connection>
-<tail-connection>
-<ref refid="09af94d8-f59d-11ef-bfb1-4cbb5880a0b8"/>
-</tail-connection>
-</CommentLineItem>
-<Box id="531831f2-f5c0-11ef-9ec2-4cbb5880a0b8">
+</UML:CommentLineItem>
+<general:Box id="531831f2-f5c0-11ef-9ec2-4cbb5880a0b8">
 <matrix>
 <val>(1.0, 0.0, 0.0, 1.0, 375.05802564891326, 349.05453145170736)</val>
 </matrix>
@@ -1054,8 +746,8 @@
 <diagram>
 <ref refid="58d6c536-66f8-11ec-b4c8-0456e5e540ed"/>
 </diagram>
-</Box>
-<Comment id="5ccad4ca-f5c0-11ef-9ec2-4cbb5880a0b8">
+</general:Box>
+<UML:Comment id="5ccad4ca-f5c0-11ef-9ec2-4cbb5880a0b8">
 <body>
 <val>To create your own parser you have to extends one of these classes</val>
 </body>
@@ -1064,8 +756,8 @@
 <ref refid="5ccae8d4-f5c0-11ef-9ec2-4cbb5880a0b8"/>
 </reflist>
 </presentation>
-</Comment>
-<CommentItem id="5ccae8d4-f5c0-11ef-9ec2-4cbb5880a0b8">
+</UML:Comment>
+<UML:CommentItem id="5ccae8d4-f5c0-11ef-9ec2-4cbb5880a0b8">
 <matrix>
 <val>(1.0, 0.0, 0.0, 1.0, 756.725301794198, 225.57697659840966)</val>
 </matrix>
@@ -1084,16 +776,16 @@
 <subject>
 <ref refid="5ccad4ca-f5c0-11ef-9ec2-4cbb5880a0b8"/>
 </subject>
-</CommentItem>
-<CommentLineItem id="6f993af6-f5c0-11ef-9ec2-4cbb5880a0b8">
+</UML:CommentItem>
+<UML:CommentLineItem id="6f993af6-f5c0-11ef-9ec2-4cbb5880a0b8">
 <diagram>
 <ref refid="58d6c536-66f8-11ec-b4c8-0456e5e540ed"/>
 </diagram>
 <horizontal>
-<val>0</val>
+<val>False</val>
 </horizontal>
 <orthogonal>
-<val>0</val>
+<val>False</val>
 </orthogonal>
 <matrix>
 <val>(1.0, 0.0, 0.0, 1.0, 943.6141683885666, 419.2772168262177)</val>
@@ -1107,5 +799,6 @@
 <tail-connection>
 <ref refid="5ccae8d4-f5c0-11ef-9ec2-4cbb5880a0b8"/>
 </tail-connection>
-</CommentLineItem>
+</UML:CommentLineItem>
+</model>
 </gaphor>
\ No newline at end of file
diff --git a/docs/parser_classes.png b/docs/parser_classes.png
index 6f7251c5..d0430b1f 100644
Binary files a/docs/parser_classes.png and b/docs/parser_classes.png differ