diff --git a/.idea/runConfigurations/ZHV_Converter.xml b/.idea/runConfigurations/ZhvConverter.xml
similarity index 86%
rename from .idea/runConfigurations/ZHV_Converter.xml
rename to .idea/runConfigurations/ZhvConverter.xml
index 7f8f1304f74a2823d6e297fdd9db5fef01079262..83646323b9d79ede4a1a5e5d927931637466a686 100644
--- a/.idea/runConfigurations/ZHV_Converter.xml
+++ b/.idea/runConfigurations/ZhvConverter.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="ZHV_Converter" type="PythonConfigurationType" factoryName="Python" nameIsGenerated="true">
+  <configuration default="false" name="ZhvConverter" type="PythonConfigurationType" factoryName="Python" nameIsGenerated="true">
     <module name="ZHV-Tools" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
@@ -12,7 +12,7 @@
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/zhv_parser/ZHV_Converter.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/zhv_parser/ZhvConverter.py" />
     <option name="PARAMETERS" value="../data/examples_zhv/example_multiple_stations.xml" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="false" />
diff --git a/data/examples_zhv/example_multiple_stations.xml b/data/examples_zhv/example_multiple_stations.xml
index b4fee3dff7bdce7d8d414de0430923d30a20c401..efe79acfbb19a85d41e9a2f96a2925ed91e1b7df 100644
--- a/data/examples_zhv/example_multiple_stations.xml
+++ b/data/examples_zhv/example_multiple_stations.xml
@@ -2,89 +2,41 @@
 <GetResponseType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://zhv.xml.wvi/">
   <Items>
     <StopPlace>
-  <Name>
-    <Name>Chemnitz, TU Campus</Name>
-  </Name>
-  <Location>
-    <Latitude>50.813726</Latitude>
-    <Longitude>12.930835</Longitude>
-  </Location>
-  <Condition>
-    <ConditionKind>Served</ConditionKind>
-  </Condition>
-  <State>
-    <StateKind>InOrder</StateKind>
-  </State>
-  <DHID>de:14511:30220</DHID>
-  <Authority>
-    <AuthorityId>13</AuthorityId>
-    <Label>VVO</Label>
-  </Authority>
-  <Municipality>
-    <MunicipalityCode>14511000</MunicipalityCode>
-    <Label>Chemnitz</Label>
-  </Municipality>
-  <District>
-    <DistrictCode />
-    <Name />
-  </District>
-  <AreaQuay>
-    <Items>
-      <Area>
-        <Name>
-          <Name>Tram</Name>
-        </Name>
-        <Location>
-          <Latitude>50.813726</Latitude>
-          <Longitude>12.930871</Longitude>
-        </Location>
-        <Condition>
-          <ConditionKind>Served</ConditionKind>
-        </Condition>
-        <State>
-          <StateKind>InOrder</StateKind>
-        </State>
-        <DHID>de:14511:30220:1</DHID>
-        <Quays>
-          <Quay>
-            <Name>
-              <Name>ChemnitzBahn Süd 2A</Name>
-            </Name>
-            <Location>
-              <Latitude>50.813465</Latitude>
-              <Longitude>12.931051</Longitude>
-            </Location>
-            <Condition>
-              <ConditionKind>Served</ConditionKind>
-            </Condition>
-            <State>
-              <StateKind>InOrder</StateKind>
-            </State>
-            <DHID>de:14511:30220:1:2A</DHID>
-          </Quay>
-          <Quay>
-            <Name>
-              <Name>Tram Süd 2B</Name>
-            </Name>
-            <Location>
-              <Latitude>50.813709</Latitude>
-              <Longitude>12.930808</Longitude>
-            </Location>
-            <Condition>
-              <ConditionKind>Served</ConditionKind>
-            </Condition>
-            <State>
-              <StateKind>InOrder</StateKind>
-            </State>
-            <DHID>de:14511:30220:1:2B</DHID>
-          </Quay>
-          <Quay>
+      <Name>
+        <Name>Chemnitz, TU Campus</Name>
+      </Name>
+      <Location>
+        <Latitude>50.813726</Latitude>
+        <Longitude>12.930835</Longitude>
+      </Location>
+      <Condition>
+        <ConditionKind>Served</ConditionKind>
+      </Condition>
+      <State>
+        <StateKind>InOrder</StateKind>
+      </State>
+      <DHID>de:14511:30220</DHID>
+      <Authority>
+        <AuthorityId>13</AuthorityId>
+        <Label>VVO</Label>
+      </Authority>
+      <Municipality>
+        <MunicipalityCode>14511000</MunicipalityCode>
+        <Label>Chemnitz</Label>
+      </Municipality>
+      <District>
+        <DistrictCode />
+        <Name />
+      </District>
+      <AreaQuay>
+        <Items>
+          <Area>
             <Name>
-              <Name>ChemnitzBahn Nord 3A</Name>
+              <Name>Tram</Name>
             </Name>
             <Location>
-              <Latitude>50.813925</Latitude>
-              <Longitude>12.930719</Longitude>
+              <Latitude>50.813726</Latitude>
+              <Longitude>12.930871</Longitude>
             </Location>
             <Condition>
               <ConditionKind>Served</ConditionKind>
@@ -92,15 +44,97 @@
             <State>
               <StateKind>InOrder</StateKind>
             </State>
-            <DHID>de:14511:30220:1:3A</DHID>
-          </Quay>
-          <Quay>
+            <DHID>de:14511:30220:1</DHID>
+            <Quays>
+              <Quay>
+                <Name>
+                  <Name>ChemnitzBahn Süd 2A</Name>
+                </Name>
+                <Location>
+                  <Latitude>50.813465</Latitude>
+                  <Longitude>12.931051</Longitude>
+                </Location>
+                <Condition>
+                  <ConditionKind>Served</ConditionKind>
+                </Condition>
+                <State>
+                  <StateKind>InOrder</StateKind>
+                </State>
+                <DHID>de:14511:30220:1:2A</DHID>
+              </Quay>
+              <Quay>
+                <Name>
+                  <Name>Tram Süd 2B</Name>
+                </Name>
+                <Location>
+                  <Latitude>50.813709</Latitude>
+                  <Longitude>12.930808</Longitude>
+                </Location>
+                <Condition>
+                  <ConditionKind>Served</ConditionKind>
+                </Condition>
+                <State>
+                  <StateKind>InOrder</StateKind>
+                </State>
+                <DHID>de:14511:30220:1:2B</DHID>
+              </Quay>
+              <Quay>
+                <Name>
+                  <Name>ChemnitzBahn Nord 3A</Name>
+                </Name>
+                <Location>
+                  <Latitude>50.813925</Latitude>
+                  <Longitude>12.930719</Longitude>
+                </Location>
+                <Condition>
+                  <ConditionKind>Served</ConditionKind>
+                </Condition>
+                <State>
+                  <StateKind>InOrder</StateKind>
+                </State>
+                <DHID>de:14511:30220:1:3A</DHID>
+              </Quay>
+              <Quay>
+                <Name>
+                  <Name>Tram Nord 3B</Name>
+                </Name>
+                <Location>
+                  <Latitude>50.813658</Latitude>
+                  <Longitude>12.930979</Longitude>
+                </Location>
+                <Condition>
+                  <ConditionKind>Served</ConditionKind>
+                </Condition>
+                <State>
+                  <StateKind>InOrder</StateKind>
+                </State>
+                <DHID>de:14511:30220:1:3B</DHID>
+              </Quay>
+              <Quay>
+                <Name>
+                  <Name>Zugang Fußgänger</Name>
+                </Name>
+                <Location>
+                  <Latitude>50.81409</Latitude>
+                  <Longitude>12.930521</Longitude>
+                </Location>
+                <Condition>
+                  <ConditionKind>Unserved</ConditionKind>
+                </Condition>
+                <State>
+                  <StateKind>OutOfOrder</StateKind>
+                </State>
+                <DHID>de:14511:30220:1:F</DHID>
+              </Quay>
+            </Quays>
+          </Area>
+          <Area>
             <Name>
-              <Name>Tram Nord 3B</Name>
+              <Name>Bus</Name>
             </Name>
             <Location>
-              <Latitude>50.813658</Latitude>
-              <Longitude>12.930979</Longitude>
+              <Latitude>50.813817</Latitude>
+              <Longitude>12.930772</Longitude>
             </Location>
             <Condition>
               <ConditionKind>Served</ConditionKind>
@@ -108,49 +142,81 @@
             <State>
               <StateKind>InOrder</StateKind>
             </State>
-            <DHID>de:14511:30220:1:3B</DHID>
-          </Quay>
-          <Quay>
-            <Name>
-              <Name>Zugang Fußgänger</Name>
-            </Name>
-            <Location>
-              <Latitude>50.81409</Latitude>
-              <Longitude>12.930521</Longitude>
-            </Location>
-            <Condition>
-              <ConditionKind>Unserved</ConditionKind>
-            </Condition>
-            <State>
-              <StateKind>OutOfOrder</StateKind>
-            </State>
-            <DHID>de:14511:30220:1:F</DHID>
-          </Quay>
-        </Quays>
-      </Area>
-      <Area>
-        <Name>
-          <Name>Bus</Name>
-        </Name>
-        <Location>
-          <Latitude>50.813817</Latitude>
-          <Longitude>12.930772</Longitude>
-        </Location>
-        <Condition>
-          <ConditionKind>Served</ConditionKind>
-        </Condition>
-        <State>
-          <StateKind>InOrder</StateKind>
-        </State>
-        <DHID>de:14511:30220:2</DHID>
-        <Quays>
-          <Quay>
+            <DHID>de:14511:30220:2</DHID>
+            <Quays>
+              <Quay>
+                <Name>
+                  <Name>Bus Süd 1</Name>
+                </Name>
+                <Location>
+                  <Latitude>50.813721</Latitude>
+                  <Longitude>12.930683</Longitude>
+                </Location>
+                <Condition>
+                  <ConditionKind>Served</ConditionKind>
+                </Condition>
+                <State>
+                  <StateKind>InOrder</StateKind>
+                </State>
+                <DHID>de:14511:30220:2:1</DHID>
+              </Quay>
+              <Quay>
+                <Name>
+                  <Name>Bus Nord 4</Name>
+                </Name>
+                <Location>
+                  <Latitude>50.813936</Latitude>
+                  <Longitude>12.930844</Longitude>
+                </Location>
+                <Condition>
+                  <ConditionKind>Served</ConditionKind>
+                </Condition>
+                <State>
+                  <StateKind>InOrder</StateKind>
+                </State>
+                <DHID>de:14511:30220:2:4</DHID>
+              </Quay>
+            </Quays>
+          </Area>
+        </Items>
+      </AreaQuay>
+    </StopPlace>
+    <StopPlace>
+      <Name>
+        <Name>Chemnitz, Rosenbergstr</Name>
+      </Name>
+      <Location>
+        <Latitude>50.817779</Latitude>
+        <Longitude>12.929326</Longitude>
+      </Location>
+      <Condition>
+        <ConditionKind>Served</ConditionKind>
+      </Condition>
+      <State>
+        <StateKind>InOrder</StateKind>
+      </State>
+      <DHID>de:14511:30222</DHID>
+      <Authority>
+        <AuthorityId>13</AuthorityId>
+        <Label>VVO</Label>
+      </Authority>
+      <Municipality>
+        <MunicipalityCode>14511000</MunicipalityCode>
+        <Label>Chemnitz</Label>
+      </Municipality>
+      <District>
+        <DistrictCode />
+        <Name />
+      </District>
+      <AreaQuay>
+        <Items>
+          <Area>
             <Name>
-              <Name>Bus Süd 1</Name>
+              <Name>Tram</Name>
             </Name>
             <Location>
-              <Latitude>50.813721</Latitude>
-              <Longitude>12.930683</Longitude>
+              <Latitude>50.817802</Latitude>
+              <Longitude>12.929335</Longitude>
             </Location>
             <Condition>
               <ConditionKind>Served</ConditionKind>
@@ -158,15 +224,97 @@
             <State>
               <StateKind>InOrder</StateKind>
             </State>
-            <DHID>de:14511:30220:2:1</DHID>
-          </Quay>
-          <Quay>
+            <DHID>de:14511:30222:1</DHID>
+            <Quays>
+              <Quay>
+                <Name>
+                  <Name>ChemnitzBahnn Nord</Name>
+                </Name>
+                <Location>
+                  <Latitude>50.818023</Latitude>
+                  <Longitude>12.929236</Longitude>
+                </Location>
+                <Condition>
+                  <ConditionKind>Served</ConditionKind>
+                </Condition>
+                <State>
+                  <StateKind>InOrder</StateKind>
+                </State>
+                <DHID>de:14511:30222:1:CN</DHID>
+              </Quay>
+              <Quay>
+                <Name>
+                  <Name>ChemnitzBahn Süd</Name>
+                </Name>
+                <Location>
+                  <Latitude>50.817506</Latitude>
+                  <Longitude>12.92938</Longitude>
+                </Location>
+                <Condition>
+                  <ConditionKind>Served</ConditionKind>
+                </Condition>
+                <State>
+                  <StateKind>InOrder</StateKind>
+                </State>
+                <DHID>de:14511:30222:1:CS</DHID>
+              </Quay>
+              <Quay>
+                <Name>
+                  <Name>Zugang Fußgänger</Name>
+                </Name>
+                <Location>
+                  <Latitude>50.818301</Latitude>
+                  <Longitude>12.929039</Longitude>
+                </Location>
+                <Condition>
+                  <ConditionKind>Unserved</ConditionKind>
+                </Condition>
+                <State>
+                  <StateKind>OutOfOrder</StateKind>
+                </State>
+                <DHID>de:14511:30222:1:F</DHID>
+              </Quay>
+              <Quay>
+                <Name>
+                  <Name>Tram Nord</Name>
+                </Name>
+                <Location>
+                  <Latitude>50.817751</Latitude>
+                  <Longitude>12.929416</Longitude>
+                </Location>
+                <Condition>
+                  <ConditionKind>Served</ConditionKind>
+                </Condition>
+                <State>
+                  <StateKind>InOrder</StateKind>
+                </State>
+                <DHID>de:14511:30222:1:TN</DHID>
+              </Quay>
+              <Quay>
+                <Name>
+                  <Name>Tram Süd</Name>
+                </Name>
+                <Location>
+                  <Latitude>50.817824</Latitude>
+                  <Longitude>12.92929</Longitude>
+                </Location>
+                <Condition>
+                  <ConditionKind>Served</ConditionKind>
+                </Condition>
+                <State>
+                  <StateKind>InOrder</StateKind>
+                </State>
+                <DHID>de:14511:30222:1:TS</DHID>
+              </Quay>
+            </Quays>
+          </Area>
+          <Area>
             <Name>
-              <Name>Bus Nord 4</Name>
+              <Name>Bus</Name>
             </Name>
             <Location>
-              <Latitude>50.813936</Latitude>
-              <Longitude>12.930844</Longitude>
+              <Latitude>50.817802</Latitude>
+              <Longitude>12.929299</Longitude>
             </Location>
             <Condition>
               <ConditionKind>Served</ConditionKind>
@@ -174,273 +322,125 @@
             <State>
               <StateKind>InOrder</StateKind>
             </State>
-            <DHID>de:14511:30220:2:4</DHID>
-          </Quay>
-        </Quays>
-      </Area>
-    </Items>
-  </AreaQuay>
-</StopPlace>
-<StopPlace>
-<Name>
-  <Name>Chemnitz, Rosenbergstr</Name>
-</Name>
-<Location>
-  <Latitude>50.817779</Latitude>
-  <Longitude>12.929326</Longitude>
-</Location>
-<Condition>
-  <ConditionKind>Served</ConditionKind>
-</Condition>
-<State>
-  <StateKind>InOrder</StateKind>
-</State>
-<DHID>de:14511:30222</DHID>
-<Authority>
-  <AuthorityId>13</AuthorityId>
-  <Label>VVO</Label>
-</Authority>
-<Municipality>
-  <MunicipalityCode>14511000</MunicipalityCode>
-  <Label>Chemnitz</Label>
-</Municipality>
-<District>
-  <DistrictCode />
-  <Name />
-</District>
-<AreaQuay>
-  <Items>
-    <Area>
-      <Name>
-        <Name>Tram</Name>
-      </Name>
-      <Location>
-        <Latitude>50.817802</Latitude>
-        <Longitude>12.929335</Longitude>
-      </Location>
-      <Condition>
-        <ConditionKind>Served</ConditionKind>
-      </Condition>
-      <State>
-        <StateKind>InOrder</StateKind>
-      </State>
-      <DHID>de:14511:30222:1</DHID>
-      <Quays>
-        <Quay>
-          <Name>
-            <Name>ChemnitzBahnn Nord</Name>
-          </Name>
-          <Location>
-            <Latitude>50.818023</Latitude>
-            <Longitude>12.929236</Longitude>
-          </Location>
-          <Condition>
-            <ConditionKind>Served</ConditionKind>
-          </Condition>
-          <State>
-            <StateKind>InOrder</StateKind>
-          </State>
-          <DHID>de:14511:30222:1:CN</DHID>
-        </Quay>
-        <Quay>
-          <Name>
-            <Name>ChemnitzBahn Süd</Name>
-          </Name>
-          <Location>
-            <Latitude>50.817506</Latitude>
-            <Longitude>12.92938</Longitude>
-          </Location>
-          <Condition>
-            <ConditionKind>Served</ConditionKind>
-          </Condition>
-          <State>
-            <StateKind>InOrder</StateKind>
-          </State>
-          <DHID>de:14511:30222:1:CS</DHID>
-        </Quay>
-        <Quay>
-          <Name>
-            <Name>Zugang Fußgänger</Name>
-          </Name>
-          <Location>
-            <Latitude>50.818301</Latitude>
-            <Longitude>12.929039</Longitude>
-          </Location>
-          <Condition>
-            <ConditionKind>Unserved</ConditionKind>
-          </Condition>
-          <State>
-            <StateKind>OutOfOrder</StateKind>
-          </State>
-          <DHID>de:14511:30222:1:F</DHID>
-        </Quay>
-        <Quay>
-          <Name>
-            <Name>Tram Nord</Name>
-          </Name>
-          <Location>
-            <Latitude>50.817751</Latitude>
-            <Longitude>12.929416</Longitude>
-          </Location>
-          <Condition>
-            <ConditionKind>Served</ConditionKind>
-          </Condition>
-          <State>
-            <StateKind>InOrder</StateKind>
-          </State>
-          <DHID>de:14511:30222:1:TN</DHID>
-        </Quay>
-        <Quay>
-          <Name>
-            <Name>Tram Süd</Name>
-          </Name>
-          <Location>
-            <Latitude>50.817824</Latitude>
-            <Longitude>12.92929</Longitude>
-          </Location>
-          <Condition>
-            <ConditionKind>Served</ConditionKind>
-          </Condition>
-          <State>
-            <StateKind>InOrder</StateKind>
-          </State>
-          <DHID>de:14511:30222:1:TS</DHID>
-        </Quay>
-      </Quays>
-    </Area>
-    <Area>
+            <DHID>de:14511:30222:2</DHID>
+            <Quays>
+              <Quay>
+                <Name>
+                  <Name>Bus Nord</Name>
+                </Name>
+                <Location>
+                  <Latitude>50.81804</Latitude>
+                  <Longitude>12.92938</Longitude>
+                </Location>
+                <Condition>
+                  <ConditionKind>Served</ConditionKind>
+                </Condition>
+                <State>
+                  <StateKind>InOrder</StateKind>
+                </State>
+                <DHID>de:14511:30222:2:BN</DHID>
+              </Quay>
+              <Quay>
+                <Name>
+                  <Name>Bus Süd</Name>
+                </Name>
+                <Location>
+                  <Latitude>50.817569</Latitude>
+                  <Longitude>12.929209</Longitude>
+                </Location>
+                <Condition>
+                  <ConditionKind>Served</ConditionKind>
+                </Condition>
+                <State>
+                  <StateKind>InOrder</StateKind>
+                </State>
+                <DHID>de:14511:30222:2:BS</DHID>
+              </Quay>
+            </Quays>
+          </Area>
+        </Items>
+      </AreaQuay>
+    </StopPlace>
+    <StopPlace>
       <Name>
-        <Name>Bus</Name>
+        <Name>Beckedorf (Schaumb.), Robert-Koch-Str.</Name>
       </Name>
       <Location>
-        <Latitude>50.817802</Latitude>
-        <Longitude>12.929299</Longitude>
+        <Latitude>52.337202</Latitude>
+        <Longitude>9.319024</Longitude>
       </Location>
       <Condition>
         <ConditionKind>Served</ConditionKind>
       </Condition>
-      <State>
-        <StateKind>InOrder</StateKind>
-      </State>
-      <DHID>de:14511:30222:2</DHID>
-      <Quays>
-        <Quay>
-          <Name>
-            <Name>Bus Nord</Name>
-          </Name>
-          <Location>
-            <Latitude>50.81804</Latitude>
-            <Longitude>12.92938</Longitude>
-          </Location>
-          <Condition>
-            <ConditionKind>Served</ConditionKind>
-          </Condition>
-          <State>
-            <StateKind>InOrder</StateKind>
-          </State>
-          <DHID>de:14511:30222:2:BN</DHID>
-        </Quay>
-        <Quay>
-          <Name>
-            <Name>Bus Süd</Name>
-          </Name>
-          <Location>
-            <Latitude>50.817569</Latitude>
-            <Longitude>12.929209</Longitude>
-          </Location>
-          <Condition>
-            <ConditionKind>Served</ConditionKind>
-          </Condition>
-          <State>
-            <StateKind>InOrder</StateKind>
-          </State>
-          <DHID>de:14511:30222:2:BS</DHID>
-        </Quay>
-      </Quays>
-    </Area>
-  </Items>
-</AreaQuay>
-</StopPlace>
-<StopPlace>
-  <Name>
-    <Name>Beckedorf (Schaumb.), Robert-Koch-Str.</Name>
-  </Name>
-  <Location>
-    <Latitude>52.337202</Latitude>
-    <Longitude>9.319024</Longitude>
-  </Location>
-  <Condition>
-    <ConditionKind>Served</ConditionKind>
-  </Condition>
-  <DHID>de:03257:1014</DHID>
-  <Authority>
-    <AuthorityId>9</AuthorityId>
-    <Label>HannIT</Label>
-  </Authority>
-  <Municipality>
-    <MunicipalityCode>03257007</MunicipalityCode>
-    <Label>Beckedorf</Label>
-  </Municipality>
-  <District>
-    <DistrictCode>-</DistrictCode>
-    <Name>-</Name>
-  </District>
-  <AreaQuay>
-    <Items>
-      <Area>
-        <Name>
-          <Name>1</Name>
-        </Name>
-        <Location>
-          <Latitude>52.337174</Latitude>
-          <Longitude>9.318997</Longitude>
-        </Location>
-        <Condition>
-          <ConditionKind>Unknown</ConditionKind>
-        </Condition>
-        <Description>
-          <Description>BBus</Description>
-        </Description>
-        <DHID>de:03257:1014:1</DHID>
-        <Quays>
-          <Quay>
+      <DHID>de:03257:1014</DHID>
+      <Authority>
+        <AuthorityId>9</AuthorityId>
+        <Label>HannIT</Label>
+      </Authority>
+      <Municipality>
+        <MunicipalityCode>03257007</MunicipalityCode>
+        <Label>Beckedorf</Label>
+      </Municipality>
+      <District>
+        <DistrictCode>-</DistrictCode>
+        <Name>-</Name>
+      </District>
+      <AreaQuay>
+        <Items>
+          <Area>
             <Name>
               <Name>1</Name>
             </Name>
             <Location>
-              <Latitude>52.337191</Latitude>
-              <Longitude>9.319033</Longitude>
-            </Location>
-            <Condition>
-              <ConditionKind>Unknown</ConditionKind>
-            </Condition>
-            <Description>
-              <Description>Bus 1</Description>
-            </Description>
-            <DHID>de:03257:1014:1:1</DHID>
-          </Quay>
-          <Quay>
-            <Name>
-              <Name>2</Name>
-            </Name>
-            <Location>
-              <Latitude>52.337207</Latitude>
-              <Longitude>9.318979</Longitude>
+              <Latitude>52.337174</Latitude>
+              <Longitude>9.318997</Longitude>
             </Location>
             <Condition>
               <ConditionKind>Unknown</ConditionKind>
             </Condition>
             <Description>
-              <Description>Bus 2</Description>
+              <Description>BBus</Description>
             </Description>
-            <DHID>de:03257:1014:1:2</DHID>
-          </Quay>
-        </Quays>
-      </Area>
-    </Items>
-  </AreaQuay>
-</StopPlace>
-<StopPlace>
+            <DHID>de:03257:1014:1</DHID>
+            <Quays>
+              <Quay>
+                <Name>
+                  <Name>1</Name>
+                </Name>
+                <Location>
+                  <Latitude>52.337191</Latitude>
+                  <Longitude>9.319033</Longitude>
+                </Location>
+                <Condition>
+                  <ConditionKind>Unknown</ConditionKind>
+                </Condition>
+                <Description>
+                  <Description>Bus 1</Description>
+                </Description>
+                <DHID>de:03257:1014:1:1</DHID>
+              </Quay>
+              <Quay>
+                <Name>
+                  <Name>2</Name>
+                </Name>
+                <Location>
+                  <Latitude>52.337207</Latitude>
+                  <Longitude>9.318979</Longitude>
+                </Location>
+                <Condition>
+                  <ConditionKind>Unknown</ConditionKind>
+                </Condition>
+                <Description>
+                  <Description>Bus 2</Description>
+                </Description>
+                <DHID>de:03257:1014:1:2</DHID>
+              </Quay>
+            </Quays>
+          </Area>
+        </Items>
+      </AreaQuay>
+    </StopPlace>
+    <StopPlace>
       <Name>
         <Name>Dresden Fährstelle Ostragehege</Name>
       </Name>
@@ -519,5 +519,62 @@
         </Items>
       </AreaQuay>
     </StopPlace>
-</Items>
+    <StopPlace>
+      <Name>
+        <Name>S Neuenhagen</Name>
+      </Name>
+      <Location>
+        <Latitude>52.520674</Latitude>
+        <Longitude>13.699994</Longitude>
+      </Location>
+      <Condition>
+        <ConditionKind>Served</ConditionKind>
+      </Condition>
+      <DHID>de:12064:900320007</DHID>
+      <Authority>
+        <AuthorityId>3</AuthorityId>
+        <Label>VBB</Label>
+      </Authority>
+      <Municipality>
+        <MunicipalityCode>12064336</MunicipalityCode>
+        <Label>Neuenhagen bei Berlin</Label>
+      </Municipality>
+      <District>
+        <DistrictCode />
+        <Name />
+      </District>
+      <AreaQuay>
+        <Items>
+          <Area>
+            <Name>
+              <Name>S-Bahnsteig Gleis 1</Name>
+            </Name>
+            <Location>
+              <Latitude>52.52079</Latitude>
+              <Longitude>13.70045</Longitude>
+            </Location>
+            <Condition>
+              <ConditionKind>Served</ConditionKind>
+            </Condition>
+            <DHID>de:12064:900320007:1</DHID>
+            <Quays>
+              <Quay>
+                <Name>
+                  <Name>S-Bahnsteig Gleis 1</Name>
+                </Name>
+                <Location>
+                  <Latitude>52.52078</Latitude>
+                  <Longitude>13.700395</Longitude>
+                </Location>
+                <Condition>
+                  <ConditionKind>Served</ConditionKind>
+                </Condition>
+                <DHID>de:12064:900320007:1:50</DHID>
+              </Quay>
+            </Quays>
+          </Area>
+        </Items>
+      </AreaQuay>
+    </StopPlace>
+  </Items>
 </GetResponseType>
diff --git a/data/region_boundaries/sachsen.poly b/data/region_boundaries/sachsen.poly
deleted file mode 100644
index 6d000c4838d5254d6433a62096eacaf738a06bff..0000000000000000000000000000000000000000
--- a/data/region_boundaries/sachsen.poly
+++ /dev/null
@@ -1,342 +0,0 @@
-none
-1
-   1.474579E+01   5.158172E+01
-   1.474310E+01   5.157898E+01
-   1.472602E+01   5.156452E+01
-   1.474243E+01   5.154070E+01
-   1.474795E+01   5.153143E+01
-   1.474915E+01   5.153130E+01
-   1.485274E+01   5.150766E+01
-   1.491869E+01   5.149319E+01
-   1.495094E+01   5.148427E+01
-   1.496053E+01   5.147519E+01
-   1.498033E+01   5.143681E+01
-   1.498885E+01   5.139591E+01
-   1.498939E+01   5.137327E+01
-   1.499250E+01   5.134461E+01
-   1.500064E+01   5.133931E+01
-   1.500214E+01   5.133212E+01
-   1.504596E+01   5.129975E+01
-   1.505078E+01   5.123583E+01
-   1.502117E+01   5.120425E+01
-   1.501598E+01   5.117244E+01
-   1.499701E+01   5.110608E+01
-   1.497836E+01   5.106176E+01
-   1.490178E+01   5.093087E+01
-   1.484115E+01   5.088907E+01
-   1.483560E+01   5.088562E+01
-   1.483398E+01   5.087891E+01
-   1.481370E+01   5.082151E+01
-   1.478332E+01   5.081622E+01
-   1.471107E+01   5.081844E+01
-   1.470760E+01   5.083119E+01
-   1.468303E+01   5.083499E+01
-   1.460047E+01   5.085431E+01
-   1.459936E+01   5.085471E+01
-   1.463789E+01   5.091833E+01
-   1.464210E+01   5.092208E+01
-   1.457823E+01   5.090779E+01
-   1.455977E+01   5.090399E+01
-   1.455210E+01   5.093715E+01
-   1.457589E+01   5.095659E+01
-   1.458175E+01   5.097275E+01
-   1.458596E+01   5.097749E+01
-   1.458393E+01   5.097879E+01
-   1.458498E+01   5.098168E+01
-   1.455514E+01   5.100025E+01
-   1.454361E+01   5.099937E+01
-   1.452797E+01   5.100026E+01
-   1.452345E+01   5.100191E+01
-   1.452540E+01   5.101210E+01
-   1.449272E+01   5.101310E+01
-   1.446218E+01   5.102423E+01
-   1.445095E+01   5.102080E+01
-   1.441029E+01   5.101006E+01
-   1.434728E+01   5.102991E+01
-   1.431407E+01   5.104243E+01
-   1.427493E+01   5.099271E+01
-   1.429657E+01   5.099276E+01
-   1.432594E+01   5.098959E+01
-   1.432994E+01   5.098415E+01
-   1.433452E+01   5.097208E+01
-   1.432227E+01   5.096816E+01
-   1.433140E+01   5.095376E+01
-   1.440874E+01   5.093953E+01
-   1.441492E+01   5.093769E+01
-   1.439726E+01   5.088617E+01
-   1.424942E+01   5.087153E+01
-   1.423982E+01   5.085493E+01
-   1.418893E+01   5.083773E+01
-   1.408357E+01   5.080550E+01
-   1.405581E+01   5.079981E+01
-   1.397948E+01   5.079781E+01
-   1.395918E+01   5.077999E+01
-   1.395684E+01   5.077951E+01
-   1.390768E+01   5.077487E+01
-   1.391193E+01   5.074351E+01
-   1.384519E+01   5.071483E+01
-   1.382394E+01   5.071432E+01
-   1.375672E+01   5.072195E+01
-   1.368628E+01   5.071126E+01
-   1.366279E+01   5.072012E+01
-   1.362166E+01   5.070791E+01
-   1.356285E+01   5.070578E+01
-   1.355523E+01   5.070187E+01
-   1.355071E+01   5.070156E+01
-   1.355089E+01   5.069964E+01
-   1.354660E+01   5.069744E+01
-   1.355152E+01   5.069289E+01
-   1.355403E+01   5.066593E+01
-   1.355387E+01   5.066474E+01
-   1.353104E+01   5.065342E+01
-   1.353370E+01   5.063757E+01
-   1.353063E+01   5.063353E+01
-   1.351868E+01   5.062639E+01
-   1.350249E+01   5.062322E+01
-   1.348289E+01   5.060501E+01
-   1.346554E+01   5.059464E+01
-   1.340331E+01   5.061242E+01
-   1.339414E+01   5.063167E+01
-   1.337352E+01   5.061695E+01
-   1.335195E+01   5.060633E+01
-   1.333414E+01   5.059850E+01
-   1.333600E+01   5.057887E+01
-   1.329556E+01   5.057054E+01
-   1.328221E+01   5.056818E+01
-   1.328128E+01   5.056973E+01
-   1.327580E+01   5.058134E+01
-   1.327446E+01   5.058109E+01
-   1.327341E+01   5.058283E+01
-   1.325251E+01   5.058203E+01
-   1.325027E+01   5.057659E+01
-   1.324740E+01   5.057606E+01
-   1.323286E+01   5.053889E+01
-   1.319893E+01   5.049486E+01
-   1.318832E+01   5.049478E+01
-   1.311708E+01   5.049812E+01
-   1.308787E+01   5.049407E+01
-   1.304347E+01   5.049376E+01
-   1.304247E+01   5.048779E+01
-   1.304098E+01   5.048758E+01
-   1.303075E+01   5.044381E+01
-   1.298826E+01   5.041597E+01
-   1.296878E+01   5.040711E+01
-   1.294442E+01   5.039928E+01
-   1.287835E+01   5.042749E+01
-   1.283353E+01   5.044527E+01
-   1.282147E+01   5.043339E+01
-   1.281163E+01   5.042646E+01
-   1.280311E+01   5.042681E+01
-   1.278987E+01   5.043735E+01
-   1.278810E+01   5.043899E+01
-   1.278788E+01   5.043893E+01
-   1.278656E+01   5.043998E+01
-   1.278081E+01   5.043705E+01
-   1.274678E+01   5.042799E+01
-   1.271770E+01   5.040624E+01
-   1.271242E+01   5.039525E+01
-   1.269854E+01   5.039409E+01
-   1.267133E+01   5.040722E+01
-   1.255870E+01   5.039114E+01
-   1.251684E+01   5.038957E+01
-   1.251439E+01   5.038383E+01
-   1.249940E+01   5.037166E+01
-   1.249848E+01   5.034654E+01
-   1.249806E+01   5.034556E+01
-   1.246687E+01   5.034338E+01
-   1.245052E+01   5.033642E+01
-   1.244639E+01   5.032220E+01
-   1.240879E+01   5.031439E+01
-   1.241315E+01   5.029536E+01
-   1.240428E+01   5.028818E+01
-   1.239947E+01   5.028526E+01
-   1.239880E+01   5.028437E+01
-   1.238392E+01   5.028256E+01
-   1.236268E+01   5.025619E+01
-   1.236448E+01   5.023848E+01
-   1.234218E+01   5.023388E+01
-   1.234339E+01   5.021733E+01
-   1.234320E+01   5.018955E+01
-   1.233281E+01   5.016750E+01
-   1.228694E+01   5.017165E+01
-   1.226865E+01   5.019606E+01
-   1.227119E+01   5.022284E+01
-   1.223236E+01   5.024537E+01
-   1.223705E+01   5.026372E+01
-   1.219353E+01   5.027036E+01
-   1.217399E+01   5.031796E+01
-   1.215266E+01   5.031426E+01
-   1.210021E+01   5.031351E+01
-   1.207804E+01   5.032785E+01
-   1.204409E+01   5.032051E+01
-   1.199071E+01   5.034409E+01
-   1.197265E+01   5.034479E+01
-   1.196362E+01   5.035492E+01
-   1.197374E+01   5.038478E+01
-   1.194829E+01   5.039054E+01
-   1.191599E+01   5.042107E+01
-   1.192091E+01   5.043275E+01
-   1.189518E+01   5.043467E+01
-   1.188026E+01   5.044627E+01
-   1.190107E+01   5.045969E+01
-   1.193966E+01   5.047380E+01
-   1.192625E+01   5.051542E+01
-   1.188300E+01   5.051559E+01
-   1.186685E+01   5.054517E+01
-   1.188848E+01   5.056187E+01
-   1.192297E+01   5.056387E+01
-   1.192707E+01   5.059411E+01
-   1.195663E+01   5.061340E+01
-   1.197935E+01   5.063181E+01
-   1.201959E+01   5.064526E+01
-   1.204094E+01   5.062998E+01
-   1.202671E+01   5.061783E+01
-   1.205354E+01   5.060341E+01
-   1.204669E+01   5.058238E+01
-   1.203547E+01   5.057421E+01
-   1.204368E+01   5.056309E+01
-   1.207940E+01   5.056961E+01
-   1.207968E+01   5.058595E+01
-   1.211362E+01   5.059133E+01
-   1.212402E+01   5.058021E+01
-   1.214674E+01   5.059411E+01
-   1.215222E+01   5.061774E+01
-   1.214346E+01   5.063267E+01
-   1.215961E+01   5.064031E+01
-   1.219930E+01   5.064031E+01
-   1.220450E+01   5.065090E+01
-   1.222859E+01   5.065142E+01
-   1.223625E+01   5.064500E+01
-   1.226527E+01   5.064795E+01
-   1.228744E+01   5.066149E+01
-   1.231783E+01   5.067658E+01
-   1.231591E+01   5.068647E+01
-   1.227239E+01   5.069271E+01
-   1.223105E+01   5.074912E+01
-   1.223489E+01   5.077509E+01
-   1.225733E+01   5.079949E+01
-   1.224666E+01   5.081575E+01
-   1.225186E+01   5.082820E+01
-   1.231646E+01   5.084376E+01
-   1.238339E+01   5.086536E+01
-   1.244525E+01   5.086882E+01
-   1.248768E+01   5.090301E+01
-   1.254037E+01   5.091734E+01
-   1.263262E+01   5.091906E+01
-   1.263070E+01   5.095236E+01
-   1.261893E+01   5.098623E+01
-   1.258800E+01   5.098347E+01
-   1.252258E+01   5.100208E+01
-   1.250273E+01   5.106070E+01
-   1.236053E+01   5.107308E+01
-   1.235683E+01   5.109363E+01
-   1.228700E+01   5.108745E+01
-   1.222345E+01   5.110402E+01
-   1.219814E+01   5.114369E+01
-   1.220054E+01   5.117775E+01
-   1.217680E+01   5.117941E+01
-   1.217704E+01   5.120015E+01
-   1.219481E+01   5.121526E+01
-   1.219149E+01   5.125154E+01
-   1.216717E+01   5.126081E+01
-   1.216562E+01   5.128516E+01
-   1.213566E+01   5.131993E+01
-   1.218231E+01   5.133899E+01
-   1.217347E+01   5.141243E+01
-   1.218165E+01   5.142524E+01
-   1.215820E+01   5.143388E+01
-   1.215169E+01   5.146561E+01
-   1.217732E+01   5.147514E+01
-   1.217861E+01   5.148577E+01
-   1.220660E+01   5.149042E+01
-   1.221007E+01   5.149656E+01
-   1.219024E+01   5.150243E+01
-   1.219397E+01   5.152778E+01
-   1.221358E+01   5.154336E+01
-   1.223773E+01   5.155343E+01
-   1.223439E+01   5.156070E+01
-   1.224787E+01   5.157147E+01
-   1.230704E+01   5.156962E+01
-   1.235352E+01   5.159285E+01
-   1.242657E+01   5.158896E+01
-   1.242722E+01   5.160568E+01
-   1.245182E+01   5.161287E+01
-   1.256073E+01   5.161412E+01
-   1.259047E+01   5.162977E+01
-   1.263535E+01   5.163243E+01
-   1.264997E+01   5.162523E+01
-   1.267039E+01   5.163571E+01
-   1.269232E+01   5.166379E+01
-   1.275282E+01   5.166238E+01
-   1.278131E+01   5.165019E+01
-   1.279366E+01   5.166582E+01
-   1.284030E+01   5.168380E+01
-   1.286702E+01   5.168380E+01
-   1.291113E+01   5.166707E+01
-   1.291340E+01   5.165269E+01
-   1.297743E+01   5.165566E+01
-   1.297315E+01   5.166958E+01
-   1.303567E+01   5.166879E+01
-   1.303995E+01   5.164315E+01
-   1.306428E+01   5.165378E+01
-   1.310940E+01   5.161576E+01
-   1.313663E+01   5.162327E+01
-   1.317784E+01   5.160292E+01
-   1.321112E+01   5.155906E+01
-   1.323646E+01   5.152292E+01
-   1.322889E+01   5.144616E+01
-   1.323759E+01   5.140497E+01
-   1.328876E+01   5.140529E+01
-   1.328675E+01   5.141551E+01
-   1.333313E+01   5.144569E+01
-   1.337952E+01   5.144333E+01
-   1.341809E+01   5.146077E+01
-   1.343611E+01   5.145409E+01
-   1.349334E+01   5.142706E+01
-   1.354375E+01   5.140883E+01
-   1.355409E+01   5.139058E+01
-   1.361182E+01   5.139373E+01
-   1.362201E+01   5.137784E+01
-   1.367102E+01   5.137784E+01
-   1.368681E+01   5.138340E+01
-   1.374675E+01   5.137202E+01
-   1.375445E+01   5.136773E+01
-   1.376336E+01   5.137733E+01
-   1.381155E+01   5.137683E+01
-   1.384800E+01   5.138997E+01
-   1.393953E+01   5.139199E+01
-   1.396909E+01   5.140311E+01
-   1.399339E+01   5.140261E+01
-   1.399258E+01   5.138214E+01
-   1.400473E+01   5.137936E+01
-   1.400513E+01   5.139199E+01
-   1.401404E+01   5.140412E+01
-   1.404847E+01   5.142307E+01
-   1.405029E+01   5.144314E+01
-   1.406851E+01   5.144995E+01
-   1.404341E+01   5.148174E+01
-   1.410942E+01   5.150696E+01
-   1.411124E+01   5.152611E+01
-   1.415012E+01   5.154929E+01
-   1.422302E+01   5.154475E+01
-   1.428822E+01   5.153493E+01
-   1.434046E+01   5.152183E+01
-   1.439271E+01   5.154249E+01
-   1.445143E+01   5.154576E+01
-   1.445105E+01   5.155649E+01
-   1.450044E+01   5.155775E+01
-   1.454378E+01   5.155900E+01
-   1.454428E+01   5.156809E+01
-   1.456545E+01   5.157560E+01
-   1.458813E+01   5.157592E+01
-   1.460879E+01   5.156621E+01
-   1.460829E+01   5.155367E+01
-   1.462038E+01   5.155336E+01
-   1.462340E+01   5.155806E+01
-   1.466826E+01   5.155837E+01
-   1.467934E+01   5.158469E+01
-   1.467373E+01   5.160647E+01
-   1.470801E+01   5.160582E+01
-   1.474579E+01   5.158172E+01
-END
-END
diff --git a/data/scheme/zhv_scheme.xsd b/data/scheme/zhv_scheme.xsd
index 60d5516e04f1092489efd6e7b1d607c97bbd4819..100321e910592fa51ad9884a85fc6a01aaf0019a 100644
--- a/data/scheme/zhv_scheme.xsd
+++ b/data/scheme/zhv_scheme.xsd
@@ -1,116 +1,138 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://zhv.xml.wvi/" xmlns:ns1="http://zhv.xml.wvi/">
- <xs:element name="GetResponseType" type="ns1:Items"/>
- <xs:complexType name="Items">
-  <xs:sequence>
-   <xs:element ref="ns1:Items"/>
-  </xs:sequence>
- </xs:complexType>
- <xs:element name="Items">
-  <xs:complexType>
-   <xs:choice>
-    <xs:element ref="ns1:StopPlace"/>
-    <xs:element ref="ns1:Area"/>
-   </xs:choice>
-  </xs:complexType>
- </xs:element>
- <xs:element name="StopPlace">
-  <xs:complexType>
-   <xs:sequence>
-    <xs:element ref="ns1:Name"/>
-    <xs:element ref="ns1:Location"/>
-    <xs:element ref="ns1:Condition"/>
-    <xs:element ref="ns1:DHID"/>
-    <xs:element ref="ns1:Authority"/>
-    <xs:element ref="ns1:Municipality"/>
-    <xs:element ref="ns1:District"/>
-    <xs:element ref="ns1:AreaQuay"/>
-   </xs:sequence>
-  </xs:complexType>
- </xs:element>
- <xs:element name="Authority">
-  <xs:complexType>
-   <xs:sequence>
-    <xs:element ref="ns1:AuthorityId"/>
-    <xs:element ref="ns1:Label"/>
-   </xs:sequence>
-  </xs:complexType>
- </xs:element>
- <xs:element name="AuthorityId" type="xs:integer"/>
- <xs:element name="Municipality">
-  <xs:complexType>
-   <xs:sequence>
-    <xs:element ref="ns1:MunicipalityCode"/>
-    <xs:element ref="ns1:Label"/>
-   </xs:sequence>
-  </xs:complexType>
- </xs:element>
- <xs:element name="MunicipalityCode" type="xs:integer"/>
- <xs:element name="District">
-  <xs:complexType>
-   <xs:sequence>
-    <xs:element ref="ns1:DistrictCode"/>
-    <xs:element ref="ns1:Name"/>
-   </xs:sequence>
-  </xs:complexType>
- </xs:element>
- <xs:element name="DistrictCode">
-  <xs:complexType/>
- </xs:element>
- <xs:element name="AreaQuay" type="ns1:Items"/>
- <xs:element name="Area">
-  <xs:complexType>
-   <xs:sequence>
-    <xs:element ref="ns1:Name"/>
-    <xs:element ref="ns1:Location"/>
-    <xs:element ref="ns1:Condition"/>
-    <xs:element ref="ns1:DHID"/>
-    <xs:element ref="ns1:Quays"/>
-   </xs:sequence>
-  </xs:complexType>
- </xs:element>
- <xs:element name="Quays">
-  <xs:complexType>
-   <xs:sequence>
-    <xs:element ref="ns1:Quay"/>
-   </xs:sequence>
-  </xs:complexType>
- </xs:element>
- <xs:element name="Quay">
-  <xs:complexType>
-   <xs:sequence>
-    <xs:element ref="ns1:Name"/>
-    <xs:element ref="ns1:Location"/>
-    <xs:element ref="ns1:Condition"/>
-    <xs:element ref="ns1:DHID"/>
-   </xs:sequence>
-  </xs:complexType>
- </xs:element>
- <xs:element name="Name">
-  <xs:complexType mixed="true">
-   <xs:sequence>
-    <xs:element minOccurs="0" maxOccurs="unbounded" ref="ns1:Name"/>
-   </xs:sequence>
-  </xs:complexType>
- </xs:element>
- <xs:element name="Location">
-  <xs:complexType>
-   <xs:sequence>
-    <xs:element ref="ns1:Latitude"/>
-    <xs:element ref="ns1:Longitude"/>
-   </xs:sequence>
-  </xs:complexType>
- </xs:element>
- <xs:element name="Latitude" type="xs:decimal"/>
- <xs:element name="Longitude" type="xs:decimal"/>
- <xs:element name="Condition">
-  <xs:complexType>
-   <xs:sequence>
-    <xs:element ref="ns1:ConditionKind"/>
-   </xs:sequence>
-  </xs:complexType>
- </xs:element>
- <xs:element name="ConditionKind" type="xs:NCName"/>
- <xs:element name="DHID" type="xs:NMTOKEN"/>
- <xs:element name="Label" type="xs:string"/>
+    <xs:element name="GetResponseType" type="ns1:Items"/>
+    <xs:complexType name="Items">
+        <xs:sequence>
+            <xs:element ref="ns1:Items"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:element name="Items">
+        <xs:complexType>
+            <xs:choice minOccurs="0">
+                <xs:element maxOccurs="unbounded" ref="ns1:StopPlace"/>
+                <xs:element maxOccurs="unbounded" ref="ns1:Area"/>
+            </xs:choice>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="StopPlace">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element ref="ns1:Name"/>
+                <xs:element ref="ns1:Location"/>
+                <xs:element ref="ns1:Condition"/>
+                <xs:element minOccurs="0" ref="ns1:State"/>
+                <xs:element ref="ns1:DHID"/>
+                <xs:element ref="ns1:Authority"/>
+                <xs:element ref="ns1:Municipality"/>
+                <xs:element ref="ns1:District"/>
+                <xs:element ref="ns1:AreaQuay"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Authority">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element ref="ns1:AuthorityId"/>
+                <xs:element ref="ns1:Label"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="AuthorityId" type="xs:integer"/>
+    <xs:element name="Municipality">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element ref="ns1:MunicipalityCode"/>
+                <xs:element ref="ns1:Label"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="MunicipalityCode" type="xs:integer"/>
+    <xs:element name="District">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element ref="ns1:DistrictCode"/>
+                <xs:element ref="ns1:Name"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="DistrictCode" type="xs:string"/>
+    <xs:element name="AreaQuay" type="ns1:Items"/>
+    <xs:element name="Area">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element ref="ns1:Name"/>
+                <xs:element ref="ns1:Location"/>
+                <xs:element ref="ns1:Condition"/>
+                <xs:choice minOccurs="0">
+                    <xs:element ref="ns1:Description"/>
+                    <xs:element ref="ns1:State"/>
+                </xs:choice>
+                <xs:element ref="ns1:DHID"/>
+                <xs:element ref="ns1:Quays"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Quays">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element maxOccurs="unbounded" ref="ns1:Quay"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Quay">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element ref="ns1:Name"/>
+                <xs:element ref="ns1:Location"/>
+                <xs:element ref="ns1:Condition"/>
+                <xs:choice minOccurs="0">
+                    <xs:element ref="ns1:Description"/>
+                    <xs:element ref="ns1:State"/>
+                </xs:choice>
+                <xs:element ref="ns1:DHID"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Name">
+        <xs:complexType mixed="true">
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="ns1:Name"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Location">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element ref="ns1:Latitude"/>
+                <xs:element ref="ns1:Longitude"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Latitude" type="xs:decimal"/>
+    <xs:element name="Longitude" type="xs:decimal"/>
+    <xs:element name="Condition">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element ref="ns1:ConditionKind"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="ConditionKind" type="xs:NCName"/>
+    <xs:element name="State">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element ref="ns1:StateKind"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="StateKind" type="xs:NCName"/>
+    <xs:element name="DHID" type="xs:NMTOKEN"/>
+    <xs:element name="Label" type="xs:string"/>
+    <xs:element name="Description">
+        <xs:complexType mixed="true">
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="ns1:Description"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
 </xs:schema>
diff --git a/zhv_parser/RegionCode.py b/zhv_parser/RegionCode.py
index 99806de0d72499c43afb60214d2b5eb10df74c91..88e95bba550f9ada553507ac1ef2af1d501c5a1a 100644
--- a/zhv_parser/RegionCode.py
+++ b/zhv_parser/RegionCode.py
@@ -3,7 +3,7 @@ from enum import Enum
 
 # This is representing the first two digits of Germany's "Amtlicher Gemeindeschlüssel":
 # https://www.destatis.de/DE/Themen/Laender-Regionen/Regionales/Gemeindeverzeichnis/Glossar/amtlicher-gemeindeschluessel.html
-from zhv_parser.ZHV_Classes import StopPlace
+from zhv_parser.ZhvClasses import StopPlace
 
 
 class RegionCode(Enum):
diff --git a/zhv_parser/ZHV_Classes.py b/zhv_parser/ZhvClasses.py
similarity index 77%
rename from zhv_parser/ZHV_Classes.py
rename to zhv_parser/ZhvClasses.py
index 735bd82c28d28e8fda4ba3097a01d9f5220c34f8..844a85ae94e0ab618550640b340a08b18a049d88 100644
--- a/zhv_parser/ZHV_Classes.py
+++ b/zhv_parser/ZhvClasses.py
@@ -2,21 +2,20 @@
 # -*- coding: utf-8 -*-
 
 #
-# Generated Sun Feb  2 07:59:01 2020 by generateDS.py version 2.35.11.
+# Generated Wed May  6 16:21:01 2020 by generateDS.py version 2.35.21.
 # Python 3.8.1 (v3.8.1:1b293b6006, Dec 18 2019, 14:08:53)  [Clang 6.0 (clang-600.0.57)]
 #
 # Command line options:
-#   ('-o', 'ZHV_Classes.py')
-#   ('-s', 'ZHV_Parser.py')
+#   ('-o', 'ZhvClasses.py')
 #
 # Command line arguments:
-#   ../data/example_single_station.xsd
+#   zhv_scheme.xsd
 #
 # Command line:
-#   /Users/grait/projects/opener/opener-zhv-converter/venv/bin/generateDS -o "ZHV_Classes.py" -s "ZHV_Parser.py" ../data/example_single_station.xsd
+#   /Library/Frameworks/Python.framework/Versions/3.8/bin/generateDS -o "ZhvClasses.py" zhv_scheme.xsd
 #
 # Current working directory (os.getcwd()):
-#   zhv_parser
+#   scheme
 #
 
 from six.moves import zip_longest
@@ -26,12 +25,12 @@ import re as re_
 import base64
 import datetime as datetime_
 import decimal as decimal_
+
 try:
     from lxml import etree as etree_
 except ImportError:
     from xml.etree import ElementTree as etree_
 
-
 Validate_simpletypes_ = True
 SaveElementTreeNode = True
 if sys.version_info.major == 2:
@@ -57,6 +56,7 @@ def parsexml_(infile, parser=None, **kwargs):
     doc = etree_.parse(infile, parser=parser, **kwargs)
     return doc
 
+
 def parsexmlstring_(instring, parser=None, **kwargs):
     if parser is None:
         # Use the lxml ElementTree compatible parser so that, e.g.,
@@ -69,6 +69,7 @@ def parsexmlstring_(instring, parser=None, **kwargs):
     element = etree_.fromstring(instring, parser=parser, **kwargs)
     return element
 
+
 #
 # Namespace prefix definition table (and other attributes, too)
 #
@@ -149,7 +150,6 @@ except ImportError:
             for msg in self.messages:
                 outstream.write("Warning: {}\n".format(msg))
 
-
 #
 # The super-class for enum types
 #
@@ -169,49 +169,63 @@ except ImportError:
 try:
     from generatedssuper import GeneratedsSuper
 except ImportError as exp:
-    
+
     class GeneratedsSuper(object):
         __hash__ = object.__hash__
         tzoff_pattern = re_.compile(r'(\+|-)((0\d|1[0-3]):[0-5]\d|14:00)$')
+
         class _FixedOffsetTZ(datetime_.tzinfo):
             def __init__(self, offset, name):
                 self.__offset = datetime_.timedelta(minutes=offset)
                 self.__name = name
+
             def utcoffset(self, dt):
                 return self.__offset
+
             def tzname(self, dt):
                 return self.__name
+
             def dst(self, dt):
                 return None
+
         def gds_format_string(self, input_data, input_name=''):
             return input_data
+
         def gds_parse_string(self, input_data, node=None, input_name=''):
             return input_data
+
         def gds_validate_string(self, input_data, node=None, input_name=''):
             if not input_data:
                 return ''
             else:
                 return input_data
+
         def gds_format_base64(self, input_data, input_name=''):
             return base64.b64encode(input_data)
+
         def gds_validate_base64(self, input_data, node=None, input_name=''):
             return input_data
+
         def gds_format_integer(self, input_data, input_name=''):
             return '%d' % input_data
+
         def gds_parse_integer(self, input_data, node=None, input_name=''):
             try:
                 ival = int(input_data)
             except (TypeError, ValueError) as exp:
                 raise_parse_error(node, 'Requires integer value: %s' % exp)
             return ival
+
         def gds_validate_integer(self, input_data, node=None, input_name=''):
             try:
                 value = int(input_data)
             except (TypeError, ValueError):
                 raise_parse_error(node, 'Requires integer value')
             return value
+
         def gds_format_integer_list(self, input_data, input_name=''):
             return '%s' % ' '.join(input_data)
+
         def gds_validate_integer_list(
                 self, input_data, node=None, input_name=''):
             values = input_data.split()
@@ -221,22 +235,27 @@ except ImportError as exp:
                 except (TypeError, ValueError):
                     raise_parse_error(node, 'Requires sequence of integer valuess')
             return values
+
         def gds_format_float(self, input_data, input_name=''):
             return ('%.15f' % input_data).rstrip('0')
+
         def gds_parse_float(self, input_data, node=None, input_name=''):
             try:
                 fval_ = float(input_data)
             except (TypeError, ValueError) as exp:
                 raise_parse_error(node, 'Requires float or double value: %s' % exp)
             return fval_
+
         def gds_validate_float(self, input_data, node=None, input_name=''):
             try:
                 value = float(input_data)
             except (TypeError, ValueError):
                 raise_parse_error(node, 'Requires float value')
             return value
+
         def gds_format_float_list(self, input_data, input_name=''):
             return '%s' % ' '.join(input_data)
+
         def gds_validate_float_list(
                 self, input_data, node=None, input_name=''):
             values = input_data.split()
@@ -246,22 +265,32 @@ except ImportError as exp:
                 except (TypeError, ValueError):
                     raise_parse_error(node, 'Requires sequence of float values')
             return values
+
         def gds_format_decimal(self, input_data, input_name=''):
-            return ('%0.10f' % input_data).rstrip('0')
+            return_value = '%s' % input_data
+            if '.' in return_value:
+                return_value = return_value.rstrip('0')
+                if return_value.endswith('.'):
+                    return_value = return_value.rstrip('.')
+            return return_value
+
         def gds_parse_decimal(self, input_data, node=None, input_name=''):
             try:
                 decimal_value = decimal_.Decimal(input_data)
             except (TypeError, ValueError):
                 raise_parse_error(node, 'Requires decimal value')
             return decimal_value
+
         def gds_validate_decimal(self, input_data, node=None, input_name=''):
             try:
                 value = decimal_.Decimal(input_data)
             except (TypeError, ValueError):
                 raise_parse_error(node, 'Requires decimal value')
             return value
+
         def gds_format_decimal_list(self, input_data, input_name=''):
-            return '%s' % ' '.join(input_data)
+            return ' '.join([self.gds_format_decimal(item) for item in input_data])
+
         def gds_validate_decimal_list(
                 self, input_data, node=None, input_name=''):
             values = input_data.split()
@@ -271,22 +300,27 @@ except ImportError as exp:
                 except (TypeError, ValueError):
                     raise_parse_error(node, 'Requires sequence of decimal values')
             return values
+
         def gds_format_double(self, input_data, input_name=''):
             return '%e' % input_data
+
         def gds_parse_double(self, input_data, node=None, input_name=''):
             try:
                 fval_ = float(input_data)
             except (TypeError, ValueError) as exp:
                 raise_parse_error(node, 'Requires double or float value: %s' % exp)
             return fval_
+
         def gds_validate_double(self, input_data, node=None, input_name=''):
             try:
                 value = float(input_data)
             except (TypeError, ValueError):
                 raise_parse_error(node, 'Requires double or float value')
             return value
+
         def gds_format_double_list(self, input_data, input_name=''):
             return '%s' % ' '.join(input_data)
+
         def gds_validate_double_list(
                 self, input_data, node=None, input_name=''):
             values = input_data.split()
@@ -297,8 +331,10 @@ except ImportError as exp:
                     raise_parse_error(
                         node, 'Requires sequence of double or float values')
             return values
+
         def gds_format_boolean(self, input_data, input_name=''):
             return ('%s' % input_data).lower()
+
         def gds_parse_boolean(self, input_data, node=None, input_name=''):
             if input_data in ('true', '1'):
                 bval = True
@@ -307,27 +343,32 @@ except ImportError as exp:
             else:
                 raise_parse_error(node, 'Requires boolean value')
             return bval
+
         def gds_validate_boolean(self, input_data, node=None, input_name=''):
-            if input_data not in (True, 1, False, 0, ):
+            if input_data not in (True, 1, False, 0,):
                 raise_parse_error(
                     node,
                     'Requires boolean value '
                     '(one of True, 1, False, 0)')
             return input_data
+
         def gds_format_boolean_list(self, input_data, input_name=''):
             return '%s' % ' '.join(input_data)
+
         def gds_validate_boolean_list(
                 self, input_data, node=None, input_name=''):
             values = input_data.split()
             for value in values:
-                if value not in (True, 1, False, 0, ):
+                if value not in (True, 1, False, 0,):
                     raise_parse_error(
                         node,
                         'Requires sequence of boolean values '
                         '(one of True, 1, False, 0)')
             return values
+
         def gds_validate_datetime(self, input_data, node=None, input_name=''):
             return input_data
+
         def gds_format_datetime(self, input_data, input_name=''):
             if input_data.microsecond == 0:
                 _svalue = '%04d-%02d-%02dT%02d:%02d:%02d' % (
@@ -364,6 +405,7 @@ except ImportError as exp:
                         minutes = (total_seconds - (hours * 3600)) // 60
                         _svalue += '{0:02d}:{1:02d}'.format(hours, minutes)
             return _svalue
+
         @classmethod
         def gds_parse_datetime(cls, input_data):
             tz = None
@@ -384,7 +426,7 @@ except ImportError as exp:
             if len(time_parts) > 1:
                 micro_seconds = int(float('0.' + time_parts[1]) * 1000000)
                 input_data = '%s.%s' % (
-                    time_parts[0], "{}".format(micro_seconds).rjust(6, "0"), )
+                    time_parts[0], "{}".format(micro_seconds).rjust(6, "0"),)
                 dt = datetime_.datetime.strptime(
                     input_data, '%Y-%m-%dT%H:%M:%S.%f')
             else:
@@ -392,8 +434,10 @@ except ImportError as exp:
                     input_data, '%Y-%m-%dT%H:%M:%S')
             dt = dt.replace(tzinfo=tz)
             return dt
+
         def gds_validate_date(self, input_data, node=None, input_name=''):
             return input_data
+
         def gds_format_date(self, input_data, input_name=''):
             _svalue = '%04d-%02d-%02d' % (
                 input_data.year,
@@ -420,6 +464,7 @@ except ImportError as exp:
             except AttributeError:
                 pass
             return _svalue
+
         @classmethod
         def gds_parse_date(cls, input_data):
             tz = None
@@ -439,8 +484,10 @@ except ImportError as exp:
             dt = datetime_.datetime.strptime(input_data, '%Y-%m-%d')
             dt = dt.replace(tzinfo=tz)
             return dt.date()
+
         def gds_validate_time(self, input_data, node=None, input_name=''):
             return input_data
+
         def gds_format_time(self, input_data, input_name=''):
             if input_data.microsecond == 0:
                 _svalue = '%02d:%02d:%02d' % (
@@ -471,6 +518,7 @@ except ImportError as exp:
                         minutes = (total_seconds - (hours * 3600)) // 60
                         _svalue += '{0:02d}:{1:02d}'.format(hours, minutes)
             return _svalue
+
         def gds_validate_simple_patterns(self, patterns, target):
             # pat is a list of lists of strings/patterns.
             # The target value must match at least one of the patterns
@@ -487,6 +535,7 @@ except ImportError as exp:
                     found1 = False
                     break
             return found1
+
         @classmethod
         def gds_parse_time(cls, input_data):
             tz = None
@@ -509,6 +558,7 @@ except ImportError as exp:
                 dt = datetime_.datetime.strptime(input_data, '%H:%M:%S')
             dt = dt.replace(tzinfo=tz)
             return dt.time()
+
         def gds_check_cardinality_(
                 self, value, input_name,
                 min_occurs=0, max_occurs=1, required=None):
@@ -518,7 +568,7 @@ except ImportError as exp:
                 length = len(value)
             else:
                 length = 1
-            if required is not None :
+            if required is not None:
                 if required and length < 1:
                     self.gds_collector_.add_message(
                         "Required value {}{} is missing".format(
@@ -537,6 +587,7 @@ except ImportError as exp:
                     "expected at most {}, found {}".format(
                         input_name, self.gds_get_node_lineno_(),
                         max_occurs, length))
+
         def gds_validate_builtin_ST_(
                 self, validator, value, input_name,
                 min_occurs=None, max_occurs=None, required=None):
@@ -545,6 +596,7 @@ except ImportError as exp:
                     validator(value, input_name=input_name)
                 except GDSParseError as parse_error:
                     self.gds_collector_.add_message(str(parse_error))
+
         def gds_validate_defined_ST_(
                 self, validator, value, input_name,
                 min_occurs=None, max_occurs=None, required=None):
@@ -553,15 +605,19 @@ except ImportError as exp:
                     validator(value)
                 except GDSParseError as parse_error:
                     self.gds_collector_.add_message(str(parse_error))
+
         def gds_str_lower(self, instring):
             return instring.lower()
+
         def get_path_(self, node):
             path_list = []
             self.get_path_list_(node, path_list)
             path_list.reverse()
             path = '/'.join(path_list)
             return path
+
         Tag_strip_pattern_ = re_.compile(r'\{.*\}')
+
         def get_path_list_(self, node, path_list):
             if node is None:
                 return
@@ -569,6 +625,7 @@ except ImportError as exp:
             if tag:
                 path_list.append(tag)
             self.get_path_list_(node.getparent(), path_list)
+
         def get_class_obj_(self, node, default_class=None):
             class_obj1 = default_class
             if 'xsi' in node.nsmap:
@@ -581,14 +638,17 @@ except ImportError as exp:
                     if class_obj2 is not None:
                         class_obj1 = class_obj2
             return class_obj1
+
         def gds_build_any(self, node, type_name=None):
             # provide default value in case option --disable-xml is used.
             content = ""
             content = etree_.tostring(node, encoding="unicode")
             return content
+
         @classmethod
         def gds_reverse_node_mapping(cls, mapping):
             return dict(((v, k) for k, v in mapping.items()))
+
         @staticmethod
         def gds_encode(instring):
             if sys.version_info.major == 2:
@@ -599,6 +659,7 @@ except ImportError as exp:
                 return instring.encode(encoding)
             else:
                 return instring
+
         @staticmethod
         def convert_unicode(instring):
             if isinstance(instring, str):
@@ -608,27 +669,35 @@ except ImportError as exp:
             else:
                 result = GeneratedsSuper.gds_encode(str(instring))
             return result
+
         def __eq__(self, other):
             def excl_select_objs_(obj):
                 return (obj[0] != 'parent_object_' and
                         obj[0] != 'gds_collector_')
+
             if type(self) != type(other):
                 return False
             return all(x == y for x, y in zip_longest(
                 filter(excl_select_objs_, self.__dict__.items()),
                 filter(excl_select_objs_, other.__dict__.items())))
+
         def __ne__(self, other):
             return not self.__eq__(other)
+
         # Django ETL transform hooks.
         def gds_djo_etl_transform(self):
             pass
+
         def gds_djo_etl_transform_db_obj(self, dbobj):
             pass
+
         # SQLAlchemy ETL transform hooks.
         def gds_sqa_etl_transform(self):
             return 0, None
+
         def gds_sqa_etl_transform_db_obj(self, dbobj):
             pass
+
         def gds_get_node_lineno_(self):
             if (hasattr(self, "gds_elementtree_node_") and
                     self.gds_elementtree_node_ is not None):
@@ -636,8 +705,8 @@ except ImportError as exp:
                     self.gds_elementtree_node_.sourceline)
             else:
                 return ""
-    
-    
+
+
     def getSubclassFromModule_(module, class_):
         '''Get the subclass of a class from a specific module.'''
         name = class_.__name__ + 'Sub'
@@ -646,7 +715,6 @@ except ImportError as exp:
         else:
             return None
 
-
 #
 # If you have installed IPython you can uncomment and use the following.
 # IPython is available from http://ipython.scipy.org/.
@@ -680,6 +748,7 @@ CDATA_pattern_ = re_.compile(r"<!\[CDATA\[.*?\]\]>", re_.DOTALL)
 # specific subclass module.
 CurrentSubclassModule_ = None
 
+
 #
 # Support/utility functions.
 #
@@ -768,7 +837,7 @@ def find_attr_value_(attr_name, node):
         prefix, name = attr_parts
         namespace = node.nsmap.get(prefix)
         if namespace is not None:
-            value = attrs.get('{%s}%s' % (namespace, name, ))
+            value = attrs.get('{%s}%s' % (namespace, name,))
     return value
 
 
@@ -782,7 +851,7 @@ class GDSParseError(Exception):
 
 def raise_parse_error(node, msg):
     if node is not None:
-        msg = '%s (element %s/line %d)' % (msg, node.tag, node.sourceline, )
+        msg = '%s (element %s/line %d)' % (msg, node.tag, node.sourceline,)
     raise GDSParseError(msg)
 
 
@@ -802,19 +871,25 @@ class MixedContainer:
     TypeDouble = 6
     TypeBoolean = 7
     TypeBase64 = 8
+
     def __init__(self, category, content_type, name, value):
         self.category = category
         self.content_type = content_type
         self.name = name
         self.value = value
+
     def getCategory(self):
         return self.category
+
     def getContenttype(self, content_type):
         return self.content_type
+
     def getValue(self):
         return self.value
+
     def getName(self):
         return self.name
+
     def export(self, outfile, level, name, namespace,
                pretty_print=True):
         if self.category == MixedContainer.CategoryText:
@@ -823,10 +898,11 @@ class MixedContainer:
                 outfile.write(self.value)
         elif self.category == MixedContainer.CategorySimple:
             self.exportSimple(outfile, level, name)
-        else:    # category == MixedContainer.CategoryComplex
+        else:  # category == MixedContainer.CategoryComplex
             self.value.export(
                 outfile, level, namespace, name_=name,
                 pretty_print=pretty_print)
+
     def exportSimple(self, outfile, level, name):
         if self.content_type == MixedContainer.TypeString:
             outfile.write('<%s>%s</%s>' % (
@@ -847,7 +923,8 @@ class MixedContainer:
                 self.name,
                 base64.b64encode(self.value),
                 self.name))
-    def to_etree(self, element):
+
+    def to_etree(self, element, mapping_=None, nsmap_=None):
         if self.category == MixedContainer.CategoryText:
             # Prevent exporting empty content as empty lines.
             if self.value.strip():
@@ -865,22 +942,24 @@ class MixedContainer:
             subelement = etree_.SubElement(
                 element, '%s' % self.name)
             subelement.text = self.to_etree_simple()
-        else:    # category == MixedContainer.CategoryComplex
+        else:  # category == MixedContainer.CategoryComplex
             self.value.to_etree(element)
-    def to_etree_simple(self):
+
+    def to_etree_simple(self, mapping_=None, nsmap_=None):
         if self.content_type == MixedContainer.TypeString:
             text = self.value
         elif (self.content_type == MixedContainer.TypeInteger or
-                self.content_type == MixedContainer.TypeBoolean):
+              self.content_type == MixedContainer.TypeBoolean):
             text = '%d' % self.value
         elif (self.content_type == MixedContainer.TypeFloat or
-                self.content_type == MixedContainer.TypeDecimal):
+              self.content_type == MixedContainer.TypeDecimal):
             text = '%f' % self.value
         elif self.content_type == MixedContainer.TypeDouble:
             text = '%g' % self.value
         elif self.content_type == MixedContainer.TypeBase64:
             text = '%s' % base64.b64encode(self.value)
         return text
+
     def exportLiteral(self, outfile, level, name):
         if self.category == MixedContainer.CategoryText:
             showIndent(outfile, level)
@@ -894,7 +973,7 @@ class MixedContainer:
                 'model_.MixedContainer(%d, %d, "%s", "%s"),\n' % (
                     self.category, self.content_type,
                     self.name, self.value))
-        else:    # category == MixedContainer.CategoryComplex
+        else:  # category == MixedContainer.CategoryComplex
             showIndent(outfile, level)
             outfile.write(
                 'model_.MixedContainer(%d, %d, "%s",\n' % (
@@ -906,17 +985,26 @@ class MixedContainer:
 
 class MemberSpec_(object):
     def __init__(self, name='', data_type='', container=0,
-            optional=0, child_attrs=None, choice=None):
+                 optional=0, child_attrs=None, choice=None):
         self.name = name
         self.data_type = data_type
         self.container = container
         self.child_attrs = child_attrs
         self.choice = choice
         self.optional = optional
-    def set_name(self, name): self.name = name
-    def get_name(self): return self.name
-    def set_data_type(self, data_type): self.data_type = data_type
-    def get_data_type_chain(self): return self.data_type
+
+    def set_name(self, name):
+        self.name = name
+
+    def get_name(self):
+        return self.name
+
+    def set_data_type(self, data_type):
+        self.data_type = data_type
+
+    def get_data_type_chain(self):
+        return self.data_type
+
     def get_data_type(self):
         if isinstance(self.data_type, list):
             if len(self.data_type) > 0:
@@ -925,14 +1013,30 @@ class MemberSpec_(object):
                 return 'xs:string'
         else:
             return self.data_type
-    def set_container(self, container): self.container = container
-    def get_container(self): return self.container
-    def set_child_attrs(self, child_attrs): self.child_attrs = child_attrs
-    def get_child_attrs(self): return self.child_attrs
-    def set_choice(self, choice): self.choice = choice
-    def get_choice(self): return self.choice
-    def set_optional(self, optional): self.optional = optional
-    def get_optional(self): return self.optional
+
+    def set_container(self, container):
+        self.container = container
+
+    def get_container(self):
+        return self.container
+
+    def set_child_attrs(self, child_attrs):
+        self.child_attrs = child_attrs
+
+    def get_child_attrs(self):
+        return self.child_attrs
+
+    def set_choice(self, choice):
+        self.choice = choice
+
+    def get_choice(self):
+        return self.choice
+
+    def set_optional(self, optional):
+        self.optional = optional
+
+    def get_optional(self):
+        return self.optional
 
 
 def _cast(typ, value):
@@ -940,6 +1044,7 @@ def _cast(typ, value):
         return value
     return typ(value)
 
+
 #
 # Data representation classes.
 #
@@ -949,6 +1054,7 @@ class Items(GeneratedsSuper):
     __hash__ = GeneratedsSuper.__hash__
     subclass = None
     superclass = None
+
     def __init__(self, Items_member=None, gds_collector_=None, **kwargs_):
         self.gds_collector_ = gds_collector_
         self.gds_elementtree_node_ = None
@@ -957,6 +1063,7 @@ class Items(GeneratedsSuper):
         self.ns_prefix_ = None
         self.Items = Items_member
         self.Items_nsprefix_ = None
+
     def factory(*args_, **kwargs_):
         if CurrentSubclassModule_ is not None:
             subclass = getSubclassFromModule_(
@@ -967,23 +1074,31 @@ class Items(GeneratedsSuper):
             return Items.subclass(*args_, **kwargs_)
         else:
             return Items(*args_, **kwargs_)
+
     factory = staticmethod(factory)
+
     def get_ns_prefix_(self):
         return self.ns_prefix_
+
     def set_ns_prefix_(self, ns_prefix):
         self.ns_prefix_ = ns_prefix
+
     def get_Items(self):
         return self.Items
+
     def set_Items(self, Items):
         self.Items = Items
+
     def hasContent_(self):
         if (
-            self.Items is not None
+                self.Items is not None
         ):
             return True
         else:
             return False
-    def export(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"', name_='Items', pretty_print=True):
+
+    def export(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"',
+               name_='Items', pretty_print=True):
         imported_ns_def_ = GenerateDSNamespaceDefs_.get('Items')
         if imported_ns_def_ is not None:
             namespacedef_ = imported_ns_def_
@@ -991,31 +1106,37 @@ class Items(GeneratedsSuper):
             eol_ = '\n'
         else:
             eol_ = ''
-        if self.original_tagname_ is not None:
+        if self.original_tagname_ is not None and name_ == 'Items':
             name_ = self.original_tagname_
         if UseCapturedNS_ and self.ns_prefix_:
             namespaceprefix_ = self.ns_prefix_ + ':'
         showIndent(outfile, level, pretty_print)
-        outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+        outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '',))
         already_processed = set()
         self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='Items')
         if self.hasContent_():
-            outfile.write('>%s' % (eol_, ))
-            self.exportChildren(outfile, level + 1, namespaceprefix_, namespacedef_, name_='Items', pretty_print=pretty_print)
+            outfile.write('>%s' % (eol_,))
+            self.exportChildren(outfile, level + 1, namespaceprefix_, namespacedef_, name_='Items',
+                                pretty_print=pretty_print)
             showIndent(outfile, level, pretty_print)
             outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
         else:
-            outfile.write('/>%s' % (eol_, ))
+            outfile.write('/>%s' % (eol_,))
+
     def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='Items'):
         pass
-    def exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"', name_='Items', fromsubclass_=False, pretty_print=True):
+
+    def exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"',
+                       name_='Items', fromsubclass_=False, pretty_print=True):
         if pretty_print:
             eol_ = '\n'
         else:
             eol_ = ''
         if self.Items is not None:
             namespaceprefix_ = self.Items_nsprefix_ + ':' if (UseCapturedNS_ and self.Items_nsprefix_) else ''
-            self.Items.export(outfile, level, namespaceprefix_='ns1:', namespacedef_='', name_='Items', pretty_print=pretty_print)
+            self.Items.export(outfile, level, namespaceprefix_='ns1:', namespacedef_='', name_='Items',
+                              pretty_print=pretty_print)
+
     def build(self, node, gds_collector_=None):
         self.gds_collector_ = gds_collector_
         if SaveElementTreeNode:
@@ -1027,14 +1148,18 @@ class Items(GeneratedsSuper):
             nodeName_ = Tag_pattern_.match(child.tag).groups()[-1]
             self.buildChildren(child, node, nodeName_, gds_collector_=gds_collector_)
         return self
+
     def buildAttributes(self, node, attrs, already_processed):
         pass
+
     def buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_collector_=None):
         if nodeName_ == 'Items':
             obj_ = Items.factory(parent_object_=self)
             obj_.build(child_, gds_collector_=gds_collector_)
             self.Items = obj_
             obj_.original_tagname_ = 'Items'
+
+
 # end class Items
 
 
@@ -1042,7 +1167,9 @@ class StopPlace(GeneratedsSuper):
     __hash__ = GeneratedsSuper.__hash__
     subclass = None
     superclass = None
-    def __init__(self, Name=None, Location=None, Condition=None, DHID=None, Authority=None, Municipality=None, District=None, AreaQuay=None, gds_collector_=None, **kwargs_):
+
+    def __init__(self, Name=None, Location=None, Condition=None, State=None, DHID=None, Authority=None,
+                 Municipality=None, District=None, AreaQuay=None, gds_collector_=None, **kwargs_):
         self.gds_collector_ = gds_collector_
         self.gds_elementtree_node_ = None
         self.original_tagname_ = None
@@ -1054,6 +1181,8 @@ class StopPlace(GeneratedsSuper):
         self.Location_nsprefix_ = None
         self.Condition = Condition
         self.Condition_nsprefix_ = None
+        self.State = State
+        self.State_nsprefix_ = None
         self.DHID = DHID
         self.DHID_nsprefix_ = None
         self.Authority = Authority
@@ -1064,6 +1193,7 @@ class StopPlace(GeneratedsSuper):
         self.District_nsprefix_ = None
         self.AreaQuay = AreaQuay
         self.AreaQuay_nsprefix_ = None
+
     def factory(*args_, **kwargs_):
         if CurrentSubclassModule_ is not None:
             subclass = getSubclassFromModule_(
@@ -1074,58 +1204,87 @@ class StopPlace(GeneratedsSuper):
             return StopPlace.subclass(*args_, **kwargs_)
         else:
             return StopPlace(*args_, **kwargs_)
+
     factory = staticmethod(factory)
+
     def get_ns_prefix_(self):
         return self.ns_prefix_
+
     def set_ns_prefix_(self, ns_prefix):
         self.ns_prefix_ = ns_prefix
+
     def get_Name(self):
         return self.Name
+
     def set_Name(self, Name):
         self.Name = Name
+
     def get_Location(self):
         return self.Location
+
     def set_Location(self, Location):
         self.Location = Location
+
     def get_Condition(self):
         return self.Condition
+
     def set_Condition(self, Condition):
         self.Condition = Condition
+
+    def get_State(self):
+        return self.State
+
+    def set_State(self, State):
+        self.State = State
+
     def get_DHID(self):
         return self.DHID
+
     def set_DHID(self, DHID):
         self.DHID = DHID
+
     def get_Authority(self):
         return self.Authority
+
     def set_Authority(self, Authority):
         self.Authority = Authority
+
     def get_Municipality(self):
         return self.Municipality
+
     def set_Municipality(self, Municipality):
         self.Municipality = Municipality
+
     def get_District(self):
         return self.District
+
     def set_District(self, District):
         self.District = District
+
     def get_AreaQuay(self):
         return self.AreaQuay
+
     def set_AreaQuay(self, AreaQuay):
         self.AreaQuay = AreaQuay
+
     def hasContent_(self):
         if (
-            self.Name is not None or
-            self.Location is not None or
-            self.Condition is not None or
-            self.DHID is not None or
-            self.Authority is not None or
-            self.Municipality is not None or
-            self.District is not None or
-            self.AreaQuay is not None
+                self.Name is not None or
+                self.Location is not None or
+                self.Condition is not None or
+                self.State is not None or
+                self.DHID is not None or
+                self.Authority is not None or
+                self.Municipality is not None or
+                self.District is not None or
+                self.AreaQuay is not None
         ):
             return True
         else:
             return False
-    def export(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"', name_='StopPlace', pretty_print=True):
+
+    def export(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"',
+               name_='StopPlace', pretty_print=True):
         imported_ns_def_ = GenerateDSNamespaceDefs_.get('StopPlace')
         if imported_ns_def_ is not None:
             namespacedef_ = imported_ns_def_
@@ -1133,53 +1292,72 @@ class StopPlace(GeneratedsSuper):
             eol_ = '\n'
         else:
             eol_ = ''
-        if self.original_tagname_ is not None:
+        if self.original_tagname_ is not None and name_ == 'StopPlace':
             name_ = self.original_tagname_
         if UseCapturedNS_ and self.ns_prefix_:
             namespaceprefix_ = self.ns_prefix_ + ':'
         showIndent(outfile, level, pretty_print)
-        outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+        outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '',))
         already_processed = set()
         self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='StopPlace')
         if self.hasContent_():
-            outfile.write('>%s' % (eol_, ))
-            self.exportChildren(outfile, level + 1, namespaceprefix_, namespacedef_, name_='StopPlace', pretty_print=pretty_print)
+            outfile.write('>%s' % (eol_,))
+            self.exportChildren(outfile, level + 1, namespaceprefix_, namespacedef_, name_='StopPlace',
+                                pretty_print=pretty_print)
             showIndent(outfile, level, pretty_print)
             outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
         else:
-            outfile.write('/>%s' % (eol_, ))
+            outfile.write('/>%s' % (eol_,))
+
     def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='StopPlace'):
         pass
-    def exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"', name_='StopPlace', fromsubclass_=False, pretty_print=True):
+
+    def exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"',
+                       name_='StopPlace', fromsubclass_=False, pretty_print=True):
         if pretty_print:
             eol_ = '\n'
         else:
             eol_ = ''
         if self.Name is not None:
             namespaceprefix_ = self.Name_nsprefix_ + ':' if (UseCapturedNS_ and self.Name_nsprefix_) else ''
-            self.Name.export(outfile, level, namespaceprefix_='ns1:', namespacedef_='', name_='Name', pretty_print=pretty_print)
+            self.Name.export(outfile, level, namespaceprefix_='ns1:', namespacedef_='', name_='Name',
+                             pretty_print=pretty_print)
         if self.Location is not None:
             namespaceprefix_ = self.Location_nsprefix_ + ':' if (UseCapturedNS_ and self.Location_nsprefix_) else ''
-            self.Location.export(outfile, level, namespaceprefix_='ns1:', namespacedef_='', name_='Location', pretty_print=pretty_print)
+            self.Location.export(outfile, level, namespaceprefix_='ns1:', namespacedef_='', name_='Location',
+                                 pretty_print=pretty_print)
         if self.Condition is not None:
             namespaceprefix_ = self.Condition_nsprefix_ + ':' if (UseCapturedNS_ and self.Condition_nsprefix_) else ''
-            self.Condition.export(outfile, level, namespaceprefix_='ns1:', namespacedef_='', name_='Condition', pretty_print=pretty_print)
+            self.Condition.export(outfile, level, namespaceprefix_='ns1:', namespacedef_='', name_='Condition',
+                                  pretty_print=pretty_print)
+        if self.State is not None:
+            namespaceprefix_ = self.State_nsprefix_ + ':' if (UseCapturedNS_ and self.State_nsprefix_) else ''
+            self.State.export(outfile, level, namespaceprefix_='ns1:', namespacedef_='', name_='State',
+                              pretty_print=pretty_print)
         if self.DHID is not None:
             namespaceprefix_ = self.DHID_nsprefix_ + ':' if (UseCapturedNS_ and self.DHID_nsprefix_) else ''
             showIndent(outfile, level, pretty_print)
-            outfile.write('<%sDHID>%s</%sDHID>%s' % (namespaceprefix_ , self.gds_encode(self.gds_format_string(quote_xml(self.DHID), input_name='DHID')), namespaceprefix_ , eol_))
+            outfile.write('<%sDHID>%s</%sDHID>%s' % (
+            namespaceprefix_, self.gds_encode(self.gds_format_string(quote_xml(self.DHID), input_name='DHID')),
+            namespaceprefix_, eol_))
         if self.Authority is not None:
             namespaceprefix_ = self.Authority_nsprefix_ + ':' if (UseCapturedNS_ and self.Authority_nsprefix_) else ''
-            self.Authority.export(outfile, level, namespaceprefix_='ns1:', namespacedef_='', name_='Authority', pretty_print=pretty_print)
+            self.Authority.export(outfile, level, namespaceprefix_='ns1:', namespacedef_='', name_='Authority',
+                                  pretty_print=pretty_print)
         if self.Municipality is not None:
-            namespaceprefix_ = self.Municipality_nsprefix_ + ':' if (UseCapturedNS_ and self.Municipality_nsprefix_) else ''
-            self.Municipality.export(outfile, level, namespaceprefix_='ns1:', namespacedef_='', name_='Municipality', pretty_print=pretty_print)
+            namespaceprefix_ = self.Municipality_nsprefix_ + ':' if (
+                        UseCapturedNS_ and self.Municipality_nsprefix_) else ''
+            self.Municipality.export(outfile, level, namespaceprefix_='ns1:', namespacedef_='', name_='Municipality',
+                                     pretty_print=pretty_print)
         if self.District is not None:
             namespaceprefix_ = self.District_nsprefix_ + ':' if (UseCapturedNS_ and self.District_nsprefix_) else ''
-            self.District.export(outfile, level, namespaceprefix_='ns1:', namespacedef_='', name_='District', pretty_print=pretty_print)
+            self.District.export(outfile, level, namespaceprefix_='ns1:', namespacedef_='', name_='District',
+                                 pretty_print=pretty_print)
         if self.AreaQuay is not None:
             namespaceprefix_ = self.AreaQuay_nsprefix_ + ':' if (UseCapturedNS_ and self.AreaQuay_nsprefix_) else ''
-            self.AreaQuay.export(outfile, level, namespaceprefix_='ns1:', namespacedef_='', name_='AreaQuay', pretty_print=pretty_print)
+            self.AreaQuay.export(outfile, level, namespaceprefix_='ns1:', namespacedef_='', name_='AreaQuay',
+                                 pretty_print=pretty_print)
+
     def build(self, node, gds_collector_=None):
         self.gds_collector_ = gds_collector_
         if SaveElementTreeNode:
@@ -1191,8 +1369,10 @@ class StopPlace(GeneratedsSuper):
             nodeName_ = Tag_pattern_.match(child.tag).groups()[-1]
             self.buildChildren(child, node, nodeName_, gds_collector_=gds_collector_)
         return self
+
     def buildAttributes(self, node, attrs, already_processed):
         pass
+
     def buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_collector_=None):
         if nodeName_ == 'Name':
             obj_ = Name.factory(parent_object_=self)
@@ -1209,6 +1389,11 @@ class StopPlace(GeneratedsSuper):
             obj_.build(child_, gds_collector_=gds_collector_)
             self.Condition = obj_
             obj_.original_tagname_ = 'Condition'
+        elif nodeName_ == 'State':
+            obj_ = State.factory(parent_object_=self)
+            obj_.build(child_, gds_collector_=gds_collector_)
+            self.State = obj_
+            obj_.original_tagname_ = 'State'
         elif nodeName_ == 'DHID':
             value_ = child_.text
             value_ = self.gds_parse_string(value_, node, 'DHID')
@@ -1235,6 +1420,8 @@ class StopPlace(GeneratedsSuper):
             obj_.build(child_, gds_collector_=gds_collector_)
             self.AreaQuay = obj_
             obj_.original_tagname_ = 'AreaQuay'
+
+
 # end class StopPlace
 
 
@@ -1242,6 +1429,7 @@ class Authority(GeneratedsSuper):
     __hash__ = GeneratedsSuper.__hash__
     subclass = None
     superclass = None
+
     def __init__(self, AuthorityId=None, Label=None, gds_collector_=None, **kwargs_):
         self.gds_collector_ = gds_collector_
         self.gds_elementtree_node_ = None
@@ -1252,6 +1440,7 @@ class Authority(GeneratedsSuper):
         self.AuthorityId_nsprefix_ = None
         self.Label = Label
         self.Label_nsprefix_ = None
+
     def factory(*args_, **kwargs_):
         if CurrentSubclassModule_ is not None:
             subclass = getSubclassFromModule_(
@@ -1262,28 +1451,38 @@ class Authority(GeneratedsSuper):
             return Authority.subclass(*args_, **kwargs_)
         else:
             return Authority(*args_, **kwargs_)
+
     factory = staticmethod(factory)
+
     def get_ns_prefix_(self):
         return self.ns_prefix_
+
     def set_ns_prefix_(self, ns_prefix):
         self.ns_prefix_ = ns_prefix
+
     def get_AuthorityId(self):
         return self.AuthorityId
+
     def set_AuthorityId(self, AuthorityId):
         self.AuthorityId = AuthorityId
+
     def get_Label(self):
         return self.Label
+
     def set_Label(self, Label):
         self.Label = Label
+
     def hasContent_(self):
         if (
-            self.AuthorityId is not None or
-            self.Label is not None
+                self.AuthorityId is not None or
+                self.Label is not None
         ):
             return True
         else:
             return False
-    def export(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"', name_='Authority', pretty_print=True):
+
+    def export(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"',
+               name_='Authority', pretty_print=True):
         imported_ns_def_ = GenerateDSNamespaceDefs_.get('Authority')
         if imported_ns_def_ is not None:
             namespacedef_ = imported_ns_def_
@@ -1291,36 +1490,46 @@ class Authority(GeneratedsSuper):
             eol_ = '\n'
         else:
             eol_ = ''
-        if self.original_tagname_ is not None:
+        if self.original_tagname_ is not None and name_ == 'Authority':
             name_ = self.original_tagname_
         if UseCapturedNS_ and self.ns_prefix_:
             namespaceprefix_ = self.ns_prefix_ + ':'
         showIndent(outfile, level, pretty_print)
-        outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+        outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '',))
         already_processed = set()
         self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='Authority')
         if self.hasContent_():
-            outfile.write('>%s' % (eol_, ))
-            self.exportChildren(outfile, level + 1, namespaceprefix_, namespacedef_, name_='Authority', pretty_print=pretty_print)
+            outfile.write('>%s' % (eol_,))
+            self.exportChildren(outfile, level + 1, namespaceprefix_, namespacedef_, name_='Authority',
+                                pretty_print=pretty_print)
             showIndent(outfile, level, pretty_print)
             outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
         else:
-            outfile.write('/>%s' % (eol_, ))
+            outfile.write('/>%s' % (eol_,))
+
     def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='Authority'):
         pass
-    def exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"', name_='Authority', fromsubclass_=False, pretty_print=True):
+
+    def exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"',
+                       name_='Authority', fromsubclass_=False, pretty_print=True):
         if pretty_print:
             eol_ = '\n'
         else:
             eol_ = ''
         if self.AuthorityId is not None:
-            namespaceprefix_ = self.AuthorityId_nsprefix_ + ':' if (UseCapturedNS_ and self.AuthorityId_nsprefix_) else ''
+            namespaceprefix_ = self.AuthorityId_nsprefix_ + ':' if (
+                        UseCapturedNS_ and self.AuthorityId_nsprefix_) else ''
             showIndent(outfile, level, pretty_print)
-            outfile.write('<%sAuthorityId>%s</%sAuthorityId>%s' % (namespaceprefix_ , self.gds_format_integer(self.AuthorityId, input_name='AuthorityId'), namespaceprefix_ , eol_))
+            outfile.write('<%sAuthorityId>%s</%sAuthorityId>%s' % (
+            namespaceprefix_, self.gds_format_integer(self.AuthorityId, input_name='AuthorityId'), namespaceprefix_,
+            eol_))
         if self.Label is not None:
             namespaceprefix_ = self.Label_nsprefix_ + ':' if (UseCapturedNS_ and self.Label_nsprefix_) else ''
             showIndent(outfile, level, pretty_print)
-            outfile.write('<%sLabel>%s</%sLabel>%s' % (namespaceprefix_ , self.gds_encode(self.gds_format_string(quote_xml(self.Label), input_name='Label')), namespaceprefix_ , eol_))
+            outfile.write('<%sLabel>%s</%sLabel>%s' % (
+            namespaceprefix_, self.gds_encode(self.gds_format_string(quote_xml(self.Label), input_name='Label')),
+            namespaceprefix_, eol_))
+
     def build(self, node, gds_collector_=None):
         self.gds_collector_ = gds_collector_
         if SaveElementTreeNode:
@@ -1332,8 +1541,10 @@ class Authority(GeneratedsSuper):
             nodeName_ = Tag_pattern_.match(child.tag).groups()[-1]
             self.buildChildren(child, node, nodeName_, gds_collector_=gds_collector_)
         return self
+
     def buildAttributes(self, node, attrs, already_processed):
         pass
+
     def buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_collector_=None):
         if nodeName_ == 'AuthorityId' and child_.text:
             sval_ = child_.text
@@ -1347,6 +1558,8 @@ class Authority(GeneratedsSuper):
             value_ = self.gds_validate_string(value_, node, 'Label')
             self.Label = value_
             self.Label_nsprefix_ = child_.prefix
+
+
 # end class Authority
 
 
@@ -1354,6 +1567,7 @@ class Municipality(GeneratedsSuper):
     __hash__ = GeneratedsSuper.__hash__
     subclass = None
     superclass = None
+
     def __init__(self, MunicipalityCode=None, Label=None, gds_collector_=None, **kwargs_):
         self.gds_collector_ = gds_collector_
         self.gds_elementtree_node_ = None
@@ -1364,6 +1578,7 @@ class Municipality(GeneratedsSuper):
         self.MunicipalityCode_nsprefix_ = None
         self.Label = Label
         self.Label_nsprefix_ = None
+
     def factory(*args_, **kwargs_):
         if CurrentSubclassModule_ is not None:
             subclass = getSubclassFromModule_(
@@ -1374,28 +1589,38 @@ class Municipality(GeneratedsSuper):
             return Municipality.subclass(*args_, **kwargs_)
         else:
             return Municipality(*args_, **kwargs_)
+
     factory = staticmethod(factory)
+
     def get_ns_prefix_(self):
         return self.ns_prefix_
+
     def set_ns_prefix_(self, ns_prefix):
         self.ns_prefix_ = ns_prefix
+
     def get_MunicipalityCode(self):
         return self.MunicipalityCode
+
     def set_MunicipalityCode(self, MunicipalityCode):
         self.MunicipalityCode = MunicipalityCode
+
     def get_Label(self):
         return self.Label
+
     def set_Label(self, Label):
         self.Label = Label
+
     def hasContent_(self):
         if (
-            self.MunicipalityCode is not None or
-            self.Label is not None
+                self.MunicipalityCode is not None or
+                self.Label is not None
         ):
             return True
         else:
             return False
-    def export(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"', name_='Municipality', pretty_print=True):
+
+    def export(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"',
+               name_='Municipality', pretty_print=True):
         imported_ns_def_ = GenerateDSNamespaceDefs_.get('Municipality')
         if imported_ns_def_ is not None:
             namespacedef_ = imported_ns_def_
@@ -1403,36 +1628,46 @@ class Municipality(GeneratedsSuper):
             eol_ = '\n'
         else:
             eol_ = ''
-        if self.original_tagname_ is not None:
+        if self.original_tagname_ is not None and name_ == 'Municipality':
             name_ = self.original_tagname_
         if UseCapturedNS_ and self.ns_prefix_:
             namespaceprefix_ = self.ns_prefix_ + ':'
         showIndent(outfile, level, pretty_print)
-        outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+        outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '',))
         already_processed = set()
         self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='Municipality')
         if self.hasContent_():
-            outfile.write('>%s' % (eol_, ))
-            self.exportChildren(outfile, level + 1, namespaceprefix_, namespacedef_, name_='Municipality', pretty_print=pretty_print)
+            outfile.write('>%s' % (eol_,))
+            self.exportChildren(outfile, level + 1, namespaceprefix_, namespacedef_, name_='Municipality',
+                                pretty_print=pretty_print)
             showIndent(outfile, level, pretty_print)
             outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
         else:
-            outfile.write('/>%s' % (eol_, ))
+            outfile.write('/>%s' % (eol_,))
+
     def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='Municipality'):
         pass
-    def exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"', name_='Municipality', fromsubclass_=False, pretty_print=True):
+
+    def exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"',
+                       name_='Municipality', fromsubclass_=False, pretty_print=True):
         if pretty_print:
             eol_ = '\n'
         else:
             eol_ = ''
         if self.MunicipalityCode is not None:
-            namespaceprefix_ = self.MunicipalityCode_nsprefix_ + ':' if (UseCapturedNS_ and self.MunicipalityCode_nsprefix_) else ''
+            namespaceprefix_ = self.MunicipalityCode_nsprefix_ + ':' if (
+                        UseCapturedNS_ and self.MunicipalityCode_nsprefix_) else ''
             showIndent(outfile, level, pretty_print)
-            outfile.write('<%sMunicipalityCode>%s</%sMunicipalityCode>%s' % (namespaceprefix_ , self.gds_format_integer(self.MunicipalityCode, input_name='MunicipalityCode'), namespaceprefix_ , eol_))
+            outfile.write('<%sMunicipalityCode>%s</%sMunicipalityCode>%s' % (
+            namespaceprefix_, self.gds_format_integer(self.MunicipalityCode, input_name='MunicipalityCode'),
+            namespaceprefix_, eol_))
         if self.Label is not None:
             namespaceprefix_ = self.Label_nsprefix_ + ':' if (UseCapturedNS_ and self.Label_nsprefix_) else ''
             showIndent(outfile, level, pretty_print)
-            outfile.write('<%sLabel>%s</%sLabel>%s' % (namespaceprefix_ , self.gds_encode(self.gds_format_string(quote_xml(self.Label), input_name='Label')), namespaceprefix_ , eol_))
+            outfile.write('<%sLabel>%s</%sLabel>%s' % (
+            namespaceprefix_, self.gds_encode(self.gds_format_string(quote_xml(self.Label), input_name='Label')),
+            namespaceprefix_, eol_))
+
     def build(self, node, gds_collector_=None):
         self.gds_collector_ = gds_collector_
         if SaveElementTreeNode:
@@ -1444,8 +1679,10 @@ class Municipality(GeneratedsSuper):
             nodeName_ = Tag_pattern_.match(child.tag).groups()[-1]
             self.buildChildren(child, node, nodeName_, gds_collector_=gds_collector_)
         return self
+
     def buildAttributes(self, node, attrs, already_processed):
         pass
+
     def buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_collector_=None):
         if nodeName_ == 'MunicipalityCode' and child_.text:
             sval_ = child_.text
@@ -1459,6 +1696,8 @@ class Municipality(GeneratedsSuper):
             value_ = self.gds_validate_string(value_, node, 'Label')
             self.Label = value_
             self.Label_nsprefix_ = child_.prefix
+
+
 # end class Municipality
 
 
@@ -1466,6 +1705,7 @@ class District(GeneratedsSuper):
     __hash__ = GeneratedsSuper.__hash__
     subclass = None
     superclass = None
+
     def __init__(self, DistrictCode=None, Name=None, gds_collector_=None, **kwargs_):
         self.gds_collector_ = gds_collector_
         self.gds_elementtree_node_ = None
@@ -1476,6 +1716,7 @@ class District(GeneratedsSuper):
         self.DistrictCode_nsprefix_ = None
         self.Name = Name
         self.Name_nsprefix_ = None
+
     def factory(*args_, **kwargs_):
         if CurrentSubclassModule_ is not None:
             subclass = getSubclassFromModule_(
@@ -1486,28 +1727,38 @@ class District(GeneratedsSuper):
             return District.subclass(*args_, **kwargs_)
         else:
             return District(*args_, **kwargs_)
+
     factory = staticmethod(factory)
+
     def get_ns_prefix_(self):
         return self.ns_prefix_
+
     def set_ns_prefix_(self, ns_prefix):
         self.ns_prefix_ = ns_prefix
+
     def get_DistrictCode(self):
         return self.DistrictCode
+
     def set_DistrictCode(self, DistrictCode):
         self.DistrictCode = DistrictCode
+
     def get_Name(self):
         return self.Name
+
     def set_Name(self, Name):
         self.Name = Name
+
     def hasContent_(self):
         if (
-            self.DistrictCode is not None or
-            self.Name is not None
+                self.DistrictCode is not None or
+                self.Name is not None
         ):
             return True
         else:
             return False
-    def export(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"', name_='District', pretty_print=True):
+
+    def export(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"',
+               name_='District', pretty_print=True):
         imported_ns_def_ = GenerateDSNamespaceDefs_.get('District')
         if imported_ns_def_ is not None:
             namespacedef_ = imported_ns_def_
@@ -1515,34 +1766,44 @@ class District(GeneratedsSuper):
             eol_ = '\n'
         else:
             eol_ = ''
-        if self.original_tagname_ is not None:
+        if self.original_tagname_ is not None and name_ == 'District':
             name_ = self.original_tagname_
         if UseCapturedNS_ and self.ns_prefix_:
             namespaceprefix_ = self.ns_prefix_ + ':'
         showIndent(outfile, level, pretty_print)
-        outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+        outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '',))
         already_processed = set()
         self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='District')
         if self.hasContent_():
-            outfile.write('>%s' % (eol_, ))
-            self.exportChildren(outfile, level + 1, namespaceprefix_, namespacedef_, name_='District', pretty_print=pretty_print)
+            outfile.write('>%s' % (eol_,))
+            self.exportChildren(outfile, level + 1, namespaceprefix_, namespacedef_, name_='District',
+                                pretty_print=pretty_print)
             showIndent(outfile, level, pretty_print)
             outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
         else:
-            outfile.write('/>%s' % (eol_, ))
+            outfile.write('/>%s' % (eol_,))
+
     def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='District'):
         pass
-    def exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"', name_='District', fromsubclass_=False, pretty_print=True):
+
+    def exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"',
+                       name_='District', fromsubclass_=False, pretty_print=True):
         if pretty_print:
             eol_ = '\n'
         else:
             eol_ = ''
         if self.DistrictCode is not None:
-            namespaceprefix_ = self.DistrictCode_nsprefix_ + ':' if (UseCapturedNS_ and self.DistrictCode_nsprefix_) else ''
-            self.DistrictCode.export(outfile, level, namespaceprefix_='ns1:', namespacedef_='', name_='DistrictCode', pretty_print=pretty_print)
+            namespaceprefix_ = self.DistrictCode_nsprefix_ + ':' if (
+                        UseCapturedNS_ and self.DistrictCode_nsprefix_) else ''
+            showIndent(outfile, level, pretty_print)
+            outfile.write('<%sDistrictCode>%s</%sDistrictCode>%s' % (namespaceprefix_, self.gds_encode(
+                self.gds_format_string(quote_xml(self.DistrictCode), input_name='DistrictCode')), namespaceprefix_,
+                                                                     eol_))
         if self.Name is not None:
             namespaceprefix_ = self.Name_nsprefix_ + ':' if (UseCapturedNS_ and self.Name_nsprefix_) else ''
-            self.Name.export(outfile, level, namespaceprefix_='ns1:', namespacedef_='', name_='Name', pretty_print=pretty_print)
+            self.Name.export(outfile, level, namespaceprefix_='ns1:', namespacedef_='', name_='Name',
+                             pretty_print=pretty_print)
+
     def build(self, node, gds_collector_=None):
         self.gds_collector_ = gds_collector_
         if SaveElementTreeNode:
@@ -1554,165 +1815,131 @@ class District(GeneratedsSuper):
             nodeName_ = Tag_pattern_.match(child.tag).groups()[-1]
             self.buildChildren(child, node, nodeName_, gds_collector_=gds_collector_)
         return self
+
     def buildAttributes(self, node, attrs, already_processed):
         pass
+
     def buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_collector_=None):
         if nodeName_ == 'DistrictCode':
-            obj_ = DistrictCode.factory(parent_object_=self)
-            obj_.build(child_, gds_collector_=gds_collector_)
-            self.DistrictCode = obj_
-            obj_.original_tagname_ = 'DistrictCode'
+            value_ = child_.text
+            value_ = self.gds_parse_string(value_, node, 'DistrictCode')
+            value_ = self.gds_validate_string(value_, node, 'DistrictCode')
+            self.DistrictCode = value_
+            self.DistrictCode_nsprefix_ = child_.prefix
         elif nodeName_ == 'Name':
             obj_ = Name.factory(parent_object_=self)
             obj_.build(child_, gds_collector_=gds_collector_)
             self.Name = obj_
             obj_.original_tagname_ = 'Name'
+
+
 # end class District
 
 
-class DistrictCode(GeneratedsSuper):
+class Area(GeneratedsSuper):
     __hash__ = GeneratedsSuper.__hash__
     subclass = None
     superclass = None
-    def __init__(self, gds_collector_=None, **kwargs_):
+
+    def __init__(self, Name=None, Location=None, Condition=None, Description=None, State=None, DHID=None, Quays=None,
+                 gds_collector_=None, **kwargs_):
         self.gds_collector_ = gds_collector_
         self.gds_elementtree_node_ = None
         self.original_tagname_ = None
         self.parent_object_ = kwargs_.get('parent_object_')
         self.ns_prefix_ = None
+        self.Name = Name
+        self.Name_nsprefix_ = None
+        self.Location = Location
+        self.Location_nsprefix_ = None
+        self.Condition = Condition
+        self.Condition_nsprefix_ = None
+        self.Description = Description
+        self.Description_nsprefix_ = None
+        self.State = State
+        self.State_nsprefix_ = None
+        self.DHID = DHID
+        self.DHID_nsprefix_ = None
+        self.Quays = Quays
+        self.Quays_nsprefix_ = None
+
     def factory(*args_, **kwargs_):
         if CurrentSubclassModule_ is not None:
             subclass = getSubclassFromModule_(
-                CurrentSubclassModule_, DistrictCode)
+                CurrentSubclassModule_, Area)
             if subclass is not None:
                 return subclass(*args_, **kwargs_)
-        if DistrictCode.subclass:
-            return DistrictCode.subclass(*args_, **kwargs_)
+        if Area.subclass:
+            return Area.subclass(*args_, **kwargs_)
         else:
-            return DistrictCode(*args_, **kwargs_)
+            return Area(*args_, **kwargs_)
+
     factory = staticmethod(factory)
+
     def get_ns_prefix_(self):
         return self.ns_prefix_
+
     def set_ns_prefix_(self, ns_prefix):
         self.ns_prefix_ = ns_prefix
-    def hasContent_(self):
-        if (
 
-        ):
-            return True
-        else:
-            return False
-    def export(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"', name_='DistrictCode', pretty_print=True):
-        imported_ns_def_ = GenerateDSNamespaceDefs_.get('DistrictCode')
-        if imported_ns_def_ is not None:
-            namespacedef_ = imported_ns_def_
-        if pretty_print:
-            eol_ = '\n'
-        else:
-            eol_ = ''
-        if self.original_tagname_ is not None:
-            name_ = self.original_tagname_
-        if UseCapturedNS_ and self.ns_prefix_:
-            namespaceprefix_ = self.ns_prefix_ + ':'
-        showIndent(outfile, level, pretty_print)
-        outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
-        already_processed = set()
-        self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='DistrictCode')
-        if self.hasContent_():
-            outfile.write('>%s' % (eol_, ))
-            self.exportChildren(outfile, level + 1, namespaceprefix_, namespacedef_, name_='DistrictCode', pretty_print=pretty_print)
-            outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
-        else:
-            outfile.write('/>%s' % (eol_, ))
-    def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='DistrictCode'):
-        pass
-    def exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"', name_='DistrictCode', fromsubclass_=False, pretty_print=True):
-        pass
-    def build(self, node, gds_collector_=None):
-        self.gds_collector_ = gds_collector_
-        if SaveElementTreeNode:
-            self.gds_elementtree_node_ = node
-        already_processed = set()
-        self.ns_prefix_ = node.prefix
-        self.buildAttributes(node, node.attrib, already_processed)
-        for child in node:
-            nodeName_ = Tag_pattern_.match(child.tag).groups()[-1]
-            self.buildChildren(child, node, nodeName_, gds_collector_=gds_collector_)
-        return self
-    def buildAttributes(self, node, attrs, already_processed):
-        pass
-    def buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_collector_=None):
-        pass
-# end class DistrictCode
-
-
-class Area(GeneratedsSuper):
-    __hash__ = GeneratedsSuper.__hash__
-    subclass = None
-    superclass = None
-    def __init__(self, Name=None, Location=None, Condition=None, DHID=None, Quays=None, gds_collector_=None, **kwargs_):
-        self.gds_collector_ = gds_collector_
-        self.gds_elementtree_node_ = None
-        self.original_tagname_ = None
-        self.parent_object_ = kwargs_.get('parent_object_')
-        self.ns_prefix_ = None
-        self.Name = Name
-        self.Name_nsprefix_ = None
-        self.Location = Location
-        self.Location_nsprefix_ = None
-        self.Condition = Condition
-        self.Condition_nsprefix_ = None
-        self.DHID = DHID
-        self.DHID_nsprefix_ = None
-        self.Quays = Quays
-        self.Quays_nsprefix_ = None
-    def factory(*args_, **kwargs_):
-        if CurrentSubclassModule_ is not None:
-            subclass = getSubclassFromModule_(
-                CurrentSubclassModule_, Area)
-            if subclass is not None:
-                return subclass(*args_, **kwargs_)
-        if Area.subclass:
-            return Area.subclass(*args_, **kwargs_)
-        else:
-            return Area(*args_, **kwargs_)
-    factory = staticmethod(factory)
-    def get_ns_prefix_(self):
-        return self.ns_prefix_
-    def set_ns_prefix_(self, ns_prefix):
-        self.ns_prefix_ = ns_prefix
     def get_Name(self):
         return self.Name
+
     def set_Name(self, Name):
         self.Name = Name
+
     def get_Location(self):
         return self.Location
+
     def set_Location(self, Location):
         self.Location = Location
+
     def get_Condition(self):
         return self.Condition
+
     def set_Condition(self, Condition):
         self.Condition = Condition
+
+    def get_Description(self):
+        return self.Description
+
+    def set_Description(self, Description):
+        self.Description = Description
+
+    def get_State(self):
+        return self.State
+
+    def set_State(self, State):
+        self.State = State
+
     def get_DHID(self):
         return self.DHID
+
     def set_DHID(self, DHID):
         self.DHID = DHID
+
     def get_Quays(self):
         return self.Quays
+
     def set_Quays(self, Quays):
         self.Quays = Quays
+
     def hasContent_(self):
         if (
-            self.Name is not None or
-            self.Location is not None or
-            self.Condition is not None or
-            self.DHID is not None or
-            self.Quays is not None
+                self.Name is not None or
+                self.Location is not None or
+                self.Condition is not None or
+                self.Description is not None or
+                self.State is not None or
+                self.DHID is not None or
+                self.Quays is not None
         ):
             return True
         else:
             return False
-    def export(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"', name_='Area', pretty_print=True):
+
+    def export(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"', name_='Area',
+               pretty_print=True):
         imported_ns_def_ = GenerateDSNamespaceDefs_.get('Area')
         if imported_ns_def_ is not None:
             namespacedef_ = imported_ns_def_
@@ -1720,44 +1947,64 @@ class Area(GeneratedsSuper):
             eol_ = '\n'
         else:
             eol_ = ''
-        if self.original_tagname_ is not None:
+        if self.original_tagname_ is not None and name_ == 'Area':
             name_ = self.original_tagname_
         if UseCapturedNS_ and self.ns_prefix_:
             namespaceprefix_ = self.ns_prefix_ + ':'
         showIndent(outfile, level, pretty_print)
-        outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+        outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '',))
         already_processed = set()
         self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='Area')
         if self.hasContent_():
-            outfile.write('>%s' % (eol_, ))
-            self.exportChildren(outfile, level + 1, namespaceprefix_, namespacedef_, name_='Area', pretty_print=pretty_print)
+            outfile.write('>%s' % (eol_,))
+            self.exportChildren(outfile, level + 1, namespaceprefix_, namespacedef_, name_='Area',
+                                pretty_print=pretty_print)
             showIndent(outfile, level, pretty_print)
             outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
         else:
-            outfile.write('/>%s' % (eol_, ))
+            outfile.write('/>%s' % (eol_,))
+
     def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='Area'):
         pass
-    def exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"', name_='Area', fromsubclass_=False, pretty_print=True):
+
+    def exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"',
+                       name_='Area', fromsubclass_=False, pretty_print=True):
         if pretty_print:
             eol_ = '\n'
         else:
             eol_ = ''
         if self.Name is not None:
             namespaceprefix_ = self.Name_nsprefix_ + ':' if (UseCapturedNS_ and self.Name_nsprefix_) else ''
-            self.Name.export(outfile, level, namespaceprefix_='ns1:', namespacedef_='', name_='Name', pretty_print=pretty_print)
+            self.Name.export(outfile, level, namespaceprefix_='ns1:', namespacedef_='', name_='Name',
+                             pretty_print=pretty_print)
         if self.Location is not None:
             namespaceprefix_ = self.Location_nsprefix_ + ':' if (UseCapturedNS_ and self.Location_nsprefix_) else ''
-            self.Location.export(outfile, level, namespaceprefix_='ns1:', namespacedef_='', name_='Location', pretty_print=pretty_print)
+            self.Location.export(outfile, level, namespaceprefix_='ns1:', namespacedef_='', name_='Location',
+                                 pretty_print=pretty_print)
         if self.Condition is not None:
             namespaceprefix_ = self.Condition_nsprefix_ + ':' if (UseCapturedNS_ and self.Condition_nsprefix_) else ''
-            self.Condition.export(outfile, level, namespaceprefix_='ns1:', namespacedef_='', name_='Condition', pretty_print=pretty_print)
+            self.Condition.export(outfile, level, namespaceprefix_='ns1:', namespacedef_='', name_='Condition',
+                                  pretty_print=pretty_print)
+        if self.Description is not None:
+            namespaceprefix_ = self.Description_nsprefix_ + ':' if (
+                        UseCapturedNS_ and self.Description_nsprefix_) else ''
+            self.Description.export(outfile, level, namespaceprefix_='ns1:', namespacedef_='', name_='Description',
+                                    pretty_print=pretty_print)
+        if self.State is not None:
+            namespaceprefix_ = self.State_nsprefix_ + ':' if (UseCapturedNS_ and self.State_nsprefix_) else ''
+            self.State.export(outfile, level, namespaceprefix_='ns1:', namespacedef_='', name_='State',
+                              pretty_print=pretty_print)
         if self.DHID is not None:
             namespaceprefix_ = self.DHID_nsprefix_ + ':' if (UseCapturedNS_ and self.DHID_nsprefix_) else ''
             showIndent(outfile, level, pretty_print)
-            outfile.write('<%sDHID>%s</%sDHID>%s' % (namespaceprefix_ , self.gds_encode(self.gds_format_string(quote_xml(self.DHID), input_name='DHID')), namespaceprefix_ , eol_))
+            outfile.write('<%sDHID>%s</%sDHID>%s' % (
+            namespaceprefix_, self.gds_encode(self.gds_format_string(quote_xml(self.DHID), input_name='DHID')),
+            namespaceprefix_, eol_))
         if self.Quays is not None:
             namespaceprefix_ = self.Quays_nsprefix_ + ':' if (UseCapturedNS_ and self.Quays_nsprefix_) else ''
-            self.Quays.export(outfile, level, namespaceprefix_='ns1:', namespacedef_='', name_='Quays', pretty_print=pretty_print)
+            self.Quays.export(outfile, level, namespaceprefix_='ns1:', namespacedef_='', name_='Quays',
+                              pretty_print=pretty_print)
+
     def build(self, node, gds_collector_=None):
         self.gds_collector_ = gds_collector_
         if SaveElementTreeNode:
@@ -1769,8 +2016,10 @@ class Area(GeneratedsSuper):
             nodeName_ = Tag_pattern_.match(child.tag).groups()[-1]
             self.buildChildren(child, node, nodeName_, gds_collector_=gds_collector_)
         return self
+
     def buildAttributes(self, node, attrs, already_processed):
         pass
+
     def buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_collector_=None):
         if nodeName_ == 'Name':
             obj_ = Name.factory(parent_object_=self)
@@ -1787,6 +2036,16 @@ class Area(GeneratedsSuper):
             obj_.build(child_, gds_collector_=gds_collector_)
             self.Condition = obj_
             obj_.original_tagname_ = 'Condition'
+        elif nodeName_ == 'Description':
+            obj_ = Description.factory(parent_object_=self)
+            obj_.build(child_, gds_collector_=gds_collector_)
+            self.Description = obj_
+            obj_.original_tagname_ = 'Description'
+        elif nodeName_ == 'State':
+            obj_ = State.factory(parent_object_=self)
+            obj_.build(child_, gds_collector_=gds_collector_)
+            self.State = obj_
+            obj_.original_tagname_ = 'State'
         elif nodeName_ == 'DHID':
             value_ = child_.text
             value_ = self.gds_parse_string(value_, node, 'DHID')
@@ -1798,6 +2057,8 @@ class Area(GeneratedsSuper):
             obj_.build(child_, gds_collector_=gds_collector_)
             self.Quays = obj_
             obj_.original_tagname_ = 'Quays'
+
+
 # end class Area
 
 
@@ -1805,14 +2066,19 @@ class Quays(GeneratedsSuper):
     __hash__ = GeneratedsSuper.__hash__
     subclass = None
     superclass = None
+
     def __init__(self, Quay=None, gds_collector_=None, **kwargs_):
         self.gds_collector_ = gds_collector_
         self.gds_elementtree_node_ = None
         self.original_tagname_ = None
         self.parent_object_ = kwargs_.get('parent_object_')
         self.ns_prefix_ = None
-        self.Quay = Quay
+        if Quay is None:
+            self.Quay = []
+        else:
+            self.Quay = Quay
         self.Quay_nsprefix_ = None
+
     def factory(*args_, **kwargs_):
         if CurrentSubclassModule_ is not None:
             subclass = getSubclassFromModule_(
@@ -1823,23 +2089,40 @@ class Quays(GeneratedsSuper):
             return Quays.subclass(*args_, **kwargs_)
         else:
             return Quays(*args_, **kwargs_)
+
     factory = staticmethod(factory)
+
     def get_ns_prefix_(self):
         return self.ns_prefix_
+
     def set_ns_prefix_(self, ns_prefix):
         self.ns_prefix_ = ns_prefix
+
     def get_Quay(self):
         return self.Quay
+
     def set_Quay(self, Quay):
         self.Quay = Quay
+
+    def add_Quay(self, value):
+        self.Quay.append(value)
+
+    def insert_Quay_at(self, index, value):
+        self.Quay.insert(index, value)
+
+    def replace_Quay_at(self, index, value):
+        self.Quay[index] = value
+
     def hasContent_(self):
         if (
-            self.Quay is not None
+                self.Quay
         ):
             return True
         else:
             return False
-    def export(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"', name_='Quays', pretty_print=True):
+
+    def export(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"',
+               name_='Quays', pretty_print=True):
         imported_ns_def_ = GenerateDSNamespaceDefs_.get('Quays')
         if imported_ns_def_ is not None:
             namespacedef_ = imported_ns_def_
@@ -1847,31 +2130,37 @@ class Quays(GeneratedsSuper):
             eol_ = '\n'
         else:
             eol_ = ''
-        if self.original_tagname_ is not None:
+        if self.original_tagname_ is not None and name_ == 'Quays':
             name_ = self.original_tagname_
         if UseCapturedNS_ and self.ns_prefix_:
             namespaceprefix_ = self.ns_prefix_ + ':'
         showIndent(outfile, level, pretty_print)
-        outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+        outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '',))
         already_processed = set()
         self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='Quays')
         if self.hasContent_():
-            outfile.write('>%s' % (eol_, ))
-            self.exportChildren(outfile, level + 1, namespaceprefix_, namespacedef_, name_='Quays', pretty_print=pretty_print)
+            outfile.write('>%s' % (eol_,))
+            self.exportChildren(outfile, level + 1, namespaceprefix_, namespacedef_, name_='Quays',
+                                pretty_print=pretty_print)
             showIndent(outfile, level, pretty_print)
             outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
         else:
-            outfile.write('/>%s' % (eol_, ))
+            outfile.write('/>%s' % (eol_,))
+
     def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='Quays'):
         pass
-    def exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"', name_='Quays', fromsubclass_=False, pretty_print=True):
+
+    def exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"',
+                       name_='Quays', fromsubclass_=False, pretty_print=True):
         if pretty_print:
             eol_ = '\n'
         else:
             eol_ = ''
-        if self.Quay is not None:
+        for Quay_ in self.Quay:
             namespaceprefix_ = self.Quay_nsprefix_ + ':' if (UseCapturedNS_ and self.Quay_nsprefix_) else ''
-            self.Quay.export(outfile, level, namespaceprefix_='ns1:', namespacedef_='', name_='Quay', pretty_print=pretty_print)
+            Quay_.export(outfile, level, namespaceprefix_='ns1:', namespacedef_='', name_='Quay',
+                         pretty_print=pretty_print)
+
     def build(self, node, gds_collector_=None):
         self.gds_collector_ = gds_collector_
         if SaveElementTreeNode:
@@ -1883,14 +2172,18 @@ class Quays(GeneratedsSuper):
             nodeName_ = Tag_pattern_.match(child.tag).groups()[-1]
             self.buildChildren(child, node, nodeName_, gds_collector_=gds_collector_)
         return self
+
     def buildAttributes(self, node, attrs, already_processed):
         pass
+
     def buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_collector_=None):
         if nodeName_ == 'Quay':
             obj_ = Quay.factory(parent_object_=self)
             obj_.build(child_, gds_collector_=gds_collector_)
-            self.Quay = obj_
+            self.Quay.append(obj_)
             obj_.original_tagname_ = 'Quay'
+
+
 # end class Quays
 
 
@@ -1898,7 +2191,9 @@ class Quay(GeneratedsSuper):
     __hash__ = GeneratedsSuper.__hash__
     subclass = None
     superclass = None
-    def __init__(self, Name=None, Location=None, Condition=None, DHID=None, gds_collector_=None, **kwargs_):
+
+    def __init__(self, Name=None, Location=None, Condition=None, Description=None, State=None, DHID=None,
+                 gds_collector_=None, **kwargs_):
         self.gds_collector_ = gds_collector_
         self.gds_elementtree_node_ = None
         self.original_tagname_ = None
@@ -1910,8 +2205,13 @@ class Quay(GeneratedsSuper):
         self.Location_nsprefix_ = None
         self.Condition = Condition
         self.Condition_nsprefix_ = None
+        self.Description = Description
+        self.Description_nsprefix_ = None
+        self.State = State
+        self.State_nsprefix_ = None
         self.DHID = DHID
         self.DHID_nsprefix_ = None
+
     def factory(*args_, **kwargs_):
         if CurrentSubclassModule_ is not None:
             subclass = getSubclassFromModule_(
@@ -1922,38 +2222,66 @@ class Quay(GeneratedsSuper):
             return Quay.subclass(*args_, **kwargs_)
         else:
             return Quay(*args_, **kwargs_)
+
     factory = staticmethod(factory)
+
     def get_ns_prefix_(self):
         return self.ns_prefix_
+
     def set_ns_prefix_(self, ns_prefix):
         self.ns_prefix_ = ns_prefix
+
     def get_Name(self):
         return self.Name
+
     def set_Name(self, Name):
         self.Name = Name
+
     def get_Location(self):
         return self.Location
+
     def set_Location(self, Location):
         self.Location = Location
+
     def get_Condition(self):
         return self.Condition
+
     def set_Condition(self, Condition):
         self.Condition = Condition
+
+    def get_Description(self):
+        return self.Description
+
+    def set_Description(self, Description):
+        self.Description = Description
+
+    def get_State(self):
+        return self.State
+
+    def set_State(self, State):
+        self.State = State
+
     def get_DHID(self):
         return self.DHID
+
     def set_DHID(self, DHID):
         self.DHID = DHID
+
     def hasContent_(self):
         if (
-            self.Name is not None or
-            self.Location is not None or
-            self.Condition is not None or
-            self.DHID is not None
+                self.Name is not None or
+                self.Location is not None or
+                self.Condition is not None or
+                self.Description is not None or
+                self.State is not None or
+                self.DHID is not None
         ):
             return True
         else:
             return False
-    def export(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"', name_='Quay', pretty_print=True):
+
+    def export(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"', name_='Quay',
+               pretty_print=True):
         imported_ns_def_ = GenerateDSNamespaceDefs_.get('Quay')
         if imported_ns_def_ is not None:
             namespacedef_ = imported_ns_def_
@@ -1961,41 +2289,60 @@ class Quay(GeneratedsSuper):
             eol_ = '\n'
         else:
             eol_ = ''
-        if self.original_tagname_ is not None:
+        if self.original_tagname_ is not None and name_ == 'Quay':
             name_ = self.original_tagname_
         if UseCapturedNS_ and self.ns_prefix_:
             namespaceprefix_ = self.ns_prefix_ + ':'
         showIndent(outfile, level, pretty_print)
-        outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+        outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '',))
         already_processed = set()
         self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='Quay')
         if self.hasContent_():
-            outfile.write('>%s' % (eol_, ))
-            self.exportChildren(outfile, level + 1, namespaceprefix_, namespacedef_, name_='Quay', pretty_print=pretty_print)
+            outfile.write('>%s' % (eol_,))
+            self.exportChildren(outfile, level + 1, namespaceprefix_, namespacedef_, name_='Quay',
+                                pretty_print=pretty_print)
             showIndent(outfile, level, pretty_print)
             outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
         else:
-            outfile.write('/>%s' % (eol_, ))
+            outfile.write('/>%s' % (eol_,))
+
     def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='Quay'):
         pass
-    def exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"', name_='Quay', fromsubclass_=False, pretty_print=True):
+
+    def exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"',
+                       name_='Quay', fromsubclass_=False, pretty_print=True):
         if pretty_print:
             eol_ = '\n'
         else:
             eol_ = ''
         if self.Name is not None:
             namespaceprefix_ = self.Name_nsprefix_ + ':' if (UseCapturedNS_ and self.Name_nsprefix_) else ''
-            self.Name.export(outfile, level, namespaceprefix_='ns1:', namespacedef_='', name_='Name', pretty_print=pretty_print)
+            self.Name.export(outfile, level, namespaceprefix_='ns1:', namespacedef_='', name_='Name',
+                             pretty_print=pretty_print)
         if self.Location is not None:
             namespaceprefix_ = self.Location_nsprefix_ + ':' if (UseCapturedNS_ and self.Location_nsprefix_) else ''
-            self.Location.export(outfile, level, namespaceprefix_='ns1:', namespacedef_='', name_='Location', pretty_print=pretty_print)
+            self.Location.export(outfile, level, namespaceprefix_='ns1:', namespacedef_='', name_='Location',
+                                 pretty_print=pretty_print)
         if self.Condition is not None:
             namespaceprefix_ = self.Condition_nsprefix_ + ':' if (UseCapturedNS_ and self.Condition_nsprefix_) else ''
-            self.Condition.export(outfile, level, namespaceprefix_='ns1:', namespacedef_='', name_='Condition', pretty_print=pretty_print)
+            self.Condition.export(outfile, level, namespaceprefix_='ns1:', namespacedef_='', name_='Condition',
+                                  pretty_print=pretty_print)
+        if self.Description is not None:
+            namespaceprefix_ = self.Description_nsprefix_ + ':' if (
+                        UseCapturedNS_ and self.Description_nsprefix_) else ''
+            self.Description.export(outfile, level, namespaceprefix_='ns1:', namespacedef_='', name_='Description',
+                                    pretty_print=pretty_print)
+        if self.State is not None:
+            namespaceprefix_ = self.State_nsprefix_ + ':' if (UseCapturedNS_ and self.State_nsprefix_) else ''
+            self.State.export(outfile, level, namespaceprefix_='ns1:', namespacedef_='', name_='State',
+                              pretty_print=pretty_print)
         if self.DHID is not None:
             namespaceprefix_ = self.DHID_nsprefix_ + ':' if (UseCapturedNS_ and self.DHID_nsprefix_) else ''
             showIndent(outfile, level, pretty_print)
-            outfile.write('<%sDHID>%s</%sDHID>%s' % (namespaceprefix_ , self.gds_encode(self.gds_format_string(quote_xml(self.DHID), input_name='DHID')), namespaceprefix_ , eol_))
+            outfile.write('<%sDHID>%s</%sDHID>%s' % (
+            namespaceprefix_, self.gds_encode(self.gds_format_string(quote_xml(self.DHID), input_name='DHID')),
+            namespaceprefix_, eol_))
+
     def build(self, node, gds_collector_=None):
         self.gds_collector_ = gds_collector_
         if SaveElementTreeNode:
@@ -2007,8 +2354,10 @@ class Quay(GeneratedsSuper):
             nodeName_ = Tag_pattern_.match(child.tag).groups()[-1]
             self.buildChildren(child, node, nodeName_, gds_collector_=gds_collector_)
         return self
+
     def buildAttributes(self, node, attrs, already_processed):
         pass
+
     def buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_collector_=None):
         if nodeName_ == 'Name':
             obj_ = Name.factory(parent_object_=self)
@@ -2025,12 +2374,24 @@ class Quay(GeneratedsSuper):
             obj_.build(child_, gds_collector_=gds_collector_)
             self.Condition = obj_
             obj_.original_tagname_ = 'Condition'
+        elif nodeName_ == 'Description':
+            obj_ = Description.factory(parent_object_=self)
+            obj_.build(child_, gds_collector_=gds_collector_)
+            self.Description = obj_
+            obj_.original_tagname_ = 'Description'
+        elif nodeName_ == 'State':
+            obj_ = State.factory(parent_object_=self)
+            obj_.build(child_, gds_collector_=gds_collector_)
+            self.State = obj_
+            obj_.original_tagname_ = 'State'
         elif nodeName_ == 'DHID':
             value_ = child_.text
             value_ = self.gds_parse_string(value_, node, 'DHID')
             value_ = self.gds_validate_string(value_, node, 'DHID')
             self.DHID = value_
             self.DHID_nsprefix_ = child_.prefix
+
+
 # end class Quay
 
 
@@ -2038,7 +2399,9 @@ class Name(GeneratedsSuper):
     __hash__ = GeneratedsSuper.__hash__
     subclass = None
     superclass = None
-    def __init__(self, Name_member=None, valueOf_=None, mixedclass_=None, content_=None, gds_collector_=None, **kwargs_):
+
+    def __init__(self, Name_member=None, valueOf_=None, mixedclass_=None, content_=None, gds_collector_=None,
+                 **kwargs_):
         self.gds_collector_ = gds_collector_
         self.gds_elementtree_node_ = None
         self.original_tagname_ = None
@@ -2059,6 +2422,7 @@ class Name(GeneratedsSuper):
         else:
             self.content_ = content_
         self.valueOf_ = valueOf_
+
     def factory(*args_, **kwargs_):
         if CurrentSubclassModule_ is not None:
             subclass = getSubclassFromModule_(
@@ -2069,32 +2433,48 @@ class Name(GeneratedsSuper):
             return Name.subclass(*args_, **kwargs_)
         else:
             return Name(*args_, **kwargs_)
+
     factory = staticmethod(factory)
+
     def get_ns_prefix_(self):
         return self.ns_prefix_
+
     def set_ns_prefix_(self, ns_prefix):
         self.ns_prefix_ = ns_prefix
+
     def get_Name(self):
         return self.Name
+
     def set_Name(self, Name):
         self.Name = Name
+
     def add_Name(self, value):
         self.Name.append(value)
+
     def insert_Name_at(self, index, value):
         self.Name.insert(index, value)
+
     def replace_Name_at(self, index, value):
         self.Name[index] = value
-    def get_valueOf_(self): return self.valueOf_
-    def set_valueOf_(self, valueOf_): self.valueOf_ = valueOf_
+
+    def get_valueOf_(self):
+        return self.valueOf_
+
+    def set_valueOf_(self, valueOf_):
+        self.valueOf_ = valueOf_
+
     def hasContent_(self):
         if (
-            self.Name or
-            (1 if type(self.valueOf_) in [int,float] else self.valueOf_)
+                self.Name or
+                (1 if type(self.valueOf_) in [int, float] else self.valueOf_) or
+                self.content_
         ):
             return True
         else:
             return False
-    def export(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"', name_='Name', pretty_print=True):
+
+    def export(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"', name_='Name',
+               pretty_print=True):
         imported_ns_def_ = GenerateDSNamespaceDefs_.get('Name')
         if imported_ns_def_ is not None:
             namespacedef_ = imported_ns_def_
@@ -2102,24 +2482,28 @@ class Name(GeneratedsSuper):
             eol_ = '\n'
         else:
             eol_ = ''
-        if self.original_tagname_ is not None:
+        if self.original_tagname_ is not None and name_ == 'Name':
             name_ = self.original_tagname_
         if UseCapturedNS_ and self.ns_prefix_:
             namespaceprefix_ = self.ns_prefix_ + ':'
         showIndent(outfile, level, pretty_print)
-        outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+        outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '',))
         already_processed = set()
         self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='Name')
         if self.hasContent_():
-            outfile.write('>%s' % (eol_, ))
-            self.exportChildren(outfile, level + 1, namespaceprefix_, namespacedef_, name_='Name', pretty_print=pretty_print)
+            outfile.write('>%s' % (eol_,))
+            self.exportChildren(outfile, level + 1, namespaceprefix_, namespacedef_, name_='Name',
+                                pretty_print=pretty_print)
             showIndent(outfile, level, pretty_print)
             outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
         else:
-            outfile.write('/>%s' % (eol_, ))
+            outfile.write('/>%s' % (eol_,))
+
     def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='Name'):
         pass
-    def exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"', name_='Name', fromsubclass_=False, pretty_print=True):
+
+    def exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"',
+                       name_='Name', fromsubclass_=False, pretty_print=True):
         if not fromsubclass_:
             for item_ in self.content_:
                 item_.export(outfile, level, item_.name, namespaceprefix_, pretty_print=pretty_print)
@@ -2129,7 +2513,9 @@ class Name(GeneratedsSuper):
             eol_ = ''
         for Name_ in self.Name:
             namespaceprefix_ = self.Name_nsprefix_ + ':' if (UseCapturedNS_ and self.Name_nsprefix_) else ''
-            Name_.export(outfile, level, namespaceprefix_='ns1:', namespacedef_='', name_='Name', pretty_print=pretty_print)
+            Name_.export(outfile, level, namespaceprefix_='ns1:', namespacedef_='', name_='Name',
+                         pretty_print=pretty_print)
+
     def build(self, node, gds_collector_=None):
         self.gds_collector_ = gds_collector_
         if SaveElementTreeNode:
@@ -2140,29 +2526,33 @@ class Name(GeneratedsSuper):
         self.valueOf_ = get_all_text_(node)
         if node.text is not None:
             obj_ = self.mixedclass_(MixedContainer.CategoryText,
-                MixedContainer.TypeNone, '', node.text)
+                                    MixedContainer.TypeNone, '', node.text)
             self.content_.append(obj_)
         for child in node:
             nodeName_ = Tag_pattern_.match(child.tag).groups()[-1]
             self.buildChildren(child, node, nodeName_, gds_collector_=gds_collector_)
         return self
+
     def buildAttributes(self, node, attrs, already_processed):
         pass
+
     def buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_collector_=None):
         if nodeName_ == 'Name':
             obj_ = Name.factory(parent_object_=self)
             obj_.build(child_, gds_collector_=gds_collector_)
             obj_ = self.mixedclass_(MixedContainer.CategoryComplex,
-                MixedContainer.TypeNone, 'Name', obj_)
+                                    MixedContainer.TypeNone, 'Name', obj_)
             self.content_.append(obj_)
             if hasattr(self, 'add_Name'):
-              self.add_Name(obj_.value)
+                self.add_Name(obj_.value)
             elif hasattr(self, 'set_Name'):
-              self.set_Name(obj_.value)
+                self.set_Name(obj_.value)
         if not fromsubclass_ and child_.tail is not None:
             obj_ = self.mixedclass_(MixedContainer.CategoryText,
-                MixedContainer.TypeNone, '', child_.tail)
+                                    MixedContainer.TypeNone, '', child_.tail)
             self.content_.append(obj_)
+
+
 # end class Name
 
 
@@ -2170,6 +2560,7 @@ class Location(GeneratedsSuper):
     __hash__ = GeneratedsSuper.__hash__
     subclass = None
     superclass = None
+
     def __init__(self, Latitude=None, Longitude=None, gds_collector_=None, **kwargs_):
         self.gds_collector_ = gds_collector_
         self.gds_elementtree_node_ = None
@@ -2180,6 +2571,7 @@ class Location(GeneratedsSuper):
         self.Latitude_nsprefix_ = None
         self.Longitude = Longitude
         self.Longitude_nsprefix_ = None
+
     def factory(*args_, **kwargs_):
         if CurrentSubclassModule_ is not None:
             subclass = getSubclassFromModule_(
@@ -2190,28 +2582,38 @@ class Location(GeneratedsSuper):
             return Location.subclass(*args_, **kwargs_)
         else:
             return Location(*args_, **kwargs_)
+
     factory = staticmethod(factory)
+
     def get_ns_prefix_(self):
         return self.ns_prefix_
+
     def set_ns_prefix_(self, ns_prefix):
         self.ns_prefix_ = ns_prefix
+
     def get_Latitude(self):
         return self.Latitude
+
     def set_Latitude(self, Latitude):
         self.Latitude = Latitude
+
     def get_Longitude(self):
         return self.Longitude
+
     def set_Longitude(self, Longitude):
         self.Longitude = Longitude
+
     def hasContent_(self):
         if (
-            self.Latitude is not None or
-            self.Longitude is not None
+                self.Latitude is not None or
+                self.Longitude is not None
         ):
             return True
         else:
             return False
-    def export(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"', name_='Location', pretty_print=True):
+
+    def export(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"',
+               name_='Location', pretty_print=True):
         imported_ns_def_ = GenerateDSNamespaceDefs_.get('Location')
         if imported_ns_def_ is not None:
             namespacedef_ = imported_ns_def_
@@ -2219,24 +2621,28 @@ class Location(GeneratedsSuper):
             eol_ = '\n'
         else:
             eol_ = ''
-        if self.original_tagname_ is not None:
+        if self.original_tagname_ is not None and name_ == 'Location':
             name_ = self.original_tagname_
         if UseCapturedNS_ and self.ns_prefix_:
             namespaceprefix_ = self.ns_prefix_ + ':'
         showIndent(outfile, level, pretty_print)
-        outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+        outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '',))
         already_processed = set()
         self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='Location')
         if self.hasContent_():
-            outfile.write('>%s' % (eol_, ))
-            self.exportChildren(outfile, level + 1, namespaceprefix_, namespacedef_, name_='Location', pretty_print=pretty_print)
+            outfile.write('>%s' % (eol_,))
+            self.exportChildren(outfile, level + 1, namespaceprefix_, namespacedef_, name_='Location',
+                                pretty_print=pretty_print)
             showIndent(outfile, level, pretty_print)
             outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
         else:
-            outfile.write('/>%s' % (eol_, ))
+            outfile.write('/>%s' % (eol_,))
+
     def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='Location'):
         pass
-    def exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"', name_='Location', fromsubclass_=False, pretty_print=True):
+
+    def exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"',
+                       name_='Location', fromsubclass_=False, pretty_print=True):
         if pretty_print:
             eol_ = '\n'
         else:
@@ -2244,11 +2650,14 @@ class Location(GeneratedsSuper):
         if self.Latitude is not None:
             namespaceprefix_ = self.Latitude_nsprefix_ + ':' if (UseCapturedNS_ and self.Latitude_nsprefix_) else ''
             showIndent(outfile, level, pretty_print)
-            outfile.write('<%sLatitude>%s</%sLatitude>%s' % (namespaceprefix_ , self.gds_format_decimal(self.Latitude, input_name='Latitude'), namespaceprefix_ , eol_))
+            outfile.write('<%sLatitude>%s</%sLatitude>%s' % (
+            namespaceprefix_, self.gds_format_decimal(self.Latitude, input_name='Latitude'), namespaceprefix_, eol_))
         if self.Longitude is not None:
             namespaceprefix_ = self.Longitude_nsprefix_ + ':' if (UseCapturedNS_ and self.Longitude_nsprefix_) else ''
             showIndent(outfile, level, pretty_print)
-            outfile.write('<%sLongitude>%s</%sLongitude>%s' % (namespaceprefix_ , self.gds_format_decimal(self.Longitude, input_name='Longitude'), namespaceprefix_ , eol_))
+            outfile.write('<%sLongitude>%s</%sLongitude>%s' % (
+            namespaceprefix_, self.gds_format_decimal(self.Longitude, input_name='Longitude'), namespaceprefix_, eol_))
+
     def build(self, node, gds_collector_=None):
         self.gds_collector_ = gds_collector_
         if SaveElementTreeNode:
@@ -2260,8 +2669,10 @@ class Location(GeneratedsSuper):
             nodeName_ = Tag_pattern_.match(child.tag).groups()[-1]
             self.buildChildren(child, node, nodeName_, gds_collector_=gds_collector_)
         return self
+
     def buildAttributes(self, node, attrs, already_processed):
         pass
+
     def buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_collector_=None):
         if nodeName_ == 'Latitude' and child_.text:
             sval_ = child_.text
@@ -2275,6 +2686,8 @@ class Location(GeneratedsSuper):
             fval_ = self.gds_validate_decimal(fval_, node, 'Longitude')
             self.Longitude = fval_
             self.Longitude_nsprefix_ = child_.prefix
+
+
 # end class Location
 
 
@@ -2282,6 +2695,7 @@ class Condition(GeneratedsSuper):
     __hash__ = GeneratedsSuper.__hash__
     subclass = None
     superclass = None
+
     def __init__(self, ConditionKind=None, gds_collector_=None, **kwargs_):
         self.gds_collector_ = gds_collector_
         self.gds_elementtree_node_ = None
@@ -2290,6 +2704,7 @@ class Condition(GeneratedsSuper):
         self.ns_prefix_ = None
         self.ConditionKind = ConditionKind
         self.ConditionKind_nsprefix_ = None
+
     def factory(*args_, **kwargs_):
         if CurrentSubclassModule_ is not None:
             subclass = getSubclassFromModule_(
@@ -2300,23 +2715,31 @@ class Condition(GeneratedsSuper):
             return Condition.subclass(*args_, **kwargs_)
         else:
             return Condition(*args_, **kwargs_)
+
     factory = staticmethod(factory)
+
     def get_ns_prefix_(self):
         return self.ns_prefix_
+
     def set_ns_prefix_(self, ns_prefix):
         self.ns_prefix_ = ns_prefix
+
     def get_ConditionKind(self):
         return self.ConditionKind
+
     def set_ConditionKind(self, ConditionKind):
         self.ConditionKind = ConditionKind
+
     def hasContent_(self):
         if (
-            self.ConditionKind is not None
+                self.ConditionKind is not None
         ):
             return True
         else:
             return False
-    def export(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"', name_='Condition', pretty_print=True):
+
+    def export(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"',
+               name_='Condition', pretty_print=True):
         imported_ns_def_ = GenerateDSNamespaceDefs_.get('Condition')
         if imported_ns_def_ is not None:
             namespacedef_ = imported_ns_def_
@@ -2324,32 +2747,40 @@ class Condition(GeneratedsSuper):
             eol_ = '\n'
         else:
             eol_ = ''
-        if self.original_tagname_ is not None:
+        if self.original_tagname_ is not None and name_ == 'Condition':
             name_ = self.original_tagname_
         if UseCapturedNS_ and self.ns_prefix_:
             namespaceprefix_ = self.ns_prefix_ + ':'
         showIndent(outfile, level, pretty_print)
-        outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
+        outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '',))
         already_processed = set()
         self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='Condition')
         if self.hasContent_():
-            outfile.write('>%s' % (eol_, ))
-            self.exportChildren(outfile, level + 1, namespaceprefix_, namespacedef_, name_='Condition', pretty_print=pretty_print)
+            outfile.write('>%s' % (eol_,))
+            self.exportChildren(outfile, level + 1, namespaceprefix_, namespacedef_, name_='Condition',
+                                pretty_print=pretty_print)
             showIndent(outfile, level, pretty_print)
             outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
         else:
-            outfile.write('/>%s' % (eol_, ))
+            outfile.write('/>%s' % (eol_,))
+
     def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='Condition'):
         pass
-    def exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"', name_='Condition', fromsubclass_=False, pretty_print=True):
+
+    def exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"',
+                       name_='Condition', fromsubclass_=False, pretty_print=True):
         if pretty_print:
             eol_ = '\n'
         else:
             eol_ = ''
         if self.ConditionKind is not None:
-            namespaceprefix_ = self.ConditionKind_nsprefix_ + ':' if (UseCapturedNS_ and self.ConditionKind_nsprefix_) else ''
+            namespaceprefix_ = self.ConditionKind_nsprefix_ + ':' if (
+                        UseCapturedNS_ and self.ConditionKind_nsprefix_) else ''
             showIndent(outfile, level, pretty_print)
-            outfile.write('<%sConditionKind>%s</%sConditionKind>%s' % (namespaceprefix_ , self.gds_encode(self.gds_format_string(quote_xml(self.ConditionKind), input_name='ConditionKind')), namespaceprefix_ , eol_))
+            outfile.write('<%sConditionKind>%s</%sConditionKind>%s' % (namespaceprefix_, self.gds_encode(
+                self.gds_format_string(quote_xml(self.ConditionKind), input_name='ConditionKind')), namespaceprefix_,
+                                                                       eol_))
+
     def build(self, node, gds_collector_=None):
         self.gds_collector_ = gds_collector_
         if SaveElementTreeNode:
@@ -2361,8 +2792,10 @@ class Condition(GeneratedsSuper):
             nodeName_ = Tag_pattern_.match(child.tag).groups()[-1]
             self.buildChildren(child, node, nodeName_, gds_collector_=gds_collector_)
         return self
+
     def buildAttributes(self, node, attrs, already_processed):
         pass
+
     def buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_collector_=None):
         if nodeName_ == 'ConditionKind':
             value_ = child_.text
@@ -2370,15 +2803,293 @@ class Condition(GeneratedsSuper):
             value_ = self.gds_validate_string(value_, node, 'ConditionKind')
             self.ConditionKind = value_
             self.ConditionKind_nsprefix_ = child_.prefix
+
+
 # end class Condition
 
 
+class State(GeneratedsSuper):
+    __hash__ = GeneratedsSuper.__hash__
+    subclass = None
+    superclass = None
+
+    def __init__(self, StateKind=None, gds_collector_=None, **kwargs_):
+        self.gds_collector_ = gds_collector_
+        self.gds_elementtree_node_ = None
+        self.original_tagname_ = None
+        self.parent_object_ = kwargs_.get('parent_object_')
+        self.ns_prefix_ = None
+        self.StateKind = StateKind
+        self.StateKind_nsprefix_ = None
+
+    def factory(*args_, **kwargs_):
+        if CurrentSubclassModule_ is not None:
+            subclass = getSubclassFromModule_(
+                CurrentSubclassModule_, State)
+            if subclass is not None:
+                return subclass(*args_, **kwargs_)
+        if State.subclass:
+            return State.subclass(*args_, **kwargs_)
+        else:
+            return State(*args_, **kwargs_)
+
+    factory = staticmethod(factory)
+
+    def get_ns_prefix_(self):
+        return self.ns_prefix_
+
+    def set_ns_prefix_(self, ns_prefix):
+        self.ns_prefix_ = ns_prefix
+
+    def get_StateKind(self):
+        return self.StateKind
+
+    def set_StateKind(self, StateKind):
+        self.StateKind = StateKind
+
+    def hasContent_(self):
+        if (
+                self.StateKind is not None
+        ):
+            return True
+        else:
+            return False
+
+    def export(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"',
+               name_='State', pretty_print=True):
+        imported_ns_def_ = GenerateDSNamespaceDefs_.get('State')
+        if imported_ns_def_ is not None:
+            namespacedef_ = imported_ns_def_
+        if pretty_print:
+            eol_ = '\n'
+        else:
+            eol_ = ''
+        if self.original_tagname_ is not None and name_ == 'State':
+            name_ = self.original_tagname_
+        if UseCapturedNS_ and self.ns_prefix_:
+            namespaceprefix_ = self.ns_prefix_ + ':'
+        showIndent(outfile, level, pretty_print)
+        outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '',))
+        already_processed = set()
+        self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='State')
+        if self.hasContent_():
+            outfile.write('>%s' % (eol_,))
+            self.exportChildren(outfile, level + 1, namespaceprefix_, namespacedef_, name_='State',
+                                pretty_print=pretty_print)
+            showIndent(outfile, level, pretty_print)
+            outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
+        else:
+            outfile.write('/>%s' % (eol_,))
+
+    def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='State'):
+        pass
+
+    def exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"',
+                       name_='State', fromsubclass_=False, pretty_print=True):
+        if pretty_print:
+            eol_ = '\n'
+        else:
+            eol_ = ''
+        if self.StateKind is not None:
+            namespaceprefix_ = self.StateKind_nsprefix_ + ':' if (UseCapturedNS_ and self.StateKind_nsprefix_) else ''
+            showIndent(outfile, level, pretty_print)
+            outfile.write('<%sStateKind>%s</%sStateKind>%s' % (namespaceprefix_, self.gds_encode(
+                self.gds_format_string(quote_xml(self.StateKind), input_name='StateKind')), namespaceprefix_, eol_))
+
+    def build(self, node, gds_collector_=None):
+        self.gds_collector_ = gds_collector_
+        if SaveElementTreeNode:
+            self.gds_elementtree_node_ = node
+        already_processed = set()
+        self.ns_prefix_ = node.prefix
+        self.buildAttributes(node, node.attrib, already_processed)
+        for child in node:
+            nodeName_ = Tag_pattern_.match(child.tag).groups()[-1]
+            self.buildChildren(child, node, nodeName_, gds_collector_=gds_collector_)
+        return self
+
+    def buildAttributes(self, node, attrs, already_processed):
+        pass
+
+    def buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_collector_=None):
+        if nodeName_ == 'StateKind':
+            value_ = child_.text
+            value_ = self.gds_parse_string(value_, node, 'StateKind')
+            value_ = self.gds_validate_string(value_, node, 'StateKind')
+            self.StateKind = value_
+            self.StateKind_nsprefix_ = child_.prefix
+
+
+# end class State
+
+
+class Description(GeneratedsSuper):
+    __hash__ = GeneratedsSuper.__hash__
+    subclass = None
+    superclass = None
+
+    def __init__(self, Description_member=None, valueOf_=None, mixedclass_=None, content_=None, gds_collector_=None,
+                 **kwargs_):
+        self.gds_collector_ = gds_collector_
+        self.gds_elementtree_node_ = None
+        self.original_tagname_ = None
+        self.parent_object_ = kwargs_.get('parent_object_')
+        self.ns_prefix_ = None
+        if Description_member is None:
+            self.Description = []
+        else:
+            self.Description = Description_member
+        self.Description_nsprefix_ = None
+        self.valueOf_ = valueOf_
+        if mixedclass_ is None:
+            self.mixedclass_ = MixedContainer
+        else:
+            self.mixedclass_ = mixedclass_
+        if content_ is None:
+            self.content_ = []
+        else:
+            self.content_ = content_
+        self.valueOf_ = valueOf_
+
+    def factory(*args_, **kwargs_):
+        if CurrentSubclassModule_ is not None:
+            subclass = getSubclassFromModule_(
+                CurrentSubclassModule_, Description)
+            if subclass is not None:
+                return subclass(*args_, **kwargs_)
+        if Description.subclass:
+            return Description.subclass(*args_, **kwargs_)
+        else:
+            return Description(*args_, **kwargs_)
+
+    factory = staticmethod(factory)
+
+    def get_ns_prefix_(self):
+        return self.ns_prefix_
+
+    def set_ns_prefix_(self, ns_prefix):
+        self.ns_prefix_ = ns_prefix
+
+    def get_Description(self):
+        return self.Description
+
+    def set_Description(self, Description):
+        self.Description = Description
+
+    def add_Description(self, value):
+        self.Description.append(value)
+
+    def insert_Description_at(self, index, value):
+        self.Description.insert(index, value)
+
+    def replace_Description_at(self, index, value):
+        self.Description[index] = value
+
+    def get_valueOf_(self):
+        return self.valueOf_
+
+    def set_valueOf_(self, valueOf_):
+        self.valueOf_ = valueOf_
+
+    def hasContent_(self):
+        if (
+                self.Description or
+                (1 if type(self.valueOf_) in [int, float] else self.valueOf_) or
+                self.content_
+        ):
+            return True
+        else:
+            return False
+
+    def export(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"',
+               name_='Description', pretty_print=True):
+        imported_ns_def_ = GenerateDSNamespaceDefs_.get('Description')
+        if imported_ns_def_ is not None:
+            namespacedef_ = imported_ns_def_
+        if pretty_print:
+            eol_ = '\n'
+        else:
+            eol_ = ''
+        if self.original_tagname_ is not None and name_ == 'Description':
+            name_ = self.original_tagname_
+        if UseCapturedNS_ and self.ns_prefix_:
+            namespaceprefix_ = self.ns_prefix_ + ':'
+        showIndent(outfile, level, pretty_print)
+        outfile.write('<%s%s%s' % (namespaceprefix_, name_, namespacedef_ and ' ' + namespacedef_ or '',))
+        already_processed = set()
+        self.exportAttributes(outfile, level, already_processed, namespaceprefix_, name_='Description')
+        if self.hasContent_():
+            outfile.write('>%s' % (eol_,))
+            self.exportChildren(outfile, level + 1, namespaceprefix_, namespacedef_, name_='Description',
+                                pretty_print=pretty_print)
+            showIndent(outfile, level, pretty_print)
+            outfile.write('</%s%s>%s' % (namespaceprefix_, name_, eol_))
+        else:
+            outfile.write('/>%s' % (eol_,))
+
+    def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='Description'):
+        pass
+
+    def exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:ns1="http://zhv.xml.wvi/"',
+                       name_='Description', fromsubclass_=False, pretty_print=True):
+        if not fromsubclass_:
+            for item_ in self.content_:
+                item_.export(outfile, level, item_.name, namespaceprefix_, pretty_print=pretty_print)
+        if pretty_print:
+            eol_ = '\n'
+        else:
+            eol_ = ''
+        for Description_ in self.Description:
+            namespaceprefix_ = self.Description_nsprefix_ + ':' if (
+                        UseCapturedNS_ and self.Description_nsprefix_) else ''
+            Description_.export(outfile, level, namespaceprefix_='ns1:', namespacedef_='', name_='Description',
+                                pretty_print=pretty_print)
+
+    def build(self, node, gds_collector_=None):
+        self.gds_collector_ = gds_collector_
+        if SaveElementTreeNode:
+            self.gds_elementtree_node_ = node
+        already_processed = set()
+        self.ns_prefix_ = node.prefix
+        self.buildAttributes(node, node.attrib, already_processed)
+        self.valueOf_ = get_all_text_(node)
+        if node.text is not None:
+            obj_ = self.mixedclass_(MixedContainer.CategoryText,
+                                    MixedContainer.TypeNone, '', node.text)
+            self.content_.append(obj_)
+        for child in node:
+            nodeName_ = Tag_pattern_.match(child.tag).groups()[-1]
+            self.buildChildren(child, node, nodeName_, gds_collector_=gds_collector_)
+        return self
+
+    def buildAttributes(self, node, attrs, already_processed):
+        pass
+
+    def buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_collector_=None):
+        if nodeName_ == 'Description':
+            obj_ = Description.factory(parent_object_=self)
+            obj_.build(child_, gds_collector_=gds_collector_)
+            obj_ = self.mixedclass_(MixedContainer.CategoryComplex,
+                                    MixedContainer.TypeNone, 'Description', obj_)
+            self.content_.append(obj_)
+            if hasattr(self, 'add_Description'):
+                self.add_Description(obj_.value)
+            elif hasattr(self, 'set_Description'):
+                self.set_Description(obj_.value)
+        if not fromsubclass_ and child_.tail is not None:
+            obj_ = self.mixedclass_(MixedContainer.CategoryText,
+                                    MixedContainer.TypeNone, '', child_.tail)
+            self.content_.append(obj_)
+
+
+# end class Description
+
+
 GDSClassesMapping = {
     'AreaQuay': Items,
     'GetResponseType': Items,
 }
 
-
 USAGE_TEXT = """
 Usage: python <Parser>.py [ -s ] <in_xml_file>
 """
@@ -2446,7 +3157,8 @@ def parse(inFileName, silence=False, print_warnings=True):
     return rootObj
 
 
-def parseEtree(inFileName, silence=False, print_warnings=True):
+def parseEtree(inFileName, silence=False, print_warnings=True,
+               mapping=None, nsmap=None):
     parser = None
     doc = parsexml_(inFileName, parser)
     gds_collector = GdsCollector_()
@@ -2458,8 +3170,10 @@ def parseEtree(inFileName, silence=False, print_warnings=True):
     rootObj = rootClass.factory()
     rootObj.build(rootNode, gds_collector_=gds_collector)
     # Enable Python to collect the space used by the DOM.
-    mapping = {}
-    rootElement = rootObj.to_etree(None, name_=rootTag, mapping_=mapping)
+    if mapping is None:
+        mapping = {}
+    rootElement = rootObj.to_etree(
+        None, name_=rootTag, mapping_=mapping, nsmap_=nsmap)
     reverse_mapping = rootObj.gds_reverse_node_mapping(mapping)
     if not SaveElementTreeNode:
         doc = None
@@ -2490,7 +3204,7 @@ def parseString(inString, silence=False, print_warnings=True):
     Returns -- The root object in the tree.
     '''
     parser = None
-    rootNode= parsexmlstring_(inString, parser)
+    rootNode = parsexmlstring_(inString, parser)
     gds_collector = GdsCollector_()
     rootTag, rootClass = get_root_tag(rootNode)
     if rootClass is None:
@@ -2531,8 +3245,8 @@ def parseLiteral(inFileName, silence=False, print_warnings=True):
         doc = None
         rootNode = None
     if not silence:
-        sys.stdout.write('#from ZHV_Classes import *\n\n')
-        sys.stdout.write('import ZHV_Classes as model_\n\n')
+        sys.stdout.write('#from ZhvClasses import *\n\n')
+        sys.stdout.write('import ZhvClasses as model_\n\n')
         sys.stdout.write('rootObj = model_.rootClass(\n')
         rootObj.exportLiteral(sys.stdout, 0, name_=rootTag)
         sys.stdout.write(')\n')
@@ -2555,7 +3269,7 @@ def main():
 
 
 if __name__ == '__main__':
-    #import pdb; pdb.set_trace()
+    # import pdb; pdb.set_trace()
     main()
 
 RenameMappings_ = {
@@ -2565,13 +3279,14 @@ __all__ = [
     "Area",
     "Authority",
     "Condition",
+    "Description",
     "District",
-    "DistrictCode",
     "Items",
     "Location",
     "Municipality",
     "Name",
     "Quay",
     "Quays",
+    "State",
     "StopPlace"
 ]
diff --git a/zhv_parser/ZHV_Converter.py b/zhv_parser/ZhvConverter.py
similarity index 97%
rename from zhv_parser/ZHV_Converter.py
rename to zhv_parser/ZhvConverter.py
index 8d5381a341f9199f10070f3948e2dd64a2d7aa2d..358efa011061eee20508237d6dfa9369f1af16eb 100644
--- a/zhv_parser/ZHV_Converter.py
+++ b/zhv_parser/ZhvConverter.py
@@ -11,9 +11,9 @@ from osmium.osm import Location
 from osmium.osm._osm import RelationMember
 from osmium.osm.mutable import Relation, Node
 
-from zhv_parser import ZHV_Classes
+from zhv_parser import ZhvClasses
 from zhv_parser.RegionCode import RegionCode
-from zhv_parser.ZHV_Classes import StopPlace, Area, Quay, Name
+from zhv_parser.ZhvClasses import StopPlace, Area, Quay, Name
 
 # ZHV related XML tags, elements
 namespace: str = "{http://zhv.xml.wvi/}"
@@ -103,7 +103,7 @@ class ZhvConverter:
                                   tag=(tag_stop_place, tag_area, tag_quay))
         for action, elem in context:
             if elem.tag == tag_stop_place and action == event_start:
-                stop_place_class = ZHV_Classes.StopPlace
+                stop_place_class = ZhvClasses.StopPlace
                 stop_place = stop_place_class.factory()
                 stop_place.build(elem)
                 if not self.is_stop_place_in_region(RegionCode.SACHSEN, stop_place):
@@ -137,7 +137,7 @@ class ZhvConverter:
         list_stop_signs = list()
         for action, elem in context:
             if elem.tag == tag_area and action == event_start:
-                area_class = ZHV_Classes.Area
+                area_class = ZhvClasses.Area
                 area = area_class.factory()
                 area.build(elem)
                 list_stop_signs += self.area_to_osm(area, context)
@@ -170,7 +170,7 @@ class ZhvConverter:
 
         for action, elem in context:
             if elem.tag == tag_quay and action == event_start:
-                quay_class = ZHV_Classes.Quay
+                quay_class = ZhvClasses.Quay
                 quay = quay_class.factory()
                 quay.build(elem)
                 list_nodes.append(self.quay_to_osm(quay, stop_sign_type, context))