diff --git a/01-model/01-project/01-agate.json b/01-model/01-project/01-agate.json
index d7df974..fb92010 100644
--- a/01-model/01-project/01-agate.json
+++ b/01-model/01-project/01-agate.json
@@ -1,6 +1,6 @@
 {
   "name": "agate",
-  "description": "The A-GATE, focus on these targets Redis, Parquet, CSV",
+  "description": "The A-GATE, focus on these targets Redis, Parquet, CSV targets",
   "labels": {
     "temp": "True"
   },
diff --git a/01-model/01-project/01/01.01-agate-csv.json b/01-model/01-project/01/01.01-agate-csv.json
new file mode 100644
index 0000000..1d7d41c
--- /dev/null
+++ b/01-model/01-project/01/01.01-agate-csv.json
@@ -0,0 +1,12 @@
+{
+  "name": "agate-csv",
+  "description": "The A-GATE with csv target",
+  "labels": {
+    "temp": "True"
+  },
+  "kind": "project",
+  "parent": "agate",
+  "spec": {
+    "targets": ["csv"]
+  }
+}
diff --git a/01-model/01-project/01/01.8-agate-parquet.json b/01-model/01-project/01/01.02-agate-parquet.json
similarity index 75%
rename from 01-model/01-project/01/01.8-agate-parquet.json
rename to 01-model/01-project/01/01.02-agate-parquet.json
index 2d6875b..3f23b1d 100644
--- a/01-model/01-project/01/01.8-agate-parquet.json
+++ b/01-model/01-project/01/01.02-agate-parquet.json
@@ -1,6 +1,6 @@
 {
   "name": "agate-parquet",
-  "description": "The A-GATE with parquet",
+  "description": "The A-GATE with parquet target",
   "labels": {
     "temp": "True"
   },
diff --git a/01-model/01-project/01/01.9-agate-redis.json b/01-model/01-project/01/01.03-agate-redis.json
similarity index 75%
rename from 01-model/01-project/01/01.9-agate-redis.json
rename to 01-model/01-project/01/01.03-agate-redis.json
index 887a2e5..2089431 100644
--- a/01-model/01-project/01/01.9-agate-redis.json
+++ b/01-model/01-project/01/01.03-agate-redis.json
@@ -1,6 +1,6 @@
 {
   "name": "agate-redis",
-  "description": "The A-GATE with redis",
+  "description": "The A-GATE with redis target",
   "labels": {
     "temp": "True"
   },
diff --git a/01-model/01-project/01/01.04-agate-mysql.json b/01-model/01-project/01/01.04-agate-mysql.json
new file mode 100644
index 0000000..85a266b
--- /dev/null
+++ b/01-model/01-project/01/01.04-agate-mysql.json
@@ -0,0 +1,12 @@
+{
+  "name": "agate-mysql",
+  "description": "The A-GATE with mysql target",
+  "labels": {
+    "temp": "True"
+  },
+  "kind": "project",
+  "parent": "agate",
+  "spec": {
+    "targets": ["mysql"]
+  }
+}
diff --git a/01-model/01-project/01/01.7-agate-kafka.json b/01-model/01-project/01/01.05-agate-kafka.json
similarity index 75%
rename from 01-model/01-project/01/01.7-agate-kafka.json
rename to 01-model/01-project/01/01.05-agate-kafka.json
index fcbb2fd..82872fd 100644
--- a/01-model/01-project/01/01.7-agate-kafka.json
+++ b/01-model/01-project/01/01.05-agate-kafka.json
@@ -1,6 +1,6 @@
 {
   "name": "agate-kafka",
-  "description": "The A-GATE with kafka",
+  "description": "The A-GATE with kafka target",
   "labels": {
     "temp": "True"
   },
diff --git a/01-model/01-project/01/01.1-agate-redis-csv.json b/01-model/01-project/01/01.11-agate-redis-csv.json
similarity index 73%
rename from 01-model/01-project/01/01.1-agate-redis-csv.json
rename to 01-model/01-project/01/01.11-agate-redis-csv.json
index 4d92df0..106d04e 100644
--- a/01-model/01-project/01/01.1-agate-redis-csv.json
+++ b/01-model/01-project/01/01.11-agate-redis-csv.json
@@ -1,6 +1,6 @@
 {
   "name": "agate-redis-csv",
-  "description": "The A-GATE with redis and csv",
+  "description": "The A-GATE with redis and csv targets",
   "labels": {
     "temp": "True"
   },
diff --git a/01-model/01-project/01/01.2-agate-redis-parquet.json b/01-model/01-project/01/01.12-agate-redis-parquet.json
similarity index 73%
rename from 01-model/01-project/01/01.2-agate-redis-parquet.json
rename to 01-model/01-project/01/01.12-agate-redis-parquet.json
index 0daae07..d339c03 100644
--- a/01-model/01-project/01/01.2-agate-redis-parquet.json
+++ b/01-model/01-project/01/01.12-agate-redis-parquet.json
@@ -1,6 +1,6 @@
 {
   "name": "agate-redis-parquet",
-  "description": "The A-GATE with redis and parquet",
+  "description": "The A-GATE with redis and parquet targets",
   "labels": {
     "temp": "True"
   },
diff --git a/01-model/01-project/01/01.3-agate-mysql-csv.json b/01-model/01-project/01/01.13-agate-mysql-csv.json
similarity index 73%
rename from 01-model/01-project/01/01.3-agate-mysql-csv.json
rename to 01-model/01-project/01/01.13-agate-mysql-csv.json
index 0c78fab..933123b 100644
--- a/01-model/01-project/01/01.3-agate-mysql-csv.json
+++ b/01-model/01-project/01/01.13-agate-mysql-csv.json
@@ -1,6 +1,6 @@
 {
   "name": "agate-mysql-csv",
-  "description": "The A-GATE with mysql and csv",
+  "description": "The A-GATE with mysql and csv targets",
   "labels": {
     "temp": "True"
   },
diff --git a/01-model/01-project/01/01.4-agate-mysql-parquet.json b/01-model/01-project/01/01.14-agate-mysql-parquet.json
similarity index 73%
rename from 01-model/01-project/01/01.4-agate-mysql-parquet.json
rename to 01-model/01-project/01/01.14-agate-mysql-parquet.json
index 800c73b..bc2c5ac 100644
--- a/01-model/01-project/01/01.4-agate-mysql-parquet.json
+++ b/01-model/01-project/01/01.14-agate-mysql-parquet.json
@@ -1,6 +1,6 @@
 {
   "name": "agate-mysql-parquet",
-  "description": "The A-GATE with mysql and parquet",
+  "description": "The A-GATE with mysql and parquet targets",
   "labels": {
     "temp": "True"
   },
diff --git a/01-model/01-project/01/01.5-agate-postgres-csv.json b/01-model/01-project/01/01.15-agate-postgres-csv.json
similarity index 73%
rename from 01-model/01-project/01/01.5-agate-postgres-csv.json
rename to 01-model/01-project/01/01.15-agate-postgres-csv.json
index 7da66b7..18af22f 100644
--- a/01-model/01-project/01/01.5-agate-postgres-csv.json
+++ b/01-model/01-project/01/01.15-agate-postgres-csv.json
@@ -1,6 +1,6 @@
 {
   "name": "agate-postgres-csv",
-  "description": "The A-GATE with postgres and csv",
+  "description": "The A-GATE with postgres and csv targets",
   "labels": {
     "temp": "True"
   },
diff --git a/01-model/01-project/01/01.6-agate-postgres-parquet.json b/01-model/01-project/01/01.16-agate-postgres-parquet.json
similarity index 72%
rename from 01-model/01-project/01/01.6-agate-postgres-parquet.json
rename to 01-model/01-project/01/01.16-agate-postgres-parquet.json
index e92c875..0e6fe0a 100644
--- a/01-model/01-project/01/01.6-agate-postgres-parquet.json
+++ b/01-model/01-project/01/01.16-agate-postgres-parquet.json
@@ -1,6 +1,6 @@
 {
   "name": "agate-postgres-parquet",
-  "description": "The A-GATE with postgres and parquet",
+  "description": "The A-GATE with postgres and parquet targets",
   "labels": {
     "temp": "True"
   },
diff --git a/01-model/01-project/02-bgate.json b/01-model/01-project/02-bgate.json
index e984c69..5e08416 100644
--- a/01-model/01-project/02-bgate.json
+++ b/01-model/01-project/02-bgate.json
@@ -1,6 +1,6 @@
 {
   "name": "bgate",
-  "description": "The B-GATE, focus on these targets Redis, Parquet, CSV",
+  "description": "The B-GATE, focus on these targets Redis, Parquet, CSV targets",
   "labels": {
     "temp": "True"
   },
diff --git a/01-model/model.json b/01-model/model.json
index 685b3c9..cd14352 100644
--- a/01-model/model.json
+++ b/01-model/model.json
@@ -3,7 +3,7 @@
   "description": "The machine learning meta-model with synthetic data (useful for MLOps/feature store), part of the quality gate concept.",
   "kind": "model",
   "spec": {
-    "version": "0.2.3",
+    "version": "0.2.4",
     "CSV_SEPARATOR": ",",
     "CSV_DECIMAL": "."
   }
diff --git a/generator/basic_communication.py b/generator/basic_communication.py
index 2cf7d6e..078c41a 100644
--- a/generator/basic_communication.py
+++ b/generator/basic_communication.py
@@ -16,7 +16,7 @@ class Sentiment(Enum):
 class BasicCommunication(BaseData):
 
     NAME = "07-basic-communication"
-    COMMUNICATION_HISTORY_DAYS = 90
+    MAX_COMMUNICATION_HISTORY_DAYS = 90
 
     def __init__(self, path, gmodel):
         super().__init__(path, gmodel, BasicCommunication.NAME)
@@ -35,7 +35,7 @@ def generate(self, count):
             # only 3 months back history
             # generate communication with history EVENT_HISTORY_DAYS
             party_customer=party['party-type'] == "Customer"
-            communication_date = self.now - datetime.timedelta(days=float(BasicCommunication.COMMUNICATION_HISTORY_DAYS))
+            communication_date = self.now - datetime.timedelta(days=float(BasicCommunication.MAX_COMMUNICATION_HISTORY_DAYS))
 
             # iteration cross days
             while True:
diff --git a/generator/basic_event.py b/generator/basic_event.py
index 9634b4f..66f4f54 100644
--- a/generator/basic_event.py
+++ b/generator/basic_event.py
@@ -13,7 +13,7 @@
 class BasicEvent(BaseData):
 
     NAME = "06-basic-event"
-    EVENT_HISTORY_DAYS = 90
+    MAX_EVENT_HISTORY_DAYS = 90
 
     def __init__(self, path, gmodel):
         super().__init__(path, gmodel, BasicEvent.NAME)
@@ -71,7 +71,7 @@ def generate(self, count):
 
             # generate event with history EVENT_HISTORY_DAYS
             party_customer=party['party-type'] == "Customer"
-            event_date = self.now - datetime.timedelta(days=float(BasicEvent.EVENT_HISTORY_DAYS))
+            event_date = self.now - datetime.timedelta(days=float(BasicEvent.MAX_EVENT_HISTORY_DAYS))
 
             # iteration cross days
             while True:
diff --git a/generator/version.py b/generator/version.py
index c318e7c..cfeffaa 100644
--- a/generator/version.py
+++ b/generator/version.py
@@ -1,3 +1,3 @@
 # Store the version here so:
 
-__version__ = '0.2.2'
\ No newline at end of file
+__version__ = '0.2.3'
\ No newline at end of file