diff --git a/implementation/src_ap/xmi_conceptual_model/Images/EAID_0318BDD3_B88C_4131_9C3F_EDBF20AE03E6.emf b/implementation/src_ap/xmi_conceptual_model/Images/EAID_0318BDD3_B88C_4131_9C3F_EDBF20AE03E6.emf
deleted file mode 100644
index c892e4c..0000000
Binary files a/implementation/src_ap/xmi_conceptual_model/Images/EAID_0318BDD3_B88C_4131_9C3F_EDBF20AE03E6.emf and /dev/null differ
diff --git a/implementation/src_ap/xmi_conceptual_model/Images/EAID_193DBFC0_ED8A_4f4a_AEC4_BC97A1F58191.emf b/implementation/src_ap/xmi_conceptual_model/Images/EAID_193DBFC0_ED8A_4f4a_AEC4_BC97A1F58191.emf
deleted file mode 100644
index ba2e3a1..0000000
Binary files a/implementation/src_ap/xmi_conceptual_model/Images/EAID_193DBFC0_ED8A_4f4a_AEC4_BC97A1F58191.emf and /dev/null differ
diff --git a/implementation/src_ap/xmi_conceptual_model/Images/EAID_67D1EEE9_7A25_49c4_918E_84DD5E245D50.emf b/implementation/src_ap/xmi_conceptual_model/Images/EAID_67D1EEE9_7A25_49c4_918E_84DD5E245D50.emf
deleted file mode 100644
index 023dfe1..0000000
Binary files a/implementation/src_ap/xmi_conceptual_model/Images/EAID_67D1EEE9_7A25_49c4_918E_84DD5E245D50.emf and /dev/null differ
diff --git a/implementation/src_ap/xmi_conceptual_model/Images/EAID_BEF356A3_69EF_470b_8389_0B6C5851F93F.emf b/implementation/src_ap/xmi_conceptual_model/Images/EAID_BEF356A3_69EF_470b_8389_0B6C5851F93F.emf
deleted file mode 100644
index c876ccb..0000000
Binary files a/implementation/src_ap/xmi_conceptual_model/Images/EAID_BEF356A3_69EF_470b_8389_0B6C5851F93F.emf and /dev/null differ
diff --git a/implementation/src_ap/xmi_conceptual_model/Images/EAID_EEED635E_5361_47cc_9A6B_D2BF2D000C09.png b/implementation/src_ap/xmi_conceptual_model/Images/EAID_EEED635E_5361_47cc_9A6B_D2BF2D000C09.png
new file mode 100644
index 0000000..ca6915b
Binary files /dev/null and b/implementation/src_ap/xmi_conceptual_model/Images/EAID_EEED635E_5361_47cc_9A6B_D2BF2D000C09.png differ
diff --git a/implementation/src_ap/xmi_conceptual_model/Images/EAID_F67AD3F4_EC2C_4f17_AF45_80BF1486DAEA.emf b/implementation/src_ap/xmi_conceptual_model/Images/EAID_F67AD3F4_EC2C_4f17_AF45_80BF1486DAEA.emf
deleted file mode 100644
index fb11401..0000000
Binary files a/implementation/src_ap/xmi_conceptual_model/Images/EAID_F67AD3F4_EC2C_4f17_AF45_80BF1486DAEA.emf and /dev/null differ
diff --git a/implementation/src_ap/xmi_conceptual_model/Images/EAID_F67AD3F4_EC2C_4f17_AF45_80BF1486DAEA.png b/implementation/src_ap/xmi_conceptual_model/Images/EAID_F67AD3F4_EC2C_4f17_AF45_80BF1486DAEA.png
new file mode 100644
index 0000000..8114b01
Binary files /dev/null and b/implementation/src_ap/xmi_conceptual_model/Images/EAID_F67AD3F4_EC2C_4f17_AF45_80BF1486DAEA.png differ
diff --git a/implementation/src_ap/xmi_conceptual_model/src_ap_CM.xml b/implementation/src_ap/xmi_conceptual_model/src_ap_CM.xml
index 50cee72..3788b2a 100644
--- a/implementation/src_ap/xmi_conceptual_model/src_ap_CM.xml
+++ b/implementation/src_ap/xmi_conceptual_model/src_ap_CM.xml
@@ -3,6 +3,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -34,19 +64,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -56,44 +75,44 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
@@ -133,129 +152,119 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -307,13 +316,7 @@
-
-
-
-
-
-
-
+
@@ -328,13 +331,7 @@
-
-
-
-
-
-
-
+
@@ -351,148 +348,93 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
@@ -500,339 +442,500 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
-
-
-
-
+
-
+
-
-
-
+
+
+
+
-
-
-
+
+
+
+
-
-
-
+
+
+
+
-
-
-
+
+
+
+
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
-
+
-
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -852,60 +955,171 @@
-
-
-
-
+
+
+
+
+