From f09097f740f7760aaec72881aa6a0d034b7ad70b Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Tue, 19 Feb 2019 08:58:40 +0100
Subject: new column in install_target_providers to reflect wether it is a
 group or a provides

---
 misc/database-layout.dmf  | 1754 +++++++++++++++++++++++----------------------
 misc/database-layout.dump |    3 +-
 2 files changed, 882 insertions(+), 875 deletions(-)

(limited to 'misc')

diff --git a/misc/database-layout.dmf b/misc/database-layout.dmf
index 72efaa4..7d08807 100644
--- a/misc/database-layout.dmf
+++ b/misc/database-layout.dmf
@@ -2,163 +2,133 @@
 <diagram xmlns="http://oxygene.sk/ns/diagram/1/">
   <notation>Relational</notation>
   <item-list>
-    <item type="database-table" id="{fdd7ff7b-7a96-4625-9287-820e1b076c2a}">
+    <item type="database-table" id="{bb59ebca-0255-40dd-91b4-68bd2e110447}">
       <position>
-        <x>29</x>
-        <y>569</y>
+        <x>956</x>
+        <y>420</y>
       </position>
       <table>
-        <name>toolchain_order</name>
+        <name>mirror_statuses</name>
         <color>#ffffff</color>
         <column-list>
           <column>
-            <name>number</name>
-            <data-type>SMALLINT</data-type>
+            <name>id</name>
+            <data-type>BIGINT</data-type>
             <required>True</required>
             <primary-key>True</primary-key>
           </column>
           <column>
-            <name>pkgbase</name>
-            <data-type>VARCHAR(64)</data-type>
+            <name>protocol</name>
+            <data-type>VARCHAR(8)</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
-        </column-list>
-      </table>
-    </item>
-    <item type="database-table" id="{a67b38a9-c701-412c-8292-5ef58536da85}">
-      <position>
-        <x>483</x>
-        <y>57</y>
-      </position>
-      <table>
-        <name>versions</name>
-        <color>#ffffff</color>
-        <column-list>
           <column>
-            <name>id</name>
-            <data-type>BIGINT</data-type>
+            <name>url</name>
+            <data-type>VARCHAR(128)</data-type>
             <required>True</required>
-            <primary-key>True</primary-key>
+            <primary-key>False</primary-key>
           </column>
           <column>
-            <name>order</name>
-            <data-type>BIGINT</data-type>
+            <name>country</name>
+            <data-type>VARCHAR(64)</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>epoch</name>
-            <data-type>MEDIUMINT</data-type>
+            <name>country_code</name>
+            <data-type>VARCHAR(4)</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>version</name>
-            <data-type>VARCHAR(32)</data-type>
+            <name>last_sync</name>
+            <data-type>BIGINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
-        </column-list>
-      </table>
-    </item>
-    <item type="database-table" id="{caab4a73-46dc-49dc-ac51-d8ae916827c5}">
-      <position>
-        <x>398</x>
-        <y>-74</y>
-      </position>
-      <table>
-        <name>dependencies</name>
-        <color>#ffffff</color>
-        <column-list>
           <column>
-            <name>id</name>
-            <data-type>BIGINT</data-type>
+            <name>start</name>
+            <data-type>FLOAT</data-type>
             <required>True</required>
-            <primary-key>True</primary-key>
+            <primary-key>False</primary-key>
           </column>
           <column>
-            <name>dependent</name>
-            <data-type>BIGINT</data-type>
+            <name>stop</name>
+            <data-type>FLOAT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>depending_on</name>
-            <data-type>BIGINT</data-type>
+            <name>isos</name>
+            <data-type>BIT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>dependency_type</name>
-            <data-type>SMALLINT</data-type>
+            <name>ipv4</name>
+            <data-type>BIT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>version</name>
-            <data-type>BIGINT</data-type>
+            <name>ipv6</name>
+            <data-type>BIT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>version_relation</name>
-            <data-type>VARCHAR(2)</data-type>
+            <name>active</name>
+            <data-type>BIT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{b33d4844-b4e4-4ef6-944b-36b4113c2b82}">
+    <item type="database-table" id="{3d2d24a7-42f1-4c59-9cb3-a8d8478ac4a8}">
       <position>
-        <x>546</x>
-        <y>188</y>
+        <x>373</x>
+        <y>388</y>
       </position>
       <table>
-        <name>binary_packages_in_repositories</name>
+        <name>architecture_compatibilities</name>
         <color>#ffffff</color>
         <column-list>
           <column>
             <name>id</name>
-            <data-type>BIGINT</data-type>
+            <data-type>MEDIUMINT</data-type>
             <required>True</required>
             <primary-key>True</primary-key>
           </column>
           <column>
-            <name>package</name>
-            <data-type>BIGINT</data-type>
+            <name>built_for</name>
+            <data-type>SMALLINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>repository</name>
-            <data-type>MEDIUMINT</data-type>
+            <name>runs_on</name>
+            <data-type>SMALLINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>is_to_be_deleted</name>
+            <name>fully_compatible</name>
             <data-type>BIT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
-          <column>
-            <name>last_moved</name>
-            <data-type>TIMESTAMP</data-type>
-            <required>True</required>
-            <primary-key>False</primary-key>
-          </column>
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{5f12db03-a8bb-4467-bab6-a57e545b9081}">
+    <item type="database-table" id="{33867a1e-ef36-4cc2-a08e-7366f56fbf5f}">
       <position>
-        <x>-52</x>
-        <y>134</y>
+        <x>229</x>
+        <y>20</y>
       </position>
       <table>
-        <name>ssh_log</name>
+        <name>ssh_keys</name>
         <color>#ffffff</color>
         <column-list>
           <column>
@@ -168,25 +138,13 @@
             <primary-key>True</primary-key>
           </column>
           <column>
-            <name>date</name>
-            <data-type>TIMESTAMP</data-type>
-            <required>True</required>
-            <primary-key>False</primary-key>
-          </column>
-          <column>
-            <name>build_slave</name>
+            <name>owner</name>
             <data-type>MEDIUMINT</data-type>
-            <required>False</required>
-            <primary-key>False</primary-key>
-          </column>
-          <column>
-            <name>action</name>
-            <data-type>VARCHAR(32)</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>parameters</name>
+            <name>fingerprint</name>
             <data-type>TEXT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
@@ -194,108 +152,102 @@
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{5cbe15f1-fea8-48eb-a84f-97f7e22060f6}">
+    <item type="database-table" id="{6180fcbf-5069-4d86-8919-fd39394f1813}">
       <position>
-        <x>-55</x>
-        <y>-72</y>
+        <x>-54</x>
+        <y>70</y>
       </position>
       <table>
-        <name>email_log</name>
+        <name>email_actions</name>
         <color>#ffffff</color>
         <column-list>
           <column>
             <name>id</name>
-            <data-type>BIGINT</data-type>
+            <data-type>MEDIUMINT</data-type>
             <required>True</required>
             <primary-key>True</primary-key>
           </column>
           <column>
-            <name>date</name>
-            <data-type>TIMESTAMP</data-type>
+            <name>name</name>
+            <data-type>VARCHAR(32)</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
+        </column-list>
+      </table>
+    </item>
+    <item type="database-table" id="{b5671c08-e24a-4293-b983-3c86b1a6d622}">
+      <position>
+        <x>68</x>
+        <y>42</y>
+      </position>
+      <table>
+        <name>allowed_email_actions</name>
+        <color>#ffffff</color>
+        <column-list>
           <column>
-            <name>success</name>
-            <data-type>BIT</data-type>
+            <name>id</name>
+            <data-type>BIGINT</data-type>
             <required>True</required>
-            <primary-key>False</primary-key>
-          </column>
-          <column>
-            <name>action</name>
-            <data-type>MEDIUMINT</data-type>
-            <required>False</required>
-            <primary-key>False</primary-key>
-          </column>
-          <column>
-            <name>count</name>
-            <data-type>MEDIUMINT</data-type>
-            <required>False</required>
-            <primary-key>False</primary-key>
+            <primary-key>True</primary-key>
           </column>
           <column>
             <name>gpg_key</name>
             <data-type>BIGINT</data-type>
-            <required>False</required>
+            <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>comment</name>
-            <data-type>TEXT</data-type>
-            <required>False</required>
+            <name>action</name>
+            <data-type>MEDIUMINT</data-type>
+            <required>True</required>
             <primary-key>False</primary-key>
           </column>
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{d823ab09-1c04-44ee-ad4b-6802208967ff}">
+    <item type="database-table" id="{f31249ea-ab19-45a4-9427-1854379ad8e7}">
       <position>
-        <x>488</x>
-        <y>475</y>
+        <x>106</x>
+        <y>-51</y>
       </position>
       <table>
-        <name>repository_moves</name>
+        <name>gpg_keys</name>
         <color>#ffffff</color>
         <column-list>
           <column>
             <name>id</name>
-            <data-type>MEDIUMINT</data-type>
+            <data-type>BIGINT</data-type>
             <required>True</required>
             <primary-key>True</primary-key>
           </column>
           <column>
-            <name>from_repository</name>
-            <data-type>MEDIUMINT</data-type>
+            <name>fingerprint</name>
+            <data-type>VARCHAR(40)</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>to_repository</name>
+            <name>owner</name>
             <data-type>MEDIUMINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
-          <column>
-            <name>upstream_package_repository</name>
-            <data-type>SMALLINT</data-type>
-            <required>True</required>
-            <primary-key>False</primary-key>
-          </column>
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{fee50b4d-969b-4b5f-8545-90ea8f8f7aec}">
+    <item type="database-table" id="{75e4ebd8-5915-4aff-8316-0c542d3953da}">
       <position>
-        <x>770</x>
-        <y>345</y>
+        <x>240</x>
+        <y>-66</y>
       </position>
       <table>
-        <name>repository_stabilities</name>
+        <name>persons</name>
         <color>#ffffff</color>
         <column-list>
           <column>
             <name>id</name>
-            <data-type>SMALLINT</data-type>
+            <data-type>MEDIUMINT</data-type>
             <required>True</required>
             <primary-key>True</primary-key>
           </column>
@@ -305,38 +257,26 @@
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
-          <column>
-            <name>bugtracker_category</name>
-            <data-type>VARCHAR(32)</data-type>
-            <required>False</required>
-            <primary-key>False</primary-key>
-          </column>
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{04b6fdc5-85ae-4416-8db5-034ad05be93a}">
+    <item type="database-table" id="{36980651-4f03-4748-aee8-1f9211aaafde}">
       <position>
-        <x>69</x>
-        <y>483</y>
+        <x>940</x>
+        <y>71</y>
       </position>
       <table>
-        <name>build_dependency_loops</name>
+        <name>todo_links</name>
         <color>#ffffff</color>
         <column-list>
           <column>
-            <name>id</name>
+            <name>dependent</name>
             <data-type>BIGINT</data-type>
             <required>True</required>
-            <primary-key>True</primary-key>
-          </column>
-          <column>
-            <name>loop</name>
-            <data-type>MEDIUMINT</data-type>
-            <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>build_assignment</name>
+            <name>depending_on</name>
             <data-type>BIGINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
@@ -344,49 +284,55 @@
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{be821d83-a9b4-4c0c-8e1b-433730200714}">
+    <item type="database-table" id="{dc01c567-d657-4db7-8a55-d2763ed00cee}">
       <position>
-        <x>637</x>
+        <x>945</x>
         <y>-70</y>
       </position>
       <table>
-        <name>dependency_types</name>
+        <name>todos</name>
         <color>#ffffff</color>
         <column-list>
           <column>
             <name>id</name>
-            <data-type>SMALLINT</data-type>
+            <data-type>BIGINT</data-type>
             <required>True</required>
             <primary-key>True</primary-key>
           </column>
           <column>
-            <name>name</name>
-            <data-type>VARCHAR(32)</data-type>
+            <name>file</name>
+            <data-type>VARCHAR(64)</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>relevant_for_building</name>
-            <data-type>BIT</data-type>
+            <name>line</name>
+            <data-type>MEDIUMINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>relevant_for_binary_packages</name>
-            <data-type>BIT</data-type>
+            <name>description</name>
+            <data-type>TEXT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
+          <column>
+            <name>importance</name>
+            <data-type>SMALLINT</data-type>
+            <required>False</required>
+            <primary-key>False</primary-key>
+          </column>
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{e84f8e5f-28e0-4d8b-a7e5-0f80a896f74e}">
+    <item type="database-table" id="{9085c36f-5884-41c8-9ca8-9d53973e657d}">
       <position>
-        <x>653</x>
-        <y>21</y>
+        <x>820</x>
+        <y>145</y>
       </position>
       <table>
-        <name>install_targets</name>
+        <name>statitstics</name>
         <color>#ffffff</color>
         <column-list>
           <column>
@@ -396,135 +342,111 @@
             <primary-key>True</primary-key>
           </column>
           <column>
-            <name>name</name>
-            <data-type>VARCHAR(64)</data-type>
+            <name>date</name>
+            <data-type>TIMESTAMP</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
-        </column-list>
-      </table>
-    </item>
-    <item type="database-table" id="{04f424bf-6465-478b-9529-0038615b51d9}">
-      <position>
-        <x>395</x>
-        <y>313</y>
-      </position>
-      <table>
-        <name>architectures</name>
-        <color>#ffffff</color>
-        <column-list>
           <column>
-            <name>id</name>
-            <data-type>SMALLINT</data-type>
+            <name>stable_packages_count</name>
+            <data-type>MEDIUMINT</data-type>
             <required>True</required>
-            <primary-key>True</primary-key>
+            <primary-key>False</primary-key>
           </column>
           <column>
-            <name>name</name>
-            <data-type>VARCHAR(16)</data-type>
+            <name>pending_tasks_count</name>
+            <data-type>MEDIUMINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
-        </column-list>
-      </table>
-    </item>
-    <item type="database-table" id="{7c210122-c51d-4724-b7cc-22f143bc47ac}">
-      <position>
-        <x>248</x>
-        <y>499</y>
-      </position>
-      <table>
-        <name>package_sources</name>
-        <color>#ffffff</color>
-        <column-list>
           <column>
-            <name>id</name>
-            <data-type>BIGINT</data-type>
+            <name>staging_packages_count</name>
+            <data-type>MEDIUMINT</data-type>
             <required>True</required>
-            <primary-key>True</primary-key>
+            <primary-key>False</primary-key>
           </column>
           <column>
-            <name>pkgbase</name>
-            <data-type>VARCHAR(64)</data-type>
+            <name>testing_packages_count</name>
+            <data-type>MEDIUMINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>git_revision</name>
-            <data-type>VARCHAR(40)</data-type>
+            <name>broken_tasks_count</name>
+            <data-type>MEDIUMINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>mod_git_revision</name>
-            <data-type>VARCHAR(40)</data-type>
+            <name>dependency_loops_count</name>
+            <data-type>MEDIUMINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>upsream_package_repository</name>
-            <data-type>SMALLINT</data-type>
+            <name>dependency_looped_tasks_count</name>
+            <data-type>MEDIUMINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>uses_upstream</name>
-            <data-type>BIT</data-type>
+            <name>locked_tasks_count</name>
+            <data-type>MEDIUMINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>uses_modification</name>
-            <data-type>BIT</data-type>
+            <name>blocked_tasks_count</name>
+            <data-type>MEDIUMINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>commit_time</name>
-            <data-type>TIMESTAMP</data-type>
+            <name>next_tasks_count</name>
+            <data-type>MEDIUMINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{d01e6205-a6dc-4724-a1fd-d4b2f73637ea}">
+    <item type="database-table" id="{92f54126-a433-458e-80b7-67235e560334}">
       <position>
-        <x>528</x>
-        <y>571</y>
+        <x>756</x>
+        <y>452</y>
       </position>
       <table>
-        <name>upstream_repositories</name>
+        <name>repository_stability_relations</name>
         <color>#ffffff</color>
         <column-list>
           <column>
             <name>id</name>
-            <data-type>SMALLINT</data-type>
+            <data-type>MEDIUMINT</data-type>
             <required>True</required>
             <primary-key>True</primary-key>
           </column>
           <column>
-            <name>name</name>
-            <data-type>VARCHAR(64)</data-type>
+            <name>more_stable</name>
+            <data-type>MEDIUMINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>git_repository</name>
-            <data-type>SMALLINT</data-type>
+            <name>less_stable</name>
+            <data-type>MEDIUMINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{b3c86235-971a-4d3e-873c-c4179aa96cbc}">
+    <item type="database-table" id="{7b159780-7f39-45a7-9557-046874a57e43}">
       <position>
-        <x>811</x>
-        <y>553</y>
+        <x>-53</x>
+        <y>240</y>
       </position>
       <table>
-        <name>git_repositories</name>
+        <name>fail_reasons</name>
         <color>#ffffff</color>
         <column-list>
           <column>
@@ -535,38 +457,32 @@
           </column>
           <column>
             <name>name</name>
-            <data-type>VARCHAR(64)</data-type>
-            <required>True</required>
-            <primary-key>False</primary-key>
-          </column>
-          <column>
-            <name>url</name>
-            <data-type>VARCHAR(128)</data-type>
+            <data-type>VARCHAR(32)</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>directory</name>
-            <data-type>VARCHAR(128)</data-type>
+            <name>identifier</name>
+            <data-type>VARCHAR(64)</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>head</name>
-            <data-type>VARCHAR(40)</data-type>
+            <name>severity</name>
+            <data-type>SMALLINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{844766fc-c5af-4f61-b51b-d3f9393c60ca}">
+    <item type="database-table" id="{a774fcb7-1193-4b57-947c-135212695915}">
       <position>
-        <x>566</x>
-        <y>299</y>
+        <x>-17</x>
+        <y>342</y>
       </position>
       <table>
-        <name>repositories</name>
+        <name>failed_builds</name>
         <color>#ffffff</color>
         <column-list>
           <column>
@@ -576,75 +492,51 @@
             <primary-key>True</primary-key>
           </column>
           <column>
-            <name>name</name>
-            <data-type>VARCHAR(64)</data-type>
+            <name>build_slave</name>
+            <data-type>MEDIUMINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>stability</name>
-            <data-type>SMALLINT</data-type>
+            <name>build_assignment</name>
+            <data-type>BIGINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>is_on_master_mirror</name>
-            <data-type>BIT</data-type>
+            <name>date</name>
+            <data-type>TIMESTAMP</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>architecture</name>
+            <name>reason</name>
             <data-type>SMALLINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
-        </column-list>
-      </table>
-    </item>
-    <item type="database-table" id="{f8caa2d5-11ba-485c-b273-8183713896bf}">
-      <position>
-        <x>618</x>
-        <y>100</y>
-      </position>
-      <table>
-        <name>install_target_providers</name>
-        <color>#ffffff</color>
-        <column-list>
-          <column>
-            <name>id</name>
-            <data-type>BIGINT</data-type>
-            <required>True</required>
-            <primary-key>True</primary-key>
-          </column>
           <column>
-            <name>package</name>
-            <data-type>BIGINT</data-type>
-            <required>True</required>
-            <primary-key>False</primary-key>
-          </column>
-          <column>
-            <name>install_target</name>
-            <data-type>BIGINT</data-type>
+            <name>log_file</name>
+            <data-type>VARCHAR(512)</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>version</name>
-            <data-type>BIGINT</data-type>
+            <name>log_file_exists</name>
+            <data-type>BIT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}">
+    <item type="database-table" id="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}">
       <position>
-        <x>299</x>
-        <y>99</y>
+        <x>196</x>
+        <y>326</y>
       </position>
       <table>
-        <name>binary_packages</name>
+        <name>build_assignments</name>
         <color>#ffffff</color>
         <column-list>
           <column>
@@ -654,71 +546,47 @@
             <primary-key>True</primary-key>
           </column>
           <column>
-            <name>build_assignment</name>
+            <name>package_source</name>
             <data-type>BIGINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>epoch</name>
-            <data-type>MEDIUMINT</data-type>
-            <required>True</required>
-            <primary-key>False</primary-key>
-          </column>
-          <column>
-            <name>pkgver</name>
-            <data-type>VARCHAR(64)</data-type>
-            <required>True</required>
-            <primary-key>False</primary-key>
-          </column>
-          <column>
-            <name>pkgrel</name>
-            <data-type>MEDIUMINT</data-type>
+            <name>architecture</name>
+            <data-type>SMALLINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>sub_pkgrel</name>
-            <data-type>MEDIUMINT</data-type>
-            <required>True</required>
+            <name>is_blocked</name>
+            <data-type>VARCHAR(128)</data-type>
+            <required>False</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>has_issues</name>
-            <data-type>BIT</data-type>
-            <required>True</required>
+            <name>is_black_listed</name>
+            <data-type>VARCHAR(128)</data-type>
+            <required>False</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>is_tested</name>
+            <name>is_broken</name>
             <data-type>BIT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>pkgname</name>
-            <data-type>VARCHAR(64)</data-type>
-            <required>True</required>
-            <primary-key>False</primary-key>
-          </column>
-          <column>
-            <name>architecture</name>
+            <name>priority</name>
             <data-type>SMALLINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>sha512sum</name>
-            <data-type>VARCHAR(128)</data-type>
+            <name>return_date</name>
+            <data-type>TIMESTAMP</data-type>
             <required>False</required>
             <primary-key>False</primary-key>
           </column>
-          <column>
-            <name>sub_pkgrel_omitted</name>
-            <data-type>BIT</data-type>
-            <required>True</required>
-            <primary-key>False</primary-key>
-          </column>
         </column-list>
       </table>
     </item>
@@ -788,13 +656,13 @@
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}">
+    <item type="database-table" id="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}">
       <position>
-        <x>196</x>
-        <y>326</y>
+        <x>299</x>
+        <y>99</y>
       </position>
       <table>
-        <name>build_assignments</name>
+        <name>binary_packages</name>
         <color>#ffffff</color>
         <column-list>
           <column>
@@ -804,111 +672,165 @@
             <primary-key>True</primary-key>
           </column>
           <column>
-            <name>package_source</name>
+            <name>build_assignment</name>
             <data-type>BIGINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>architecture</name>
-            <data-type>SMALLINT</data-type>
+            <name>epoch</name>
+            <data-type>MEDIUMINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>is_blocked</name>
-            <data-type>VARCHAR(128)</data-type>
-            <required>False</required>
+            <name>pkgver</name>
+            <data-type>VARCHAR(64)</data-type>
+            <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>is_black_listed</name>
-            <data-type>VARCHAR(128)</data-type>
-            <required>False</required>
+            <name>pkgrel</name>
+            <data-type>MEDIUMINT</data-type>
+            <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>is_broken</name>
+            <name>sub_pkgrel</name>
+            <data-type>MEDIUMINT</data-type>
+            <required>True</required>
+            <primary-key>False</primary-key>
+          </column>
+          <column>
+            <name>has_issues</name>
             <data-type>BIT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>priority</name>
+            <name>is_tested</name>
+            <data-type>BIT</data-type>
+            <required>True</required>
+            <primary-key>False</primary-key>
+          </column>
+          <column>
+            <name>pkgname</name>
+            <data-type>VARCHAR(64)</data-type>
+            <required>True</required>
+            <primary-key>False</primary-key>
+          </column>
+          <column>
+            <name>architecture</name>
             <data-type>SMALLINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>return_date</name>
-            <data-type>TIMESTAMP</data-type>
+            <name>sha512sum</name>
+            <data-type>VARCHAR(128)</data-type>
             <required>False</required>
             <primary-key>False</primary-key>
           </column>
+          <column>
+            <name>sub_pkgrel_omitted</name>
+            <data-type>BIT</data-type>
+            <required>True</required>
+            <primary-key>False</primary-key>
+          </column>
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{a774fcb7-1193-4b57-947c-135212695915}">
+    <item type="database-table" id="{f8caa2d5-11ba-485c-b273-8183713896bf}">
       <position>
-        <x>-17</x>
-        <y>342</y>
+        <x>613</x>
+        <y>86</y>
       </position>
       <table>
-        <name>failed_builds</name>
+        <name>install_target_providers</name>
         <color>#ffffff</color>
         <column-list>
           <column>
             <name>id</name>
-            <data-type>MEDIUMINT</data-type>
+            <data-type>BIGINT</data-type>
             <required>True</required>
             <primary-key>True</primary-key>
           </column>
           <column>
-            <name>build_slave</name>
-            <data-type>MEDIUMINT</data-type>
+            <name>package</name>
+            <data-type>BIGINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>build_assignment</name>
+            <name>install_target</name>
             <data-type>BIGINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>date</name>
-            <data-type>TIMESTAMP</data-type>
+            <name>version</name>
+            <data-type>BIGINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>reason</name>
-            <data-type>SMALLINT</data-type>
+            <name>install_target_is_group</name>
+            <data-type>BIT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
+        </column-list>
+      </table>
+    </item>
+    <item type="database-table" id="{844766fc-c5af-4f61-b51b-d3f9393c60ca}">
+      <position>
+        <x>566</x>
+        <y>299</y>
+      </position>
+      <table>
+        <name>repositories</name>
+        <color>#ffffff</color>
+        <column-list>
+          <column>
+            <name>id</name>
+            <data-type>MEDIUMINT</data-type>
+            <required>True</required>
+            <primary-key>True</primary-key>
+          </column>
           <column>
-            <name>log_file</name>
-            <data-type>VARCHAR(512)</data-type>
+            <name>name</name>
+            <data-type>VARCHAR(64)</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>log_file_exists</name>
+            <name>stability</name>
+            <data-type>SMALLINT</data-type>
+            <required>True</required>
+            <primary-key>False</primary-key>
+          </column>
+          <column>
+            <name>is_on_master_mirror</name>
             <data-type>BIT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
+          <column>
+            <name>architecture</name>
+            <data-type>SMALLINT</data-type>
+            <required>True</required>
+            <primary-key>False</primary-key>
+          </column>
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{7b159780-7f39-45a7-9557-046874a57e43}">
+    <item type="database-table" id="{b3c86235-971a-4d3e-873c-c4179aa96cbc}">
       <position>
-        <x>-53</x>
-        <y>240</y>
+        <x>811</x>
+        <y>553</y>
       </position>
       <table>
-        <name>fail_reasons</name>
+        <name>git_repositories</name>
         <color>#ffffff</color>
         <column-list>
           <column>
@@ -919,62 +841,68 @@
           </column>
           <column>
             <name>name</name>
-            <data-type>VARCHAR(32)</data-type>
+            <data-type>VARCHAR(64)</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>identifier</name>
-            <data-type>VARCHAR(64)</data-type>
+            <name>url</name>
+            <data-type>VARCHAR(128)</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>severity</name>
-            <data-type>SMALLINT</data-type>
+            <name>directory</name>
+            <data-type>VARCHAR(128)</data-type>
+            <required>True</required>
+            <primary-key>False</primary-key>
+          </column>
+          <column>
+            <name>head</name>
+            <data-type>VARCHAR(40)</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{92f54126-a433-458e-80b7-67235e560334}">
+    <item type="database-table" id="{d01e6205-a6dc-4724-a1fd-d4b2f73637ea}">
       <position>
-        <x>756</x>
-        <y>452</y>
+        <x>528</x>
+        <y>571</y>
       </position>
       <table>
-        <name>repository_stability_relations</name>
+        <name>upstream_repositories</name>
         <color>#ffffff</color>
         <column-list>
           <column>
             <name>id</name>
-            <data-type>MEDIUMINT</data-type>
+            <data-type>SMALLINT</data-type>
             <required>True</required>
             <primary-key>True</primary-key>
           </column>
           <column>
-            <name>more_stable</name>
-            <data-type>MEDIUMINT</data-type>
+            <name>name</name>
+            <data-type>VARCHAR(64)</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>less_stable</name>
-            <data-type>MEDIUMINT</data-type>
+            <name>git_repository</name>
+            <data-type>SMALLINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{9085c36f-5884-41c8-9ca8-9d53973e657d}">
+    <item type="database-table" id="{7c210122-c51d-4724-b7cc-22f143bc47ac}">
       <position>
-        <x>820</x>
-        <y>145</y>
+        <x>248</x>
+        <y>499</y>
       </position>
       <table>
-        <name>statitstics</name>
+        <name>package_sources</name>
         <color>#ffffff</color>
         <column-list>
           <column>
@@ -984,133 +912,157 @@
             <primary-key>True</primary-key>
           </column>
           <column>
-            <name>date</name>
-            <data-type>TIMESTAMP</data-type>
+            <name>pkgbase</name>
+            <data-type>VARCHAR(64)</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>stable_packages_count</name>
-            <data-type>MEDIUMINT</data-type>
+            <name>git_revision</name>
+            <data-type>VARCHAR(40)</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>pending_tasks_count</name>
-            <data-type>MEDIUMINT</data-type>
+            <name>mod_git_revision</name>
+            <data-type>VARCHAR(40)</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>staging_packages_count</name>
-            <data-type>MEDIUMINT</data-type>
+            <name>upsream_package_repository</name>
+            <data-type>SMALLINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>testing_packages_count</name>
-            <data-type>MEDIUMINT</data-type>
+            <name>uses_upstream</name>
+            <data-type>BIT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>broken_tasks_count</name>
-            <data-type>MEDIUMINT</data-type>
+            <name>uses_modification</name>
+            <data-type>BIT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>dependency_loops_count</name>
-            <data-type>MEDIUMINT</data-type>
+            <name>commit_time</name>
+            <data-type>TIMESTAMP</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
+        </column-list>
+      </table>
+    </item>
+    <item type="database-table" id="{04f424bf-6465-478b-9529-0038615b51d9}">
+      <position>
+        <x>395</x>
+        <y>313</y>
+      </position>
+      <table>
+        <name>architectures</name>
+        <color>#ffffff</color>
+        <column-list>
           <column>
-            <name>dependency_looped_tasks_count</name>
-            <data-type>MEDIUMINT</data-type>
+            <name>id</name>
+            <data-type>SMALLINT</data-type>
             <required>True</required>
-            <primary-key>False</primary-key>
+            <primary-key>True</primary-key>
           </column>
           <column>
-            <name>locked_tasks_count</name>
-            <data-type>MEDIUMINT</data-type>
+            <name>name</name>
+            <data-type>VARCHAR(16)</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
+        </column-list>
+      </table>
+    </item>
+    <item type="database-table" id="{e84f8e5f-28e0-4d8b-a7e5-0f80a896f74e}">
+      <position>
+        <x>653</x>
+        <y>21</y>
+      </position>
+      <table>
+        <name>install_targets</name>
+        <color>#ffffff</color>
+        <column-list>
           <column>
-            <name>blocked_tasks_count</name>
-            <data-type>MEDIUMINT</data-type>
+            <name>id</name>
+            <data-type>BIGINT</data-type>
             <required>True</required>
-            <primary-key>False</primary-key>
+            <primary-key>True</primary-key>
           </column>
           <column>
-            <name>next_tasks_count</name>
-            <data-type>MEDIUMINT</data-type>
+            <name>name</name>
+            <data-type>VARCHAR(64)</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{dc01c567-d657-4db7-8a55-d2763ed00cee}">
+    <item type="database-table" id="{be821d83-a9b4-4c0c-8e1b-433730200714}">
       <position>
-        <x>945</x>
+        <x>637</x>
         <y>-70</y>
       </position>
       <table>
-        <name>todos</name>
+        <name>dependency_types</name>
         <color>#ffffff</color>
         <column-list>
           <column>
             <name>id</name>
-            <data-type>BIGINT</data-type>
+            <data-type>SMALLINT</data-type>
             <required>True</required>
             <primary-key>True</primary-key>
           </column>
           <column>
-            <name>file</name>
-            <data-type>VARCHAR(64)</data-type>
+            <name>name</name>
+            <data-type>VARCHAR(32)</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>line</name>
-            <data-type>MEDIUMINT</data-type>
+            <name>relevant_for_building</name>
+            <data-type>BIT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>description</name>
-            <data-type>TEXT</data-type>
+            <name>relevant_for_binary_packages</name>
+            <data-type>BIT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
-          <column>
-            <name>importance</name>
-            <data-type>SMALLINT</data-type>
-            <required>False</required>
-            <primary-key>False</primary-key>
-          </column>
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{36980651-4f03-4748-aee8-1f9211aaafde}">
+    <item type="database-table" id="{04b6fdc5-85ae-4416-8db5-034ad05be93a}">
       <position>
-        <x>940</x>
-        <y>71</y>
+        <x>69</x>
+        <y>483</y>
       </position>
       <table>
-        <name>todo_links</name>
+        <name>build_dependency_loops</name>
         <color>#ffffff</color>
         <column-list>
           <column>
-            <name>dependent</name>
+            <name>id</name>
             <data-type>BIGINT</data-type>
             <required>True</required>
+            <primary-key>True</primary-key>
+          </column>
+          <column>
+            <name>loop</name>
+            <data-type>MEDIUMINT</data-type>
+            <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>depending_on</name>
+            <name>build_assignment</name>
             <data-type>BIGINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
@@ -1118,18 +1070,18 @@
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{75e4ebd8-5915-4aff-8316-0c542d3953da}">
+    <item type="database-table" id="{fee50b4d-969b-4b5f-8545-90ea8f8f7aec}">
       <position>
-        <x>240</x>
-        <y>-66</y>
+        <x>770</x>
+        <y>345</y>
       </position>
       <table>
-        <name>persons</name>
+        <name>repository_stabilities</name>
         <color>#ffffff</color>
         <column-list>
           <column>
             <name>id</name>
-            <data-type>MEDIUMINT</data-type>
+            <data-type>SMALLINT</data-type>
             <required>True</required>
             <primary-key>True</primary-key>
           </column>
@@ -1139,46 +1091,58 @@
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
+          <column>
+            <name>bugtracker_category</name>
+            <data-type>VARCHAR(32)</data-type>
+            <required>False</required>
+            <primary-key>False</primary-key>
+          </column>
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{f31249ea-ab19-45a4-9427-1854379ad8e7}">
+    <item type="database-table" id="{d823ab09-1c04-44ee-ad4b-6802208967ff}">
       <position>
-        <x>106</x>
-        <y>-51</y>
+        <x>488</x>
+        <y>475</y>
       </position>
       <table>
-        <name>gpg_keys</name>
+        <name>repository_moves</name>
         <color>#ffffff</color>
         <column-list>
           <column>
             <name>id</name>
-            <data-type>BIGINT</data-type>
+            <data-type>MEDIUMINT</data-type>
             <required>True</required>
             <primary-key>True</primary-key>
           </column>
           <column>
-            <name>fingerprint</name>
-            <data-type>VARCHAR(40)</data-type>
+            <name>from_repository</name>
+            <data-type>MEDIUMINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>owner</name>
+            <name>to_repository</name>
             <data-type>MEDIUMINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
+          <column>
+            <name>upstream_package_repository</name>
+            <data-type>SMALLINT</data-type>
+            <required>True</required>
+            <primary-key>False</primary-key>
+          </column>
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{b5671c08-e24a-4293-b983-3c86b1a6d622}">
+    <item type="database-table" id="{5cbe15f1-fea8-48eb-a84f-97f7e22060f6}">
       <position>
-        <x>68</x>
-        <y>42</y>
+        <x>-55</x>
+        <y>-72</y>
       </position>
       <table>
-        <name>allowed_email_actions</name>
+        <name>email_log</name>
         <color>#ffffff</color>
         <column-list>
           <column>
@@ -1188,51 +1152,51 @@
             <primary-key>True</primary-key>
           </column>
           <column>
-            <name>gpg_key</name>
-            <data-type>BIGINT</data-type>
+            <name>date</name>
+            <data-type>TIMESTAMP</data-type>
+            <required>True</required>
+            <primary-key>False</primary-key>
+          </column>
+          <column>
+            <name>success</name>
+            <data-type>BIT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
             <name>action</name>
             <data-type>MEDIUMINT</data-type>
-            <required>True</required>
+            <required>False</required>
             <primary-key>False</primary-key>
           </column>
-        </column-list>
-      </table>
-    </item>
-    <item type="database-table" id="{6180fcbf-5069-4d86-8919-fd39394f1813}">
-      <position>
-        <x>-54</x>
-        <y>70</y>
-      </position>
-      <table>
-        <name>email_actions</name>
-        <color>#ffffff</color>
-        <column-list>
           <column>
-            <name>id</name>
+            <name>count</name>
             <data-type>MEDIUMINT</data-type>
-            <required>True</required>
-            <primary-key>True</primary-key>
+            <required>False</required>
+            <primary-key>False</primary-key>
           </column>
           <column>
-            <name>name</name>
-            <data-type>VARCHAR(32)</data-type>
-            <required>True</required>
+            <name>gpg_key</name>
+            <data-type>BIGINT</data-type>
+            <required>False</required>
+            <primary-key>False</primary-key>
+          </column>
+          <column>
+            <name>comment</name>
+            <data-type>TEXT</data-type>
+            <required>False</required>
             <primary-key>False</primary-key>
           </column>
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{33867a1e-ef36-4cc2-a08e-7366f56fbf5f}">
+    <item type="database-table" id="{5f12db03-a8bb-4467-bab6-a57e545b9081}">
       <position>
-        <x>229</x>
-        <y>20</y>
+        <x>-52</x>
+        <y>134</y>
       </position>
       <table>
-        <name>ssh_keys</name>
+        <name>ssh_log</name>
         <color>#ffffff</color>
         <column-list>
           <column>
@@ -1242,13 +1206,25 @@
             <primary-key>True</primary-key>
           </column>
           <column>
-            <name>owner</name>
+            <name>date</name>
+            <data-type>TIMESTAMP</data-type>
+            <required>True</required>
+            <primary-key>False</primary-key>
+          </column>
+          <column>
+            <name>build_slave</name>
             <data-type>MEDIUMINT</data-type>
+            <required>False</required>
+            <primary-key>False</primary-key>
+          </column>
+          <column>
+            <name>action</name>
+            <data-type>VARCHAR(32)</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>fingerprint</name>
+            <name>parameters</name>
             <data-type>TEXT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
@@ -1256,49 +1232,55 @@
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{3d2d24a7-42f1-4c59-9cb3-a8d8478ac4a8}">
+    <item type="database-table" id="{b33d4844-b4e4-4ef6-944b-36b4113c2b82}">
       <position>
-        <x>373</x>
-        <y>388</y>
+        <x>546</x>
+        <y>188</y>
       </position>
       <table>
-        <name>architecture_compatibilities</name>
+        <name>binary_packages_in_repositories</name>
         <color>#ffffff</color>
         <column-list>
           <column>
             <name>id</name>
-            <data-type>MEDIUMINT</data-type>
+            <data-type>BIGINT</data-type>
             <required>True</required>
             <primary-key>True</primary-key>
           </column>
           <column>
-            <name>built_for</name>
-            <data-type>SMALLINT</data-type>
+            <name>package</name>
+            <data-type>BIGINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>runs_on</name>
-            <data-type>SMALLINT</data-type>
+            <name>repository</name>
+            <data-type>MEDIUMINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>fully_compatible</name>
+            <name>is_to_be_deleted</name>
             <data-type>BIT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
+          <column>
+            <name>last_moved</name>
+            <data-type>TIMESTAMP</data-type>
+            <required>True</required>
+            <primary-key>False</primary-key>
+          </column>
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{bb59ebca-0255-40dd-91b4-68bd2e110447}">
+    <item type="database-table" id="{caab4a73-46dc-49dc-ac51-d8ae916827c5}">
       <position>
-        <x>956</x>
-        <y>420</y>
+        <x>398</x>
+        <y>-74</y>
       </position>
       <table>
-        <name>mirror_statuses</name>
+        <name>dependencies</name>
         <color>#ffffff</color>
         <column-list>
           <column>
@@ -1308,125 +1290,149 @@
             <primary-key>True</primary-key>
           </column>
           <column>
-            <name>protocol</name>
-            <data-type>VARCHAR(8)</data-type>
+            <name>dependent</name>
+            <data-type>BIGINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>url</name>
-            <data-type>VARCHAR(128)</data-type>
+            <name>depending_on</name>
+            <data-type>BIGINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>country</name>
-            <data-type>VARCHAR(64)</data-type>
+            <name>dependency_type</name>
+            <data-type>SMALLINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>country_code</name>
-            <data-type>VARCHAR(4)</data-type>
+            <name>version</name>
+            <data-type>BIGINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>last_sync</name>
-            <data-type>BIGINT</data-type>
+            <name>version_relation</name>
+            <data-type>VARCHAR(2)</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
+        </column-list>
+      </table>
+    </item>
+    <item type="database-table" id="{a67b38a9-c701-412c-8292-5ef58536da85}">
+      <position>
+        <x>483</x>
+        <y>57</y>
+      </position>
+      <table>
+        <name>versions</name>
+        <color>#ffffff</color>
+        <column-list>
           <column>
-            <name>start</name>
-            <data-type>FLOAT</data-type>
+            <name>id</name>
+            <data-type>BIGINT</data-type>
             <required>True</required>
-            <primary-key>False</primary-key>
+            <primary-key>True</primary-key>
           </column>
           <column>
-            <name>stop</name>
-            <data-type>FLOAT</data-type>
+            <name>order</name>
+            <data-type>BIGINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>isos</name>
-            <data-type>BIT</data-type>
+            <name>epoch</name>
+            <data-type>MEDIUMINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>ipv4</name>
-            <data-type>BIT</data-type>
+            <name>version</name>
+            <data-type>VARCHAR(32)</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
+        </column-list>
+      </table>
+    </item>
+    <item type="database-table" id="{fdd7ff7b-7a96-4625-9287-820e1b076c2a}">
+      <position>
+        <x>29</x>
+        <y>569</y>
+      </position>
+      <table>
+        <name>toolchain_order</name>
+        <color>#ffffff</color>
+        <column-list>
           <column>
-            <name>ipv6</name>
-            <data-type>BIT</data-type>
+            <name>number</name>
+            <data-type>SMALLINT</data-type>
             <required>True</required>
-            <primary-key>False</primary-key>
+            <primary-key>True</primary-key>
           </column>
           <column>
-            <name>active</name>
-            <data-type>BIT</data-type>
+            <name>pkgbase</name>
+            <data-type>VARCHAR(64)</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
         </column-list>
       </table>
     </item>
-    <item type="database-relationship" id="{64756b6f-e7d3-4995-8b5d-21d07292741f}">
+    <item type="database-relationship" id="{f2d38c97-7a03-4454-8b95-7b35ba1c0304}">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>137.547</x>
-              <y>593.906</y>
+              <x>434.969</x>
+              <y>388</y>
             </position>
-            <angle>0</angle>
-            <hub owner="{fdd7ff7b-7a96-4625-9287-820e1b076c2a}"/>
+            <angle>90</angle>
+            <hub owner="{3d2d24a7-42f1-4c59-9cb3-a8d8478ac4a8}"/>
           </connector>
           <connector>
             <position>
-              <x>248</x>
-              <y>565.906</y>
+              <x>427.125</x>
+              <y>358.797</y>
             </position>
-            <angle>180</angle>
-            <hub owner="{7c210122-c51d-4724-b7cc-22f143bc47ac}"/>
+            <angle>270</angle>
+            <hub owner="{04f424bf-6465-478b-9529-0038615b51d9}"/>
           </connector>
         </connector-list>
       </line>
       <relationship>
         <cardinality>OneToOne</cardinality>
         <modality>
-          <child>Optional</child>
-          <parent>Optional</parent>
+          <child>Mandatory</child>
+          <parent>Mandatory</parent>
         </modality>
         <columns>
           <child>1</child>
-          <parent>1</parent>
+          <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{8e252eee-d544-482b-9a11-ba30ff6b4ebd}">
+    <item type="database-relationship" id="{30a694b2-681f-44ae-90bb-911220d65737}">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>499.115</x>
-              <y>31.8125</y>
+              <x>496.938</x>
+              <y>388</y>
             </position>
-            <angle>270</angle>
-            <hub owner="{caab4a73-46dc-49dc-ac51-d8ae916827c5}"/>
+            <angle>90</angle>
+            <hub owner="{3d2d24a7-42f1-4c59-9cb3-a8d8478ac4a8}"/>
           </connector>
           <connector>
             <position>
-              <x>524.594</x>
-              <y>57</y>
+              <x>459.25</x>
+              <y>358.797</y>
             </position>
-            <angle>90</angle>
-            <hub owner="{a67b38a9-c701-412c-8292-5ef58536da85}"/>
+            <angle>270</angle>
+            <hub owner="{04f424bf-6465-478b-9529-0038615b51d9}"/>
           </connector>
         </connector-list>
       </line>
@@ -1437,29 +1443,29 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>4</child>
+          <child>2</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{3016bcca-8c69-49ae-b7af-6f236ee0a018}">
+    <item type="database-relationship" id="{25ec7ee3-9041-4ef4-a5b8-c41a06385813}">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>618</x>
-              <y>125.938</y>
+              <x>566</x>
+              <y>342.898</y>
             </position>
             <angle>180</angle>
-            <hub owner="{f8caa2d5-11ba-485c-b273-8183713896bf}"/>
+            <hub owner="{844766fc-c5af-4f61-b51b-d3f9393c60ca}"/>
           </connector>
           <connector>
             <position>
-              <x>566.188</x>
-              <y>95.9062</y>
+              <x>491.375</x>
+              <y>335.898</y>
             </position>
             <angle>0</angle>
-            <hub owner="{a67b38a9-c701-412c-8292-5ef58536da85}"/>
+            <hub owner="{04f424bf-6465-478b-9529-0038615b51d9}"/>
           </connector>
         </connector-list>
       </line>
@@ -1470,29 +1476,29 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>3</child>
+          <child>4</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{d3ded37c-70d5-4388-8e27-2329f59a1d9c}">
+    <item type="database-relationship" id="{3539786a-db3b-4c5c-ba35-e89fb027cda8}">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>549.672</x>
-              <y>-38.7292</y>
+              <x>282.078</x>
+              <y>20</y>
             </position>
-            <angle>0</angle>
-            <hub owner="{caab4a73-46dc-49dc-ac51-d8ae916827c5}"/>
+            <angle>90</angle>
+            <hub owner="{33867a1e-ef36-4cc2-a08e-7366f56fbf5f}"/>
           </connector>
           <connector>
             <position>
-              <x>637</x>
-              <y>-31.0938</y>
+              <x>275.258</x>
+              <y>-20.2031</y>
             </position>
-            <angle>180</angle>
-            <hub owner="{be821d83-a9b4-4c0c-8e1b-433730200714}"/>
+            <angle>270</angle>
+            <hub owner="{75e4ebd8-5915-4aff-8316-0c542d3953da}"/>
           </connector>
         </connector-list>
       </line>
@@ -1503,29 +1509,29 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>3</child>
+          <child>1</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{ab992baa-6a2c-441b-a290-da42a791eb95}">
+    <item type="database-relationship" id="{326ba5fe-513e-48e9-b924-51305ffa2aeb}">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>549.672</x>
-              <y>-3.45833</y>
+              <x>190.617</x>
+              <y>148</y>
             </position>
-            <angle>0</angle>
-            <hub owner="{caab4a73-46dc-49dc-ac51-d8ae916827c5}"/>
+            <angle>90</angle>
+            <hub owner="{a945e439-8796-49e8-aa9b-7ce0a58a2c26}"/>
           </connector>
           <connector>
             <position>
-              <x>653</x>
-              <y>45.9062</y>
+              <x>282.078</x>
+              <y>79.7969</y>
             </position>
-            <angle>180</angle>
-            <hub owner="{e84f8e5f-28e0-4d8b-a7e5-0f80a896f74e}"/>
+            <angle>270</angle>
+            <hub owner="{33867a1e-ef36-4cc2-a08e-7366f56fbf5f}"/>
           </connector>
         </connector-list>
       </line>
@@ -1541,57 +1547,57 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{0213a360-5a3b-484f-82c7-320003506c8a}">
+    <item type="database-relationship" id="{4174d8cf-11ae-4a89-bc89-ae6044cee76d}">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>650.922</x>
-              <y>279.812</y>
+              <x>-10.2266</x>
+              <y>43.7969</y>
             </position>
             <angle>270</angle>
-            <hub owner="{b33d4844-b4e4-4ef6-944b-36b4113c2b82}"/>
+            <hub owner="{5cbe15f1-fea8-48eb-a84f-97f7e22060f6}"/>
           </connector>
           <connector>
             <position>
-              <x>650.703</x>
-              <y>299</y>
+              <x>-5.02344</x>
+              <y>70</y>
             </position>
             <angle>90</angle>
-            <hub owner="{844766fc-c5af-4f61-b51b-d3f9393c60ca}"/>
+            <hub owner="{6180fcbf-5069-4d86-8919-fd39394f1813}"/>
           </connector>
         </connector-list>
       </line>
       <relationship>
-        <cardinality>OneToMany</cardinality>
+        <cardinality>OneToOne</cardinality>
         <modality>
-          <child>Optional</child>
-          <parent>Optional</parent>
+          <child>Mandatory</child>
+          <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>2</child>
+          <child>3</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{f26515ec-f37f-4eb3-a07f-6d5077208806}">
+    <item type="database-relationship" id="{af592aac-17cd-415f-99e8-9cf164311215}">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>448.557</x>
-              <y>31.8125</y>
+              <x>68</x>
+              <y>71.8984</y>
             </position>
-            <angle>270</angle>
-            <hub owner="{caab4a73-46dc-49dc-ac51-d8ae916827c5}"/>
+            <angle>180</angle>
+            <hub owner="{b5671c08-e24a-4293-b983-3c86b1a6d622}"/>
           </connector>
           <connector>
             <position>
-              <x>381.93</x>
-              <y>99</y>
+              <x>43.9531</x>
+              <y>92.8984</y>
             </position>
-            <angle>90</angle>
-            <hub owner="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}"/>
+            <angle>0</angle>
+            <hub owner="{6180fcbf-5069-4d86-8919-fd39394f1813}"/>
           </connector>
         </connector-list>
       </line>
@@ -1602,29 +1608,29 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>1</child>
+          <child>2</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{c672e45e-2bd4-4ff1-9b42-fdd2443cae6a}">
+    <item type="database-relationship" id="{80755775-c938-4545-b4eb-1f08cfb1f0cc}">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>546</x>
-              <y>233.906</y>
+              <x>143.469</x>
+              <y>42</y>
             </position>
-            <angle>180</angle>
-            <hub owner="{b33d4844-b4e4-4ef6-944b-36b4113c2b82}"/>
+            <angle>90</angle>
+            <hub owner="{b5671c08-e24a-4293-b983-3c86b1a6d622}"/>
           </connector>
           <connector>
             <position>
-              <x>464.859</x>
-              <y>225.542</y>
+              <x>159.078</x>
+              <y>8.79688</y>
             </position>
-            <angle>0</angle>
-            <hub owner="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}"/>
+            <angle>270</angle>
+            <hub owner="{f31249ea-ab19-45a4-9427-1854379ad8e7}"/>
           </connector>
         </connector-list>
       </line>
@@ -1640,24 +1646,24 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{9a650bd7-521d-499f-ac79-a0fd9226a656}">
+    <item type="database-relationship" id="{803ce991-1984-4cab-9bb8-48acabb347af}">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>59.5312</x>
-              <y>179.906</y>
+              <x>34.5469</x>
+              <y>-14.1016</y>
             </position>
             <angle>0</angle>
-            <hub owner="{5f12db03-a8bb-4467-bab6-a57e545b9081}"/>
+            <hub owner="{5cbe15f1-fea8-48eb-a84f-97f7e22060f6}"/>
           </connector>
           <connector>
             <position>
-              <x>118</x>
-              <y>221.906</y>
+              <x>106</x>
+              <y>-21.1016</y>
             </position>
             <angle>180</angle>
-            <hub owner="{a945e439-8796-49e8-aa9b-7ce0a58a2c26}"/>
+            <hub owner="{f31249ea-ab19-45a4-9427-1854379ad8e7}"/>
           </connector>
         </connector-list>
       </line>
@@ -1668,29 +1674,29 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>2</child>
+          <child>5</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{30efa4b2-f4e7-4c8d-943e-44c699e54853}">
+    <item type="database-relationship" id="{abba2005-f23b-445f-aea6-ff9365bc1569}">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>606.133</x>
-              <y>552.812</y>
+              <x>212.156</x>
+              <y>-21.1016</y>
             </position>
-            <angle>270</angle>
-            <hub owner="{d823ab09-1c04-44ee-ad4b-6802208967ff}"/>
+            <angle>0</angle>
+            <hub owner="{f31249ea-ab19-45a4-9427-1854379ad8e7}"/>
           </connector>
           <connector>
             <position>
-              <x>602.727</x>
-              <y>571</y>
+              <x>240</x>
+              <y>-43.1016</y>
             </position>
-            <angle>90</angle>
-            <hub owner="{d01e6205-a6dc-4724-a1fd-d4b2f73637ea}"/>
+            <angle>180</angle>
+            <hub owner="{75e4ebd8-5915-4aff-8316-0c542d3953da}"/>
           </connector>
         </connector-list>
       </line>
@@ -1701,29 +1707,29 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>3</child>
+          <child>2</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{6094d4c4-439f-4e6c-94e1-736ae145362a}">
+    <item type="database-relationship" id="{172204a1-76e9-45fc-826f-b3d174112734}">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>566.755</x>
-              <y>475</y>
+              <x>1024.78</x>
+              <y>71</y>
             </position>
             <angle>90</angle>
-            <hub owner="{d823ab09-1c04-44ee-ad4b-6802208967ff}"/>
+            <hub owner="{36980651-4f03-4748-aee8-1f9211aaafde}"/>
           </connector>
           <connector>
             <position>
-              <x>622.469</x>
-              <y>390.812</y>
+              <x>1017.95</x>
+              <y>17.7969</y>
             </position>
             <angle>270</angle>
-            <hub owner="{844766fc-c5af-4f61-b51b-d3f9393c60ca}"/>
+            <hub owner="{dc01c567-d657-4db7-8a55-d2763ed00cee}"/>
           </connector>
         </connector-list>
       </line>
@@ -1734,29 +1740,29 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>1</child>
+          <child>0</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{4b0f5386-c5f6-4fa4-9c78-f0d85410c366}">
+    <item type="database-relationship" id="{bb03129e-aba8-4449-88c1-6c352745aeda}">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>645.51</x>
-              <y>475</y>
+              <x>982.391</x>
+              <y>71</y>
             </position>
             <angle>90</angle>
-            <hub owner="{d823ab09-1c04-44ee-ad4b-6802208967ff}"/>
+            <hub owner="{36980651-4f03-4748-aee8-1f9211aaafde}"/>
           </connector>
           <connector>
             <position>
-              <x>678.938</x>
-              <y>390.812</y>
+              <x>981.474</x>
+              <y>17.7969</y>
             </position>
             <angle>270</angle>
-            <hub owner="{844766fc-c5af-4f61-b51b-d3f9393c60ca}"/>
+            <hub owner="{dc01c567-d657-4db7-8a55-d2763ed00cee}"/>
           </connector>
         </connector-list>
       </line>
@@ -1767,29 +1773,29 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>2</child>
+          <child>1</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{c54c97e3-dd0a-4b21-9eeb-708d5b492e2a}">
+    <item type="database-relationship" id="{fa899065-104a-466d-bc8c-16589a774a45}">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>409.573</x>
-              <y>288.812</y>
+              <x>819.854</x>
+              <y>452</y>
             </position>
-            <angle>270</angle>
-            <hub owner="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}"/>
+            <angle>90</angle>
+            <hub owner="{92f54126-a433-458e-80b7-67235e560334}"/>
           </connector>
           <connector>
             <position>
-              <x>442.273</x>
-              <y>313</y>
+              <x>823.302</x>
+              <y>404.797</y>
             </position>
-            <angle>90</angle>
-            <hub owner="{04f424bf-6465-478b-9529-0038615b51d9}"/>
+            <angle>270</angle>
+            <hub owner="{fee50b4d-969b-4b5f-8545-90ea8f8f7aec}"/>
           </connector>
         </connector-list>
       </line>
@@ -1800,28 +1806,28 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>9</child>
+          <child>2</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{67f0b7bd-a201-45d1-b18c-db46a8de0480}">
+    <item type="database-relationship" id="{8f5f94cd-2919-43f6-ae67-6b783850a2e7}">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>735.406</x>
-              <y>344.906</y>
+              <x>883.708</x>
+              <y>452</y>
             </position>
-            <angle>0</angle>
-            <hub owner="{844766fc-c5af-4f61-b51b-d3f9393c60ca}"/>
+            <angle>90</angle>
+            <hub owner="{92f54126-a433-458e-80b7-67235e560334}"/>
           </connector>
           <connector>
             <position>
-              <x>770</x>
-              <y>376.906</y>
+              <x>876.604</x>
+              <y>404.797</y>
             </position>
-            <angle>180</angle>
+            <angle>270</angle>
             <hub owner="{fee50b4d-969b-4b5f-8545-90ea8f8f7aec}"/>
           </connector>
         </connector-list>
@@ -1833,29 +1839,29 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>2</child>
+          <child>1</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{9a1b5925-a86a-470b-9c2b-3132fdcfc87e}">
+    <item type="database-relationship" id="{65ace480-001e-4e4e-912d-2a975ff995c8}">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>696.109</x>
-              <y>100</y>
+              <x>33.5521</x>
+              <y>342</y>
             </position>
             <angle>90</angle>
-            <hub owner="{f8caa2d5-11ba-485c-b273-8183713896bf}"/>
+            <hub owner="{a774fcb7-1193-4b57-947c-135212695915}"/>
           </connector>
           <connector>
             <position>
-              <x>703.016</x>
-              <y>70.8125</y>
+              <x>-5.3125</x>
+              <y>313.797</y>
             </position>
             <angle>270</angle>
-            <hub owner="{e84f8e5f-28e0-4d8b-a7e5-0f80a896f74e}"/>
+            <hub owner="{7b159780-7f39-45a7-9557-046874a57e43}"/>
           </connector>
         </connector-list>
       </line>
@@ -1866,29 +1872,29 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>2</child>
+          <child>4</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{89cacf0f-5195-48db-aace-02a13aa29eee}">
+    <item type="database-relationship" id="{35556854-c6c3-45e8-9e10-bd5150680fd2}">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>618</x>
-              <y>151.875</y>
+              <x>134.656</x>
+              <y>399.898</y>
             </position>
-            <angle>180</angle>
-            <hub owner="{f8caa2d5-11ba-485c-b273-8183713896bf}"/>
+            <angle>0</angle>
+            <hub owner="{a774fcb7-1193-4b57-947c-135212695915}"/>
           </connector>
           <connector>
             <position>
-              <x>464.859</x>
-              <y>162.271</y>
+              <x>196</x>
+              <y>390.898</y>
             </position>
-            <angle>0</angle>
-            <hub owner="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}"/>
+            <angle>180</angle>
+            <hub owner="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}"/>
           </connector>
         </connector-list>
       </line>
@@ -1899,29 +1905,29 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>1</child>
+          <child>2</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{48ec4e54-ceb5-48f1-b773-9ab92f6c1c5a}">
+    <item type="database-relationship" id="{307a930b-cbe8-4000-b89d-b6cc99479b19}">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>478.531</x>
-              <y>565.906</y>
+              <x>84.1042</x>
+              <y>342</y>
             </position>
-            <angle>0</angle>
-            <hub owner="{7c210122-c51d-4724-b7cc-22f143bc47ac}"/>
+            <angle>90</angle>
+            <hub owner="{a774fcb7-1193-4b57-947c-135212695915}"/>
           </connector>
           <connector>
             <position>
-              <x>528</x>
-              <y>602.906</y>
+              <x>166.411</x>
+              <y>291.797</y>
             </position>
-            <angle>180</angle>
-            <hub owner="{d01e6205-a6dc-4724-a1fd-d4b2f73637ea}"/>
+            <angle>270</angle>
+            <hub owner="{a945e439-8796-49e8-aa9b-7ce0a58a2c26}"/>
           </connector>
         </connector-list>
       </line>
@@ -1932,29 +1938,29 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>4</child>
+          <child>1</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{fb5f9b76-6f5d-4c06-b7dd-f89583096ba7}">
+    <item type="database-relationship" id="{40654aec-f5e1-4d82-a528-102a76a971d3}">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>677.453</x>
-              <y>602.906</y>
+              <x>150.555</x>
+              <y>483</y>
             </position>
-            <angle>0</angle>
-            <hub owner="{d01e6205-a6dc-4724-a1fd-d4b2f73637ea}"/>
+            <angle>90</angle>
+            <hub owner="{04b6fdc5-85ae-4416-8db5-034ad05be93a}"/>
           </connector>
           <connector>
             <position>
-              <x>811</x>
-              <y>598.906</y>
+              <x>242.953</x>
+              <y>455.797</y>
             </position>
-            <angle>180</angle>
-            <hub owner="{b3c86235-971a-4d3e-873c-c4179aa96cbc}"/>
+            <angle>270</angle>
+            <hub owner="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}"/>
           </connector>
         </connector-list>
       </line>
@@ -1970,24 +1976,24 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{1702ddc7-99c5-4af4-8731-eb8f4b6306d3}">
+    <item type="database-relationship" id="{41ee8002-8436-4c74-9f79-75b7a8b9d0bf}">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>289.948</x>
-              <y>459.812</y>
+              <x>214.823</x>
+              <y>291.797</y>
             </position>
             <angle>270</angle>
-            <hub owner="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}"/>
+            <hub owner="{a945e439-8796-49e8-aa9b-7ce0a58a2c26}"/>
           </connector>
           <connector>
             <position>
-              <x>363.266</x>
-              <y>499</y>
+              <x>242.953</x>
+              <y>326</y>
             </position>
             <angle>90</angle>
-            <hub owner="{7c210122-c51d-4724-b7cc-22f143bc47ac}"/>
+            <hub owner="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}"/>
           </connector>
         </connector-list>
       </line>
@@ -1998,29 +2004,29 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>1</child>
+          <child>3</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{2e8b92fe-d2c0-47e0-91b6-d1667772d162}">
+    <item type="database-relationship" id="{883853fb-bda9-450c-bde3-77422973b925}">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>336.922</x>
-              <y>392.906</y>
+              <x>354.266</x>
+              <y>284.797</y>
             </position>
-            <angle>0</angle>
-            <hub owner="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}"/>
+            <angle>270</angle>
+            <hub owner="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}"/>
           </connector>
           <connector>
             <position>
-              <x>395</x>
-              <y>337.906</y>
-            </position>
-            <angle>180</angle>
-            <hub owner="{04f424bf-6465-478b-9529-0038615b51d9}"/>
+              <x>289.906</x>
+              <y>326</y>
+            </position>
+            <angle>90</angle>
+            <hub owner="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}"/>
           </connector>
         </connector-list>
       </line>
@@ -2031,29 +2037,29 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>2</child>
+          <child>1</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{883853fb-bda9-450c-bde3-77422973b925}">
+    <item type="database-relationship" id="{2e8b92fe-d2c0-47e0-91b6-d1667772d162}">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>354.286</x>
-              <y>288.812</y>
+              <x>336.859</x>
+              <y>390.898</y>
             </position>
-            <angle>270</angle>
-            <hub owner="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}"/>
+            <angle>0</angle>
+            <hub owner="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}"/>
           </connector>
           <connector>
             <position>
-              <x>289.948</x>
-              <y>326</y>
+              <x>395</x>
+              <y>335.898</y>
             </position>
-            <angle>90</angle>
-            <hub owner="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}"/>
+            <angle>180</angle>
+            <hub owner="{04f424bf-6465-478b-9529-0038615b51d9}"/>
           </connector>
         </connector-list>
       </line>
@@ -2064,29 +2070,29 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>1</child>
+          <child>2</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{41ee8002-8436-4c74-9f79-75b7a8b9d0bf}">
+    <item type="database-relationship" id="{1702ddc7-99c5-4af4-8731-eb8f4b6306d3}">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>212.302</x>
-              <y>295.812</y>
+              <x>289.906</x>
+              <y>455.797</y>
             </position>
             <angle>270</angle>
-            <hub owner="{a945e439-8796-49e8-aa9b-7ce0a58a2c26}"/>
+            <hub owner="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}"/>
           </connector>
           <connector>
             <position>
-              <x>242.974</x>
-              <y>326</y>
+              <x>363.234</x>
+              <y>499</y>
             </position>
             <angle>90</angle>
-            <hub owner="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}"/>
+            <hub owner="{7c210122-c51d-4724-b7cc-22f143bc47ac}"/>
           </connector>
         </connector-list>
       </line>
@@ -2097,29 +2103,29 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>3</child>
+          <child>1</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{40654aec-f5e1-4d82-a528-102a76a971d3}">
+    <item type="database-relationship" id="{fb5f9b76-6f5d-4c06-b7dd-f89583096ba7}">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>150.195</x>
-              <y>483</y>
+              <x>679.281</x>
+              <y>600.898</y>
             </position>
-            <angle>90</angle>
-            <hub owner="{04b6fdc5-85ae-4416-8db5-034ad05be93a}"/>
+            <angle>0</angle>
+            <hub owner="{d01e6205-a6dc-4724-a1fd-d4b2f73637ea}"/>
           </connector>
           <connector>
             <position>
-              <x>242.974</x>
-              <y>459.812</y>
+              <x>811</x>
+              <y>596.898</y>
             </position>
-            <angle>270</angle>
-            <hub owner="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}"/>
+            <angle>180</angle>
+            <hub owner="{b3c86235-971a-4d3e-873c-c4179aa96cbc}"/>
           </connector>
         </connector-list>
       </line>
@@ -2135,24 +2141,24 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{307a930b-cbe8-4000-b89d-b6cc99479b19}">
+    <item type="database-relationship" id="{48ec4e54-ceb5-48f1-b773-9ab92f6c1c5a}">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>84.1458</x>
-              <y>342</y>
+              <x>478.469</x>
+              <y>563.898</y>
             </position>
-            <angle>90</angle>
-            <hub owner="{a774fcb7-1193-4b57-947c-135212695915}"/>
+            <angle>0</angle>
+            <hub owner="{7c210122-c51d-4724-b7cc-22f143bc47ac}"/>
           </connector>
           <connector>
             <position>
-              <x>165.151</x>
-              <y>295.812</y>
+              <x>528</x>
+              <y>600.898</y>
             </position>
-            <angle>270</angle>
-            <hub owner="{a945e439-8796-49e8-aa9b-7ce0a58a2c26}"/>
+            <angle>180</angle>
+            <hub owner="{d01e6205-a6dc-4724-a1fd-d4b2f73637ea}"/>
           </connector>
         </connector-list>
       </line>
@@ -2163,29 +2169,29 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>1</child>
+          <child>4</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{35556854-c6c3-45e8-9e10-bd5150680fd2}">
+    <item type="database-relationship" id="{89cacf0f-5195-48db-aace-02a13aa29eee}">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>134.719</x>
-              <y>401.906</y>
+              <x>613</x>
+              <y>144.531</y>
             </position>
-            <angle>0</angle>
-            <hub owner="{a774fcb7-1193-4b57-947c-135212695915}"/>
+            <angle>180</angle>
+            <hub owner="{f8caa2d5-11ba-485c-b273-8183713896bf}"/>
           </connector>
           <connector>
             <position>
-              <x>196</x>
-              <y>392.906</y>
+              <x>464.797</x>
+              <y>160.932</y>
             </position>
-            <angle>180</angle>
-            <hub owner="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}"/>
+            <angle>0</angle>
+            <hub owner="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}"/>
           </connector>
         </connector-list>
       </line>
@@ -2196,29 +2202,29 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>2</child>
+          <child>1</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{65ace480-001e-4e4e-912d-2a975ff995c8}">
+    <item type="database-relationship" id="{9a1b5925-a86a-470b-9c2b-3132fdcfc87e}">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>33.5729</x>
-              <y>342</y>
+              <x>706.172</x>
+              <y>86</y>
             </position>
             <angle>90</angle>
-            <hub owner="{a774fcb7-1193-4b57-947c-135212695915}"/>
+            <hub owner="{f8caa2d5-11ba-485c-b273-8183713896bf}"/>
           </connector>
           <connector>
             <position>
-              <x>-5.28125</x>
-              <y>317.812</y>
+              <x>703.891</x>
+              <y>66.7969</y>
             </position>
             <angle>270</angle>
-            <hub owner="{7b159780-7f39-45a7-9557-046874a57e43}"/>
+            <hub owner="{e84f8e5f-28e0-4d8b-a7e5-0f80a896f74e}"/>
           </connector>
         </connector-list>
       </line>
@@ -2229,28 +2235,28 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>4</child>
+          <child>2</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{8f5f94cd-2919-43f6-ae67-6b783850a2e7}">
+    <item type="database-relationship" id="{67f0b7bd-a201-45d1-b18c-db46a8de0480}">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>818.656</x>
-              <y>452</y>
+              <x>735.344</x>
+              <y>342.898</y>
             </position>
-            <angle>90</angle>
-            <hub owner="{92f54126-a433-458e-80b7-67235e560334}"/>
+            <angle>0</angle>
+            <hub owner="{844766fc-c5af-4f61-b51b-d3f9393c60ca}"/>
           </connector>
           <connector>
             <position>
-              <x>822.635</x>
-              <y>408.812</y>
+              <x>770</x>
+              <y>374.898</y>
             </position>
-            <angle>270</angle>
+            <angle>180</angle>
             <hub owner="{fee50b4d-969b-4b5f-8545-90ea8f8f7aec}"/>
           </connector>
         </connector-list>
@@ -2262,29 +2268,29 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>1</child>
+          <child>2</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{fa899065-104a-466d-bc8c-16589a774a45}">
+    <item type="database-relationship" id="{c54c97e3-dd0a-4b21-9eeb-708d5b492e2a}">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>881.312</x>
-              <y>452</y>
+              <x>409.531</x>
+              <y>284.797</y>
             </position>
-            <angle>90</angle>
-            <hub owner="{92f54126-a433-458e-80b7-67235e560334}"/>
+            <angle>270</angle>
+            <hub owner="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}"/>
           </connector>
           <connector>
             <position>
-              <x>875.271</x>
-              <y>408.812</y>
+              <x>443.188</x>
+              <y>313</y>
             </position>
-            <angle>270</angle>
-            <hub owner="{fee50b4d-969b-4b5f-8545-90ea8f8f7aec}"/>
+            <angle>90</angle>
+            <hub owner="{04f424bf-6465-478b-9529-0038615b51d9}"/>
           </connector>
         </connector-list>
       </line>
@@ -2295,29 +2301,29 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>2</child>
+          <child>9</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{bb03129e-aba8-4449-88c1-6c352745aeda}">
+    <item type="database-relationship" id="{4b0f5386-c5f6-4fa4-9c78-f0d85410c366}">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>982.411</x>
-              <y>71</y>
+              <x>566.734</x>
+              <y>475</y>
             </position>
             <angle>90</angle>
-            <hub owner="{36980651-4f03-4748-aee8-1f9211aaafde}"/>
+            <hub owner="{d823ab09-1c04-44ee-ad4b-6802208967ff}"/>
           </connector>
           <connector>
             <position>
-              <x>981.495</x>
-              <y>21.8125</y>
+              <x>622.448</x>
+              <y>386.797</y>
             </position>
             <angle>270</angle>
-            <hub owner="{dc01c567-d657-4db7-8a55-d2763ed00cee}"/>
+            <hub owner="{844766fc-c5af-4f61-b51b-d3f9393c60ca}"/>
           </connector>
         </connector-list>
       </line>
@@ -2328,29 +2334,29 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>1</child>
+          <child>2</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{172204a1-76e9-45fc-826f-b3d174112734}">
+    <item type="database-relationship" id="{6094d4c4-439f-4e6c-94e1-736ae145362a}">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>1024.82</x>
-              <y>71</y>
+              <x>645.469</x>
+              <y>475</y>
             </position>
             <angle>90</angle>
-            <hub owner="{36980651-4f03-4748-aee8-1f9211aaafde}"/>
+            <hub owner="{d823ab09-1c04-44ee-ad4b-6802208967ff}"/>
           </connector>
           <connector>
             <position>
-              <x>1017.99</x>
-              <y>21.8125</y>
+              <x>678.896</x>
+              <y>386.797</y>
             </position>
             <angle>270</angle>
-            <hub owner="{dc01c567-d657-4db7-8a55-d2763ed00cee}"/>
+            <hub owner="{844766fc-c5af-4f61-b51b-d3f9393c60ca}"/>
           </connector>
         </connector-list>
       </line>
@@ -2361,29 +2367,29 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>0</child>
+          <child>1</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{abba2005-f23b-445f-aea6-ff9365bc1569}">
+    <item type="database-relationship" id="{30efa4b2-f4e7-4c8d-943e-44c699e54853}">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>212.219</x>
-              <y>-19.0938</y>
+              <x>606.102</x>
+              <y>548.797</y>
             </position>
-            <angle>0</angle>
-            <hub owner="{f31249ea-ab19-45a4-9427-1854379ad8e7}"/>
+            <angle>270</angle>
+            <hub owner="{d823ab09-1c04-44ee-ad4b-6802208967ff}"/>
           </connector>
           <connector>
             <position>
-              <x>240</x>
-              <y>-41.0938</y>
+              <x>603.641</x>
+              <y>571</y>
             </position>
-            <angle>180</angle>
-            <hub owner="{75e4ebd8-5915-4aff-8316-0c542d3953da}"/>
+            <angle>90</angle>
+            <hub owner="{d01e6205-a6dc-4724-a1fd-d4b2f73637ea}"/>
           </connector>
         </connector-list>
       </line>
@@ -2394,29 +2400,29 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>2</child>
+          <child>3</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{803ce991-1984-4cab-9bb8-48acabb347af}">
+    <item type="database-relationship" id="{9a650bd7-521d-499f-ac79-a0fd9226a656}">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>35.2969</x>
-              <y>-12.0938</y>
+              <x>59.4688</x>
+              <y>177.898</y>
             </position>
             <angle>0</angle>
-            <hub owner="{5cbe15f1-fea8-48eb-a84f-97f7e22060f6}"/>
+            <hub owner="{5f12db03-a8bb-4467-bab6-a57e545b9081}"/>
           </connector>
           <connector>
             <position>
-              <x>106</x>
-              <y>-19.0938</y>
+              <x>118</x>
+              <y>219.898</y>
             </position>
             <angle>180</angle>
-            <hub owner="{f31249ea-ab19-45a4-9427-1854379ad8e7}"/>
+            <hub owner="{a945e439-8796-49e8-aa9b-7ce0a58a2c26}"/>
           </connector>
         </connector-list>
       </line>
@@ -2427,29 +2433,29 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>5</child>
+          <child>2</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{80755775-c938-4545-b4eb-1f08cfb1f0cc}">
+    <item type="database-relationship" id="{c672e45e-2bd4-4ff1-9b42-fdd2443cae6a}">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>142.789</x>
-              <y>42</y>
+              <x>546</x>
+              <y>231.898</y>
             </position>
-            <angle>90</angle>
-            <hub owner="{b5671c08-e24a-4293-b983-3c86b1a6d622}"/>
+            <angle>180</angle>
+            <hub owner="{b33d4844-b4e4-4ef6-944b-36b4113c2b82}"/>
           </connector>
           <connector>
             <position>
-              <x>159.109</x>
-              <y>12.8125</y>
+              <x>464.797</x>
+              <y>222.865</y>
             </position>
-            <angle>270</angle>
-            <hub owner="{f31249ea-ab19-45a4-9427-1854379ad8e7}"/>
+            <angle>0</angle>
+            <hub owner="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}"/>
           </connector>
         </connector-list>
       </line>
@@ -2465,24 +2471,24 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{af592aac-17cd-415f-99e8-9cf164311215}">
+    <item type="database-relationship" id="{f26515ec-f37f-4eb3-a07f-6d5077208806}">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>68</x>
-              <y>73.9062</y>
+              <x>448.536</x>
+              <y>27.7969</y>
             </position>
-            <angle>180</angle>
-            <hub owner="{b5671c08-e24a-4293-b983-3c86b1a6d622}"/>
+            <angle>270</angle>
+            <hub owner="{caab4a73-46dc-49dc-ac51-d8ae916827c5}"/>
           </connector>
           <connector>
             <position>
-              <x>43.4531</x>
-              <y>94.9062</y>
+              <x>381.898</x>
+              <y>99</y>
             </position>
-            <angle>0</angle>
-            <hub owner="{6180fcbf-5069-4d86-8919-fd39394f1813}"/>
+            <angle>90</angle>
+            <hub owner="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}"/>
           </connector>
         </connector-list>
       </line>
@@ -2493,62 +2499,62 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>2</child>
+          <child>1</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{4174d8cf-11ae-4a89-bc89-ae6044cee76d}">
+    <item type="database-relationship" id="{0213a360-5a3b-484f-82c7-320003506c8a}">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>-9.85156</x>
-              <y>47.8125</y>
+              <x>652.406</x>
+              <y>275.797</y>
             </position>
             <angle>270</angle>
-            <hub owner="{5cbe15f1-fea8-48eb-a84f-97f7e22060f6}"/>
+            <hub owner="{b33d4844-b4e4-4ef6-944b-36b4113c2b82}"/>
           </connector>
           <connector>
             <position>
-              <x>-5.27344</x>
-              <y>70</y>
+              <x>650.672</x>
+              <y>299</y>
             </position>
             <angle>90</angle>
-            <hub owner="{6180fcbf-5069-4d86-8919-fd39394f1813}"/>
+            <hub owner="{844766fc-c5af-4f61-b51b-d3f9393c60ca}"/>
           </connector>
         </connector-list>
       </line>
       <relationship>
-        <cardinality>OneToOne</cardinality>
+        <cardinality>OneToMany</cardinality>
         <modality>
-          <child>Mandatory</child>
-          <parent>Mandatory</parent>
+          <child>Optional</child>
+          <parent>Optional</parent>
         </modality>
         <columns>
-          <child>3</child>
+          <child>2</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{326ba5fe-513e-48e9-b924-51305ffa2aeb}">
+    <item type="database-relationship" id="{ab992baa-6a2c-441b-a290-da42a791eb95}">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>188.727</x>
-              <y>148</y>
+              <x>549.609</x>
+              <y>-6.13542</y>
             </position>
-            <angle>90</angle>
-            <hub owner="{a945e439-8796-49e8-aa9b-7ce0a58a2c26}"/>
+            <angle>0</angle>
+            <hub owner="{caab4a73-46dc-49dc-ac51-d8ae916827c5}"/>
           </connector>
           <connector>
             <position>
-              <x>282.109</x>
-              <y>83.8125</y>
+              <x>653</x>
+              <y>43.8984</y>
             </position>
-            <angle>270</angle>
-            <hub owner="{33867a1e-ef36-4cc2-a08e-7366f56fbf5f}"/>
+            <angle>180</angle>
+            <hub owner="{e84f8e5f-28e0-4d8b-a7e5-0f80a896f74e}"/>
           </connector>
         </connector-list>
       </line>
@@ -2564,24 +2570,24 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{3539786a-db3b-4c5c-ba35-e89fb027cda8}">
+    <item type="database-relationship" id="{d3ded37c-70d5-4388-8e27-2329f59a1d9c}">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>282.109</x>
-              <y>20</y>
+              <x>549.609</x>
+              <y>-40.0677</y>
             </position>
-            <angle>90</angle>
-            <hub owner="{33867a1e-ef36-4cc2-a08e-7366f56fbf5f}"/>
+            <angle>0</angle>
+            <hub owner="{caab4a73-46dc-49dc-ac51-d8ae916827c5}"/>
           </connector>
           <connector>
             <position>
-              <x>275.289</x>
-              <y>-16.1875</y>
+              <x>637</x>
+              <y>-33.1016</y>
             </position>
-            <angle>270</angle>
-            <hub owner="{75e4ebd8-5915-4aff-8316-0c542d3953da}"/>
+            <angle>180</angle>
+            <hub owner="{be821d83-a9b4-4c0c-8e1b-433730200714}"/>
           </connector>
         </connector-list>
       </line>
@@ -2592,29 +2598,29 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>1</child>
+          <child>3</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{25ec7ee3-9041-4ef4-a5b8-c41a06385813}">
+    <item type="database-relationship" id="{3016bcca-8c69-49ae-b7af-6f236ee0a018}">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>566</x>
-              <y>344.906</y>
+              <x>613</x>
+              <y>115.266</y>
             </position>
             <angle>180</angle>
-            <hub owner="{844766fc-c5af-4f61-b51b-d3f9393c60ca}"/>
+            <hub owner="{f8caa2d5-11ba-485c-b273-8183713896bf}"/>
           </connector>
           <connector>
             <position>
-              <x>489.547</x>
-              <y>337.906</y>
+              <x>566.125</x>
+              <y>93.8984</y>
             </position>
             <angle>0</angle>
-            <hub owner="{04f424bf-6465-478b-9529-0038615b51d9}"/>
+            <hub owner="{a67b38a9-c701-412c-8292-5ef58536da85}"/>
           </connector>
         </connector-list>
       </line>
@@ -2625,29 +2631,29 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>4</child>
+          <child>3</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{30a694b2-681f-44ae-90bb-911220d65737}">
+    <item type="database-relationship" id="{8e252eee-d544-482b-9a11-ba30ff6b4ebd}">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>494.427</x>
-              <y>388</y>
+              <x>499.073</x>
+              <y>27.7969</y>
             </position>
-            <angle>90</angle>
-            <hub owner="{3d2d24a7-42f1-4c59-9cb3-a8d8478ac4a8}"/>
+            <angle>270</angle>
+            <hub owner="{caab4a73-46dc-49dc-ac51-d8ae916827c5}"/>
           </connector>
           <connector>
             <position>
-              <x>458.031</x>
-              <y>362.812</y>
+              <x>524.562</x>
+              <y>57</y>
             </position>
-            <angle>270</angle>
-            <hub owner="{04f424bf-6465-478b-9529-0038615b51d9}"/>
+            <angle>90</angle>
+            <hub owner="{a67b38a9-c701-412c-8292-5ef58536da85}"/>
           </connector>
         </connector-list>
       </line>
@@ -2658,41 +2664,41 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>2</child>
+          <child>4</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{f2d38c97-7a03-4454-8b95-7b35ba1c0304}">
+    <item type="database-relationship" id="{64756b6f-e7d3-4995-8b5d-21d07292741f}">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>433.714</x>
-              <y>388</y>
+              <x>139.781</x>
+              <y>591.898</y>
             </position>
-            <angle>90</angle>
-            <hub owner="{3d2d24a7-42f1-4c59-9cb3-a8d8478ac4a8}"/>
+            <angle>0</angle>
+            <hub owner="{fdd7ff7b-7a96-4625-9287-820e1b076c2a}"/>
           </connector>
           <connector>
             <position>
-              <x>426.516</x>
-              <y>362.812</y>
+              <x>248</x>
+              <y>563.898</y>
             </position>
-            <angle>270</angle>
-            <hub owner="{04f424bf-6465-478b-9529-0038615b51d9}"/>
+            <angle>180</angle>
+            <hub owner="{7c210122-c51d-4724-b7cc-22f143bc47ac}"/>
           </connector>
         </connector-list>
       </line>
       <relationship>
         <cardinality>OneToOne</cardinality>
         <modality>
-          <child>Mandatory</child>
-          <parent>Mandatory</parent>
+          <child>Optional</child>
+          <parent>Optional</parent>
         </modality>
         <columns>
           <child>1</child>
-          <parent>0</parent>
+          <parent>1</parent>
         </columns>
       </relationship>
     </item>
diff --git a/misc/database-layout.dump b/misc/database-layout.dump
index 664fbdb..4568bd9 100644
--- a/misc/database-layout.dump
+++ b/misc/database-layout.dump
@@ -780,8 +780,9 @@ install_target_providers	CREATE TABLE `install_target_providers` (
 	 `package` bigint(20) NOT NULL,
 	 `install_target` bigint(20) NOT NULL,
 	 `version` bigint(20) NOT NULL,
+	 `install_target_is_group` bit(1) NOT NULL DEFAULT b'0',
 	 PRIMARY KEY (`id`),
-	 UNIQUE KEY `content` (`package`,`install_target`,`version`),
+	 UNIQUE KEY `content` (`package`,`install_target`,`version`,`install_target_is_group`),
 	 KEY `install_target_providers_ibfk_2` (`install_target`),
 	 KEY `version` (`version`),
 	 CONSTRAINT `install_target_providers_ibfk_1` FOREIGN KEY (`package`) REFERENCES `binary_packages` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
-- 
cgit v1.2.3-70-g09d2