rapiddweller · dangsg · Mar 13, 2025 · Mar 13, 2025 · Mar 13, 2025
diff --git a/datamimic_ce/contexts/context.py b/datamimic_ce/contexts/context.py
@@ -18,6 +18,7 @@
 import random
 import re
 import statistics
+import traceback
 import types
 import uuid
 from abc import ABC
@@ -205,6 +206,7 @@ def recursion_data_dict(recursion_dict):
                     "(e.g., 'True' vs 'true') adhere to the required formats."
                 ) from e
         except Exception as e:
+            traceback.print_exc()
             raise ValueError(f"Failed while evaluate '{expr}': {str(e)}") from e
 
     @staticmethod

diff --git a/datamimic_ce/domain_data/common/net/tld.csv → ...ic_ce/domain_data/common copy/net/tld.csv b/datamimic_ce/domain_data/common/net/tld.csv → ...ic_ce/domain_data/common copy/net/tld.csv
diff --git a/.../domain_data/common/net/webmailDomain.csv → ...in_data/common copy/net/webmailDomain.csv b/.../domain_data/common/net/webmailDomain.csv → ...in_data/common copy/net/webmailDomain.csv
diff --git a/...main_data/common/person/familyName_AR.csv → ...data/common copy/person/familyName_AR.csv b/...main_data/common/person/familyName_AR.csv → ...data/common copy/person/familyName_AR.csv
diff --git a/...main_data/common/person/familyName_AT.csv → ...data/common copy/person/familyName_AT.csv b/...main_data/common/person/familyName_AT.csv → ...data/common copy/person/familyName_AT.csv
diff --git a/...main_data/common/person/familyName_AU.csv → ...data/common copy/person/familyName_AU.csv b/...main_data/common/person/familyName_AU.csv → ...data/common copy/person/familyName_AU.csv
diff --git a/...main_data/common/person/familyName_BE.csv → ...data/common copy/person/familyName_BE.csv b/...main_data/common/person/familyName_BE.csv → ...data/common copy/person/familyName_BE.csv
diff --git a/...main_data/common/person/familyName_BR.csv → ...data/common copy/person/familyName_BR.csv b/...main_data/common/person/familyName_BR.csv → ...data/common copy/person/familyName_BR.csv
diff --git a/...main_data/common/person/familyName_CA.csv → ...data/common copy/person/familyName_CA.csv b/...main_data/common/person/familyName_CA.csv → ...data/common copy/person/familyName_CA.csv
diff --git a/...main_data/common/person/familyName_CH.csv → ...data/common copy/person/familyName_CH.csv b/...main_data/common/person/familyName_CH.csv → ...data/common copy/person/familyName_CH.csv
diff --git a/...main_data/common/person/familyName_CL.csv → ...data/common copy/person/familyName_CL.csv b/...main_data/common/person/familyName_CL.csv → ...data/common copy/person/familyName_CL.csv
diff --git a/...main_data/common/person/familyName_CN.csv → ...data/common copy/person/familyName_CN.csv b/...main_data/common/person/familyName_CN.csv → ...data/common copy/person/familyName_CN.csv
diff --git a/...main_data/common/person/familyName_CZ.csv → ...data/common copy/person/familyName_CZ.csv b/...main_data/common/person/familyName_CZ.csv → ...data/common copy/person/familyName_CZ.csv
diff --git a/...main_data/common/person/familyName_DE.csv → ...data/common copy/person/familyName_DE.csv b/...main_data/common/person/familyName_DE.csv → ...data/common copy/person/familyName_DE.csv
diff --git a/...main_data/common/person/familyName_DK.csv → ...data/common copy/person/familyName_DK.csv b/...main_data/common/person/familyName_DK.csv → ...data/common copy/person/familyName_DK.csv
diff --git a/...main_data/common/person/familyName_EE.csv → ...data/common copy/person/familyName_EE.csv b/...main_data/common/person/familyName_EE.csv → ...data/common copy/person/familyName_EE.csv
diff --git a/...main_data/common/person/familyName_ES.csv → ...data/common copy/person/familyName_ES.csv b/...main_data/common/person/familyName_ES.csv → ...data/common copy/person/familyName_ES.csv
diff --git a/...main_data/common/person/familyName_FI.csv → ...data/common copy/person/familyName_FI.csv b/...main_data/common/person/familyName_FI.csv → ...data/common copy/person/familyName_FI.csv
diff --git a/...main_data/common/person/familyName_FR.csv → ...data/common copy/person/familyName_FR.csv b/...main_data/common/person/familyName_FR.csv → ...data/common copy/person/familyName_FR.csv
diff --git a/...main_data/common/person/familyName_GB.csv → ...data/common copy/person/familyName_GB.csv b/...main_data/common/person/familyName_GB.csv → ...data/common copy/person/familyName_GB.csv
diff --git a/...main_data/common/person/familyName_HR.csv → ...data/common copy/person/familyName_HR.csv b/...main_data/common/person/familyName_HR.csv → ...data/common copy/person/familyName_HR.csv
diff --git a/...main_data/common/person/familyName_HU.csv → ...data/common copy/person/familyName_HU.csv b/...main_data/common/person/familyName_HU.csv → ...data/common copy/person/familyName_HU.csv
diff --git a/...main_data/common/person/familyName_IE.csv → ...data/common copy/person/familyName_IE.csv b/...main_data/common/person/familyName_IE.csv → ...data/common copy/person/familyName_IE.csv
diff --git a/...main_data/common/person/familyName_IL.csv → ...data/common copy/person/familyName_IL.csv b/...main_data/common/person/familyName_IL.csv → ...data/common copy/person/familyName_IL.csv
diff --git a/...main_data/common/person/familyName_IN.csv → ...data/common copy/person/familyName_IN.csv b/...main_data/common/person/familyName_IN.csv → ...data/common copy/person/familyName_IN.csv
diff --git a/...main_data/common/person/familyName_IT.csv → ...data/common copy/person/familyName_IT.csv b/...main_data/common/person/familyName_IT.csv → ...data/common copy/person/familyName_IT.csv
diff --git a/...main_data/common/person/familyName_JP.csv → ...data/common copy/person/familyName_JP.csv b/...main_data/common/person/familyName_JP.csv → ...data/common copy/person/familyName_JP.csv
diff --git a/...main_data/common/person/familyName_KR.csv → ...data/common copy/person/familyName_KR.csv b/...main_data/common/person/familyName_KR.csv → ...data/common copy/person/familyName_KR.csv
diff --git a/...main_data/common/person/familyName_LT.csv → ...data/common copy/person/familyName_LT.csv b/...main_data/common/person/familyName_LT.csv → ...data/common copy/person/familyName_LT.csv
diff --git a/...main_data/common/person/familyName_LV.csv → ...data/common copy/person/familyName_LV.csv b/...main_data/common/person/familyName_LV.csv → ...data/common copy/person/familyName_LV.csv
diff --git a/...main_data/common/person/familyName_MT.csv → ...data/common copy/person/familyName_MT.csv b/...main_data/common/person/familyName_MT.csv → ...data/common copy/person/familyName_MT.csv
diff --git a/...main_data/common/person/familyName_MX.csv → ...data/common copy/person/familyName_MX.csv b/...main_data/common/person/familyName_MX.csv → ...data/common copy/person/familyName_MX.csv
diff --git a/...main_data/common/person/familyName_NL.csv → ...data/common copy/person/familyName_NL.csv b/...main_data/common/person/familyName_NL.csv → ...data/common copy/person/familyName_NL.csv
diff --git a/...main_data/common/person/familyName_NO.csv → ...data/common copy/person/familyName_NO.csv b/...main_data/common/person/familyName_NO.csv → ...data/common copy/person/familyName_NO.csv
diff --git a/...main_data/common/person/familyName_NZ.csv → ...data/common copy/person/familyName_NZ.csv b/...main_data/common/person/familyName_NZ.csv → ...data/common copy/person/familyName_NZ.csv
diff --git a/...main_data/common/person/familyName_PL.csv → ...data/common copy/person/familyName_PL.csv b/...main_data/common/person/familyName_PL.csv → ...data/common copy/person/familyName_PL.csv
diff --git a/...main_data/common/person/familyName_RU.csv → ...data/common copy/person/familyName_RU.csv b/...main_data/common/person/familyName_RU.csv → ...data/common copy/person/familyName_RU.csv
diff --git a/...main_data/common/person/familyName_SE.csv → ...data/common copy/person/familyName_SE.csv b/...main_data/common/person/familyName_SE.csv → ...data/common copy/person/familyName_SE.csv
diff --git a/...main_data/common/person/familyName_SI.csv → ...data/common copy/person/familyName_SI.csv b/...main_data/common/person/familyName_SI.csv → ...data/common copy/person/familyName_SI.csv
diff --git a/...main_data/common/person/familyName_SK.csv → ...data/common copy/person/familyName_SK.csv b/...main_data/common/person/familyName_SK.csv → ...data/common copy/person/familyName_SK.csv
diff --git a/...main_data/common/person/familyName_TR.csv → ...data/common copy/person/familyName_TR.csv b/...main_data/common/person/familyName_TR.csv → ...data/common copy/person/familyName_TR.csv
diff --git a/...main_data/common/person/familyName_UA.csv → ...data/common copy/person/familyName_UA.csv b/...main_data/common/person/familyName_UA.csv → ...data/common copy/person/familyName_UA.csv
diff --git a/...main_data/common/person/familyName_US.csv → ...data/common copy/person/familyName_US.csv b/...main_data/common/person/familyName_US.csv → ...data/common copy/person/familyName_US.csv
diff --git a/...ata/common/person/givenName_female_AT.csv → ...ommon copy/person/givenName_female_AT.csv b/...ata/common/person/givenName_female_AT.csv → ...ommon copy/person/givenName_female_AT.csv
diff --git a/...ata/common/person/givenName_female_AU.csv → ...ommon copy/person/givenName_female_AU.csv b/...ata/common/person/givenName_female_AU.csv → ...ommon copy/person/givenName_female_AU.csv
diff --git a/...ata/common/person/givenName_female_BE.csv → ...ommon copy/person/givenName_female_BE.csv b/...ata/common/person/givenName_female_BE.csv → ...ommon copy/person/givenName_female_BE.csv
diff --git a/...ata/common/person/givenName_female_BR.csv → ...ommon copy/person/givenName_female_BR.csv b/...ata/common/person/givenName_female_BR.csv → ...ommon copy/person/givenName_female_BR.csv
diff --git a/...ata/common/person/givenName_female_CA.csv → ...ommon copy/person/givenName_female_CA.csv b/...ata/common/person/givenName_female_CA.csv → ...ommon copy/person/givenName_female_CA.csv
diff --git a/...ata/common/person/givenName_female_CH.csv → ...ommon copy/person/givenName_female_CH.csv b/...ata/common/person/givenName_female_CH.csv → ...ommon copy/person/givenName_female_CH.csv
diff --git a/...ata/common/person/givenName_female_CN.csv → ...ommon copy/person/givenName_female_CN.csv b/...ata/common/person/givenName_female_CN.csv → ...ommon copy/person/givenName_female_CN.csv
diff --git a/...ata/common/person/givenName_female_CZ.csv → ...ommon copy/person/givenName_female_CZ.csv b/...ata/common/person/givenName_female_CZ.csv → ...ommon copy/person/givenName_female_CZ.csv
diff --git a/...ata/common/person/givenName_female_DE.csv → ...ommon copy/person/givenName_female_DE.csv b/...ata/common/person/givenName_female_DE.csv → ...ommon copy/person/givenName_female_DE.csv
diff --git a/...ata/common/person/givenName_female_ES.csv → ...ommon copy/person/givenName_female_ES.csv b/...ata/common/person/givenName_female_ES.csv → ...ommon copy/person/givenName_female_ES.csv
diff --git a/...ata/common/person/givenName_female_FI.csv → ...ommon copy/person/givenName_female_FI.csv b/...ata/common/person/givenName_female_FI.csv → ...ommon copy/person/givenName_female_FI.csv
diff --git a/...ata/common/person/givenName_female_FR.csv → ...ommon copy/person/givenName_female_FR.csv b/...ata/common/person/givenName_female_FR.csv → ...ommon copy/person/givenName_female_FR.csv
diff --git a/...ata/common/person/givenName_female_GB.csv → ...ommon copy/person/givenName_female_GB.csv b/...ata/common/person/givenName_female_GB.csv → ...ommon copy/person/givenName_female_GB.csv
diff --git a/...ata/common/person/givenName_female_IE.csv → ...ommon copy/person/givenName_female_IE.csv b/...ata/common/person/givenName_female_IE.csv → ...ommon copy/person/givenName_female_IE.csv
diff --git a/...ata/common/person/givenName_female_IL.csv → ...ommon copy/person/givenName_female_IL.csv b/...ata/common/person/givenName_female_IL.csv → ...ommon copy/person/givenName_female_IL.csv
diff --git a/...ata/common/person/givenName_female_IN.csv → ...ommon copy/person/givenName_female_IN.csv b/...ata/common/person/givenName_female_IN.csv → ...ommon copy/person/givenName_female_IN.csv
diff --git a/...ata/common/person/givenName_female_IT.csv → ...ommon copy/person/givenName_female_IT.csv b/...ata/common/person/givenName_female_IT.csv → ...ommon copy/person/givenName_female_IT.csv
diff --git a/...ata/common/person/givenName_female_JP.csv → ...ommon copy/person/givenName_female_JP.csv b/...ata/common/person/givenName_female_JP.csv → ...ommon copy/person/givenName_female_JP.csv
diff --git a/...ata/common/person/givenName_female_KR.csv → ...ommon copy/person/givenName_female_KR.csv b/...ata/common/person/givenName_female_KR.csv → ...ommon copy/person/givenName_female_KR.csv
diff --git a/...ata/common/person/givenName_female_NL.csv → ...ommon copy/person/givenName_female_NL.csv b/...ata/common/person/givenName_female_NL.csv → ...ommon copy/person/givenName_female_NL.csv
diff --git a/...ata/common/person/givenName_female_NO.csv → ...ommon copy/person/givenName_female_NO.csv b/...ata/common/person/givenName_female_NO.csv → ...ommon copy/person/givenName_female_NO.csv
diff --git a/...ata/common/person/givenName_female_NZ.csv → ...ommon copy/person/givenName_female_NZ.csv b/...ata/common/person/givenName_female_NZ.csv → ...ommon copy/person/givenName_female_NZ.csv
diff --git a/...ata/common/person/givenName_female_PL.csv → ...ommon copy/person/givenName_female_PL.csv b/...ata/common/person/givenName_female_PL.csv → ...ommon copy/person/givenName_female_PL.csv
diff --git a/...ata/common/person/givenName_female_RU.csv → ...ommon copy/person/givenName_female_RU.csv b/...ata/common/person/givenName_female_RU.csv → ...ommon copy/person/givenName_female_RU.csv
diff --git a/...ata/common/person/givenName_female_SE.csv → ...ommon copy/person/givenName_female_SE.csv b/...ata/common/person/givenName_female_SE.csv → ...ommon copy/person/givenName_female_SE.csv
diff --git a/...ata/common/person/givenName_female_SI.csv → ...ommon copy/person/givenName_female_SI.csv b/...ata/common/person/givenName_female_SI.csv → ...ommon copy/person/givenName_female_SI.csv
diff --git a/...ata/common/person/givenName_female_SK.csv → ...ommon copy/person/givenName_female_SK.csv b/...ata/common/person/givenName_female_SK.csv → ...ommon copy/person/givenName_female_SK.csv
diff --git a/...ata/common/person/givenName_female_TR.csv → ...ommon copy/person/givenName_female_TR.csv b/...ata/common/person/givenName_female_TR.csv → ...ommon copy/person/givenName_female_TR.csv
diff --git a/...ata/common/person/givenName_female_UA.csv → ...ommon copy/person/givenName_female_UA.csv b/...ata/common/person/givenName_female_UA.csv → ...ommon copy/person/givenName_female_UA.csv
diff --git a/...ata/common/person/givenName_female_US.csv → ...ommon copy/person/givenName_female_US.csv b/...ata/common/person/givenName_female_US.csv → ...ommon copy/person/givenName_female_US.csv
diff --git a/..._data/common/person/givenName_male_AT.csv → .../common copy/person/givenName_male_AT.csv b/..._data/common/person/givenName_male_AT.csv → .../common copy/person/givenName_male_AT.csv
diff --git a/..._data/common/person/givenName_male_AU.csv → .../common copy/person/givenName_male_AU.csv b/..._data/common/person/givenName_male_AU.csv → .../common copy/person/givenName_male_AU.csv
diff --git a/..._data/common/person/givenName_male_BE.csv → .../common copy/person/givenName_male_BE.csv b/..._data/common/person/givenName_male_BE.csv → .../common copy/person/givenName_male_BE.csv
diff --git a/..._data/common/person/givenName_male_BR.csv → .../common copy/person/givenName_male_BR.csv b/..._data/common/person/givenName_male_BR.csv → .../common copy/person/givenName_male_BR.csv
diff --git a/..._data/common/person/givenName_male_CA.csv → .../common copy/person/givenName_male_CA.csv b/..._data/common/person/givenName_male_CA.csv → .../common copy/person/givenName_male_CA.csv
diff --git a/..._data/common/person/givenName_male_CH.csv → .../common copy/person/givenName_male_CH.csv b/..._data/common/person/givenName_male_CH.csv → .../common copy/person/givenName_male_CH.csv
diff --git a/..._data/common/person/givenName_male_CN.csv → .../common copy/person/givenName_male_CN.csv b/..._data/common/person/givenName_male_CN.csv → .../common copy/person/givenName_male_CN.csv
diff --git a/..._data/common/person/givenName_male_CZ.csv → .../common copy/person/givenName_male_CZ.csv b/..._data/common/person/givenName_male_CZ.csv → .../common copy/person/givenName_male_CZ.csv
diff --git a/..._data/common/person/givenName_male_DE.csv → .../common copy/person/givenName_male_DE.csv b/..._data/common/person/givenName_male_DE.csv → .../common copy/person/givenName_male_DE.csv
diff --git a/..._data/common/person/givenName_male_ES.csv → .../common copy/person/givenName_male_ES.csv b/..._data/common/person/givenName_male_ES.csv → .../common copy/person/givenName_male_ES.csv
diff --git a/..._data/common/person/givenName_male_FI.csv → .../common copy/person/givenName_male_FI.csv b/..._data/common/person/givenName_male_FI.csv → .../common copy/person/givenName_male_FI.csv
diff --git a/..._data/common/person/givenName_male_FR.csv → .../common copy/person/givenName_male_FR.csv b/..._data/common/person/givenName_male_FR.csv → .../common copy/person/givenName_male_FR.csv
diff --git a/..._data/common/person/givenName_male_GB.csv → .../common copy/person/givenName_male_GB.csv b/..._data/common/person/givenName_male_GB.csv → .../common copy/person/givenName_male_GB.csv
diff --git a/..._data/common/person/givenName_male_IE.csv → .../common copy/person/givenName_male_IE.csv b/..._data/common/person/givenName_male_IE.csv → .../common copy/person/givenName_male_IE.csv
diff --git a/..._data/common/person/givenName_male_IL.csv → .../common copy/person/givenName_male_IL.csv b/..._data/common/person/givenName_male_IL.csv → .../common copy/person/givenName_male_IL.csv
diff --git a/..._data/common/person/givenName_male_IN.csv → .../common copy/person/givenName_male_IN.csv b/..._data/common/person/givenName_male_IN.csv → .../common copy/person/givenName_male_IN.csv
diff --git a/..._data/common/person/givenName_male_IT.csv → .../common copy/person/givenName_male_IT.csv b/..._data/common/person/givenName_male_IT.csv → .../common copy/person/givenName_male_IT.csv
diff --git a/..._data/common/person/givenName_male_JP.csv → .../common copy/person/givenName_male_JP.csv b/..._data/common/person/givenName_male_JP.csv → .../common copy/person/givenName_male_JP.csv
diff --git a/..._data/common/person/givenName_male_KR.csv → .../common copy/person/givenName_male_KR.csv b/..._data/common/person/givenName_male_KR.csv → .../common copy/person/givenName_male_KR.csv
diff --git a/..._data/common/person/givenName_male_NL.csv → .../common copy/person/givenName_male_NL.csv b/..._data/common/person/givenName_male_NL.csv → .../common copy/person/givenName_male_NL.csv
diff --git a/..._data/common/person/givenName_male_NO.csv → .../common copy/person/givenName_male_NO.csv b/..._data/common/person/givenName_male_NO.csv → .../common copy/person/givenName_male_NO.csv
diff --git a/..._data/common/person/givenName_male_NZ.csv → .../common copy/person/givenName_male_NZ.csv b/..._data/common/person/givenName_male_NZ.csv → .../common copy/person/givenName_male_NZ.csv
diff --git a/..._data/common/person/givenName_male_PL.csv → .../common copy/person/givenName_male_PL.csv b/..._data/common/person/givenName_male_PL.csv → .../common copy/person/givenName_male_PL.csv
diff --git a/..._data/common/person/givenName_male_RU.csv → .../common copy/person/givenName_male_RU.csv b/..._data/common/person/givenName_male_RU.csv → .../common copy/person/givenName_male_RU.csv
diff --git a/..._data/common/person/givenName_male_SE.csv → .../common copy/person/givenName_male_SE.csv b/..._data/common/person/givenName_male_SE.csv → .../common copy/person/givenName_male_SE.csv
diff --git a/..._data/common/person/givenName_male_SI.csv → .../common copy/person/givenName_male_SI.csv b/..._data/common/person/givenName_male_SI.csv → .../common copy/person/givenName_male_SI.csv
diff --git a/..._data/common/person/givenName_male_SK.csv → .../common copy/person/givenName_male_SK.csv b/..._data/common/person/givenName_male_SK.csv → .../common copy/person/givenName_male_SK.csv
diff --git a/..._data/common/person/givenName_male_TR.csv → .../common copy/person/givenName_male_TR.csv b/..._data/common/person/givenName_male_TR.csv → .../common copy/person/givenName_male_TR.csv
diff --git a/..._data/common/person/givenName_male_UA.csv → .../common copy/person/givenName_male_UA.csv b/..._data/common/person/givenName_male_UA.csv → .../common copy/person/givenName_male_UA.csv
diff --git a/..._data/common/person/givenName_male_US.csv → .../common copy/person/givenName_male_US.csv b/..._data/common/person/givenName_male_US.csv → .../common copy/person/givenName_male_US.csv
diff --git a/...in_data/common/person/nobTitle_female.csv → ...ta/common copy/person/nobTitle_female.csv b/...in_data/common/person/nobTitle_female.csv → ...ta/common copy/person/nobTitle_female.csv
diff --git a/...data/common/person/nobTitle_female_de.csv → ...common copy/person/nobTitle_female_de.csv b/...data/common/person/nobTitle_female_de.csv → ...common copy/person/nobTitle_female_de.csv
diff --git a/...data/common/person/nobTitle_female_en.csv → ...common copy/person/nobTitle_female_en.csv b/...data/common/person/nobTitle_female_en.csv → ...common copy/person/nobTitle_female_en.csv
diff --git a/...data/common/person/nobTitle_female_es.csv → ...common copy/person/nobTitle_female_es.csv b/...data/common/person/nobTitle_female_es.csv → ...common copy/person/nobTitle_female_es.csv
diff --git a/...data/common/person/nobTitle_female_fr.csv → ...common copy/person/nobTitle_female_fr.csv b/...data/common/person/nobTitle_female_fr.csv → ...common copy/person/nobTitle_female_fr.csv
diff --git a/...data/common/person/nobTitle_female_it.csv → ...common copy/person/nobTitle_female_it.csv b/...data/common/person/nobTitle_female_it.csv → ...common copy/person/nobTitle_female_it.csv
diff --git a/...main_data/common/person/nobTitle_male.csv → ...data/common copy/person/nobTitle_male.csv b/...main_data/common/person/nobTitle_male.csv → ...data/common copy/person/nobTitle_male.csv
diff --git a/...n_data/common/person/nobTitle_male_de.csv → ...a/common copy/person/nobTitle_male_de.csv b/...n_data/common/person/nobTitle_male_de.csv → ...a/common copy/person/nobTitle_male_de.csv
diff --git a/...n_data/common/person/nobTitle_male_en.csv → ...a/common copy/person/nobTitle_male_en.csv b/...n_data/common/person/nobTitle_male_en.csv → ...a/common copy/person/nobTitle_male_en.csv
diff --git a/...n_data/common/person/nobTitle_male_es.csv → ...a/common copy/person/nobTitle_male_es.csv b/...n_data/common/person/nobTitle_male_es.csv → ...a/common copy/person/nobTitle_male_es.csv
diff --git a/...n_data/common/person/nobTitle_male_fr.csv → ...a/common copy/person/nobTitle_male_fr.csv b/...n_data/common/person/nobTitle_male_fr.csv → ...a/common copy/person/nobTitle_male_fr.csv
diff --git a/...n_data/common/person/nobTitle_male_it.csv → ...a/common copy/person/nobTitle_male_it.csv b/...n_data/common/person/nobTitle_male_it.csv → ...a/common copy/person/nobTitle_male_it.csv
diff --git a/...main_data/common/person/salutation_BE.csv → ...data/common copy/person/salutation_BE.csv b/...main_data/common/person/salutation_BE.csv → ...data/common copy/person/salutation_BE.csv
diff --git a/...main_data/common/person/salutation_BG.csv → ...data/common copy/person/salutation_BG.csv b/...main_data/common/person/salutation_BG.csv → ...data/common copy/person/salutation_BG.csv
diff --git a/...main_data/common/person/salutation_CS.csv → ...data/common copy/person/salutation_CS.csv b/...main_data/common/person/salutation_CS.csv → ...data/common copy/person/salutation_CS.csv
diff --git a/...main_data/common/person/salutation_DA.csv → ...data/common copy/person/salutation_DA.csv b/...main_data/common/person/salutation_DA.csv → ...data/common copy/person/salutation_DA.csv
diff --git a/...main_data/common/person/salutation_DE.csv → ...data/common copy/person/salutation_DE.csv b/...main_data/common/person/salutation_DE.csv → ...data/common copy/person/salutation_DE.csv
diff --git a/...main_data/common/person/salutation_EN.csv → ...data/common copy/person/salutation_EN.csv b/...main_data/common/person/salutation_EN.csv → ...data/common copy/person/salutation_EN.csv
diff --git a/...main_data/common/person/salutation_ES.csv → ...data/common copy/person/salutation_ES.csv b/...main_data/common/person/salutation_ES.csv → ...data/common copy/person/salutation_ES.csv
diff --git a/...main_data/common/person/salutation_FI.csv → ...data/common copy/person/salutation_FI.csv b/...main_data/common/person/salutation_FI.csv → ...data/common copy/person/salutation_FI.csv
diff --git a/...main_data/common/person/salutation_FR.csv → ...data/common copy/person/salutation_FR.csv b/...main_data/common/person/salutation_FR.csv → ...data/common copy/person/salutation_FR.csv
diff --git a/...main_data/common/person/salutation_IN.csv → ...data/common copy/person/salutation_IN.csv b/...main_data/common/person/salutation_IN.csv → ...data/common copy/person/salutation_IN.csv
diff --git a/...main_data/common/person/salutation_IT.csv → ...data/common copy/person/salutation_IT.csv b/...main_data/common/person/salutation_IT.csv → ...data/common copy/person/salutation_IT.csv
diff --git a/...main_data/common/person/salutation_IW.csv → ...data/common copy/person/salutation_IW.csv b/...main_data/common/person/salutation_IW.csv → ...data/common copy/person/salutation_IW.csv
diff --git a/...main_data/common/person/salutation_MT.csv → ...data/common copy/person/salutation_MT.csv b/...main_data/common/person/salutation_MT.csv → ...data/common copy/person/salutation_MT.csv
diff --git a/...main_data/common/person/salutation_NL.csv → ...data/common copy/person/salutation_NL.csv b/...main_data/common/person/salutation_NL.csv → ...data/common copy/person/salutation_NL.csv
diff --git a/...main_data/common/person/salutation_NO.csv → ...data/common copy/person/salutation_NO.csv b/...main_data/common/person/salutation_NO.csv → ...data/common copy/person/salutation_NO.csv
diff --git a/...main_data/common/person/salutation_PL.csv → ...data/common copy/person/salutation_PL.csv b/...main_data/common/person/salutation_PL.csv → ...data/common copy/person/salutation_PL.csv
diff --git a/...main_data/common/person/salutation_PT.csv → ...data/common copy/person/salutation_PT.csv b/...main_data/common/person/salutation_PT.csv → ...data/common copy/person/salutation_PT.csv
diff --git a/...main_data/common/person/salutation_RU.csv → ...data/common copy/person/salutation_RU.csv b/...main_data/common/person/salutation_RU.csv → ...data/common copy/person/salutation_RU.csv
diff --git a/...main_data/common/person/salutation_SK.csv → ...data/common copy/person/salutation_SK.csv b/...main_data/common/person/salutation_SK.csv → ...data/common copy/person/salutation_SK.csv
diff --git a/...main_data/common/person/salutation_SL.csv → ...data/common copy/person/salutation_SL.csv b/...main_data/common/person/salutation_SL.csv → ...data/common copy/person/salutation_SL.csv
diff --git a/...main_data/common/person/salutation_SR.csv → ...data/common copy/person/salutation_SR.csv b/...main_data/common/person/salutation_SR.csv → ...data/common copy/person/salutation_SR.csv
diff --git a/...main_data/common/person/salutation_SV.csv → ...data/common copy/person/salutation_SV.csv b/...main_data/common/person/salutation_SV.csv → ...data/common copy/person/salutation_SV.csv
diff --git a/...main_data/common/person/salutation_TR.csv → ...data/common copy/person/salutation_TR.csv b/...main_data/common/person/salutation_TR.csv → ...data/common copy/person/salutation_TR.csv
diff --git a/...main_data/common/person/salutation_UK.csv → ...data/common copy/person/salutation_UK.csv b/...main_data/common/person/salutation_UK.csv → ...data/common copy/person/salutation_UK.csv
diff --git a/...main_data/common/person/salutation_US.csv → ...data/common copy/person/salutation_US.csv b/...main_data/common/person/salutation_US.csv → ...data/common copy/person/salutation_US.csv
diff --git a/...ic_ce/domain_data/common/person/title.csv → .../domain_data/common copy/person/title.csv b/...ic_ce/domain_data/common/person/title.csv → .../domain_data/common copy/person/title.csv
diff --git a/...ce/domain_data/common/person/title_CN.csv → ...main_data/common copy/person/title_CN.csv b/...ce/domain_data/common/person/title_CN.csv → ...main_data/common copy/person/title_CN.csv
diff --git a/...ce/domain_data/common/person/title_DE.csv → ...main_data/common copy/person/title_DE.csv b/...ce/domain_data/common/person/title_DE.csv → ...main_data/common copy/person/title_DE.csv
diff --git a/...ce/domain_data/common/person/title_FR.csv → ...main_data/common copy/person/title_FR.csv b/...ce/domain_data/common/person/title_FR.csv → ...main_data/common copy/person/title_FR.csv
diff --git a/...ce/domain_data/common/person/title_IT.csv → ...main_data/common copy/person/title_IT.csv b/...ce/domain_data/common/person/title_IT.csv → ...main_data/common copy/person/title_IT.csv
diff --git a/...ce/domain_data/common/person/title_US.csv → ...main_data/common copy/person/title_US.csv b/...ce/domain_data/common/person/title_US.csv → ...main_data/common copy/person/title_US.csv
diff --git a/...e/domain_data/common/street/street_AD.csv → ...ain_data/common copy/street/street_AD.csv b/...e/domain_data/common/street/street_AD.csv → ...ain_data/common copy/street/street_AD.csv
diff --git a/...e/domain_data/common/street/street_AL.csv → ...ain_data/common copy/street/street_AL.csv b/...e/domain_data/common/street/street_AL.csv → ...ain_data/common copy/street/street_AL.csv
diff --git a/...e/domain_data/common/street/street_AT.csv → ...ain_data/common copy/street/street_AT.csv b/...e/domain_data/common/street/street_AT.csv → ...ain_data/common copy/street/street_AT.csv
diff --git a/...e/domain_data/common/street/street_AU.csv → ...ain_data/common copy/street/street_AU.csv b/...e/domain_data/common/street/street_AU.csv → ...ain_data/common copy/street/street_AU.csv
diff --git a/...e/domain_data/common/street/street_BA.csv → ...ain_data/common copy/street/street_BA.csv b/...e/domain_data/common/street/street_BA.csv → ...ain_data/common copy/street/street_BA.csv
diff --git a/...e/domain_data/common/street/street_BE.csv → ...ain_data/common copy/street/street_BE.csv b/...e/domain_data/common/street/street_BE.csv → ...ain_data/common copy/street/street_BE.csv
diff --git a/...e/domain_data/common/street/street_BG.csv → ...ain_data/common copy/street/street_BG.csv b/...e/domain_data/common/street/street_BG.csv → ...ain_data/common copy/street/street_BG.csv
diff --git a/...e/domain_data/common/street/street_BR.csv → ...ain_data/common copy/street/street_BR.csv b/...e/domain_data/common/street/street_BR.csv → ...ain_data/common copy/street/street_BR.csv
diff --git a/...e/domain_data/common/street/street_CA.csv → ...ain_data/common copy/street/street_CA.csv b/...e/domain_data/common/street/street_CA.csv → ...ain_data/common copy/street/street_CA.csv
diff --git a/...e/domain_data/common/street/street_CH.csv → ...ain_data/common copy/street/street_CH.csv b/...e/domain_data/common/street/street_CH.csv → ...ain_data/common copy/street/street_CH.csv
diff --git a/...e/domain_data/common/street/street_CY.csv → ...ain_data/common copy/street/street_CY.csv b/...e/domain_data/common/street/street_CY.csv → ...ain_data/common copy/street/street_CY.csv
diff --git a/...e/domain_data/common/street/street_CZ.csv → ...ain_data/common copy/street/street_CZ.csv b/...e/domain_data/common/street/street_CZ.csv → ...ain_data/common copy/street/street_CZ.csv
diff --git a/...e/domain_data/common/street/street_DE.csv → ...ain_data/common copy/street/street_DE.csv b/...e/domain_data/common/street/street_DE.csv → ...ain_data/common copy/street/street_DE.csv
diff --git a/...e/domain_data/common/street/street_DK.csv → ...ain_data/common copy/street/street_DK.csv b/...e/domain_data/common/street/street_DK.csv → ...ain_data/common copy/street/street_DK.csv
diff --git a/...e/domain_data/common/street/street_EE.csv → ...ain_data/common copy/street/street_EE.csv b/...e/domain_data/common/street/street_EE.csv → ...ain_data/common copy/street/street_EE.csv
diff --git a/...e/domain_data/common/street/street_ES.csv → ...ain_data/common copy/street/street_ES.csv b/...e/domain_data/common/street/street_ES.csv → ...ain_data/common copy/street/street_ES.csv
diff --git a/...e/domain_data/common/street/street_FI.csv → ...ain_data/common copy/street/street_FI.csv b/...e/domain_data/common/street/street_FI.csv → ...ain_data/common copy/street/street_FI.csv
diff --git a/...e/domain_data/common/street/street_FR.csv → ...ain_data/common copy/street/street_FR.csv b/...e/domain_data/common/street/street_FR.csv → ...ain_data/common copy/street/street_FR.csv
diff --git a/...e/domain_data/common/street/street_GB.csv → ...ain_data/common copy/street/street_GB.csv b/...e/domain_data/common/street/street_GB.csv → ...ain_data/common copy/street/street_GB.csv
diff --git a/...e/domain_data/common/street/street_GR.csv → ...ain_data/common copy/street/street_GR.csv b/...e/domain_data/common/street/street_GR.csv → ...ain_data/common copy/street/street_GR.csv
diff --git a/...e/domain_data/common/street/street_HR.csv → ...ain_data/common copy/street/street_HR.csv b/...e/domain_data/common/street/street_HR.csv → ...ain_data/common copy/street/street_HR.csv
diff --git a/...e/domain_data/common/street/street_HU.csv → ...ain_data/common copy/street/street_HU.csv b/...e/domain_data/common/street/street_HU.csv → ...ain_data/common copy/street/street_HU.csv
diff --git a/...e/domain_data/common/street/street_IE.csv → ...ain_data/common copy/street/street_IE.csv b/...e/domain_data/common/street/street_IE.csv → ...ain_data/common copy/street/street_IE.csv
diff --git a/...e/domain_data/common/street/street_IS.csv → ...ain_data/common copy/street/street_IS.csv b/...e/domain_data/common/street/street_IS.csv → ...ain_data/common copy/street/street_IS.csv
diff --git a/...e/domain_data/common/street/street_IT.csv → ...ain_data/common copy/street/street_IT.csv b/...e/domain_data/common/street/street_IT.csv → ...ain_data/common copy/street/street_IT.csv
diff --git a/...e/domain_data/common/street/street_LI.csv → ...ain_data/common copy/street/street_LI.csv b/...e/domain_data/common/street/street_LI.csv → ...ain_data/common copy/street/street_LI.csv
diff --git a/...e/domain_data/common/street/street_LT.csv → ...ain_data/common copy/street/street_LT.csv b/...e/domain_data/common/street/street_LT.csv → ...ain_data/common copy/street/street_LT.csv
diff --git a/...e/domain_data/common/street/street_LU.csv → ...ain_data/common copy/street/street_LU.csv b/...e/domain_data/common/street/street_LU.csv → ...ain_data/common copy/street/street_LU.csv
diff --git a/...e/domain_data/common/street/street_LV.csv → ...ain_data/common copy/street/street_LV.csv b/...e/domain_data/common/street/street_LV.csv → ...ain_data/common copy/street/street_LV.csv
diff --git a/...e/domain_data/common/street/street_MC.csv → ...ain_data/common copy/street/street_MC.csv b/...e/domain_data/common/street/street_MC.csv → ...ain_data/common copy/street/street_MC.csv
diff --git a/...e/domain_data/common/street/street_NL.csv → ...ain_data/common copy/street/street_NL.csv b/...e/domain_data/common/street/street_NL.csv → ...ain_data/common copy/street/street_NL.csv
diff --git a/...e/domain_data/common/street/street_NO.csv → ...ain_data/common copy/street/street_NO.csv b/...e/domain_data/common/street/street_NO.csv → ...ain_data/common copy/street/street_NO.csv
diff --git a/...e/domain_data/common/street/street_NZ.csv → ...ain_data/common copy/street/street_NZ.csv b/...e/domain_data/common/street/street_NZ.csv → ...ain_data/common copy/street/street_NZ.csv
diff --git a/...e/domain_data/common/street/street_PL.csv → ...ain_data/common copy/street/street_PL.csv b/...e/domain_data/common/street/street_PL.csv → ...ain_data/common copy/street/street_PL.csv
diff --git a/...e/domain_data/common/street/street_PT.csv → ...ain_data/common copy/street/street_PT.csv b/...e/domain_data/common/street/street_PT.csv → ...ain_data/common copy/street/street_PT.csv
diff --git a/...e/domain_data/common/street/street_RO.csv → ...ain_data/common copy/street/street_RO.csv b/...e/domain_data/common/street/street_RO.csv → ...ain_data/common copy/street/street_RO.csv
diff --git a/...e/domain_data/common/street/street_RU.csv → ...ain_data/common copy/street/street_RU.csv b/...e/domain_data/common/street/street_RU.csv → ...ain_data/common copy/street/street_RU.csv
diff --git a/...e/domain_data/common/street/street_SE.csv → ...ain_data/common copy/street/street_SE.csv b/...e/domain_data/common/street/street_SE.csv → ...ain_data/common copy/street/street_SE.csv
diff --git a/...e/domain_data/common/street/street_SI.csv → ...ain_data/common copy/street/street_SI.csv b/...e/domain_data/common/street/street_SI.csv → ...ain_data/common copy/street/street_SI.csv
diff --git a/...e/domain_data/common/street/street_SK.csv → ...ain_data/common copy/street/street_SK.csv b/...e/domain_data/common/street/street_SK.csv → ...ain_data/common copy/street/street_SK.csv
diff --git a/...e/domain_data/common/street/street_SM.csv → ...ain_data/common copy/street/street_SM.csv b/...e/domain_data/common/street/street_SM.csv → ...ain_data/common copy/street/street_SM.csv
diff --git a/...e/domain_data/common/street/street_TH.csv → ...ain_data/common copy/street/street_TH.csv b/...e/domain_data/common/street/street_TH.csv → ...ain_data/common copy/street/street_TH.csv
diff --git a/...e/domain_data/common/street/street_TR.csv → ...ain_data/common copy/street/street_TR.csv b/...e/domain_data/common/street/street_TR.csv → ...ain_data/common copy/street/street_TR.csv
diff --git a/...e/domain_data/common/street/street_UA.csv → ...ain_data/common copy/street/street_UA.csv b/...e/domain_data/common/street/street_UA.csv → ...ain_data/common copy/street/street_UA.csv
diff --git a/...e/domain_data/common/street/street_US.csv → ...ain_data/common copy/street/street_US.csv b/...e/domain_data/common/street/street_US.csv → ...ain_data/common copy/street/street_US.csv
diff --git a/...e/domain_data/common/street/street_VA.csv → ...ain_data/common copy/street/street_VA.csv b/...e/domain_data/common/street/street_VA.csv → ...ain_data/common copy/street/street_VA.csv
diff --git a/...e/domain_data/common/street/street_VE.csv → ...ain_data/common copy/street/street_VE.csv b/...e/domain_data/common/street/street_VE.csv → ...ain_data/common copy/street/street_VE.csv
diff --git a/...e/domain_data/common/street/street_VN.csv → ...ain_data/common copy/street/street_VN.csv b/...e/domain_data/common/street/street_VN.csv → ...ain_data/common copy/street/street_VN.csv
diff --git a/datamimic_ce/domains/common/generators/address_generator.py b/datamimic_ce/domains/common/generators/address_generator.py
@@ -7,6 +7,7 @@
 
 import random
 
+from datamimic_ce.domains.common.literal_generators.company_name_generator import CompanyNameGenerator
 from datamimic_ce.logger import logger
 from datamimic_ce.domain_core.base_domain_generator import BaseDomainGenerator
 from datamimic_ce.domains.common.generators.city_generator import CityGenerator
@@ -36,6 +37,7 @@ def __init__(self, country_code: str = _DEFAULT_DATASET):
         self._country_generator = CountryGenerator()
         self._phone_number_generator = PhoneNumberGenerator()
         self._current_street_name_generator = None
+        self._company_name_generator = CompanyNameGenerator()
 
     @property
     def country_code(self) -> str:
@@ -72,7 +74,16 @@ def phone_number_generator(self) -> PhoneNumberGenerator:
             The phone number generator.
         """
         return self._phone_number_generator
+
+    @property
+    def company_name_generator(self) -> CompanyNameGenerator:
+        """Get the company name generator.
 
+        Returns:
+            The company name generator.
+        """
+        return self._company_name_generator
+
     def generate_street_name(self) -> str:
         """Generate a street name.
 

diff --git a/datamimic_ce/domains/common/generators/city_generator.py b/datamimic_ce/domains/common/generators/city_generator.py
@@ -119,7 +119,7 @@ def get_random_city(self) -> dict[str, Any]:
             "name": city_row[city_header_dict.get("name")],
             "postal_code": city_row[city_header_dict.get("postalCode")],
             "area_code": city_row[city_header_dict.get("areaCode")],
-            "state_id": city_row[city_header_dict.get("state.id")],
+            "state_id": city_row[city_header_dict.get("state.id")] if "state.id" in city_header_dict else None,
             "state": city_row[city_header_dict.get("state")] if "state" in city_header_dict else None,
             "language": city_row[city_header_dict.get("language")] if "language" in city_header_dict else None,
             "population": city_row[city_header_dict.get("population")] if "population" in city_header_dict else None,

diff --git a/datamimic_ce/domains/common/generators/country_generator.py b/datamimic_ce/domains/common/generators/country_generator.py
@@ -63,7 +63,10 @@ def get_country_by_iso_code(self, iso_code: str) -> dict[str, Any] | None:
         # Load country data
         country_data = self.load_country_data()
 
-        return country_data.get(iso_code)
+        return_value = country_data.get(iso_code)
+        if return_value is None:
+            raise ValueError(f"Country with ISO code {iso_code} not found")
+        return return_value
 
     def get_random_country(self) -> dict[str, Any]:
         """Get a random country.

diff --git a/datamimic_ce/domains/common/generators/person_generator.py b/datamimic_ce/domains/common/generators/person_generator.py
@@ -25,16 +25,16 @@ class PersonGenerator(BaseDomainGenerator):
     Provides methods to generate person-related attributes such as
     first name, last name, email address, phone number, and address.
     """
-    def __init__(self, country_code: str = "US"):
+    def __init__(self, country_code: str = "US", min_age: int = 18, max_age: int = 65, female_quota: float = 0.5):
         self._country_code = country_code
-        self._gender_generator = GenderGenerator()
+        self._gender_generator = GenderGenerator(female_quota=female_quota)
         self._given_name_generator = GivenNameGenerator(dataset=country_code)
         self._family_name_generator = FamilyNameGenerator(dataset=country_code)
         self._email_generator = EmailAddressGenerator(dataset=country_code)
         self._phone_generator = PhoneNumberGenerator(dataset=country_code)
         self._address_generator = AddressGenerator(country_code=country_code)
         from datamimic_ce.utils.class_factory_ce_util import ClassFactoryCEUtil
-        self._birthdate_generator = BirthdateGenerator(class_factory_util=ClassFactoryCEUtil())
+        self._birthdate_generator = BirthdateGenerator(class_factory_util=ClassFactoryCEUtil(), min_age=min_age, max_age=max_age)
         self._academic_title_generator = AcademicTitleGenerator(dataset=country_code)
         self._nobility_title_generator = NobilityTitleGenerator(dataset=country_code)
 

diff --git a/...ublic_sector/generators/cnpj_generator.py → ...mmon/literal_generators/cnpj_generator.py b/...ublic_sector/generators/cnpj_generator.py → ...mmon/literal_generators/cnpj_generator.py
@@ -4,11 +4,10 @@
 # See LICENSE file for the full text of the license.
 # For questions and support, contact: [email protected]
 
-from datamimic_ce.core.interfaces import Generator
-from datamimic_ce.generators.data_faker_generator import DataFakerGenerator
+from datamimic_ce.domain_core.base_literal_generator import BaseLiteralGenerator
+from datamimic_ce.domains.common.literal_generators.data_faker_generator import DataFakerGenerator
 
-
-class CNPJGenerator(Generator):
+class CNPJGenerator(BaseLiteralGenerator):
     """
     Generates Brazilian CNPJ numbers.
     """

diff --git a/...public_sector/generators/cpf_generator.py → ...ommon/literal_generators/cpf_generator.py b/...public_sector/generators/cpf_generator.py → ...ommon/literal_generators/cpf_generator.py
@@ -4,11 +4,10 @@
 # See LICENSE file for the full text of the license.
 # For questions and support, contact: [email protected]
 
-from datamimic_ce.core.interfaces import Generator
-from datamimic_ce.generators.data_faker_generator import DataFakerGenerator
+from datamimic_ce.domain_core.base_literal_generator import BaseLiteralGenerator
+from datamimic_ce.domains.common.literal_generators.data_faker_generator import DataFakerGenerator
 
-
-class CPFGenerator(Generator):
+class CPFGenerator(BaseLiteralGenerator):
     """
     Generate Brazilian SSN also known in Brazil as CPF.
     Can also use SSN Generator but The SSN returns a valid number with numbers

diff --git a/...ins/ecommerce/generators/ean_generator.py → ...ommon/literal_generators/ean_generator.py b/...ins/ecommerce/generators/ean_generator.py → ...ommon/literal_generators/ean_generator.py
@@ -6,11 +6,10 @@
 
 from typing import Any
 
-from datamimic_ce.core.interfaces import Generator
-from datamimic_ce.generators.data_faker_generator import DataFakerGenerator
+from datamimic_ce.domain_core.base_literal_generator import BaseLiteralGenerator
+from datamimic_ce.domains.common.literal_generators.data_faker_generator import DataFakerGenerator
 
-
-class EANGenerator(Generator):
+class EANGenerator(BaseLiteralGenerator):
     def __init__(self, locale: str | None = "en_US") -> None:
         self._gen = DataFakerGenerator(method="ean", locale=locale)
 

diff --git a/datamimic_ce/domains/common/literal_generators/generator_util.py b/datamimic_ce/domains/common/literal_generators/generator_util.py
@@ -21,9 +21,11 @@
 #     JobTitleGenerator,
 # )
 # from datamimic_ce.domains.common.literal_generators.cnpj_generator import CNPJGenerator
+from datamimic_ce.domains.common.literal_generators.cnpj_generator import CNPJGenerator
 from datamimic_ce.domains.common.literal_generators.color_generators import ColorGenerator
 from datamimic_ce.domains.common.literal_generators.company_name_generator import CompanyNameGenerator
 # from datamimic_ce.domains.common.literal_generators.cpf_generator import CPFGenerator
+from datamimic_ce.domains.common.literal_generators.cpf_generator import CPFGenerator
 from datamimic_ce.domains.common.literal_generators.data_faker_generator import DataFakerGenerator
 from datamimic_ce.domains.common.literal_generators.department_name_generator import DepartmentNameGenerator
 # from datamimic_ce.domains.common.literal_generators.document_generators import (
@@ -33,6 +35,7 @@
 # )
 from datamimic_ce.domains.common.literal_generators.domain_generator import DomainGenerator
 # from datamimic_ce.domains.common.literal_generators.ean_generator import EANGenerator
+from datamimic_ce.domains.common.literal_generators.ean_generator import EANGenerator
 from datamimic_ce.domains.common.literal_generators.email_address_generator import EmailAddressGenerator
 from datamimic_ce.domains.common.literal_generators.family_name_generator import FamilyNameGenerator
 from datamimic_ce.domains.common.literal_generators.float_generator import FloatGenerator
@@ -66,6 +69,9 @@
 from datamimic_ce.domains.common.literal_generators.street_name_generator import StreetNameGenerator
 # from datamimic_ce.domains.common.literal_generators.text_generators import ParagraphGenerator
 # from datamimic_ce.domains.common.literal_generators.url_generator import UrlGenerator
+from datamimic_ce.domains.common.literal_generators.uuid_generator import UUIDGenerator
+from datamimic_ce.domains.common.literal_generators.ssn_generator import SSNGenerator
+from datamimic_ce.domains.healthcare.generators.healthcare_generators import DiagnosisGenerator
 from datamimic_ce.logger import logger
 from datamimic_ce.statements.statement import Statement
 
@@ -94,10 +100,10 @@ def __init__(self, context: Context):
             "BooleanGenerator": BooleanGenerator,
             "DataFakerGenerator": DataFakerGenerator,
             # Identity and Personal Information
-            # "SSNGenerator": SSNGenerator,
-            # "CNPJGenerator": CNPJGenerator,
-            # "CPFGenerator": CPFGenerator,
-            # "EANGenerator": EANGenerator,
+            "SSNGenerator": SSNGenerator,
+            "CNPJGenerator": CNPJGenerator,
+            "CPFGenerator": CPFGenerator,
+            "EANGenerator": EANGenerator,
             "GenderGenerator": GenderGenerator,
             "BirthdateGenerator": BirthdateGenerator,
             "PhoneNumberGenerator": PhoneNumberGenerator,
@@ -124,7 +130,7 @@ def __init__(self, context: Context):
             # "FilePathGenerator": FilePathGenerator,
             # "MIMETypeGenerator": MIMETypeGenerator,
             # Security
-            # "UUIDGenerator": UUIDGenerator,
+            "UUIDGenerator": UUIDGenerator,
             # "HashGenerator": HashGenerator,
             # "TokenGenerator": TokenGenerator,
             # "MnemonicPhraseGenerator": MnemonicPhraseGenerator,
@@ -140,7 +146,7 @@ def __init__(self, context: Context):
             # "ScientificUnitGenerator": ScientificUnitGenerator,
             # Healthcare
             # "AllergyGenerator": AllergyGenerator,
-            # "DiagnosisGenerator": DiagnosisGenerator,
+            "DiagnosisGenerator": DiagnosisGenerator,
             # "ImmunizationGenerator": ImmunizationGenerator,
             # "LabResultGenerator": LabResultGenerator,
             # "MedicalAppointmentGenerator": MedicalAppointmentGenerator,
@@ -153,12 +159,6 @@ def __init__(self, context: Context):
             "SequenceTableGenerator": SequenceTableGenerator,
         }
 
-        self._generator_with_count = (
-            "DomainGenerator",
-            "EmailAddressGenerator",
-            "FamilyNameGenerator",
-            "GivenNameGenerator",
-        )
         self._generator_with_class_factory_util = (
             "IntegerGenerator",
             "StringGenerator",
@@ -382,31 +382,23 @@ def create_generator(
             # Handle other generators with constructor parameters
             if class_name != generator_str:
                 local_ns = copy.deepcopy(self._class_dict)
-                if class_name in self._generator_with_count or class_name in self._generator_with_class_factory_util:
+                if class_name in self._generator_with_class_factory_util:
                     class_name, args_str = generator_str[:-1].split("(")
                     # Filtering out empty arguments to avoid extra commas
                     args = [arg.strip() for arg in args_str.split(",") if arg.strip()]
 
-                    if class_name in self._generator_with_count:
-                        args.append(f"generated_count={generated_count}")
-                    else:
-                        args.append("class_factory_util=class_factory_util")
-                        local_ns.update({"class_factory_util": self._context.root.class_factory_util})
+                    args.append("class_factory_util=class_factory_util")
+                    local_ns.update({"class_factory_util": self._context.root.class_factory_util})
 
                     new_args_str = ", ".join(args)
                     generator_str = f"{class_name}({new_args_str})"
 
                 result = self._context.evaluate_python_expression(generator_str, local_ns)
             else:
-                # Handle simple instance initialization
-                if class_name in self._generator_with_count:
-                    if class_name == "DomainGenerator":
-                        result = cls(generated_count=generated_count)
-                    else:
-                        result = cls(
-                            dataset=self._context.root.default_dataset,
-                            generated_count=generated_count,
-                        )
+                if class_name in ["EmailAddressGenerator"]:
+                    result = cls(
+                        dataset=self._context.root.default_dataset,
+                    )
                 elif class_name in self._generator_with_class_factory_util:
                     result = cls(class_factory_util=self._context.root.class_factory_util)
                 else:

diff --git a/datamimic_ce/domains/common/literal_generators/sector_generator.py b/datamimic_ce/domains/common/literal_generators/sector_generator.py
@@ -25,18 +25,22 @@ def __init__(self, dataset: str | None = "US", locale: str | None = None) -> Non
         # Ensure country_code is never None by defaulting to "US"
         country_code = locale if locale is not None else (dataset if dataset is not None else "US")
 
-        file_path = Path(__file__).parent.joinpath(f"data/organization/sector_{country_code}.csv")
+        file_path = Path(__file__).parent.parent.parent.parent.joinpath(f"domain_data/common/organization/sector_{country_code}.csv")
+
+        try:
+            # Use the file content storage to cache the data
+            self._sector_data_load = FileContentStorage.load_file_with_custom_func(
+                cache_key=str(file_path),
+                read_func=lambda: FileUtil.read_csv_to_list_of_tuples_without_header(file_path)
+            )
+        except FileNotFoundError as e:
+            raise ValueError(f"Sector data does not exist for country code '{country_code}': {e}") from e
 
-        # Use the file content storage to cache the data
-        self._sector_data_load = FileContentStorage.load_file_with_custom_func(
-            cache_key=str(file_path),
-            read_func=lambda: FileUtil.read_mutil_column_wgt_file(file_path)
-        )
 
     def generate(self) -> str:
         """Generate a random sector.
 
         Returns:
             A randomly chosen sector.
         """
-        return random.choice(self._sector_data_load)
+        return random.choice(self._sector_data_load)[0]
diff --git a/...public_sector/generators/ssn_generator.py → ...ommon/literal_generators/ssn_generator.py b/...public_sector/generators/ssn_generator.py → ...ommon/literal_generators/ssn_generator.py
@@ -6,11 +6,11 @@
 
 from typing import Any
 
-from datamimic_ce.core.interfaces import Generator
-from datamimic_ce.generators.data_faker_generator import DataFakerGenerator
+from datamimic_ce.domain_core.base_literal_generator import BaseLiteralGenerator
+from datamimic_ce.domains.common.literal_generators.data_faker_generator import DataFakerGenerator
 
 
-class SSNGenerator(Generator):
+class SSNGenerator(BaseLiteralGenerator):
     def __init__(self, locale: str | None = "en_US") -> None:
         self._gen = DataFakerGenerator(method="ssn", locale=locale)
 

diff --git a/datamimic_ce/domains/common/models/address.py b/datamimic_ce/domains/common/models/address.py
@@ -101,6 +101,11 @@ def private_phone(self) -> str:
     @property_cache
     def fax(self) -> str:
         return self._address_generator.phone_number_generator.generate()
+
+    @property
+    @property_cache
+    def organization(self) -> str:
+        return self._address_generator.company_name_generator.generate()
 
     def to_dict(self) -> dict[str, Any]:
         return {
@@ -114,4 +119,5 @@ def to_dict(self) -> dict[str, Any]:
             "phone": self.phone,
             "mobile_phone": self.mobile_phone,
             "fax": self.fax,
+            "organization": self.organization,
         }
diff --git a/datamimic_ce/domains/common/models/person.py b/datamimic_ce/domains/common/models/person.py
@@ -138,7 +138,10 @@ def nobility_title(self) -> str:
     def salutation(self) -> str:
         """Get the salutation of the person.
         """
-        return self._person_generator.load_salutation_data()[self.gender.upper()]
+        gender = self.gender.upper()
+
+        return self._person_generator.load_salutation_data()[gender] if gender != "OTHER" else ""
+
     def to_dict(self) -> dict[str, Any]:
         """Convert the person to a dictionary.
 

diff --git a/datamimic_ce/domains/common/services/city_service.py b/datamimic_ce/domains/common/services/city_service.py
@@ -13,6 +13,6 @@ class CityService(BaseDomainService[City]):
 
     This class provides methods for creating, retrieving, and managing city data.
     """
-    def __init__(self):
-        super().__init__(CityGenerator(), City)
+    def __init__(self, dataset: str = "US"):
+        super().__init__(CityGenerator(dataset), City)
 
diff --git a/datamimic_ce/domains/common/services/person_service.py b/datamimic_ce/domains/common/services/person_service.py
@@ -16,5 +16,5 @@ class PersonService(BaseDomainService[Person]):
     This class provides methods for creating, retrieving, and managing person data.
     """
 
-    def __init__(self):
-        super().__init__(PersonGenerator(), Person)
+    def __init__(self, min_age: int = 18, max_age: int = 65, female_quota: float = 0.5):
+        super().__init__(PersonGenerator(min_age=min_age, max_age=max_age, female_quota=female_quota), Person)