diff --git a/models/mdbwh_starmodel.dbm b/models/mdbwh_starmodel.dbm
deleted file mode 100644
index 7cb6348..0000000
--- a/models/mdbwh_starmodel.dbm
+++ /dev/null
@@ -1,424 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/models/mondial_warehouse_full.dbm b/models/mondial_warehouse.dbm
similarity index 92%
rename from models/mondial_warehouse_full.dbm
rename to models/mondial_warehouse.dbm
index 6c99385..ca2ed6b 100644
--- a/models/mondial_warehouse_full.dbm
+++ b/models/mondial_warehouse.dbm
@@ -3,7 +3,7 @@
CAUTION: Do not modify this file unless you know what you are doing.
Unexpected results may occur if the code is changed deliberately.
-->
-
-
-
-
-
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -82,7 +99,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
-
+
@@ -121,7 +138,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
-
+
@@ -154,7 +171,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
-
+
@@ -187,7 +204,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
-
+
@@ -229,7 +246,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
-
+
@@ -250,7 +267,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
-
+
@@ -271,7 +288,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
-
+
@@ -292,7 +309,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
-
+
@@ -331,7 +348,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
-
+
@@ -346,7 +363,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
-
+
@@ -373,7 +390,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
-
+
@@ -391,7 +408,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
-
+
@@ -439,7 +456,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
-
+
@@ -460,7 +477,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
-
+
@@ -481,7 +498,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
-
+
@@ -496,7 +513,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
-
+
@@ -538,7 +555,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
-
+
@@ -568,7 +585,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
-
+
@@ -597,7 +614,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
-
+
@@ -624,7 +641,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
-
+
@@ -678,7 +695,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
-
+
@@ -723,7 +740,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
-
+
@@ -747,7 +764,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
-
+
@@ -804,7 +821,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
-
+
@@ -837,7 +854,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
-
+
@@ -855,7 +872,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
-
+
@@ -873,7 +890,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
-
+
@@ -891,7 +908,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
-
+
@@ -927,7 +944,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
-
+
@@ -945,7 +962,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
-
+
@@ -963,7 +980,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
-
+
@@ -978,7 +995,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
-
+
@@ -1023,7 +1040,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
-
+
@@ -1041,7 +1058,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
-
+
@@ -1056,7 +1073,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
-
+
@@ -1071,7 +1088,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
-
+
@@ -1129,9 +1146,9 @@ CAUTION: Do not modify this file unless you know what you are doing.
-
-
-
+
+
+
@@ -1183,15 +1200,15 @@ CAUTION: Do not modify this file unless you know what you are doing.
-
+
-
-
-
+
+
+
@@ -1210,15 +1227,15 @@ CAUTION: Do not modify this file unless you know what you are doing.
-
+
-
-
-
+
+
+
@@ -1306,16 +1323,16 @@ CAUTION: Do not modify this file unless you know what you are doing.
-
+
-
-
-
-
+
+
+
+
@@ -1399,13 +1416,16 @@ CAUTION: Do not modify this file unless you know what you are doing.
+
+
+
-
-
-
-
+
+
+
+
@@ -1471,6 +1491,9 @@ CAUTION: Do not modify this file unless you know what you are doing.
+
+
+
+ upd-action="NO ACTION" del-action="NO ACTION" ref-table="warehouse.article" table="warehouse.sales">
+ upd-action="NO ACTION" del-action="NO ACTION" ref-table="warehouse."time"" table="warehouse.sales">
+ upd-action="NO ACTION" del-action="NO ACTION" ref-table="warehouse.customer" table="warehouse.sales">
+ upd-action="NO ACTION" del-action="NO ACTION" ref-table="warehouse.location" table="warehouse.sales">
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
@@ -2404,4 +2439,13 @@ CAUTION: Do not modify this file unless you know what you are doing.
+
+
+
+
+
+
+
+
+
diff --git a/models/mondial_warehouse.png b/models/mondial_warehouse.png
new file mode 100644
index 0000000..e02f3a2
Binary files /dev/null and b/models/mondial_warehouse.png differ
diff --git a/models/mondial_warehouse_hierarchical.dbm b/models/mondial_warehouse_hierarchical.dbm
new file mode 100644
index 0000000..cd10bd8
--- /dev/null
+++ b/models/mondial_warehouse_hierarchical.dbm
@@ -0,0 +1,2451 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ = (0)::numeric)]]>
+
+
+ = (0)::numeric)]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ = (0)::numeric)]]>
+
+
+ = ('-90'::integer)::numeric) AND (latitude <= (90)::numeric))]]>
+
+
+ = ('-180'::integer)::numeric) AND (longitude <= (180)::numeric))]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ = (0)::numeric)]]>
+
+
+ = (0)::numeric)]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ = (0)::numeric)]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ (0)::numeric) AND (percentage <= (100)::numeric))]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ (0)::numeric) AND (percentage <= (100)::numeric))]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ (0)::numeric) AND (percentage <= (100)::numeric))]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ = (0)::numeric)]]>
+
+
+ = (0)::numeric)]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ = (0)::numeric)]]>
+
+
+ = (0)::numeric)]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ = (0)::numeric)]]>
+
+
+ = (0)::numeric)]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ (0)::numeric)]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ (0)::numeric) AND (percentage <= (100)::numeric))]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ = ('-90'::integer)::numeric) AND ((coordinates).latitude <= (90)::numeric) AND ((coordinates).longitude > ('-180'::integer)::numeric) AND ((coordinates).longitude <= (180)::numeric))]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ = ('-90'::integer)::numeric) AND ((coordinates).latitude <= (90)::numeric) AND ((coordinates).longitude > ('-180'::integer)::numeric) AND ((coordinates).longitude <= (180)::numeric))]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ = (0)::numeric)]]>
+
+
+ = ('-90'::integer)::numeric) AND ((coordinates).latitude <= (90)::numeric) AND ((coordinates).longitude > ('-180'::integer)::numeric) AND ((coordinates).longitude <= (180)::numeric))]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ = (0)::numeric)]]>
+
+
+ = (0)::numeric)]]>
+
+
+ (0)::numeric)]]>
+
+
+ = ('-90'::integer)::numeric) AND ((coordinates).latitude <= (90)::numeric) AND ((coordinates).longitude > ('-180'::integer)::numeric) AND ((coordinates).longitude <= (180)::numeric))]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ = (0)::numeric)]]>
+
+
+ = (0)::numeric)]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ = (0)::numeric)]]>
+
+
+ = (0)::numeric)]]>
+
+
+ = ('-90'::integer)::numeric) AND ((source).latitude <= (90)::numeric) AND ((source).longitude > ('-180'::integer)::numeric) AND ((source).longitude <= (180)::numeric))]]>
+
+
+ = ('-90'::integer)::numeric) AND ((estuary).latitude <= (90)::numeric) AND ((estuary).longitude > ('-180'::integer)::numeric) AND ((estuary).longitude <= (180)::numeric))]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ = ('-90'::integer)::numeric) AND (latitude <= (90)::numeric))]]>
+
+
+ = ('-180'::integer)::numeric) AND (longitude <= (180)::numeric))]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/models/mondial_warehouse_hierarchical.png b/models/mondial_warehouse_hierarchical.png
new file mode 100644
index 0000000..051a587
Binary files /dev/null and b/models/mondial_warehouse_hierarchical.png differ