From b56ffa39489d6d0bd94ae2adddbd41320736c7cc Mon Sep 17 00:00:00 2001
From: Aren Babikian <aren.babikian@mail.mcgill.ca>
Date: Tue, 5 Jan 2021 23:25:31 +0100
Subject: add readme and diversity measurements

---
 .../models20.diversity-calculator/.classpath       |    8 +
 .../models20.diversity-calculator/.project         |   34 +
 .../.settings/org.eclipse.jdt.core.prefs           |    7 +
 .../META-INF/MANIFEST.MF                           |   34 +
 .../.FileComparator.java._trace                    |  Bin 0 -> 2005 bytes
 .../.MeasureDiversity.java._trace                  |  Bin 0 -> 26287 bytes
 .../diversitycalculator/.MeasureDiversity.xtendbin |  Bin 0 -> 15619 bytes
 .../.MeasureInternalDiversity.java._trace          |  Bin 0 -> 10367 bytes
 .../.MeasureInternalDiversity.xtendbin             |  Bin 0 -> 8492 bytes
 .../.PatternWithMatches.java._trace                |  Bin 0 -> 713 bytes
 .../models20.diversity-calculator/build.properties |   10 +
 .../inputs/FamilyTree/10_1.xmi                     |  103 +
 .../inputs/FamilyTree/1_1.xmi                      |  103 +
 .../inputs/FamilyTree/2_1.xmi                      |  103 +
 .../inputs/FamilyTree/3_1.xmi                      |  103 +
 .../inputs/FamilyTree/4_1.xmi                      |  103 +
 .../inputs/FamilyTree/5_1.xmi                      |  103 +
 .../inputs/FamilyTree/6_1.xmi                      |  103 +
 .../inputs/FamilyTree/7_1.xmi                      |  103 +
 .../inputs/FamilyTree/8_1.xmi                      |  103 +
 .../inputs/FamilyTree/9_1.xmi                      |  103 +
 .../inputs/FamilyTreeNoNum/10_1.xmi                |  103 +
 .../inputs/FamilyTreeNoNum/1_1.xmi                 |  103 +
 .../inputs/FamilyTreeNoNum/2_1.xmi                 |  103 +
 .../inputs/FamilyTreeNoNum/3_1.xmi                 |  103 +
 .../inputs/FamilyTreeNoNum/4_1.xmi                 |  103 +
 .../inputs/FamilyTreeNoNum/5_1.xmi                 |  103 +
 .../inputs/FamilyTreeNoNum/6_1.xmi                 |  103 +
 .../inputs/FamilyTreeNoNum/7_1.xmi                 |  103 +
 .../inputs/FamilyTreeNoNum/8_1.xmi                 |  103 +
 .../inputs/FamilyTreeNoNum/9_1.xmi                 |  103 +
 .../inputs/Satellite/10_1.xmi                      |  135 +
 .../inputs/Satellite/1_1.xmi                       |  131 +
 .../inputs/Satellite/2_1.xmi                       |  129 +
 .../inputs/Satellite/3_1.xmi                       |  131 +
 .../inputs/Satellite/4_1.xmi                       |  131 +
 .../inputs/Satellite/5_1.xmi                       |  129 +
 .../inputs/Satellite/6_1.xmi                       |  129 +
 .../inputs/Satellite/7_1.xmi                       |  129 +
 .../inputs/Satellite/8_1.xmi                       |  129 +
 .../inputs/Satellite/9_1.xmi                       |  132 +
 .../inputs/SatelliteNoNum/10_1.xmi                 |  135 +
 .../inputs/SatelliteNoNum/1_1.xmi                  |  137 +
 .../inputs/SatelliteNoNum/2_1.xmi                  |  131 +
 .../inputs/SatelliteNoNum/3_1.xmi                  |  134 +
 .../inputs/SatelliteNoNum/4_1.xmi                  |  137 +
 .../inputs/SatelliteNoNum/5_1.xmi                  |  141 +
 .../inputs/SatelliteNoNum/6_1.xmi                  |  134 +
 .../inputs/SatelliteNoNum/7_1.xmi                  |  131 +
 .../inputs/SatelliteNoNum/8_1.xmi                  |  134 +
 .../inputs/SatelliteNoNum/9_1.xmi                  |  137 +
 .../inputs/Taxation/10_1.xmi                       |  118 +
 .../inputs/Taxation/1_1.xmi                        |  118 +
 .../inputs/Taxation/2_1.xmi                        |  119 +
 .../inputs/Taxation/3_1.xmi                        |  118 +
 .../inputs/Taxation/4_1.xmi                        |  118 +
 .../inputs/Taxation/5_1.xmi                        |  118 +
 .../inputs/Taxation/6_1.xmi                        |  124 +
 .../inputs/Taxation/7_1.xmi                        |  119 +
 .../inputs/Taxation/8_1.xmi                        |  118 +
 .../inputs/Taxation/9_1.xmi                        |  118 +
 .../inputs/TaxationNoNum/10_1.xmi                  |  105 +
 .../inputs/TaxationNoNum/1_1.xmi                   |  105 +
 .../inputs/TaxationNoNum/2_1.xmi                   |  105 +
 .../inputs/TaxationNoNum/3_1.xmi                   |  111 +
 .../inputs/TaxationNoNum/4_1.xmi                   |  105 +
 .../inputs/TaxationNoNum/5_1.xmi                   |  105 +
 .../inputs/TaxationNoNum/6_1.xmi                   |  105 +
 .../inputs/TaxationNoNum/7_1.xmi                   |  112 +
 .../inputs/TaxationNoNum/8_1.xmi                   |  105 +
 .../inputs/TaxationNoNum/9_1.xmi                   |  105 +
 .../inputs/diversity.csv                           |   60 +
 .../model/TaxationWithRoot.ecore                   |  551 ++
 .../model/TaxationWithRoot.genmodel                |  344 +
 .../model/familytree.ecore                         |   17 +
 .../model/familytree.genmodel                      |   19 +
 .../model/satellite.ecore                          |   39 +
 .../model/satellite.genmodel                       |   38 +
 .../plugin.properties                              |    4 +
 .../models20.diversity-calculator/plugin.xml       |   33 +
 .../src/TaxationWithRoot/Address.java              |  159 +
 .../Agriculture_and_Forestry_Income.java           |   17 +
 .../src/TaxationWithRoot/CE_Type.java              |  232 +
 .../src/TaxationWithRoot/CIM.java                  |   17 +
 .../src/TaxationWithRoot/CIP.java                  |   17 +
 .../src/TaxationWithRoot/CIS.java                  |   17 +
 .../Capital_and_Investments_Income.java            |   17 +
 .../Category_of_Health_and_Pension_Insurances.java |  232 +
 .../Category_of_Permanent_Expense.java             |  209 +
 .../Category_of_Private_Insurance_and_Plan.java    |  278 +
 .../src/TaxationWithRoot/Constants.java            |  619 ++
 .../src/TaxationWithRoot/Country.java              |  301 +
 .../src/TaxationWithRoot/Dependent.java            |  188 +
 .../src/TaxationWithRoot/Dependent_Type.java       |  278 +
 .../src/TaxationWithRoot/Disability_Types.java     |  347 +
 .../src/TaxationWithRoot/Donation.java             |   68 +
 .../src/TaxationWithRoot/Employment_Income.java    |   17 +
 .../src/TaxationWithRoot/Expense.java              |  196 +
 .../src/TaxationWithRoot/Expense_Purpose.java      |  301 +
 .../src/TaxationWithRoot/External_Allowance.java   |  166 +
 .../TaxationWithRoot/Extraordinary_Expense_CE.java |   71 +
 .../src/TaxationWithRoot/Fiscal_Address.java       |   17 +
 .../src/TaxationWithRoot/Foreign_Income.java       |   17 +
 .../src/TaxationWithRoot/FromAgent.java            |  144 +
 .../src/TaxationWithRoot/FromLaw.java              |   71 +
 .../src/TaxationWithRoot/Grantor.java              |  301 +
 .../src/TaxationWithRoot/Habitual_Address.java     |   17 +
 .../Health_and_Pension_Insurance.java              |   72 +
 .../src/TaxationWithRoot/Household.java            |   86 +
 .../src/TaxationWithRoot/Income.java               |  200 +
 .../src/TaxationWithRoot/Income_Detail.java        |  186 +
 .../src/TaxationWithRoot/Income_Tax.java           |  115 +
 .../src/TaxationWithRoot/Income_Tax_Credit.java    |  215 +
 .../src/TaxationWithRoot/Income_Type.java          |   71 +
 .../src/TaxationWithRoot/Interest_Expense.java     |   17 +
 .../src/TaxationWithRoot/Job_Activity.java         |  232 +
 .../src/TaxationWithRoot/Legal_Union_Record.java   |  221 +
 .../src/TaxationWithRoot/Legal_Union_Types.java    |  232 +
 .../src/TaxationWithRoot/Local_Income.java         |   17 +
 .../src/TaxationWithRoot/Loss_Carryforward.java    |   17 +
 .../src/TaxationWithRoot/Marriage_Record.java      |   17 +
 .../TaxationWithRoot/Miscellaneous_Expense_FO.java |   17 +
 .../TaxationWithRoot/Non_Resident_Tax_Payer.java   |   46 +
 .../src/TaxationWithRoot/Partnership_Record.java   |   17 +
 .../Pensions_and_Annuities_Income.java             |   46 +
 .../src/TaxationWithRoot/Permanent_Expense.java    |   48 +
 .../src/TaxationWithRoot/Physical_Person.java      |  219 +
 .../Private_Insurance_and_Plan.java                |   71 +
 .../src/TaxationWithRoot/Professional_Expense.java |   17 +
 .../Rentals_and_Leases_Income.java                 |   46 +
 .../src/TaxationWithRoot/Resident_Tax_Payer.java   |   17 +
 .../src/TaxationWithRoot/Resource.java             |   38 +
 .../src/TaxationWithRoot/Separation_Causes.java    |  255 +
 .../src/TaxationWithRoot/Special_Expense_DS.java   |   17 +
 .../src/TaxationWithRoot/Spousal_Expense_AC.java   |   17 +
 .../src/TaxationWithRoot/Tax_Card.java             |  810 ++
 .../src/TaxationWithRoot/Tax_Case.java             |   18 +
 .../src/TaxationWithRoot/Tax_Class_Category.java   |  232 +
 .../src/TaxationWithRoot/Tax_Office.java           |  255 +
 .../src/TaxationWithRoot/Tax_Payer.java            |  104 +
 .../src/TaxationWithRoot/Tax_Property.java         |   94 +
 .../TaxationWithRoot/TaxationWithRootFactory.java  |  420 +
 .../TaxationWithRoot/TaxationWithRootPackage.java  | 9315 ++++++++++++++++++++
 .../src/TaxationWithRoot/Town.java                 |  278 +
 .../Trade_and_Business_Income.java                 |   17 +
 .../src/TaxationWithRoot/Travel_Expense_FD.java    |   17 +
 .../src/TaxationWithRoot/impl/AddressImpl.java     |  465 +
 .../impl/Agriculture_and_Forestry_IncomeImpl.java  |   37 +
 .../src/TaxationWithRoot/impl/CIMImpl.java         |   37 +
 .../src/TaxationWithRoot/impl/CIPImpl.java         |   37 +
 .../src/TaxationWithRoot/impl/CISImpl.java         |   37 +
 .../impl/Capital_and_Investments_IncomeImpl.java   |   37 +
 .../src/TaxationWithRoot/impl/ConstantsImpl.java   | 1509 ++++
 .../src/TaxationWithRoot/impl/DependentImpl.java   |  599 ++
 .../src/TaxationWithRoot/impl/DonationImpl.java    |  220 +
 .../impl/Employment_IncomeImpl.java                |   37 +
 .../src/TaxationWithRoot/impl/ExpenseImpl.java     |  654 ++
 .../impl/External_AllowanceImpl.java               |  500 ++
 .../impl/Extraordinary_Expense_CEImpl.java         |  221 +
 .../TaxationWithRoot/impl/Fiscal_AddressImpl.java  |   37 +
 .../TaxationWithRoot/impl/Foreign_IncomeImpl.java  |   37 +
 .../src/TaxationWithRoot/impl/FromAgentImpl.java   |  506 ++
 .../src/TaxationWithRoot/impl/FromLawImpl.java     |  268 +
 .../impl/Habitual_AddressImpl.java                 |   37 +
 .../impl/Health_and_Pension_InsuranceImpl.java     |  221 +
 .../src/TaxationWithRoot/impl/HouseholdImpl.java   |  313 +
 .../src/TaxationWithRoot/impl/IncomeImpl.java      |  614 ++
 .../TaxationWithRoot/impl/Income_DetailImpl.java   |  548 ++
 .../src/TaxationWithRoot/impl/Income_TaxImpl.java  |  341 +
 .../impl/Income_Tax_CreditImpl.java                |  626 ++
 .../src/TaxationWithRoot/impl/Income_TypeImpl.java |  268 +
 .../impl/Interest_ExpenseImpl.java                 |   37 +
 .../impl/Legal_Union_RecordImpl.java               |  648 ++
 .../TaxationWithRoot/impl/Local_IncomeImpl.java    |   37 +
 .../impl/Loss_CarryforwardImpl.java                |   37 +
 .../TaxationWithRoot/impl/Marriage_RecordImpl.java |   37 +
 .../impl/Miscellaneous_Expense_FOImpl.java         |   37 +
 .../impl/Non_Resident_Tax_PayerImpl.java           |  164 +
 .../impl/Partnership_RecordImpl.java               |   37 +
 .../impl/Pensions_and_Annuities_IncomeImpl.java    |  164 +
 .../impl/Permanent_ExpenseImpl.java                |  165 +
 .../TaxationWithRoot/impl/Physical_PersonImpl.java |  617 ++
 .../impl/Private_Insurance_and_PlanImpl.java       |  221 +
 .../impl/Professional_ExpenseImpl.java             |   37 +
 .../impl/Rentals_and_Leases_IncomeImpl.java        |  164 +
 .../impl/Resident_Tax_PayerImpl.java               |   37 +
 .../src/TaxationWithRoot/impl/ResourceImpl.java    |  153 +
 .../impl/Special_Expense_DSImpl.java               |   37 +
 .../impl/Spousal_Expense_ACImpl.java               |   37 +
 .../src/TaxationWithRoot/impl/Tax_CardImpl.java    | 2093 +++++
 .../src/TaxationWithRoot/impl/Tax_PayerImpl.java   |  355 +
 .../TaxationWithRoot/impl/Tax_PropertyImpl.java    |  324 +
 .../impl/TaxationWithRootFactoryImpl.java          |  988 +++
 .../impl/TaxationWithRootPackageImpl.java          | 3663 ++++++++
 .../impl/Trade_and_Business_IncomeImpl.java        |   37 +
 .../impl/Travel_Expense_FDImpl.java                |   37 +
 .../util/TaxationWithRootAdapterFactory.java       |  984 +++
 .../util/TaxationWithRootSwitch.java               | 1163 +++
 .../src/familytree/FamilyTree.java                 |   38 +
 .../src/familytree/FamilytreeFactory.java          |   51 +
 .../src/familytree/FamilytreePackage.java          |  321 +
 .../src/familytree/Member.java                     |  102 +
 .../src/familytree/impl/FamilyTreeImpl.java        |  153 +
 .../src/familytree/impl/FamilytreeFactoryImpl.java |  109 +
 .../src/familytree/impl/FamilytreePackageImpl.java |  251 +
 .../src/familytree/impl/MemberImpl.java            |  334 +
 .../familytree/util/FamilytreeAdapterFactory.java  |  138 +
 .../src/familytree/util/FamilytreeSwitch.java      |  131 +
 .../diversitycalculator/MeasureDiversity.xtend     |  283 +
 .../MeasureInternalDiversity.xtend                 |  107 +
 .../src/satellite/CommSubsystem.java               |   92 +
 .../src/satellite/CommunicatingElement.java        |   38 +
 .../src/satellite/ConstellationMission.java        |   61 +
 .../src/satellite/CubeSat.java                     |   17 +
 .../src/satellite/CubeSat3U.java                   |   17 +
 .../src/satellite/CubeSat6U.java                   |   17 +
 .../src/satellite/GroundStationNetwork.java        |   17 +
 .../src/satellite/InterferometryMission.java       |   45 +
 .../src/satellite/InterferometryPayload.java       |   17 +
 .../src/satellite/KaCommSubsystem.java             |   17 +
 .../src/satellite/Payload.java                     |   18 +
 .../src/satellite/SatelliteFactory.java            |  114 +
 .../src/satellite/SatellitePackage.java            | 1218 +++
 .../src/satellite/SmallSat.java                    |   17 +
 .../src/satellite/Spacecraft.java                  |   45 +
 .../src/satellite/UHFCommSubsystem.java            |   17 +
 .../src/satellite/XCommSubsystem.java              |   17 +
 .../src/satellite/impl/CommSubsystemImpl.java      |  284 +
 .../satellite/impl/CommunicatingElementImpl.java   |  153 +
 .../satellite/impl/ConstellationMissionImpl.java   |  224 +
 .../src/satellite/impl/CubeSat3UImpl.java          |   37 +
 .../src/satellite/impl/CubeSat6UImpl.java          |   37 +
 .../src/satellite/impl/CubeSatImpl.java            |   37 +
 .../satellite/impl/GroundStationNetworkImpl.java   |   37 +
 .../satellite/impl/InterferometryMissionImpl.java  |  164 +
 .../satellite/impl/InterferometryPayloadImpl.java  |   37 +
 .../src/satellite/impl/KaCommSubsystemImpl.java    |   37 +
 .../src/satellite/impl/PayloadImpl.java            |   39 +
 .../src/satellite/impl/SatelliteFactoryImpl.java   |  193 +
 .../src/satellite/impl/SatellitePackageImpl.java   |  584 ++
 .../src/satellite/impl/SmallSatImpl.java           |   37 +
 .../src/satellite/impl/SpacecraftImpl.java         |  177 +
 .../src/satellite/impl/UHFCommSubsystemImpl.java   |   37 +
 .../src/satellite/impl/XCommSubsystemImpl.java     |   37 +
 .../satellite/util/SatelliteAdapterFactory.java    |  372 +
 .../src/satellite/util/SatelliteSwitch.java        |  421 +
 .../.FileComparator.java._trace                    |  Bin 0 -> 2005 bytes
 .../.MeasureDiversity.java._trace                  |  Bin 0 -> 26287 bytes
 .../diversitycalculator/.MeasureDiversity.xtendbin |  Bin 0 -> 15619 bytes
 .../.MeasureInternalDiversity.java._trace          |  Bin 0 -> 10367 bytes
 .../.MeasureInternalDiversity.xtendbin             |  Bin 0 -> 8492 bytes
 .../.PatternWithMatches.java._trace                |  Bin 0 -> 713 bytes
 .../diversitycalculator/FileComparator.java        |   27 +
 .../diversitycalculator/MeasureDiversity.java      |  350 +
 .../MeasureInternalDiversity.java                  |  165 +
 .../diversitycalculator/PatternWithMatches.java    |   72 +
 256 files changed, 54484 insertions(+)
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/.classpath
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/.project
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/META-INF/MANIFEST.MF
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/bin/hu/bme/mit/inf/dslreasoner/diversitycalculator/.FileComparator.java._trace
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/bin/hu/bme/mit/inf/dslreasoner/diversitycalculator/.MeasureDiversity.java._trace
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/bin/hu/bme/mit/inf/dslreasoner/diversitycalculator/.MeasureDiversity.xtendbin
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/bin/hu/bme/mit/inf/dslreasoner/diversitycalculator/.MeasureInternalDiversity.java._trace
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/bin/hu/bme/mit/inf/dslreasoner/diversitycalculator/.MeasureInternalDiversity.xtendbin
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/bin/hu/bme/mit/inf/dslreasoner/diversitycalculator/.PatternWithMatches.java._trace
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/build.properties
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/10_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/1_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/2_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/3_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/4_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/5_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/6_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/7_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/8_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/9_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/10_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/1_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/2_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/3_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/4_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/5_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/6_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/7_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/8_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/9_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/10_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/1_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/2_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/3_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/4_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/5_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/6_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/7_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/8_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/9_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/10_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/1_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/2_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/3_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/4_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/5_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/6_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/7_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/8_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/9_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/10_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/1_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/2_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/3_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/4_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/5_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/6_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/7_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/8_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/9_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/10_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/1_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/2_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/3_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/4_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/5_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/6_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/7_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/8_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/9_1.xmi
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/diversity.csv
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/model/TaxationWithRoot.ecore
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/model/TaxationWithRoot.genmodel
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/model/familytree.ecore
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/model/familytree.genmodel
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/model/satellite.ecore
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/model/satellite.genmodel
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/plugin.properties
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/plugin.xml
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Address.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Agriculture_and_Forestry_Income.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/CE_Type.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/CIM.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/CIP.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/CIS.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Capital_and_Investments_Income.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Category_of_Health_and_Pension_Insurances.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Category_of_Permanent_Expense.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Category_of_Private_Insurance_and_Plan.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Constants.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Country.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Dependent.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Dependent_Type.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Disability_Types.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Donation.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Employment_Income.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Expense.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Expense_Purpose.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/External_Allowance.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Extraordinary_Expense_CE.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Fiscal_Address.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Foreign_Income.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/FromAgent.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/FromLaw.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Grantor.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Habitual_Address.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Health_and_Pension_Insurance.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Household.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Income.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Income_Detail.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Income_Tax.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Income_Tax_Credit.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Income_Type.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Interest_Expense.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Job_Activity.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Legal_Union_Record.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Legal_Union_Types.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Local_Income.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Loss_Carryforward.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Marriage_Record.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Miscellaneous_Expense_FO.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Non_Resident_Tax_Payer.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Partnership_Record.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Pensions_and_Annuities_Income.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Permanent_Expense.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Physical_Person.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Private_Insurance_and_Plan.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Professional_Expense.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Rentals_and_Leases_Income.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Resident_Tax_Payer.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Resource.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Separation_Causes.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Special_Expense_DS.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Spousal_Expense_AC.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Tax_Card.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Tax_Case.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Tax_Class_Category.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Tax_Office.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Tax_Payer.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Tax_Property.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/TaxationWithRootFactory.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/TaxationWithRootPackage.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Town.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Trade_and_Business_Income.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Travel_Expense_FD.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/AddressImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Agriculture_and_Forestry_IncomeImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/CIMImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/CIPImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/CISImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Capital_and_Investments_IncomeImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/ConstantsImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/DependentImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/DonationImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Employment_IncomeImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/ExpenseImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/External_AllowanceImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Extraordinary_Expense_CEImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Fiscal_AddressImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Foreign_IncomeImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/FromAgentImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/FromLawImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Habitual_AddressImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Health_and_Pension_InsuranceImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/HouseholdImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/IncomeImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Income_DetailImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Income_TaxImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Income_Tax_CreditImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Income_TypeImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Interest_ExpenseImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Legal_Union_RecordImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Local_IncomeImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Loss_CarryforwardImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Marriage_RecordImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Miscellaneous_Expense_FOImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Non_Resident_Tax_PayerImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Partnership_RecordImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Pensions_and_Annuities_IncomeImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Permanent_ExpenseImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Physical_PersonImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Private_Insurance_and_PlanImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Professional_ExpenseImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Rentals_and_Leases_IncomeImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Resident_Tax_PayerImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/ResourceImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Special_Expense_DSImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Spousal_Expense_ACImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Tax_CardImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Tax_PayerImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Tax_PropertyImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/TaxationWithRootFactoryImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/TaxationWithRootPackageImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Trade_and_Business_IncomeImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Travel_Expense_FDImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/util/TaxationWithRootAdapterFactory.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/util/TaxationWithRootSwitch.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/familytree/FamilyTree.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/familytree/FamilytreeFactory.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/familytree/FamilytreePackage.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/familytree/Member.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/familytree/impl/FamilyTreeImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/familytree/impl/FamilytreeFactoryImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/familytree/impl/FamilytreePackageImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/familytree/impl/MemberImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/familytree/util/FamilytreeAdapterFactory.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/familytree/util/FamilytreeSwitch.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/hu/bme/mit/inf/dslreasoner/diversitycalculator/MeasureDiversity.xtend
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/hu/bme/mit/inf/dslreasoner/diversitycalculator/MeasureInternalDiversity.xtend
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/CommSubsystem.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/CommunicatingElement.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/ConstellationMission.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/CubeSat.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/CubeSat3U.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/CubeSat6U.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/GroundStationNetwork.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/InterferometryMission.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/InterferometryPayload.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/KaCommSubsystem.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/Payload.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/SatelliteFactory.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/SatellitePackage.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/SmallSat.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/Spacecraft.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/UHFCommSubsystem.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/XCommSubsystem.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/CommSubsystemImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/CommunicatingElementImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/ConstellationMissionImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/CubeSat3UImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/CubeSat6UImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/CubeSatImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/GroundStationNetworkImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/InterferometryMissionImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/InterferometryPayloadImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/KaCommSubsystemImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/PayloadImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/SatelliteFactoryImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/SatellitePackageImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/SmallSatImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/SpacecraftImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/UHFCommSubsystemImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/XCommSubsystemImpl.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/util/SatelliteAdapterFactory.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/util/SatelliteSwitch.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/xtend-gen/hu/bme/mit/inf/dslreasoner/diversitycalculator/.FileComparator.java._trace
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/xtend-gen/hu/bme/mit/inf/dslreasoner/diversitycalculator/.MeasureDiversity.java._trace
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/xtend-gen/hu/bme/mit/inf/dslreasoner/diversitycalculator/.MeasureDiversity.xtendbin
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/xtend-gen/hu/bme/mit/inf/dslreasoner/diversitycalculator/.MeasureInternalDiversity.java._trace
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/xtend-gen/hu/bme/mit/inf/dslreasoner/diversitycalculator/.MeasureInternalDiversity.xtendbin
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/xtend-gen/hu/bme/mit/inf/dslreasoner/diversitycalculator/.PatternWithMatches.java._trace
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/xtend-gen/hu/bme/mit/inf/dslreasoner/diversitycalculator/FileComparator.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/xtend-gen/hu/bme/mit/inf/dslreasoner/diversitycalculator/MeasureDiversity.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/xtend-gen/hu/bme/mit/inf/dslreasoner/diversitycalculator/MeasureInternalDiversity.java
 create mode 100644 Tests/MODELS2020-CaseStudies/models20.diversity-calculator/xtend-gen/hu/bme/mit/inf/dslreasoner/diversitycalculator/PatternWithMatches.java

(limited to 'Tests/MODELS2020-CaseStudies/models20.diversity-calculator')

diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/.classpath b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/.classpath
new file mode 100644
index 00000000..1c96fe2f
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/.classpath
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="xtend-gen"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/.project b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/.project
new file mode 100644
index 00000000..b2d56397
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>models20.diversity-calculator</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+	</natures>
+</projectDescription>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/.settings/org.eclipse.jdt.core.prefs b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000..295926d9
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/META-INF/MANIFEST.MF b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/META-INF/MANIFEST.MF
new file mode 100644
index 00000000..866763f6
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/META-INF/MANIFEST.MF
@@ -0,0 +1,34 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: models20.diversity-calculator;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: .
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Automatic-Module-Name: models20.diversity-calculator
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: familytree,
+ familytree.impl,
+ familytree.util,
+ satellite,
+ satellite.impl,
+ satellite.util,
+ TaxationWithRoot,
+ TaxationWithRoot.impl,
+ TaxationWithRoot.util
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ com.google.guava,
+ org.eclipse.xtext.xbase.lib,
+ org.eclipse.xtend.lib,
+ org.eclipse.xtend.lib.macro,
+ hu.bme.mit.inf.dslreasoner.ecore2logic;bundle-version="1.0.0",
+ hu.bme.mit.inf.dslreasoner.viatra2logic;bundle-version="1.0.0",
+ hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage;bundle-version="1.0.0",
+ org.eclipse.emf.ecore.xmi;bundle-version="2.16.0",
+ org.eclipse.viatra.query.runtime;bundle-version="2.2.0",
+ org.eclipse.viatra.query.runtime.rete;bundle-version="2.2.0",
+ org.eclipse.viatra.query.runtime.localsearch;bundle-version="2.2.0",
+ org.eclipse.collections;bundle-version="9.2.0"
+Bundle-ActivationPolicy: lazy
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/bin/hu/bme/mit/inf/dslreasoner/diversitycalculator/.FileComparator.java._trace b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/bin/hu/bme/mit/inf/dslreasoner/diversitycalculator/.FileComparator.java._trace
new file mode 100644
index 00000000..66809531
Binary files /dev/null and b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/bin/hu/bme/mit/inf/dslreasoner/diversitycalculator/.FileComparator.java._trace differ
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/bin/hu/bme/mit/inf/dslreasoner/diversitycalculator/.MeasureDiversity.java._trace b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/bin/hu/bme/mit/inf/dslreasoner/diversitycalculator/.MeasureDiversity.java._trace
new file mode 100644
index 00000000..87a0a021
Binary files /dev/null and b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/bin/hu/bme/mit/inf/dslreasoner/diversitycalculator/.MeasureDiversity.java._trace differ
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/bin/hu/bme/mit/inf/dslreasoner/diversitycalculator/.MeasureDiversity.xtendbin b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/bin/hu/bme/mit/inf/dslreasoner/diversitycalculator/.MeasureDiversity.xtendbin
new file mode 100644
index 00000000..b2685222
Binary files /dev/null and b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/bin/hu/bme/mit/inf/dslreasoner/diversitycalculator/.MeasureDiversity.xtendbin differ
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/bin/hu/bme/mit/inf/dslreasoner/diversitycalculator/.MeasureInternalDiversity.java._trace b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/bin/hu/bme/mit/inf/dslreasoner/diversitycalculator/.MeasureInternalDiversity.java._trace
new file mode 100644
index 00000000..f9773278
Binary files /dev/null and b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/bin/hu/bme/mit/inf/dslreasoner/diversitycalculator/.MeasureInternalDiversity.java._trace differ
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/bin/hu/bme/mit/inf/dslreasoner/diversitycalculator/.MeasureInternalDiversity.xtendbin b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/bin/hu/bme/mit/inf/dslreasoner/diversitycalculator/.MeasureInternalDiversity.xtendbin
new file mode 100644
index 00000000..1ffee322
Binary files /dev/null and b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/bin/hu/bme/mit/inf/dslreasoner/diversitycalculator/.MeasureInternalDiversity.xtendbin differ
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/bin/hu/bme/mit/inf/dslreasoner/diversitycalculator/.PatternWithMatches.java._trace b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/bin/hu/bme/mit/inf/dslreasoner/diversitycalculator/.PatternWithMatches.java._trace
new file mode 100644
index 00000000..f8d273ed
Binary files /dev/null and b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/bin/hu/bme/mit/inf/dslreasoner/diversitycalculator/.PatternWithMatches.java._trace differ
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/build.properties b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/build.properties
new file mode 100644
index 00000000..4d3b1827
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/build.properties
@@ -0,0 +1,10 @@
+#
+
+bin.includes = .,\
+               model/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties
+jars.compile.order = .
+source.. = src/
+output.. = bin/
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/10_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/10_1.xmi
new file mode 100644
index 00000000..cd445da5
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/10_1.xmi
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="ASCII"?>
+<familytree:FamilyTree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:familytree="http://www.example.org/familytree" xsi:schemaLocation="http://www.example.org/familytree ../case.study.familyTree.model/model/familytree.ecore">
+  <members parents="//@members.3 //@members.13"/>
+  <members parents="//@members.60 //@members.86"/>
+  <members age="39" children="//@members.73" parents="//@members.29 //@members.61"/>
+  <members age="39" children="//@members.0 //@members.17" parents="//@members.31 //@members.52"/>
+  <members parents="//@members.6 //@members.58"/>
+  <members parents="//@members.15 //@members.62"/>
+  <members age="39" children="//@members.4 //@members.64" parents="//@members.28 //@members.41"/>
+  <members age="169" children="//@members.11 //@members.27 //@members.50 //@members.55 //@members.97" parents="//@members.62 //@members.85"/>
+  <members age="104" children="//@members.42 //@members.63 //@members.86 //@members.87 //@members.88 //@members.99" parents="//@members.35 //@members.70"/>
+  <members age="156" children="//@members.10 //@members.24 //@members.60 //@members.63 //@members.69 //@members.91 //@members.98" parents="//@members.62 //@members.85"/>
+  <members age="78" children="//@members.17 //@members.29 //@members.32 //@members.36 //@members.61" parents="//@members.9 //@members.87"/>
+  <members parents="//@members.7 //@members.97"/>
+  <members age="78" children="//@members.20 //@members.26" parents="//@members.66 //@members.70"/>
+  <members age="13" children="//@members.0" parents="//@members.20 //@members.36"/>
+  <members age="13" children="//@members.56" parents="//@members.64 //@members.97"/>
+  <members age="208" children="//@members.5 //@members.16 //@members.20 //@members.62 //@members.85" parents="//@members.25 //@members.70"/>
+  <members parents="//@members.15 //@members.21"/>
+  <members age="26" children="//@members.75 //@members.96" parents="//@members.3 //@members.10"/>
+  <members age="13" children="//@members.90" parents="//@members.27 //@members.54"/>
+  <members parents="//@members.20 //@members.76"/>
+  <members age="65" children="//@members.13 //@members.19 //@members.41 //@members.82" parents="//@members.12 //@members.15"/>
+  <members age="39" children="//@members.16 //@members.73 //@members.86 //@members.89 //@members.90" parents="//@members.62 //@members.70"/>
+  <members parents="//@members.39 //@members.61"/>
+  <members age="143" children="//@members.31 //@members.35 //@members.40 //@members.53" parents="//@members.55 //@members.81"/>
+  <members age="117" children="//@members.26 //@members.34 //@members.51 //@members.59" parents="//@members.9 //@members.35"/>
+  <members age="221" children="//@members.15 //@members.33 //@members.43 //@members.49 //@members.57 //@members.83 //@members.85" parents="//@members.39 //@members.70"/>
+  <members age="13" children="//@members.40" parents="//@members.12 //@members.24"/>
+  <members age="117" children="//@members.18 //@members.60 //@members.66 //@members.80" parents="//@members.7 //@members.55"/>
+  <members age="52" children="//@members.6 //@members.47" parents="//@members.35 //@members.69"/>
+  <members age="65" children="//@members.2 //@members.41" parents="//@members.10 //@members.37"/>
+  <members parents="//@members.31 //@members.98"/>
+  <members age="52" children="//@members.3 //@members.30 //@members.46 //@members.65" parents="//@members.23 //@members.33"/>
+  <members parents="//@members.10 //@members.88"/>
+  <members age="65" children="//@members.31" parents="//@members.25 //@members.60"/>
+  <members parents="//@members.24 //@members.47"/>
+  <members age="130" children="//@members.8 //@members.24 //@members.28 //@members.54 //@members.67 //@members.88" parents="//@members.23 //@members.49"/>
+  <members age="39" children="//@members.13 //@members.45 //@members.79 //@members.98" parents="//@members.10 //@members.67"/>
+  <members age="78" children="//@members.29" parents="//@members.52 //@members.58"/>
+  <members parents="//@members.52 //@members.86"/>
+  <members age="273" children="//@members.22 //@members.25 //@members.68 //@members.70 //@members.71 //@members.82 //@members.93 //@members.95"/>
+  <members parents="//@members.23 //@members.26"/>
+  <members age="52" children="//@members.6" parents="//@members.20 //@members.29"/>
+  <members age="39" children="//@members.64" parents="//@members.8 //@members.52"/>
+  <members age="117" children="//@members.59 //@members.67" parents="//@members.25 //@members.50"/>
+  <members parents="//@members.86 //@members.94"/>
+  <members parents="//@members.36 //@members.54"/>
+  <members age="13" children="//@members.68" parents="//@members.31 //@members.51"/>
+  <members age="13" children="//@members.34" parents="//@members.28 //@members.98"/>
+  <members parents="//@members.62 //@members.80"/>
+  <members age="143" children="//@members.35 //@members.58 //@members.89" parents="//@members.25 //@members.62"/>
+  <members age="130" children="//@members.43 //@members.52 //@members.74" parents="//@members.7 //@members.69"/>
+  <members age="26" children="//@members.46" parents="//@members.24 //@members.80"/>
+  <members age="91" children="//@members.3 //@members.37 //@members.38 //@members.42 //@members.94" parents="//@members.50 //@members.59"/>
+  <members parents="//@members.23 //@members.76"/>
+  <members age="26" children="//@members.18 //@members.45" parents="//@members.35 //@members.71"/>
+  <members age="156" children="//@members.23 //@members.27 //@members.92" parents="//@members.7 //@members.81"/>
+  <members parents="//@members.14 //@members.72"/>
+  <members parents="//@members.25"/>
+  <members age="91" children="//@members.4 //@members.37 //@members.79" parents="//@members.49 //@members.80"/>
+  <members age="104" children="//@members.52 //@members.72 //@members.87" parents="//@members.24 //@members.43"/>
+  <members age="78" children="//@members.1 //@members.33 //@members.94 //@members.97" parents="//@members.9 //@members.27"/>
+  <members age="52" children="//@members.2 //@members.22" parents="//@members.10 //@members.69"/>
+  <members age="182" children="//@members.5 //@members.7 //@members.9 //@members.21 //@members.48 //@members.49 //@members.78 //@members.81" parents="//@members.15 //@members.85"/>
+  <members parents="//@members.8 //@members.9"/>
+  <members age="26" children="//@members.14" parents="//@members.6 //@members.42"/>
+  <members age="26" children="//@members.76" parents="//@members.31 //@members.82"/>
+  <members age="91" children="//@members.12" parents="//@members.27 //@members.69"/>
+  <members age="52" children="//@members.36" parents="//@members.35 //@members.43"/>
+  <members parents="//@members.39 //@members.46"/>
+  <members age="143" children="//@members.28 //@members.50 //@members.61 //@members.66 //@members.80" parents="//@members.9 //@members.81"/>
+  <members age="234" children="//@members.8 //@members.12 //@members.15 //@members.21 //@members.25 //@members.74" parents="//@members.39 //@members.71"/>
+  <members age="247" children="//@members.54 //@members.70" parents="//@members.39 //@members.93"/>
+  <members age="13" children="//@members.56 //@members.84" parents="//@members.59 //@members.87"/>
+  <members age="26" children="//@members.76" parents="//@members.2 //@members.21"/>
+  <members parents="//@members.50 //@members.70"/>
+  <members parents="//@members.17 //@members.97"/>
+  <members age="13" children="//@members.19 //@members.53" parents="//@members.65 //@members.73"/>
+  <members parents="//@members.81 //@members.85"/>
+  <members age="13" children="//@members.91" parents="//@members.62 //@members.86"/>
+  <members parents="//@members.36 //@members.58"/>
+  <members age="104" children="//@members.48 //@members.51 //@members.58 //@members.92 //@members.95" parents="//@members.27 //@members.69"/>
+  <members age="169" children="//@members.23 //@members.55 //@members.69 //@members.77" parents="//@members.62 //@members.85"/>
+  <members age="39" children="//@members.65" parents="//@members.20 //@members.39"/>
+  <members parents="//@members.25 //@members.87"/>
+  <members parents="//@members.72 //@members.97"/>
+  <members age="195" children="//@members.7 //@members.9 //@members.62 //@members.77 //@members.81" parents="//@members.15 //@members.25"/>
+  <members age="26" children="//@members.1 //@members.38 //@members.44 //@members.78" parents="//@members.8 //@members.21"/>
+  <members age="91" children="//@members.10 //@members.72 //@members.83" parents="//@members.8 //@members.59"/>
+  <members age="26" children="//@members.32 //@members.96" parents="//@members.8 //@members.35"/>
+  <members parents="//@members.21 //@members.49"/>
+  <members parents="//@members.18 //@members.21"/>
+  <members parents="//@members.9 //@members.78"/>
+  <members parents="//@members.55 //@members.80"/>
+  <members age="260" children="//@members.71" parents="//@members.39"/>
+  <members age="13" children="//@members.44" parents="//@members.52 //@members.60"/>
+  <members parents="//@members.39 //@members.80"/>
+  <members age="13" children="//@members.99" parents="//@members.17 //@members.88"/>
+  <members age="26" children="//@members.11 //@members.14 //@members.75 //@members.84" parents="//@members.7 //@members.60"/>
+  <members age="26" children="//@members.30 //@members.47" parents="//@members.9 //@members.36"/>
+  <members parents="//@members.8 //@members.96"/>
+</familytree:FamilyTree>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/1_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/1_1.xmi
new file mode 100644
index 00000000..4d55d654
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/1_1.xmi
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="ASCII"?>
+<familytree:FamilyTree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:familytree="http://www.example.org/familytree" xsi:schemaLocation="http://www.example.org/familytree ../case.study.familyTree.model/model/familytree.ecore">
+  <members parents="//@members.30 //@members.74"/>
+  <members age="182" children="//@members.6 //@members.55 //@members.58" parents="//@members.42 //@members.74"/>
+  <members age="104" children="//@members.3 //@members.16 //@members.26 //@members.76" parents="//@members.38 //@members.47"/>
+  <members parents="//@members.2 //@members.65"/>
+  <members age="13" children="//@members.18 //@members.24" parents="//@members.69 //@members.73"/>
+  <members age="39" children="//@members.23 //@members.34 //@members.71" parents="//@members.58 //@members.65"/>
+  <members age="156" children="//@members.28 //@members.85" parents="//@members.1 //@members.74"/>
+  <members age="13" children="//@members.71 //@members.79" parents="//@members.74 //@members.88"/>
+  <members parents="//@members.64 //@members.69"/>
+  <members parents="//@members.67 //@members.69"/>
+  <members parents="//@members.28 //@members.40"/>
+  <members age="26" children="//@members.59 //@members.86 //@members.87" parents="//@members.63 //@members.82"/>
+  <members age="13" children="//@members.91" parents="//@members.44 //@members.60"/>
+  <members age="39" children="//@members.17 //@members.23" parents="//@members.77 //@members.80"/>
+  <members age="52" children="//@members.41" parents="//@members.47 //@members.60"/>
+  <members age="39" children="//@members.69 //@members.72" parents="//@members.47 //@members.60"/>
+  <members age="78" children="//@members.29 //@members.61" parents="//@members.2 //@members.19"/>
+  <members parents="//@members.13 //@members.19"/>
+  <members parents="//@members.4 //@members.73"/>
+  <members age="91" children="//@members.16 //@members.17 //@members.35 //@members.43" parents="//@members.20 //@members.85"/>
+  <members age="104" children="//@members.19 //@members.45 //@members.49" parents="//@members.42 //@members.56"/>
+  <members age="78" children="//@members.33 //@members.90" parents="//@members.56 //@members.62"/>
+  <members parents="//@members.33 //@members.43"/>
+  <members age="26" children="//@members.52 //@members.84" parents="//@members.5 //@members.13"/>
+  <members parents="//@members.4 //@members.90"/>
+  <members age="39" children="//@members.78 //@members.88 //@members.89 //@members.94" parents="//@members.48 //@members.77"/>
+  <members age="91" children="//@members.45 //@members.88" parents="//@members.2 //@members.77"/>
+  <members parents="//@members.41 //@members.55"/>
+  <members age="143" children="//@members.10 //@members.48" parents="//@members.6 //@members.65"/>
+  <members age="65" children="//@members.30 //@members.34 //@members.61" parents="//@members.16 //@members.96"/>
+  <members age="13" children="//@members.0" parents="//@members.29 //@members.35"/>
+  <members parents="//@members.39 //@members.45"/>
+  <members age="117" children="//@members.40 //@members.98" parents="//@members.38 //@members.60"/>
+  <members age="65" children="//@members.22 //@members.43 //@members.64 //@members.80" parents="//@members.21 //@members.45"/>
+  <members parents="//@members.5 //@members.29"/>
+  <members age="26" children="//@members.30" parents="//@members.19 //@members.38"/>
+  <members parents="//@members.49 //@members.57"/>
+  <members age="52" children="//@members.41 //@members.63" parents="//@members.58 //@members.65"/>
+  <members age="221" children="//@members.2 //@members.32 //@members.35 //@members.42 //@members.69 //@members.74 //@members.77" parents="//@members.83 //@members.97"/>
+  <members age="273" children="//@members.31 //@members.68 //@members.97"/>
+  <members age="104" children="//@members.10 //@members.62 //@members.75" parents="//@members.32 //@members.58"/>
+  <members age="39" children="//@members.27 //@members.70 //@members.73 //@members.91" parents="//@members.14 //@members.37"/>
+  <members age="208" children="//@members.1 //@members.20 //@members.60 //@members.65 //@members.72 //@members.74 //@members.78" parents="//@members.38 //@members.83"/>
+  <members age="39" children="//@members.22 //@members.46" parents="//@members.19 //@members.33"/>
+  <members age="52" children="//@members.12 //@members.57 //@members.95" parents="//@members.67 //@members.83"/>
+  <members age="78" children="//@members.31 //@members.33 //@members.90" parents="//@members.20 //@members.26"/>
+  <members age="26" children="//@members.51" parents="//@members.43 //@members.74"/>
+  <members age="117" children="//@members.2 //@members.14 //@members.15 //@members.55 //@members.82 //@members.87" parents="//@members.58 //@members.81"/>
+  <members age="130" children="//@members.25 //@members.56 //@members.94" parents="//@members.28 //@members.65"/>
+  <members age="26" children="//@members.36 //@members.70" parents="//@members.20 //@members.57"/>
+  <members parents="//@members.92 //@members.97"/>
+  <members age="13" children="//@members.93" parents="//@members.46 //@members.85"/>
+  <members age="13" children="//@members.84" parents="//@members.23 //@members.77"/>
+  <members parents="//@members.70 //@members.97"/>
+  <members parents="//@members.87"/>
+  <members age="104" children="//@members.27 //@members.59 //@members.67 //@members.82" parents="//@members.1 //@members.47"/>
+  <members age="117" children="//@members.20 //@members.21 //@members.57 //@members.96" parents="//@members.48 //@members.81"/>
+  <members age="39" children="//@members.36 //@members.49 //@members.66" parents="//@members.44 //@members.56"/>
+  <members age="169" children="//@members.5 //@members.37 //@members.40 //@members.47 //@members.65" parents="//@members.1 //@members.74"/>
+  <members age="13" children="//@members.93" parents="//@members.11 //@members.55"/>
+  <members age="130" children="//@members.12 //@members.14 //@members.15 //@members.32 //@members.89 //@members.99" parents="//@members.42 //@members.81"/>
+  <members age="52" children="//@members.63 //@members.79" parents="//@members.16 //@members.29"/>
+  <members age="91" children="//@members.21 //@members.64" parents="//@members.40 //@members.85"/>
+  <members age="39" children="//@members.11" parents="//@members.37 //@members.61"/>
+  <members age="13" children="//@members.8" parents="//@members.33 //@members.62"/>
+  <members age="156" children="//@members.3 //@members.5 //@members.28 //@members.37 //@members.48 //@members.81 //@members.85" parents="//@members.42 //@members.58"/>
+  <members parents="//@members.57 //@members.81"/>
+  <members age="65" children="//@members.9 //@members.44" parents="//@members.55 //@members.82"/>
+  <members age="247" children="//@members.83 //@members.92" parents="//@members.39 //@members.97"/>
+  <members age="26" children="//@members.4 //@members.8 //@members.9 //@members.92" parents="//@members.15 //@members.38"/>
+  <members age="13" children="//@members.53" parents="//@members.41 //@members.49"/>
+  <members parents="//@members.5 //@members.7"/>
+  <members parents="//@members.15 //@members.42"/>
+  <members age="26" children="//@members.4 //@members.18 //@members.75" parents="//@members.41 //@members.83"/>
+  <members age="195" children="//@members.0 //@members.1 //@members.6 //@members.7 //@members.46 //@members.58 //@members.81" parents="//@members.38 //@members.42"/>
+  <members parents="//@members.40 //@members.73"/>
+  <members parents="//@members.2 //@members.81"/>
+  <members age="104" children="//@members.13 //@members.25 //@members.26 //@members.52" parents="//@members.38 //@members.81"/>
+  <members parents="//@members.25 //@members.42"/>
+  <members parents="//@members.7 //@members.61"/>
+  <members age="52" children="//@members.13" parents="//@members.33 //@members.90"/>
+  <members age="143" children="//@members.47 //@members.56 //@members.60 //@members.66 //@members.76 //@members.77" parents="//@members.65 //@members.74"/>
+  <members age="91" children="//@members.11 //@members.67 //@members.96 //@members.99" parents="//@members.47 //@members.55"/>
+  <members age="234" children="//@members.38 //@members.42 //@members.44 //@members.73" parents="//@members.68 //@members.97"/>
+  <members parents="//@members.23 //@members.52"/>
+  <members age="104" children="//@members.19 //@members.51 //@members.62 //@members.95" parents="//@members.6 //@members.65"/>
+  <members parents="//@members.11 //@members.92"/>
+  <members age="13" children="//@members.54" parents="//@members.11 //@members.47"/>
+  <members age="26" children="//@members.7" parents="//@members.25 //@members.26"/>
+  <members age="13" children="//@members.98" parents="//@members.25 //@members.60"/>
+  <members age="65" children="//@members.24 //@members.80" parents="//@members.21 //@members.45"/>
+  <members parents="//@members.12 //@members.41"/>
+  <members age="13" children="//@members.50 //@members.86" parents="//@members.68 //@members.69"/>
+  <members parents="//@members.51 //@members.59"/>
+  <members parents="//@members.25 //@members.48"/>
+  <members parents="//@members.44 //@members.85"/>
+  <members age="78" children="//@members.29" parents="//@members.56 //@members.82"/>
+  <members age="260" children="//@members.38 //@members.50 //@members.53 //@members.68 //@members.83" parents="//@members.39"/>
+  <members parents="//@members.32 //@members.89"/>
+  <members parents="//@members.60 //@members.82"/>
+</familytree:FamilyTree>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/2_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/2_1.xmi
new file mode 100644
index 00000000..690b7492
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/2_1.xmi
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="ASCII"?>
+<familytree:FamilyTree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:familytree="http://www.example.org/familytree" xsi:schemaLocation="http://www.example.org/familytree ../case.study.familyTree.model/model/familytree.ecore">
+  <members age="13" children="//@members.30 //@members.59" parents="//@members.64 //@members.88"/>
+  <members parents="//@members.53 //@members.65"/>
+  <members age="208" children="//@members.7 //@members.27 //@members.86" parents="//@members.23 //@members.44"/>
+  <members age="39" children="//@members.27 //@members.98" parents="//@members.80 //@members.88"/>
+  <members age="26" children="//@members.11 //@members.48 //@members.72" parents="//@members.51 //@members.68"/>
+  <members age="13" children="//@members.40 //@members.45" parents="//@members.23 //@members.99"/>
+  <members age="26" children="//@members.53" parents="//@members.31 //@members.39"/>
+  <members age="195" children="//@members.9 //@members.18 //@members.71 //@members.76 //@members.78 //@members.92" parents="//@members.2 //@members.23"/>
+  <members parents="//@members.39 //@members.76"/>
+  <members age="182" children="//@members.13 //@members.70 //@members.71" parents="//@members.7 //@members.23"/>
+  <members age="13" children="//@members.69" parents="//@members.42 //@members.78"/>
+  <members parents="//@members.4 //@members.22"/>
+  <members parents="//@members.62 //@members.99"/>
+  <members age="26" children="//@members.20 //@members.36 //@members.70" parents="//@members.9 //@members.89"/>
+  <members age="13" children="//@members.47" parents="//@members.22 //@members.57"/>
+  <members age="26" children="//@members.53" parents="//@members.42 //@members.64"/>
+  <members age="26" children="//@members.83" parents="//@members.78 //@members.87"/>
+  <members parents="//@members.31 //@members.92"/>
+  <members age="156" children="//@members.19 //@members.26 //@members.51 //@members.57 //@members.59 //@members.68 //@members.78" parents="//@members.7 //@members.71"/>
+  <members age="104" children="//@members.26 //@members.45 //@members.54 //@members.64 //@members.88 //@members.89" parents="//@members.18 //@members.76"/>
+  <members age="13" children="//@members.34" parents="//@members.13 //@members.54"/>
+  <members age="13" children="//@members.81" parents="//@members.50 //@members.51"/>
+  <members age="65" children="//@members.11 //@members.14 //@members.37 //@members.47 //@members.61 //@members.80" parents="//@members.68 //@members.92"/>
+  <members age="234" children="//@members.2 //@members.5 //@members.7 //@members.9 //@members.44 //@members.77" parents="//@members.43"/>
+  <members age="52" children="//@members.89" parents="//@members.75 //@members.94"/>
+  <members parents="//@members.58 //@members.91"/>
+  <members age="78" children="//@members.58 //@members.87 //@members.90 //@members.94" parents="//@members.18 //@members.19"/>
+  <members age="26" children="//@members.30 //@members.48 //@members.97" parents="//@members.2 //@members.3"/>
+  <members parents="//@members.52 //@members.78"/>
+  <members parents="//@members.52 //@members.94"/>
+  <members parents="//@members.0 //@members.27"/>
+  <members age="39" children="//@members.6 //@members.17 //@members.57" parents="//@members.46 //@members.76"/>
+  <members age="13" children="//@members.34" parents="//@members.51 //@members.71"/>
+  <members age="52" children="//@members.41 //@members.52" parents="//@members.92 //@members.96"/>
+  <members parents="//@members.20 //@members.32"/>
+  <members parents="//@members.68 //@members.90"/>
+  <members parents="//@members.13 //@members.52"/>
+  <members parents="//@members.22 //@members.48"/>
+  <members age="65" children="//@members.87" parents="//@members.84 //@members.88"/>
+  <members age="39" children="//@members.6 //@members.8" parents="//@members.87 //@members.96"/>
+  <members parents="//@members.5 //@members.52"/>
+  <members parents="//@members.33 //@members.91"/>
+  <members age="39" children="//@members.10 //@members.15" parents="//@members.68 //@members.96"/>
+  <members age="247" children="//@members.23 //@members.44"/>
+  <members age="221" children="//@members.2 //@members.56 //@members.99" parents="//@members.23 //@members.43"/>
+  <members parents="//@members.5 //@members.19"/>
+  <members age="104" children="//@members.31 //@members.51 //@members.62 //@members.64 //@members.73 //@members.96" parents="//@members.78 //@members.92"/>
+  <members parents="//@members.14 //@members.22"/>
+  <members age="13" children="//@members.37" parents="//@members.4 //@members.27"/>
+  <members parents="//@members.76 //@members.94"/>
+  <members age="78" children="//@members.21 //@members.80 //@members.96 //@members.98" parents="//@members.68 //@members.92"/>
+  <members age="91" children="//@members.4 //@members.21 //@members.32 //@members.88 //@members.97" parents="//@members.18 //@members.46"/>
+  <members age="39" children="//@members.28 //@members.29 //@members.36 //@members.40 //@members.54 //@members.63 //@members.67 //@members.79 //@members.90" parents="//@members.33 //@members.73"/>
+  <members age="13" children="//@members.1" parents="//@members.6 //@members.15"/>
+  <members age="26" children="//@members.20" parents="//@members.19 //@members.52"/>
+  <members age="13" children="//@members.74" parents="//@members.67 //@members.99"/>
+  <members parents="//@members.44 //@members.89"/>
+  <members age="26" children="//@members.14" parents="//@members.18 //@members.31"/>
+  <members age="13" children="//@members.25" parents="//@members.26 //@members.82"/>
+  <members parents="//@members.0 //@members.18"/>
+  <members age="39" children="//@members.99" parents="//@members.71 //@members.82"/>
+  <members parents="//@members.22 //@members.68"/>
+  <members age="78" children="//@members.12 //@members.94" parents="//@members.46 //@members.75"/>
+  <members parents="//@members.52 //@members.87"/>
+  <members age="91" children="//@members.0 //@members.15 //@members.67 //@members.84" parents="//@members.19 //@members.46"/>
+  <members age="13" children="//@members.1" parents="//@members.91 //@members.94"/>
+  <members parents="//@members.88 //@members.96"/>
+  <members age="26" children="//@members.55" parents="//@members.52 //@members.64"/>
+  <members age="104" children="//@members.4 //@members.22 //@members.35 //@members.42 //@members.50 //@members.61 //@members.75 //@members.91" parents="//@members.18 //@members.78"/>
+  <members parents="//@members.10 //@members.98"/>
+  <members parents="//@members.9 //@members.13"/>
+  <members age="169" children="//@members.18 //@members.32 //@members.60 //@members.73" parents="//@members.7 //@members.9"/>
+  <members parents="//@members.4 //@members.88"/>
+  <members age="65" children="//@members.52 //@members.82" parents="//@members.46 //@members.71"/>
+  <members parents="//@members.55 //@members.94"/>
+  <members age="91" children="//@members.24 //@members.62 //@members.82" parents="//@members.68 //@members.92"/>
+  <members age="117" children="//@members.8 //@members.19 //@members.31 //@members.49" parents="//@members.7 //@members.92"/>
+  <members parents="//@members.23"/>
+  <members age="143" children="//@members.10 //@members.16 //@members.28 //@members.46 //@members.68 //@members.83 //@members.92" parents="//@members.7 //@members.18"/>
+  <members parents="//@members.52 //@members.94"/>
+  <members age="52" children="//@members.3 //@members.91" parents="//@members.22 //@members.50"/>
+  <members parents="//@members.21 //@members.87"/>
+  <members age="52" children="//@members.58 //@members.60" parents="//@members.73 //@members.75"/>
+  <members age="13" children="//@members.85" parents="//@members.16 //@members.78"/>
+  <members age="78" children="//@members.38 //@members.85 //@members.93 //@members.95" parents="//@members.64 //@members.92"/>
+  <members parents="//@members.83 //@members.84"/>
+  <members parents="//@members.2 //@members.98"/>
+  <members age="52" children="//@members.16 //@members.39 //@members.63 //@members.81" parents="//@members.26 //@members.38"/>
+  <members age="78" children="//@members.0 //@members.3 //@members.38 //@members.66 //@members.72 //@members.95" parents="//@members.19 //@members.51"/>
+  <members age="39" children="//@members.13 //@members.56 //@members.93" parents="//@members.19 //@members.24"/>
+  <members age="13" children="//@members.35" parents="//@members.26 //@members.52"/>
+  <members age="26" children="//@members.25 //@members.41 //@members.65" parents="//@members.68 //@members.80"/>
+  <members age="130" children="//@members.17 //@members.22 //@members.33 //@members.46 //@members.50 //@members.75 //@members.76 //@members.84" parents="//@members.7 //@members.78"/>
+  <members parents="//@members.84 //@members.89"/>
+  <members age="65" children="//@members.24 //@members.29 //@members.49 //@members.65 //@members.74 //@members.79" parents="//@members.26 //@members.62"/>
+  <members parents="//@members.84 //@members.88"/>
+  <members age="65" children="//@members.33 //@members.39 //@members.42 //@members.66" parents="//@members.46 //@members.50"/>
+  <members parents="//@members.27 //@members.51"/>
+  <members age="13" children="//@members.69 //@members.86" parents="//@members.3 //@members.50"/>
+  <members age="26" children="//@members.5 //@members.12 //@members.55" parents="//@members.44 //@members.60"/>
+</familytree:FamilyTree>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/3_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/3_1.xmi
new file mode 100644
index 00000000..a1e10f7d
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/3_1.xmi
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="ASCII"?>
+<familytree:FamilyTree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:familytree="http://www.example.org/familytree" xsi:schemaLocation="http://www.example.org/familytree ../case.study.familyTree.model/model/familytree.ecore">
+  <members age="39" children="//@members.20 //@members.70 //@members.92" parents="//@members.64 //@members.91"/>
+  <members parents="//@members.79 //@members.87"/>
+  <members parents="//@members.51 //@members.91"/>
+  <members parents="//@members.27 //@members.89"/>
+  <members parents="//@members.35 //@members.65"/>
+  <members age="52" children="//@members.18 //@members.19 //@members.25 //@members.79" parents="//@members.43 //@members.51"/>
+  <members age="13" children="//@members.34 //@members.59" parents="//@members.7 //@members.9"/>
+  <members age="104" children="//@members.6 //@members.14 //@members.77" parents="//@members.64 //@members.91"/>
+  <members parents="//@members.51 //@members.86"/>
+  <members age="26" children="//@members.6 //@members.27 //@members.38" parents="//@members.18 //@members.64"/>
+  <members age="65" children="//@members.58 //@members.85" parents="//@members.64 //@members.72"/>
+  <members age="26" children="//@members.97" parents="//@members.57 //@members.91"/>
+  <members parents="//@members.28 //@members.40"/>
+  <members age="26" children="//@members.79 //@members.89" parents="//@members.33 //@members.86"/>
+  <members age="91" children="//@members.40 //@members.68 //@members.73 //@members.74 //@members.78 //@members.86" parents="//@members.7 //@members.76"/>
+  <members age="91" children="//@members.44 //@members.50 //@members.67" parents="//@members.64 //@members.91"/>
+  <members age="221" children="//@members.21 //@members.43 //@members.48 //@members.84 //@members.92" parents="//@members.88"/>
+  <members parents="//@members.35 //@members.95"/>
+  <members age="39" children="//@members.9 //@members.27" parents="//@members.5 //@members.51"/>
+  <members age="26" children="//@members.97" parents="//@members.5 //@members.22"/>
+  <members age="13" children="//@members.36" parents="//@members.0 //@members.57"/>
+  <members age="208" children="//@members.23 //@members.26 //@members.43 //@members.44 //@members.83" parents="//@members.16 //@members.88"/>
+  <members age="39" children="//@members.19 //@members.23" parents="//@members.39 //@members.84"/>
+  <members parents="//@members.21 //@members.22"/>
+  <members age="143" children="//@members.35 //@members.57 //@members.64 //@members.69 //@members.91 //@members.94" parents="//@members.28 //@members.61"/>
+  <members parents="//@members.5 //@members.50"/>
+  <members parents="//@members.21 //@members.90"/>
+  <members age="13" children="//@members.3" parents="//@members.9 //@members.18"/>
+  <members age="156" children="//@members.12 //@members.24 //@members.53 //@members.57 //@members.63 //@members.80 //@members.91" parents="//@members.43 //@members.61"/>
+  <members parents="//@members.60 //@members.89"/>
+  <members parents="//@members.50 //@members.66"/>
+  <members parents="//@members.76 //@members.91"/>
+  <members parents="//@members.39 //@members.90"/>
+  <members age="52" children="//@members.13 //@members.38 //@members.41 //@members.47 //@members.55 //@members.56 //@members.62 //@members.77" parents="//@members.61 //@members.69"/>
+  <members parents="//@members.6 //@members.97"/>
+  <members age="13" children="//@members.4 //@members.17" parents="//@members.24 //@members.69"/>
+  <members parents="//@members.20 //@members.80"/>
+  <members parents="//@members.41 //@members.77"/>
+  <members parents="//@members.9 //@members.33"/>
+  <members age="52" children="//@members.22 //@members.32 //@members.45 //@members.52 //@members.96" parents="//@members.43 //@members.76"/>
+  <members age="13" children="//@members.12" parents="//@members.14 //@members.83"/>
+  <members age="26" children="//@members.37 //@members.67 //@members.87" parents="//@members.33 //@members.91"/>
+  <members parents="//@members.55 //@members.96"/>
+  <members age="195" children="//@members.5 //@members.28 //@members.39 //@members.58 //@members.61 //@members.69 //@members.72 //@members.83" parents="//@members.16 //@members.21"/>
+  <members age="78" children="//@members.82 //@members.94" parents="//@members.15 //@members.21"/>
+  <members parents="//@members.39 //@members.72"/>
+  <members parents="//@members.76"/>
+  <members parents="//@members.33 //@members.88"/>
+  <members age="13" children="//@members.63" parents="//@members.16 //@members.91"/>
+  <members parents="//@members.66 //@members.70"/>
+  <members age="13" children="//@members.25 //@members.30 //@members.99" parents="//@members.15 //@members.96"/>
+  <members age="117" children="//@members.2 //@members.5 //@members.8 //@members.18 //@members.72 //@members.73 //@members.76" parents="//@members.61 //@members.91"/>
+  <members parents="//@members.39 //@members.89"/>
+  <members parents="//@members.28 //@members.95"/>
+  <members parents="//@members.78 //@members.88"/>
+  <members age="39" children="//@members.42 //@members.60 //@members.70 //@members.98" parents="//@members.33 //@members.73"/>
+  <members age="26" children="//@members.60" parents="//@members.33 //@members.90"/>
+  <members age="39" children="//@members.11 //@members.20" parents="//@members.24 //@members.28"/>
+  <members age="52" children="//@members.85 //@members.99" parents="//@members.10 //@members.43"/>
+  <members parents="//@members.6 //@members.92"/>
+  <members age="13" children="//@members.29 //@members.74" parents="//@members.55 //@members.56"/>
+  <members age="169" children="//@members.24 //@members.28 //@members.33 //@members.51 //@members.64 //@members.75" parents="//@members.43 //@members.83"/>
+  <members age="13" children="//@members.93" parents="//@members.33 //@members.72"/>
+  <members parents="//@members.28 //@members.48"/>
+  <members age="117" children="//@members.0 //@members.7 //@members.9 //@members.10 //@members.15 //@members.76 //@members.86 //@members.96" parents="//@members.24 //@members.61"/>
+  <members age="13" children="//@members.4" parents="//@members.82 //@members.84"/>
+  <members age="13" children="//@members.30 //@members.49" parents="//@members.70 //@members.88"/>
+  <members parents="//@members.15 //@members.41"/>
+  <members age="13" children="//@members.75" parents="//@members.14 //@members.81"/>
+  <members age="65" children="//@members.33 //@members.35" parents="//@members.24 //@members.43"/>
+  <members age="26" children="//@members.49 //@members.66" parents="//@members.0 //@members.55"/>
+  <members parents="//@members.72 //@members.85"/>
+  <members age="78" children="//@members.10 //@members.45 //@members.62 //@members.71 //@members.80" parents="//@members.43 //@members.51"/>
+  <members age="52" children="//@members.55" parents="//@members.14 //@members.51"/>
+  <members parents="//@members.14 //@members.60"/>
+  <members parents="//@members.61 //@members.68"/>
+  <members age="104" children="//@members.14 //@members.31 //@members.39 //@members.46" parents="//@members.51 //@members.64"/>
+  <members age="26" children="//@members.37 //@members.87" parents="//@members.7 //@members.33"/>
+  <members age="13" children="//@members.54" parents="//@members.14 //@members.94"/>
+  <members age="13" children="//@members.1" parents="//@members.5 //@members.13"/>
+  <members age="13" children="//@members.36" parents="//@members.28 //@members.72"/>
+  <members age="26" children="//@members.68" parents="//@members.85 //@members.86"/>
+  <members age="65" children="//@members.65 //@members.84 //@members.95" parents="//@members.44 //@members.86"/>
+  <members age="182" children="//@members.40 //@members.61 //@members.90" parents="//@members.21 //@members.43"/>
+  <members age="52" children="//@members.22 //@members.65" parents="//@members.16 //@members.82"/>
+  <members age="39" children="//@members.71 //@members.81 //@members.95" parents="//@members.10 //@members.58"/>
+  <members age="78" children="//@members.8 //@members.13 //@members.81 //@members.82" parents="//@members.14 //@members.64"/>
+  <members age="13" children="//@members.1" parents="//@members.41 //@members.77"/>
+  <members age="234" children="//@members.16 //@members.21 //@members.47 //@members.54 //@members.66"/>
+  <members age="13" children="//@members.3 //@members.29 //@members.52" parents="//@members.13 //@members.95"/>
+  <members age="39" children="//@members.26 //@members.32 //@members.56 //@members.98" parents="//@members.83 //@members.91"/>
+  <members age="130" children="//@members.0 //@members.2 //@members.7 //@members.11 //@members.15 //@members.31 //@members.41 //@members.48 //@members.51 //@members.90 //@members.93" parents="//@members.24 //@members.28"/>
+  <members age="13" children="//@members.59" parents="//@members.0 //@members.16"/>
+  <members parents="//@members.62 //@members.91"/>
+  <members age="26" children="//@members.78" parents="//@members.24 //@members.44"/>
+  <members age="26" children="//@members.17 //@members.53 //@members.89" parents="//@members.82 //@members.85"/>
+  <members age="26" children="//@members.42 //@members.50" parents="//@members.39 //@members.64"/>
+  <members age="13" children="//@members.34" parents="//@members.11 //@members.19"/>
+  <members parents="//@members.55 //@members.90"/>
+  <members parents="//@members.50 //@members.58"/>
+</familytree:FamilyTree>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/4_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/4_1.xmi
new file mode 100644
index 00000000..9e950b3b
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/4_1.xmi
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="ASCII"?>
+<familytree:FamilyTree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:familytree="http://www.example.org/familytree" xsi:schemaLocation="http://www.example.org/familytree ../case.study.familyTree.model/model/familytree.ecore">
+  <members age="65" children="//@members.14 //@members.20 //@members.37 //@members.57" parents="//@members.2 //@members.73"/>
+  <members parents="//@members.2 //@members.28"/>
+  <members age="130" children="//@members.0 //@members.1 //@members.8 //@members.15 //@members.16 //@members.34 //@members.50 //@members.72" parents="//@members.27 //@members.98"/>
+  <members age="52" children="//@members.28 //@members.57 //@members.76" parents="//@members.40 //@members.78"/>
+  <members age="26" children="//@members.43" parents="//@members.65 //@members.67"/>
+  <members parents="//@members.18 //@members.73"/>
+  <members age="52" children="//@members.33 //@members.38 //@members.56" parents="//@members.17 //@members.40"/>
+  <members age="13" children="//@members.68" parents="//@members.44 //@members.73"/>
+  <members age="52" children="//@members.71 //@members.92 //@members.97" parents="//@members.2 //@members.34"/>
+  <members age="52" children="//@members.36 //@members.47" parents="//@members.17 //@members.83"/>
+  <members age="143" children="//@members.53 //@members.65 //@members.77 //@members.83 //@members.86" parents="//@members.30 //@members.42"/>
+  <members age="65" children="//@members.44 //@members.67" parents="//@members.40 //@members.88"/>
+  <members age="13" children="//@members.13" parents="//@members.84 //@members.98"/>
+  <members parents="//@members.12 //@members.76"/>
+  <members parents="//@members.0 //@members.93"/>
+  <members parents="//@members.2 //@members.22"/>
+  <members age="91" children="//@members.88" parents="//@members.2 //@members.40"/>
+  <members age="195" children="//@members.6 //@members.9 //@members.27 //@members.29 //@members.30 //@members.75 //@members.81 //@members.86 //@members.90" parents="//@members.49 //@members.78"/>
+  <members age="39" children="//@members.5 //@members.41 //@members.93 //@members.96" parents="//@members.20 //@members.32"/>
+  <members age="13" children="//@members.63" parents="//@members.49 //@members.57"/>
+  <members age="52" children="//@members.18 //@members.47 //@members.51" parents="//@members.0 //@members.42"/>
+  <members age="13" children="//@members.63" parents="//@members.79 //@members.93"/>
+  <members age="91" children="//@members.15 //@members.23 //@members.28 //@members.35 //@members.50 //@members.59 //@members.88" parents="//@members.29 //@members.32"/>
+  <members age="26" children="//@members.55 //@members.76" parents="//@members.22 //@members.98"/>
+  <members parents="//@members.40 //@members.97"/>
+  <members age="26" children="//@members.43 //@members.60" parents="//@members.26 //@members.45"/>
+  <members age="65" children="//@members.25 //@members.46 //@members.51 //@members.52" parents="//@members.29 //@members.81"/>
+  <members age="182" children="//@members.2 //@members.30 //@members.42 //@members.81" parents="//@members.17 //@members.49"/>
+  <members age="26" children="//@members.1 //@members.82 //@members.87 //@members.97" parents="//@members.3 //@members.22"/>
+  <members age="117" children="//@members.22 //@members.26 //@members.31 //@members.32" parents="//@members.17 //@members.42"/>
+  <members age="156" children="//@members.10 //@members.35 //@members.39 //@members.58" parents="//@members.17 //@members.27"/>
+  <members parents="//@members.29 //@members.98"/>
+  <members age="104" children="//@members.18 //@members.22 //@members.41 //@members.69 //@members.96" parents="//@members.29 //@members.98"/>
+  <members parents="//@members.6 //@members.57"/>
+  <members age="117" children="//@members.8 //@members.40 //@members.55" parents="//@members.2 //@members.83"/>
+  <members parents="//@members.22 //@members.30"/>
+  <members age="39" children="//@members.84" parents="//@members.9 //@members.39"/>
+  <members age="39" children="//@members.70 //@members.74" parents="//@members.0 //@members.90"/>
+  <members age="39" children="//@members.84" parents="//@members.6 //@members.42"/>
+  <members age="52" children="//@members.36 //@members.58 //@members.62" parents="//@members.30 //@members.49"/>
+  <members age="104" children="//@members.3 //@members.6 //@members.11 //@members.16 //@members.24 //@members.79" parents="//@members.34 //@members.98"/>
+  <members parents="//@members.18 //@members.32"/>
+  <members age="156" children="//@members.10 //@members.20 //@members.29 //@members.38 //@members.71 //@members.85" parents="//@members.27 //@members.81"/>
+  <members age="13" children="//@members.60" parents="//@members.4 //@members.25"/>
+  <members age="26" children="//@members.7" parents="//@members.11 //@members.71"/>
+  <members age="39" children="//@members.25 //@members.56 //@members.94" parents="//@members.52 //@members.67"/>
+  <members age="52" children="//@members.65" parents="//@members.26 //@members.78"/>
+  <members parents="//@members.9 //@members.20"/>
+  <members age="13" children="//@members.61" parents="//@members.74 //@members.93"/>
+  <members age="208" children="//@members.17 //@members.19 //@members.27 //@members.39 //@members.69" parents="//@members.78 //@members.98"/>
+  <members parents="//@members.2 //@members.22"/>
+  <members age="13" children="//@members.82 //@members.87" parents="//@members.20 //@members.26"/>
+  <members age="52" children="//@members.45" parents="//@members.26 //@members.81"/>
+  <members parents="//@members.10 //@members.90"/>
+  <members age="13" children="//@members.99" parents="//@members.72 //@members.81"/>
+  <members parents="//@members.23 //@members.34"/>
+  <members parents="//@members.6 //@members.45"/>
+  <members age="39" children="//@members.19 //@members.33 //@members.66 //@members.93" parents="//@members.0 //@members.3"/>
+  <members age="13" children="//@members.66 //@members.95" parents="//@members.30 //@members.39"/>
+  <members parents="//@members.22 //@members.67"/>
+  <members parents="//@members.25 //@members.43"/>
+  <members parents="//@members.48"/>
+  <members parents="//@members.39 //@members.72"/>
+  <members parents="//@members.19 //@members.21"/>
+  <members parents="//@members.70 //@members.90"/>
+  <members age="39" children="//@members.4 //@members.91 //@members.95" parents="//@members.10 //@members.46"/>
+  <members parents="//@members.57 //@members.58"/>
+  <members age="52" children="//@members.4 //@members.45 //@members.59 //@members.75" parents="//@members.11 //@members.81"/>
+  <members parents="//@members.7 //@members.88"/>
+  <members age="39" children="//@members.72" parents="//@members.32 //@members.49"/>
+  <members age="13" children="//@members.64" parents="//@members.37 //@members.86"/>
+  <members age="39" children="//@members.44 //@members.91" parents="//@members.8 //@members.42"/>
+  <members age="26" children="//@members.54 //@members.62" parents="//@members.2 //@members.69"/>
+  <members age="247" children="//@members.0 //@members.5 //@members.7 //@members.78 //@members.85 //@members.98" parents="//@members.80 //@members.89"/>
+  <members age="26" children="//@members.48 //@members.99" parents="//@members.37 //@members.86"/>
+  <members parents="//@members.17 //@members.67"/>
+  <members age="13" children="//@members.13" parents="//@members.3 //@members.23"/>
+  <members parents="//@members.10 //@members.91"/>
+  <members age="221" children="//@members.3 //@members.17 //@members.46 //@members.49" parents="//@members.73 //@members.98"/>
+  <members age="26" children="//@members.21" parents="//@members.40 //@members.83"/>
+  <members age="273" children="//@members.73 //@members.89"/>
+  <members age="169" children="//@members.26 //@members.42 //@members.52 //@members.54 //@members.67 //@members.83 //@members.90" parents="//@members.17 //@members.27"/>
+  <members parents="//@members.28 //@members.51"/>
+  <members age="130" children="//@members.9 //@members.34 //@members.79 //@members.92" parents="//@members.10 //@members.81"/>
+  <members age="26" children="//@members.12" parents="//@members.36 //@members.38"/>
+  <members parents="//@members.42 //@members.73"/>
+  <members age="39" children="//@members.70 //@members.74" parents="//@members.10 //@members.17"/>
+  <members parents="//@members.28 //@members.51"/>
+  <members age="78" children="//@members.11 //@members.68" parents="//@members.16 //@members.22"/>
+  <members age="260" children="//@members.73 //@members.94 //@members.98" parents="//@members.80"/>
+  <members age="52" children="//@members.37 //@members.53 //@members.64" parents="//@members.17 //@members.81"/>
+  <members age="13" children="//@members.77" parents="//@members.65 //@members.71"/>
+  <members parents="//@members.8 //@members.83"/>
+  <members age="26" children="//@members.14 //@members.21 //@members.48" parents="//@members.18 //@members.57"/>
+  <members parents="//@members.45 //@members.89"/>
+  <members parents="//@members.58 //@members.65"/>
+  <members parents="//@members.18 //@members.32"/>
+  <members age="13" children="//@members.24" parents="//@members.8 //@members.28"/>
+  <members age="234" children="//@members.2 //@members.12 //@members.23 //@members.31 //@members.32 //@members.40 //@members.49 //@members.78" parents="//@members.73 //@members.89"/>
+  <members parents="//@members.54 //@members.74"/>
+</familytree:FamilyTree>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/5_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/5_1.xmi
new file mode 100644
index 00000000..c1d02cfb
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/5_1.xmi
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="ASCII"?>
+<familytree:FamilyTree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:familytree="http://www.example.org/familytree" xsi:schemaLocation="http://www.example.org/familytree ../case.study.familyTree.model/model/familytree.ecore">
+  <members age="78" children="//@members.24 //@members.51 //@members.60 //@members.66 //@members.75 //@members.87 //@members.88" parents="//@members.42 //@members.94"/>
+  <members parents="//@members.65 //@members.95"/>
+  <members age="182" children="//@members.14 //@members.24 //@members.31 //@members.83 //@members.86 //@members.91" parents="//@members.29 //@members.80"/>
+  <members age="13" children="//@members.50" parents="//@members.29 //@members.68"/>
+  <members age="52" children="//@members.70 //@members.90 //@members.98" parents="//@members.12 //@members.66"/>
+  <members age="26" children="//@members.13 //@members.26 //@members.61" parents="//@members.20 //@members.40"/>
+  <members age="13" children="//@members.63" parents="//@members.12 //@members.53"/>
+  <members age="52" children="//@members.11 //@members.36 //@members.56" parents="//@members.60 //@members.86"/>
+  <members age="39" children="//@members.59" parents="//@members.53 //@members.80"/>
+  <members parents="//@members.76 //@members.94"/>
+  <members parents="//@members.15 //@members.97"/>
+  <members age="13" children="//@members.82" parents="//@members.7 //@members.39"/>
+  <members age="91" children="//@members.4 //@members.6 //@members.25 //@members.33 //@members.39 //@members.72" parents="//@members.18 //@members.85"/>
+  <members parents="//@members.5 //@members.40"/>
+  <members age="13" children="//@members.36 //@members.46" parents="//@members.2 //@members.40"/>
+  <members age="13" children="//@members.10 //@members.93" parents="//@members.42 //@members.80"/>
+  <members parents="//@members.77 //@members.94"/>
+  <members parents="//@members.19 //@members.70"/>
+  <members age="104" children="//@members.12 //@members.38 //@members.47 //@members.66 //@members.92" parents="//@members.65 //@members.85"/>
+  <members age="13" children="//@members.17 //@members.57" parents="//@members.33 //@members.85"/>
+  <members age="39" children="//@members.5" parents="//@members.35 //@members.43"/>
+  <members age="13" children="//@members.30" parents="//@members.42 //@members.52"/>
+  <members age="13" children="//@members.48" parents="//@members.35 //@members.47"/>
+  <members age="13" children="//@members.45 //@members.73" parents="//@members.80 //@members.98"/>
+  <members parents="//@members.0 //@members.2"/>
+  <members parents="//@members.12 //@members.40"/>
+  <members parents="//@members.5 //@members.35"/>
+  <members age="234" children="//@members.29 //@members.70 //@members.80 //@members.84" parents="//@members.67"/>
+  <members age="65" children="//@members.41" parents="//@members.42 //@members.69"/>
+  <members age="208" children="//@members.2 //@members.3 //@members.80 //@members.91" parents="//@members.27 //@members.84"/>
+  <members parents="//@members.21 //@members.86"/>
+  <members parents="//@members.2 //@members.59"/>
+  <members parents="//@members.52 //@members.97"/>
+  <members age="65" children="//@members.19 //@members.41 //@members.73 //@members.97 //@members.99" parents="//@members.12 //@members.39"/>
+  <members parents="//@members.65"/>
+  <members age="52" children="//@members.20 //@members.22 //@members.26 //@members.58" parents="//@members.40 //@members.96"/>
+  <members parents="//@members.7 //@members.14"/>
+  <members age="13" children="//@members.49" parents="//@members.89 //@members.91"/>
+  <members age="26" children="//@members.76" parents="//@members.18 //@members.80"/>
+  <members age="78" children="//@members.11 //@members.33 //@members.78" parents="//@members.12 //@members.86"/>
+  <members age="65" children="//@members.5 //@members.13 //@members.14 //@members.25 //@members.35 //@members.44 //@members.55 //@members.71 //@members.98" parents="//@members.47 //@members.94"/>
+  <members age="52" children="//@members.56" parents="//@members.28 //@members.33"/>
+  <members age="91" children="//@members.0 //@members.15 //@members.21 //@members.28 //@members.47 //@members.51 //@members.62" parents="//@members.85 //@members.94"/>
+  <members age="130" children="//@members.20 //@members.52 //@members.65 //@members.96" parents="//@members.80 //@members.85"/>
+  <members age="26" children="//@members.82 //@members.95" parents="//@members.40 //@members.81"/>
+  <members parents="//@members.23 //@members.69"/>
+  <members parents="//@members.14 //@members.61"/>
+  <members age="78" children="//@members.22 //@members.40" parents="//@members.18 //@members.42"/>
+  <members parents="//@members.22 //@members.60"/>
+  <members parents="//@members.37 //@members.97"/>
+  <members parents="//@members.3 //@members.96"/>
+  <members age="13" children="//@members.62" parents="//@members.0 //@members.42"/>
+  <members age="26" children="//@members.21 //@members.32 //@members.76" parents="//@members.43 //@members.86"/>
+  <members age="52" children="//@members.6 //@members.8 //@members.57 //@members.97" parents="//@members.60 //@members.86"/>
+  <members parents="//@members.71 //@members.80"/>
+  <members parents="//@members.40 //@members.83"/>
+  <members age="39" children="//@members.68" parents="//@members.7 //@members.41"/>
+  <members parents="//@members.19 //@members.53"/>
+  <members parents="//@members.35 //@members.88"/>
+  <members age="26" children="//@members.31 //@members.61" parents="//@members.8 //@members.66"/>
+  <members age="65" children="//@members.7 //@members.48 //@members.53 //@members.93" parents="//@members.0 //@members.77"/>
+  <members age="13" children="//@members.46 //@members.63" parents="//@members.5 //@members.59"/>
+  <members parents="//@members.42 //@members.51"/>
+  <members parents="//@members.6 //@members.61"/>
+  <members parents="//@members.66 //@members.83"/>
+  <members age="117" children="//@members.1 //@members.18 //@members.34 //@members.77 //@members.83" parents="//@members.43 //@members.85"/>
+  <members age="65" children="//@members.4 //@members.59 //@members.64 //@members.79 //@members.81" parents="//@members.0 //@members.18"/>
+  <members age="247" children="//@members.27 //@members.84"/>
+  <members age="26" children="//@members.3" parents="//@members.56 //@members.98"/>
+  <members age="78" children="//@members.28 //@members.45" parents="//@members.85 //@members.96"/>
+  <members age="13" children="//@members.17" parents="//@members.4 //@members.27"/>
+  <members age="13" children="//@members.54" parents="//@members.40 //@members.94"/>
+  <members parents="//@members.12 //@members.88"/>
+  <members parents="//@members.23 //@members.33"/>
+  <members parents="//@members.86 //@members.94"/>
+  <members parents="//@members.0 //@members.92"/>
+  <members age="13" children="//@members.9" parents="//@members.38 //@members.52"/>
+  <members age="104" children="//@members.16 //@members.60 //@members.78 //@members.96" parents="//@members.65 //@members.85"/>
+  <members parents="//@members.39 //@members.77"/>
+  <members parents="//@members.66 //@members.99"/>
+  <members age="195" children="//@members.2 //@members.8 //@members.15 //@members.23 //@members.38 //@members.43 //@members.54 //@members.85 //@members.86 //@members.94" parents="//@members.27 //@members.29"/>
+  <members age="39" children="//@members.44" parents="//@members.66 //@members.85"/>
+  <members parents="//@members.11 //@members.44"/>
+  <members age="26" children="//@members.55 //@members.64 //@members.92" parents="//@members.2 //@members.65"/>
+  <members age="221" children="//@members.29" parents="//@members.27 //@members.67"/>
+  <members age="143" children="//@members.12 //@members.18 //@members.19 //@members.42 //@members.43 //@members.65 //@members.69 //@members.77 //@members.81 //@members.88" parents="//@members.80 //@members.94"/>
+  <members age="169" children="//@members.7 //@members.30 //@members.39 //@members.52 //@members.53 //@members.74 //@members.94" parents="//@members.2 //@members.80"/>
+  <members parents="//@members.0 //@members.97"/>
+  <members age="13" children="//@members.58 //@members.72 //@members.90" parents="//@members.0 //@members.85"/>
+  <members age="26" children="//@members.37 //@members.95" parents="//@members.94 //@members.97"/>
+  <members parents="//@members.4 //@members.88"/>
+  <members age="26" children="//@members.37" parents="//@members.2 //@members.29"/>
+  <members age="13" children="//@members.75" parents="//@members.18 //@members.83"/>
+  <members parents="//@members.15 //@members.60"/>
+  <members age="156" children="//@members.0 //@members.9 //@members.16 //@members.40 //@members.42 //@members.71 //@members.74 //@members.85 //@members.89 //@members.99" parents="//@members.80 //@members.86"/>
+  <members age="13" children="//@members.1" parents="//@members.44 //@members.89"/>
+  <members age="91" children="//@members.35 //@members.50 //@members.69" parents="//@members.43 //@members.77"/>
+  <members age="39" children="//@members.10 //@members.32 //@members.49 //@members.87 //@members.89" parents="//@members.33 //@members.53"/>
+  <members age="39" children="//@members.23 //@members.68" parents="//@members.4 //@members.40"/>
+  <members age="13" children="//@members.79" parents="//@members.33 //@members.94"/>
+</familytree:FamilyTree>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/6_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/6_1.xmi
new file mode 100644
index 00000000..4e1092cb
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/6_1.xmi
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="ASCII"?>
+<familytree:FamilyTree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:familytree="http://www.example.org/familytree" xsi:schemaLocation="http://www.example.org/familytree ../case.study.familyTree.model/model/familytree.ecore">
+  <members age="26" children="//@members.6" parents="//@members.16 //@members.79"/>
+  <members age="13" children="//@members.66" parents="//@members.36 //@members.91"/>
+  <members age="39" children="//@members.49 //@members.51" parents="//@members.64 //@members.72"/>
+  <members age="65" children="//@members.54 //@members.58 //@members.60 //@members.70 //@members.72 //@members.88" parents="//@members.64 //@members.85"/>
+  <members age="26" children="//@members.83 //@members.98" parents="//@members.45 //@members.87"/>
+  <members parents="//@members.26 //@members.83"/>
+  <members age="13" children="//@members.19" parents="//@members.0 //@members.45"/>
+  <members age="65" children="//@members.8 //@members.17 //@members.20 //@members.27" parents="//@members.26 //@members.80"/>
+  <members parents="//@members.7 //@members.14"/>
+  <members age="26" children="//@members.73 //@members.93 //@members.95" parents="//@members.25 //@members.68"/>
+  <members parents="//@members.70 //@members.80"/>
+  <members age="143" children="//@members.16 //@members.23 //@members.24 //@members.26 //@members.68 //@members.82 //@members.85 //@members.95" parents="//@members.43 //@members.80"/>
+  <members age="26" children="//@members.82 //@members.88" parents="//@members.50 //@members.94"/>
+  <members parents="//@members.71 //@members.85"/>
+  <members age="13" children="//@members.8" parents="//@members.69 //@members.70"/>
+  <members age="39" children="//@members.57" parents="//@members.54 //@members.70"/>
+  <members age="117" children="//@members.0 //@members.26 //@members.40 //@members.68 //@members.76 //@members.78 //@members.92 //@members.94" parents="//@members.11 //@members.85"/>
+  <members age="13" children="//@members.35 //@members.38" parents="//@members.7 //@members.55"/>
+  <members age="234" children="//@members.59 //@members.71 //@members.86"/>
+  <members parents="//@members.6"/>
+  <members age="13" children="//@members.28" parents="//@members.7 //@members.87"/>
+  <members age="13" children="//@members.89" parents="//@members.59 //@members.97"/>
+  <members parents="//@members.43 //@members.92"/>
+  <members age="13" children="//@members.89" parents="//@members.11 //@members.71"/>
+  <members age="39" children="//@members.33 //@members.97" parents="//@members.11 //@members.85"/>
+  <members age="39" children="//@members.9" parents="//@members.43 //@members.78"/>
+  <members age="104" children="//@members.5 //@members.7 //@members.36 //@members.45 //@members.53" parents="//@members.11 //@members.16"/>
+  <members age="52" children="//@members.62 //@members.65 //@members.98 //@members.99" parents="//@members.7 //@members.91"/>
+  <members parents="//@members.20 //@members.77"/>
+  <members parents="//@members.64 //@members.84"/>
+  <members age="13" children="//@members.74" parents="//@members.72 //@members.90"/>
+  <members parents="//@members.64 //@members.97"/>
+  <members parents="//@members.93 //@members.99"/>
+  <members parents="//@members.24 //@members.46"/>
+  <members parents="//@members.69 //@members.72"/>
+  <members parents="//@members.17 //@members.85"/>
+  <members age="65" children="//@members.1 //@members.53 //@members.55 //@members.79" parents="//@members.26 //@members.85"/>
+  <members parents="//@members.39 //@members.88"/>
+  <members parents="//@members.17 //@members.47"/>
+  <members age="13" children="//@members.37 //@members.56" parents="//@members.43 //@members.77"/>
+  <members age="78" children="//@members.48 //@members.72 //@members.84 //@members.90 //@members.91" parents="//@members.16 //@members.45"/>
+  <members parents="//@members.46 //@members.71"/>
+  <members parents="//@members.43 //@members.54"/>
+  <members age="156" children="//@members.11 //@members.22 //@members.25 //@members.39 //@members.42 //@members.47 //@members.87 //@members.90 //@members.94" parents="//@members.77 //@members.80"/>
+  <members age="13" children="//@members.51 //@members.86" parents="//@members.84 //@members.92"/>
+  <members age="91" children="//@members.4 //@members.6 //@members.40 //@members.60 //@members.63 //@members.64 //@members.92" parents="//@members.26 //@members.85"/>
+  <members age="13" children="//@members.33 //@members.41" parents="//@members.49 //@members.57"/>
+  <members age="13" children="//@members.38" parents="//@members.43 //@members.54"/>
+  <members parents="//@members.40 //@members.80"/>
+  <members age="26" children="//@members.46 //@members.52 //@members.81 //@members.96" parents="//@members.2 //@members.62"/>
+  <members age="39" children="//@members.12" parents="//@members.53 //@members.85"/>
+  <members parents="//@members.2 //@members.44"/>
+  <members parents="//@members.49 //@members.76"/>
+  <members age="52" children="//@members.50 //@members.67" parents="//@members.26 //@members.36"/>
+  <members age="52" children="//@members.15 //@members.42 //@members.47 //@members.57" parents="//@members.3 //@members.78"/>
+  <members age="52" children="//@members.17 //@members.63 //@members.87" parents="//@members.36 //@members.64"/>
+  <members parents="//@members.39 //@members.90"/>
+  <members age="26" children="//@members.46" parents="//@members.15 //@members.54"/>
+  <members parents="//@members.3 //@members.61"/>
+  <members age="221" children="//@members.21 //@members.71 //@members.77" parents="//@members.18"/>
+  <members parents="//@members.3 //@members.45"/>
+  <members age="182" children="//@members.58 //@members.80 //@members.91" parents="//@members.71 //@members.77"/>
+  <members age="39" children="//@members.49 //@members.73 //@members.99" parents="//@members.27 //@members.77"/>
+  <members parents="//@members.45 //@members.55"/>
+  <members age="78" children="//@members.2 //@members.3 //@members.29 //@members.31 //@members.55 //@members.79" parents="//@members.45 //@members.78"/>
+  <members age="13" children="//@members.66" parents="//@members.27 //@members.94"/>
+  <members parents="//@members.1 //@members.65"/>
+  <members parents="//@members.53 //@members.95"/>
+  <members age="104" children="//@members.9 //@members.78" parents="//@members.11 //@members.16"/>
+  <members age="26" children="//@members.14 //@members.34" parents="//@members.84 //@members.94"/>
+  <members age="52" children="//@members.10 //@members.14 //@members.15" parents="//@members.3 //@members.94"/>
+  <members age="208" children="//@members.13 //@members.23 //@members.41 //@members.61 //@members.77" parents="//@members.18 //@members.59"/>
+  <members age="52" children="//@members.2 //@members.30 //@members.34 //@members.75" parents="//@members.3 //@members.40"/>
+  <members parents="//@members.9 //@members.62"/>
+  <members parents="//@members.30 //@members.95"/>
+  <members age="26" children="//@members.76" parents="//@members.72 //@members.91"/>
+  <members age="13" children="//@members.52" parents="//@members.16 //@members.75"/>
+  <members age="195" children="//@members.28 //@members.39 //@members.43 //@members.61 //@members.62 //@members.80 //@members.83" parents="//@members.59 //@members.71"/>
+  <members age="91" children="//@members.25 //@members.54 //@members.64" parents="//@members.16 //@members.68"/>
+  <members age="39" children="//@members.0" parents="//@members.36 //@members.64"/>
+  <members age="169" children="//@members.7 //@members.10 //@members.11 //@members.43 //@members.48 //@members.85" parents="//@members.61 //@members.77"/>
+  <members parents="//@members.49 //@members.92"/>
+  <members parents="//@members.11 //@members.12"/>
+  <members age="13" children="//@members.5" parents="//@members.4 //@members.77"/>
+  <members age="39" children="//@members.29 //@members.44 //@members.69" parents="//@members.40 //@members.91"/>
+  <members age="130" children="//@members.3 //@members.13 //@members.16 //@members.24 //@members.35 //@members.36 //@members.45 //@members.50" parents="//@members.11 //@members.80"/>
+  <members parents="//@members.18 //@members.44"/>
+  <members age="39" children="//@members.4 //@members.20" parents="//@members.43 //@members.55"/>
+  <members age="13" children="//@members.37" parents="//@members.3 //@members.12"/>
+  <members parents="//@members.21 //@members.23"/>
+  <members age="26" children="//@members.30 //@members.56 //@members.93" parents="//@members.40 //@members.43"/>
+  <members age="65" children="//@members.1 //@members.27 //@members.75 //@members.84" parents="//@members.40 //@members.61"/>
+  <members age="26" children="//@members.22 //@members.44 //@members.81" parents="//@members.16 //@members.45"/>
+  <members age="13" children="//@members.32" parents="//@members.9 //@members.90"/>
+  <members age="65" children="//@members.12 //@members.65 //@members.69 //@members.70 //@members.97" parents="//@members.16 //@members.43"/>
+  <members age="13" children="//@members.67 //@members.74" parents="//@members.9 //@members.11"/>
+  <members parents="//@members.49 //@members.97"/>
+  <members age="26" children="//@members.21 //@members.31 //@members.96" parents="//@members.24 //@members.94"/>
+  <members parents="//@members.4 //@members.27"/>
+  <members age="13" children="//@members.32" parents="//@members.27 //@members.62"/>
+</familytree:FamilyTree>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/7_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/7_1.xmi
new file mode 100644
index 00000000..3db68771
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/7_1.xmi
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="ASCII"?>
+<familytree:FamilyTree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:familytree="http://www.example.org/familytree" xsi:schemaLocation="http://www.example.org/familytree ../case.study.familyTree.model/model/familytree.ecore">
+  <members age="13" children="//@members.73 //@members.99" parents="//@members.65 //@members.71"/>
+  <members age="65" children="//@members.66" parents="//@members.48 //@members.97"/>
+  <members age="117" children="//@members.11 //@members.19 //@members.38 //@members.52 //@members.60 //@members.79 //@members.88 //@members.93 //@members.97" parents="//@members.3 //@members.44"/>
+  <members age="143" children="//@members.2 //@members.19 //@members.21 //@members.37 //@members.44 //@members.71 //@members.75 //@members.88" parents="//@members.27 //@members.48"/>
+  <members age="13" children="//@members.51" parents="//@members.67 //@members.97"/>
+  <members parents="//@members.16 //@members.44"/>
+  <members parents="//@members.84"/>
+  <members age="13" children="//@members.18 //@members.25" parents="//@members.44 //@members.57"/>
+  <members age="65" children="//@members.24 //@members.38 //@members.65 //@members.67 //@members.89" parents="//@members.19 //@members.27"/>
+  <members parents="//@members.21 //@members.53"/>
+  <members parents="//@members.14 //@members.80"/>
+  <members age="39" children="//@members.16 //@members.33 //@members.70" parents="//@members.2 //@members.27"/>
+  <members age="39" children="//@members.75 //@members.85" parents="//@members.19 //@members.89"/>
+  <members age="39" children="//@members.16 //@members.24 //@members.43 //@members.59 //@members.68" parents="//@members.17 //@members.91"/>
+  <members age="13" children="//@members.10 //@members.77 //@members.98" parents="//@members.38 //@members.72"/>
+  <members parents="//@members.35 //@members.85"/>
+  <members age="13" children="//@members.5" parents="//@members.11 //@members.13"/>
+  <members age="65" children="//@members.13 //@members.36 //@members.49 //@members.59 //@members.61 //@members.87" parents="//@members.44 //@members.71"/>
+  <members parents="//@members.7 //@members.62"/>
+  <members age="104" children="//@members.8 //@members.12 //@members.50 //@members.57 //@members.64 //@members.84 //@members.86" parents="//@members.2 //@members.3"/>
+  <members age="13" children="//@members.56" parents="//@members.58 //@members.87"/>
+  <members age="13" children="//@members.9" parents="//@members.3 //@members.62"/>
+  <members parents="//@members.30 //@members.35"/>
+  <members age="13" children="//@members.26 //@members.31 //@members.99" parents="//@members.43 //@members.52"/>
+  <members age="13" children="//@members.55 //@members.90" parents="//@members.8 //@members.13"/>
+  <members parents="//@members.7 //@members.92"/>
+  <members parents="//@members.23 //@members.87"/>
+  <members age="156" children="//@members.3 //@members.8 //@members.11 //@members.44 //@members.57" parents="//@members.48 //@members.69"/>
+  <members parents="//@members.71 //@members.88"/>
+  <members age="221" children="//@members.69 //@members.91"/>
+  <members age="65" children="//@members.22 //@members.66 //@members.90 //@members.92" parents="//@members.64 //@members.88"/>
+  <members parents="//@members.23 //@members.71"/>
+  <members parents="//@members.70 //@members.86"/>
+  <members age="13" children="//@members.34 //@members.94" parents="//@members.11 //@members.86"/>
+  <members parents="//@members.33 //@members.71"/>
+  <members age="13" children="//@members.15 //@members.22" parents="//@members.86 //@members.87"/>
+  <members parents="//@members.17 //@members.86"/>
+  <members parents="//@members.3 //@members.71"/>
+  <members age="26" children="//@members.14" parents="//@members.2 //@members.8"/>
+  <members parents="//@members.43 //@members.86"/>
+  <members age="26" children="//@members.81" parents="//@members.64 //@members.83"/>
+  <members age="13" children="//@members.76" parents="//@members.63 //@members.70"/>
+  <members parents="//@members.57 //@members.86"/>
+  <members age="26" children="//@members.23 //@members.39 //@members.96" parents="//@members.13 //@members.52"/>
+  <members age="130" children="//@members.2 //@members.5 //@members.7 //@members.17 //@members.49" parents="//@members.3 //@members.27"/>
+  <members parents="//@members.65 //@members.71"/>
+  <members parents="//@members.86 //@members.88"/>
+  <members parents="//@members.88 //@members.97"/>
+  <members age="169" children="//@members.1 //@members.3 //@members.27 //@members.54 //@members.97" parents="//@members.69 //@members.74"/>
+  <members age="52" children="//@members.62 //@members.63" parents="//@members.17 //@members.44"/>
+  <members age="26" children="//@members.53" parents="//@members.19 //@members.74"/>
+  <members parents="//@members.4 //@members.87"/>
+  <members age="39" children="//@members.23 //@members.43 //@members.78 //@members.80" parents="//@members.2 //@members.74"/>
+  <members age="13" children="//@members.9 //@members.95" parents="//@members.50 //@members.67"/>
+  <members age="13" children="//@members.76" parents="//@members.48 //@members.78"/>
+  <members parents="//@members.24 //@members.84"/>
+  <members parents="//@members.20 //@members.71"/>
+  <members age="91" children="//@members.7 //@members.42 //@members.64" parents="//@members.19 //@members.27"/>
+  <members age="26" children="//@members.20" parents="//@members.74 //@members.97"/>
+  <members parents="//@members.13 //@members.17"/>
+  <members parents="//@members.2 //@members.81"/>
+  <members parents="//@members.17 //@members.87"/>
+  <members age="39" children="//@members.18 //@members.21 //@members.70" parents="//@members.49 //@members.66"/>
+  <members age="26" children="//@members.41 //@members.94" parents="//@members.49 //@members.97"/>
+  <members age="78" children="//@members.30 //@members.40 //@members.83" parents="//@members.19 //@members.57"/>
+  <members age="26" children="//@members.0 //@members.45" parents="//@members.8 //@members.86"/>
+  <members age="52" children="//@members.62 //@members.96" parents="//@members.1 //@members.30"/>
+  <members age="26" children="//@members.4 //@members.53 //@members.77" parents="//@members.8 //@members.97"/>
+  <members parents="//@members.13 //@members.87"/>
+  <members age="195" children="//@members.27 //@members.48 //@members.74" parents="//@members.29 //@members.91"/>
+  <members age="26" children="//@members.32 //@members.41" parents="//@members.11 //@members.62"/>
+  <members age="78" children="//@members.0 //@members.17 //@members.28 //@members.31 //@members.34 //@members.37 //@members.45 //@members.56 //@members.84" parents="//@members.3 //@members.88"/>
+  <members age="26" children="//@members.14" parents="//@members.86 //@members.97"/>
+  <members parents="//@members.0 //@members.86"/>
+  <members age="182" children="//@members.48 //@members.50 //@members.52 //@members.58 //@members.87 //@members.98" parents="//@members.69 //@members.91"/>
+  <members age="26" children="//@members.80" parents="//@members.3 //@members.12"/>
+  <members parents="//@members.41 //@members.54"/>
+  <members parents="//@members.14 //@members.67"/>
+  <members age="26" children="//@members.54 //@members.81" parents="//@members.52 //@members.88"/>
+  <members parents="//@members.2 //@members.81"/>
+  <members age="13" children="//@members.10" parents="//@members.52 //@members.75"/>
+  <members age="13" children="//@members.60 //@members.79" parents="//@members.40 //@members.78"/>
+  <members parents="//@members.84 //@members.86"/>
+  <members age="39" children="//@members.40" parents="//@members.64 //@members.88"/>
+  <members age="13" children="//@members.6 //@members.55 //@members.82" parents="//@members.19 //@members.71"/>
+  <members age="13" children="//@members.15" parents="//@members.12 //@members.97"/>
+  <members age="65" children="//@members.32 //@members.33 //@members.35 //@members.36 //@members.39 //@members.42 //@members.46 //@members.65 //@members.72 //@members.73 //@members.82 //@members.89" parents="//@members.19 //@members.91"/>
+  <members age="26" children="//@members.20 //@members.26 //@members.35 //@members.51 //@members.61 //@members.68 //@members.93" parents="//@members.17 //@members.74"/>
+  <members age="91" children="//@members.28 //@members.30 //@members.46 //@members.47 //@members.71 //@members.78 //@members.83" parents="//@members.2 //@members.3"/>
+  <members age="52" children="//@members.12" parents="//@members.8 //@members.86"/>
+  <members parents="//@members.24 //@members.30"/>
+  <members age="208" children="//@members.13 //@members.69 //@members.74 //@members.86 //@members.92 //@members.95" parents="//@members.29"/>
+  <members age="13" children="//@members.25" parents="//@members.30 //@members.91"/>
+  <members parents="//@members.2 //@members.87"/>
+  <members parents="//@members.33 //@members.63"/>
+  <members parents="//@members.53 //@members.91"/>
+  <members parents="//@members.43 //@members.66"/>
+  <members age="78" children="//@members.1 //@members.4 //@members.47 //@members.58 //@members.63 //@members.67 //@members.72 //@members.85" parents="//@members.2 //@members.48"/>
+  <members parents="//@members.14 //@members.74"/>
+  <members parents="//@members.0 //@members.23"/>
+</familytree:FamilyTree>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/8_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/8_1.xmi
new file mode 100644
index 00000000..383b6c76
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/8_1.xmi
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="ASCII"?>
+<familytree:FamilyTree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:familytree="http://www.example.org/familytree" xsi:schemaLocation="http://www.example.org/familytree ../case.study.familyTree.model/model/familytree.ecore">
+  <members age="78" children="//@members.27 //@members.77 //@members.79" parents="//@members.40 //@members.61"/>
+  <members age="208" children="//@members.6 //@members.7 //@members.19 //@members.30 //@members.37 //@members.61 //@members.63" parents="//@members.71 //@members.86"/>
+  <members age="26" children="//@members.26" parents="//@members.42 //@members.61"/>
+  <members age="117" children="//@members.61" parents="//@members.7 //@members.70"/>
+  <members age="39" children="//@members.11 //@members.34 //@members.96" parents="//@members.70 //@members.71"/>
+  <members age="13" children="//@members.69" parents="//@members.62 //@members.66"/>
+  <members age="169" children="//@members.42 //@members.43 //@members.65 //@members.68 //@members.78 //@members.87 //@members.89 //@members.99" parents="//@members.1 //@members.19"/>
+  <members age="195" children="//@members.3 //@members.19 //@members.20 //@members.25 //@members.55 //@members.57 //@members.87 //@members.95 //@members.97" parents="//@members.1 //@members.71"/>
+  <members age="13" children="//@members.77" parents="//@members.78 //@members.95"/>
+  <members parents="//@members.15 //@members.17"/>
+  <members age="52" children="//@members.94" parents="//@members.42 //@members.57"/>
+  <members parents="//@members.4 //@members.46"/>
+  <members parents="//@members.74 //@members.86"/>
+  <members parents="//@members.38 //@members.54"/>
+  <members age="13" children="//@members.82" parents="//@members.17 //@members.34"/>
+  <members age="65" children="//@members.9 //@members.28" parents="//@members.19 //@members.70"/>
+  <members parents="//@members.27 //@members.50"/>
+  <members age="52" children="//@members.9 //@members.14 //@members.49" parents="//@members.31 //@members.89"/>
+  <members age="247" children="//@members.71 //@members.86"/>
+  <members age="182" children="//@members.6 //@members.15 //@members.30 //@members.46 //@members.70 //@members.93 //@members.98 //@members.99" parents="//@members.1 //@members.7"/>
+  <members age="39" children="//@members.66" parents="//@members.7 //@members.32"/>
+  <members parents="//@members.61 //@members.74"/>
+  <members age="91" children="//@members.41 //@members.83 //@members.85 //@members.96 //@members.98" parents="//@members.42 //@members.74"/>
+  <members parents="//@members.40 //@members.83"/>
+  <members parents="//@members.55 //@members.57"/>
+  <members age="39" children="//@members.81" parents="//@members.7 //@members.63"/>
+  <members age="13" children="//@members.76" parents="//@members.2 //@members.97"/>
+  <members age="65" children="//@members.16 //@members.34 //@members.43 //@members.67 //@members.79" parents="//@members.0 //@members.41"/>
+  <members age="52" children="//@members.55 //@members.62 //@members.94" parents="//@members.15 //@members.42"/>
+  <members parents="//@members.42 //@members.56"/>
+  <members age="13" children="//@members.51" parents="//@members.1 //@members.19"/>
+  <members age="65" children="//@members.17 //@members.38 //@members.62 //@members.73" parents="//@members.42 //@members.71"/>
+  <members age="52" children="//@members.20 //@members.92" parents="//@members.70 //@members.89"/>
+  <members age="13" children="//@members.82" parents="//@members.53 //@members.97"/>
+  <members age="26" children="//@members.14" parents="//@members.4 //@members.27"/>
+  <members age="39" children="//@members.50 //@members.53 //@members.59" parents="//@members.70 //@members.90"/>
+  <members age="26" children="//@members.75" parents="//@members.41 //@members.87"/>
+  <members parents="//@members.1 //@members.61"/>
+  <members age="13" children="//@members.13" parents="//@members.31 //@members.71"/>
+  <members parents="//@members.57 //@members.75"/>
+  <members age="91" children="//@members.0 //@members.23 //@members.44" parents="//@members.61 //@members.70"/>
+  <members age="78" children="//@members.27 //@members.36 //@members.58 //@members.59 //@members.76" parents="//@members.22 //@members.87"/>
+  <members age="117" children="//@members.2 //@members.10 //@members.22 //@members.28 //@members.29 //@members.31 //@members.49 //@members.74" parents="//@members.6 //@members.99"/>
+  <members age="52" children="//@members.69 //@members.85" parents="//@members.6 //@members.27"/>
+  <members parents="//@members.40 //@members.50"/>
+  <members parents="//@members.47 //@members.78"/>
+  <members age="13" children="//@members.11 //@members.51" parents="//@members.19 //@members.81"/>
+  <members age="13" children="//@members.45 //@members.60 //@members.91" parents="//@members.90 //@members.96"/>
+  <members parents="//@members.54 //@members.75"/>
+  <members age="39" children="//@members.64" parents="//@members.17 //@members.42"/>
+  <members age="13" children="//@members.16 //@members.44" parents="//@members.35 //@members.64"/>
+  <members parents="//@members.30 //@members.46"/>
+  <members parents="//@members.89 //@members.98"/>
+  <members age="26" children="//@members.33 //@members.80" parents="//@members.35 //@members.85"/>
+  <members age="13" children="//@members.13 //@members.48" parents="//@members.68 //@members.78"/>
+  <members age="13" children="//@members.24" parents="//@members.7 //@members.28"/>
+  <members age="39" children="//@members.29 //@members.66 //@members.92" parents="//@members.57 //@members.93"/>
+  <members age="65" children="//@members.10 //@members.24 //@members.39 //@members.56 //@members.80 //@members.83" parents="//@members.7 //@members.70"/>
+  <members age="13" children="//@members.73" parents="//@members.41 //@members.88"/>
+  <members parents="//@members.35 //@members.41"/>
+  <members parents="//@members.47 //@members.96"/>
+  <members age="104" children="//@members.0 //@members.2 //@members.21 //@members.37 //@members.40 //@members.88" parents="//@members.1 //@members.3"/>
+  <members age="26" children="//@members.5" parents="//@members.28 //@members.31"/>
+  <members age="52" children="//@members.25" parents="//@members.1 //@members.99"/>
+  <members age="26" children="//@members.50" parents="//@members.49 //@members.72"/>
+  <members parents="//@members.6 //@members.92"/>
+  <members age="26" children="//@members.5" parents="//@members.20 //@members.56"/>
+  <members parents="//@members.27 //@members.90"/>
+  <members age="26" children="//@members.54" parents="//@members.6 //@members.86"/>
+  <members parents="//@members.5 //@members.43"/>
+  <members age="130" children="//@members.3 //@members.4 //@members.15 //@members.32 //@members.35 //@members.40 //@members.57 //@members.74 //@members.90" parents="//@members.19 //@members.93"/>
+  <members age="221" children="//@members.1 //@members.4 //@members.7 //@members.31 //@members.38" parents="//@members.18 //@members.86"/>
+  <members age="39" children="//@members.64" parents="//@members.89 //@members.93"/>
+  <members parents="//@members.31 //@members.58"/>
+  <members age="104" children="//@members.12 //@members.21 //@members.22 //@members.90" parents="//@members.42 //@members.70"/>
+  <members age="13" children="//@members.39 //@members.48" parents="//@members.36 //@members.79"/>
+  <members parents="//@members.26 //@members.41"/>
+  <members parents="//@members.0 //@members.8"/>
+  <members age="26" children="//@members.8 //@members.45 //@members.54" parents="//@members.6 //@members.95"/>
+  <members age="26" children="//@members.75" parents="//@members.0 //@members.27"/>
+  <members parents="//@members.53 //@members.57"/>
+  <members age="26" children="//@members.46" parents="//@members.25 //@members.86"/>
+  <members parents="//@members.14 //@members.33"/>
+  <members age="13" children="//@members.23" parents="//@members.22 //@members.57"/>
+  <members parents="//@members.93"/>
+  <members age="39" children="//@members.53" parents="//@members.22 //@members.43"/>
+  <members age="234" children="//@members.1 //@members.12 //@members.68 //@members.71 //@members.81" parents="//@members.18"/>
+  <members age="91" children="//@members.36 //@members.41" parents="//@members.6 //@members.7"/>
+  <members age="26" children="//@members.58" parents="//@members.61 //@members.90"/>
+  <members age="65" children="//@members.17 //@members.32 //@members.52 //@members.72" parents="//@members.6 //@members.90"/>
+  <members age="78" children="//@members.35 //@members.47 //@members.67 //@members.88 //@members.89" parents="//@members.70 //@members.74"/>
+  <members parents="//@members.47 //@members.96"/>
+  <members age="13" children="//@members.65" parents="//@members.32 //@members.56"/>
+  <members age="143" children="//@members.56 //@members.70 //@members.72 //@members.84 //@members.95" parents="//@members.19 //@members.99"/>
+  <members age="39" children="//@members.97" parents="//@members.10 //@members.28"/>
+  <members age="39" children="//@members.8 //@members.78" parents="//@members.7 //@members.93"/>
+  <members age="26" children="//@members.47 //@members.60 //@members.91" parents="//@members.4 //@members.22"/>
+  <members age="26" children="//@members.26 //@members.33" parents="//@members.7 //@members.94"/>
+  <members age="13" children="//@members.52" parents="//@members.19 //@members.22"/>
+  <members age="156" children="//@members.42 //@members.63 //@members.93" parents="//@members.6 //@members.19"/>
+</familytree:FamilyTree>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/9_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/9_1.xmi
new file mode 100644
index 00000000..8b884bb4
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/9_1.xmi
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="ASCII"?>
+<familytree:FamilyTree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:familytree="http://www.example.org/familytree" xsi:schemaLocation="http://www.example.org/familytree ../case.study.familyTree.model/model/familytree.ecore">
+  <members age="13" children="//@members.38" parents="//@members.12 //@members.73"/>
+  <members age="78" children="//@members.25 //@members.35 //@members.70" parents="//@members.4 //@members.62"/>
+  <members age="52" children="//@members.82" parents="//@members.9 //@members.40"/>
+  <members parents="//@members.7 //@members.59"/>
+  <members age="91" children="//@members.1 //@members.16 //@members.29 //@members.94" parents="//@members.13 //@members.15"/>
+  <members age="78" children="//@members.70" parents="//@members.23 //@members.64"/>
+  <members age="26" children="//@members.8 //@members.68" parents="//@members.49 //@members.74"/>
+  <members age="13" children="//@members.3 //@members.80" parents="//@members.49 //@members.54"/>
+  <members age="13" children="//@members.21 //@members.48" parents="//@members.6 //@members.84"/>
+  <members age="117" children="//@members.2 //@members.42 //@members.58 //@members.61 //@members.83" parents="//@members.10 //@members.84"/>
+  <members age="130" children="//@members.9 //@members.86 //@members.87" parents="//@members.53 //@members.88"/>
+  <members parents="//@members.78 //@members.90"/>
+  <members age="78" children="//@members.0 //@members.83" parents="//@members.88 //@members.95"/>
+  <members age="156" children="//@members.4 //@members.44 //@members.62 //@members.87" parents="//@members.15 //@members.73"/>
+  <members parents="//@members.63 //@members.69"/>
+  <members age="221" children="//@members.4 //@members.13 //@members.35 //@members.73 //@members.78 //@members.88 //@members.95 //@members.97" parents="//@members.17 //@members.54"/>
+  <members age="13" children="//@members.37" parents="//@members.4 //@members.35"/>
+  <members age="247" children="//@members.15 //@members.54 //@members.71"/>
+  <members age="65" children="//@members.58 //@members.89" parents="//@members.67 //@members.88"/>
+  <members age="26" children="//@members.98" parents="//@members.56 //@members.82"/>
+  <members age="13" children="//@members.68" parents="//@members.46 //@members.95"/>
+  <members parents="//@members.8 //@members.75"/>
+  <members age="169" children="//@members.69 //@members.93 //@members.95 //@members.99" parents="//@members.53 //@members.73"/>
+  <members age="117" children="//@members.5 //@members.33 //@members.39 //@members.45 //@members.47 //@members.90" parents="//@members.50 //@members.76"/>
+  <members age="26" children="//@members.30 //@members.86" parents="//@members.49 //@members.66"/>
+  <members parents="//@members.1 //@members.88"/>
+  <members parents="//@members.98"/>
+  <members parents="//@members.28 //@members.35"/>
+  <members age="13" children="//@members.27" parents="//@members.29 //@members.97"/>
+  <members age="26" children="//@members.28" parents="//@members.4 //@members.35"/>
+  <members parents="//@members.24 //@members.35"/>
+  <members parents="//@members.75 //@members.77"/>
+  <members age="91" children="//@members.67" parents="//@members.55 //@members.87"/>
+  <members parents="//@members.23 //@members.82"/>
+  <members parents="//@members.59 //@members.86"/>
+  <members age="39" children="//@members.16 //@members.27 //@members.29 //@members.30" parents="//@members.1 //@members.15"/>
+  <members parents="//@members.53 //@members.73"/>
+  <members parents="//@members.16 //@members.78"/>
+  <members parents="//@members.0 //@members.43"/>
+  <members age="26" children="//@members.51" parents="//@members.23 //@members.50"/>
+  <members age="65" children="//@members.2 //@members.43" parents="//@members.52 //@members.87"/>
+  <members parents="//@members.88 //@members.95"/>
+  <members age="26" children="//@members.75" parents="//@members.9 //@members.62"/>
+  <members age="13" children="//@members.38" parents="//@members.40 //@members.73"/>
+  <members age="13" children="//@members.72" parents="//@members.13 //@members.50"/>
+  <members age="13" children="//@members.65" parents="//@members.23 //@members.83"/>
+  <members age="117" children="//@members.20 //@members.47 //@members.48" parents="//@members.55 //@members.73"/>
+  <members age="104" children="//@members.92" parents="//@members.23 //@members.46"/>
+  <members parents="//@members.8 //@members.46"/>
+  <members age="156" children="//@members.6 //@members.7 //@members.24 //@members.62 //@members.81 //@members.84" parents="//@members.53 //@members.78"/>
+  <members age="130" children="//@members.23 //@members.39 //@members.44 //@members.60" parents="//@members.55 //@members.78"/>
+  <members age="13" children="//@members.81" parents="//@members.39 //@members.61"/>
+  <members age="78" children="//@members.40" parents="//@members.53 //@members.92"/>
+  <members age="182" children="//@members.10 //@members.22 //@members.36 //@members.49 //@members.52 //@members.66 //@members.76 //@members.84" parents="//@members.73 //@members.78"/>
+  <members age="234" children="//@members.7 //@members.15 //@members.78 //@members.94" parents="//@members.17"/>
+  <members age="143" children="//@members.32 //@members.46 //@members.50 //@members.59" parents="//@members.73 //@members.76"/>
+  <members age="39" children="//@members.19" parents="//@members.59 //@members.73"/>
+  <members age="13" children="//@members.71" parents="//@members.62 //@members.93"/>
+  <members parents="//@members.9 //@members.18"/>
+  <members age="65" children="//@members.3 //@members.34 //@members.56 //@members.79" parents="//@members.55 //@members.73"/>
+  <members age="13" children="//@members.85" parents="//@members.50 //@members.66"/>
+  <members age="104" children="//@members.51 //@members.92" parents="//@members.9 //@members.66"/>
+  <members age="143" children="//@members.1 //@members.42 //@members.57 //@members.74 //@members.99" parents="//@members.13 //@members.49"/>
+  <members age="13" children="//@members.14" parents="//@members.69 //@members.73"/>
+  <members age="91" children="//@members.5" parents="//@members.95 //@members.97"/>
+  <members parents="//@members.45 //@members.97"/>
+  <members age="117" children="//@members.24 //@members.60 //@members.61 //@members.80" parents="//@members.53 //@members.74"/>
+  <members age="78" children="//@members.18" parents="//@members.32 //@members.69"/>
+  <members parents="//@members.6 //@members.20"/>
+  <members age="91" children="//@members.14 //@members.63 //@members.67" parents="//@members.22 //@members.78"/>
+  <members age="65" children="//@members.75 //@members.79" parents="//@members.1 //@members.5"/>
+  <members parents="//@members.17 //@members.57"/>
+  <members parents="//@members.44 //@members.74"/>
+  <members age="195" children="//@members.0 //@members.13 //@members.22 //@members.36 //@members.43 //@members.46 //@members.53 //@members.55 //@members.56 //@members.59 //@members.63 //@members.76" parents="//@members.15 //@members.78"/>
+  <members age="130" children="//@members.6 //@members.66 //@members.72 //@members.77" parents="//@members.62 //@members.97"/>
+  <members age="13" children="//@members.21 //@members.31" parents="//@members.42 //@members.70"/>
+  <members age="156" children="//@members.23 //@members.55 //@members.90" parents="//@members.53 //@members.73"/>
+  <members age="13" children="//@members.31" parents="//@members.74 //@members.89"/>
+  <members age="208" children="//@members.11 //@members.37 //@members.49 //@members.50 //@members.53 //@members.69 //@members.73 //@members.88" parents="//@members.15 //@members.54"/>
+  <members age="52" children="//@members.91 //@members.96" parents="//@members.59 //@members.70"/>
+  <members parents="//@members.7 //@members.66"/>
+  <members parents="//@members.49 //@members.51"/>
+  <members age="39" children="//@members.19 //@members.33" parents="//@members.2 //@members.89"/>
+  <members age="65" children="//@members.45 //@members.89" parents="//@members.9 //@members.12"/>
+  <members age="130" children="//@members.8 //@members.9 //@members.91" parents="//@members.49 //@members.53"/>
+  <members parents="//@members.60 //@members.87"/>
+  <members age="13" children="//@members.34" parents="//@members.10 //@members.24"/>
+  <members age="104" children="//@members.32 //@members.40 //@members.85" parents="//@members.10 //@members.13"/>
+  <members age="143" children="//@members.10 //@members.12 //@members.18 //@members.25 //@members.41" parents="//@members.15 //@members.78"/>
+  <members age="52" children="//@members.77 //@members.82" parents="//@members.18 //@members.83"/>
+  <members age="13" children="//@members.11" parents="//@members.23 //@members.76"/>
+  <members age="39" children="//@members.93" parents="//@members.79 //@members.84"/>
+  <members age="91" children="//@members.52" parents="//@members.47 //@members.61"/>
+  <members age="26" children="//@members.57 //@members.96" parents="//@members.22 //@members.91"/>
+  <members parents="//@members.4 //@members.54"/>
+  <members age="156" children="//@members.12 //@members.20 //@members.41 //@members.64 //@members.97" parents="//@members.15 //@members.22"/>
+  <members parents="//@members.79 //@members.93"/>
+  <members age="143" children="//@members.28 //@members.64 //@members.65 //@members.74 //@members.98" parents="//@members.15 //@members.95"/>
+  <members age="13" children="//@members.26" parents="//@members.19 //@members.97"/>
+  <members parents="//@members.22 //@members.62"/>
+</familytree:FamilyTree>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/10_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/10_1.xmi
new file mode 100644
index 00000000..c851f77c
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/10_1.xmi
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="ASCII"?>
+<familytree:FamilyTree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:familytree="http://www.example.org/familytree" xsi:schemaLocation="http://www.example.org/familytree ../case.study.familyTree.model/model/familytree.ecore">
+  <members children="//@members.13 //@members.17 //@members.20 //@members.23 //@members.25 //@members.58 //@members.77" parents="//@members.31 //@members.69"/>
+  <members children="//@members.27 //@members.29 //@members.30 //@members.31 //@members.42 //@members.44 //@members.64 //@members.76 //@members.79" parents="//@members.30 //@members.79"/>
+  <members parents="//@members.18 //@members.73"/>
+  <members children="//@members.55 //@members.63" parents="//@members.71 //@members.76"/>
+  <members children="//@members.12 //@members.18 //@members.21 //@members.83" parents="//@members.7 //@members.30"/>
+  <members children="//@members.74 //@members.84" parents="//@members.7 //@members.35"/>
+  <members parents="//@members.9 //@members.67"/>
+  <members children="//@members.4 //@members.5 //@members.8 //@members.33 //@members.45 //@members.91 //@members.96" parents="//@members.44 //@members.79"/>
+  <members children="//@members.15 //@members.33 //@members.45 //@members.58 //@members.76 //@members.99" parents="//@members.7 //@members.44"/>
+  <members children="//@members.6" parents="//@members.18 //@members.29"/>
+  <members parents="//@members.22 //@members.49"/>
+  <members parents="//@members.64 //@members.96"/>
+  <members parents="//@members.4 //@members.20"/>
+  <members parents="//@members.0 //@members.74"/>
+  <members parents="//@members.24 //@members.79"/>
+  <members children="//@members.21 //@members.31 //@members.35 //@members.65 //@members.97" parents="//@members.8 //@members.44"/>
+  <members parents="//@members.33 //@members.96"/>
+  <members parents="//@members.0 //@members.58"/>
+  <members children="//@members.2 //@members.9 //@members.46 //@members.81 //@members.94" parents="//@members.4 //@members.84"/>
+  <members children="//@members.26 //@members.53" parents="//@members.67 //@members.92"/>
+  <members children="//@members.12" parents="//@members.0 //@members.94"/>
+  <members children="//@members.52 //@members.54 //@members.60 //@members.90" parents="//@members.4 //@members.15"/>
+  <members children="//@members.10 //@members.56 //@members.61" parents="//@members.37 //@members.79"/>
+  <members parents="//@members.0 //@members.72"/>
+  <members children="//@members.14" parents="//@members.66 //@members.79"/>
+  <members parents="//@members.0 //@members.75"/>
+  <members children="//@members.46" parents="//@members.19 //@members.76"/>
+  <members parents="//@members.1 //@members.52"/>
+  <members parents="//@members.33 //@members.95"/>
+  <members children="//@members.9 //@members.32" parents="//@members.1 //@members.38"/>
+  <members children="//@members.1 //@members.4 //@members.35 //@members.37 //@members.44 //@members.51 //@members.54 //@members.59 //@members.66 //@members.91 //@members.96" parents="//@members.1 //@members.79"/>
+  <members children="//@members.0 //@members.82 //@members.88 //@members.92" parents="//@members.1 //@members.15"/>
+  <members parents="//@members.29 //@members.75"/>
+  <members children="//@members.16 //@members.28 //@members.34 //@members.72" parents="//@members.7 //@members.8"/>
+  <members parents="//@members.33 //@members.54"/>
+  <members children="//@members.5 //@members.69" parents="//@members.15 //@members.30"/>
+  <members children="//@members.60 //@members.80" parents="//@members.44 //@members.69"/>
+  <members children="//@members.22 //@members.53 //@members.92" parents="//@members.30 //@members.54"/>
+  <members children="//@members.29 //@members.67 //@members.83 //@members.85 //@members.89 //@members.97" parents="//@members.51 //@members.64"/>
+  <members parents="//@members.44 //@members.93"/>
+  <members children="//@members.72 //@members.75" parents="//@members.44 //@members.69"/>
+  <members parents="//@members.56 //@members.95"/>
+  <members parents="//@members.1 //@members.87"/>
+  <members parents="//@members.56 //@members.71"/>
+  <members children="//@members.7 //@members.8 //@members.15 //@members.36 //@members.39 //@members.40 //@members.47 //@members.64 //@members.78 //@members.79 //@members.85 //@members.95" parents="//@members.1 //@members.30"/>
+  <members parents="//@members.7 //@members.8"/>
+  <members parents="//@members.18 //@members.26"/>
+  <members parents="//@members.44 //@members.67"/>
+  <members children="//@members.62 //@members.73" parents="//@members.54 //@members.71"/>
+  <members children="//@members.10" parents="//@members.67 //@members.99"/>
+  <members parents="//@members.72 //@members.74"/>
+  <members children="//@members.38 //@members.69 //@members.71 //@members.90" parents="//@members.30 //@members.79"/>
+  <members children="//@members.27 //@members.75" parents="//@members.21 //@members.97"/>
+  <members parents="//@members.19 //@members.37"/>
+  <members children="//@members.34 //@members.37 //@members.48 //@members.81 //@members.93 //@members.99" parents="//@members.21 //@members.30"/>
+  <members parents="//@members.3 //@members.71"/>
+  <members children="//@members.41 //@members.43" parents="//@members.22 //@members.82"/>
+  <members parents="//@members.78 //@members.94"/>
+  <members children="//@members.17 //@members.61 //@members.80 //@members.82 //@members.93" parents="//@members.0 //@members.8"/>
+  <members children="//@members.89 //@members.95" parents="//@members.30 //@members.66"/>
+  <members children="//@members.86 //@members.88" parents="//@members.21 //@members.36"/>
+  <members parents="//@members.22 //@members.58"/>
+  <members parents="//@members.48 //@members.76"/>
+  <members parents="//@members.3 //@members.64"/>
+  <members children="//@members.11 //@members.38 //@members.63 //@members.66 //@members.98" parents="//@members.1 //@members.44"/>
+  <members parents="//@members.15 //@members.93"/>
+  <members children="//@members.24 //@members.59 //@members.67" parents="//@members.30 //@members.64"/>
+  <members children="//@members.6 //@members.19 //@members.47 //@members.49" parents="//@members.38 //@members.66"/>
+  <members parents="//@members.84 //@members.85"/>
+  <members children="//@members.0 //@members.36 //@members.40" parents="//@members.35 //@members.51"/>
+  <members/>
+  <members children="//@members.3 //@members.43 //@members.48 //@members.55" parents="//@members.51 //@members.76"/>
+  <members children="//@members.23 //@members.50" parents="//@members.33 //@members.40"/>
+  <members children="//@members.2" parents="//@members.48 //@members.82"/>
+  <members children="//@members.13 //@members.50" parents="//@members.5 //@members.79"/>
+  <members children="//@members.25 //@members.32" parents="//@members.40 //@members.52"/>
+  <members children="//@members.3 //@members.26 //@members.62 //@members.71 //@members.87" parents="//@members.1 //@members.8"/>
+  <members parents="//@members.0 //@members.84"/>
+  <members children="//@members.57" parents="//@members.44 //@members.91"/>
+  <members children="//@members.1 //@members.7 //@members.14 //@members.22 //@members.24 //@members.30 //@members.51 //@members.74 //@members.87" parents="//@members.1 //@members.44"/>
+  <members parents="//@members.36 //@members.58"/>
+  <members parents="//@members.18 //@members.54"/>
+  <members children="//@members.56 //@members.73" parents="//@members.31 //@members.58"/>
+  <members children="//@members.98" parents="//@members.4 //@members.38"/>
+  <members children="//@members.18 //@members.68 //@members.77" parents="//@members.5 //@members.99"/>
+  <members children="//@members.68" parents="//@members.38 //@members.44"/>
+  <members parents="//@members.60 //@members.91"/>
+  <members children="//@members.42" parents="//@members.76 //@members.79"/>
+  <members parents="//@members.31 //@members.60"/>
+  <members parents="//@members.38 //@members.59"/>
+  <members children="//@members.94" parents="//@members.21 //@members.51"/>
+  <members children="//@members.78 //@members.86" parents="//@members.7 //@members.30"/>
+  <members children="//@members.19" parents="//@members.31 //@members.37"/>
+  <members children="//@members.39 //@members.65" parents="//@members.54 //@members.58"/>
+  <members children="//@members.20 //@members.57" parents="//@members.18 //@members.90"/>
+  <members children="//@members.28 //@members.41" parents="//@members.44 //@members.59"/>
+  <members children="//@members.11 //@members.16" parents="//@members.7 //@members.30"/>
+  <members children="//@members.52" parents="//@members.15 //@members.38"/>
+  <members parents="//@members.64 //@members.83"/>
+  <members children="//@members.49 //@members.84" parents="//@members.8 //@members.54"/>
+</familytree:FamilyTree>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/1_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/1_1.xmi
new file mode 100644
index 00000000..d4e2a212
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/1_1.xmi
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="ASCII"?>
+<familytree:FamilyTree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:familytree="http://www.example.org/familytree" xsi:schemaLocation="http://www.example.org/familytree ../case.study.familyTree.model/model/familytree.ecore">
+  <members children="//@members.49 //@members.62 //@members.64 //@members.72 //@members.94 //@members.95" parents="//@members.37 //@members.50"/>
+  <members parents="//@members.53 //@members.55"/>
+  <members parents="//@members.24 //@members.72"/>
+  <members parents="//@members.24 //@members.35"/>
+  <members parents="//@members.15 //@members.31"/>
+  <members children="//@members.30 //@members.46 //@members.79 //@members.88 //@members.98" parents="//@members.27 //@members.78"/>
+  <members parents="//@members.64 //@members.87"/>
+  <members children="//@members.36" parents="//@members.9 //@members.28"/>
+  <members children="//@members.80 //@members.93" parents="//@members.40 //@members.77"/>
+  <members children="//@members.7 //@members.41" parents="//@members.43 //@members.94"/>
+  <members parents="//@members.13 //@members.80"/>
+  <members children="//@members.29 //@members.39 //@members.60 //@members.68" parents="//@members.28 //@members.58"/>
+  <members parents="//@members.63 //@members.97"/>
+  <members children="//@members.10 //@members.32 //@members.44" parents="//@members.64 //@members.76"/>
+  <members children="//@members.21 //@members.61 //@members.73" parents="//@members.18 //@members.50"/>
+  <members children="//@members.4 //@members.90" parents="//@members.27 //@members.77"/>
+  <members children="//@members.45 //@members.94" parents="//@members.28 //@members.86"/>
+  <members parents="//@members.31 //@members.57"/>
+  <members children="//@members.14 //@members.65" parents="//@members.43 //@members.77"/>
+  <members children="//@members.82" parents="//@members.78 //@members.91"/>
+  <members parents="//@members.27 //@members.89"/>
+  <members parents="//@members.14 //@members.90"/>
+  <members children="//@members.25 //@members.51 //@members.75" parents="//@members.37 //@members.74"/>
+  <members children="//@members.26" parents="//@members.43 //@members.64"/>
+  <members children="//@members.2 //@members.3 //@members.40 //@members.97" parents="//@members.46 //@members.62"/>
+  <members parents="//@members.22 //@members.27"/>
+  <members parents="//@members.23 //@members.82"/>
+  <members children="//@members.5 //@members.15 //@members.20 //@members.25 //@members.33 //@members.50 //@members.74 //@members.81 //@members.97 //@members.98" parents="//@members.37 //@members.89"/>
+  <members children="//@members.7 //@members.11 //@members.16 //@members.57" parents="//@members.34 //@members.77"/>
+  <members parents="//@members.11 //@members.38"/>
+  <members children="//@members.33 //@members.56 //@members.69 //@members.70" parents="//@members.5 //@members.63"/>
+  <members children="//@members.4 //@members.17 //@members.41" parents="//@members.76 //@members.94"/>
+  <members parents="//@members.13 //@members.93"/>
+  <members parents="//@members.27 //@members.30"/>
+  <members children="//@members.28 //@members.66 //@members.77 //@members.89 //@members.99" parents="//@members.43 //@members.77"/>
+  <members children="//@members.3" parents="//@members.48 //@members.78"/>
+  <members parents="//@members.7 //@members.85"/>
+  <members children="//@members.0 //@members.22 //@members.27 //@members.40 //@members.47 //@members.54 //@members.76 //@members.88 //@members.92 //@members.95 //@members.96" parents="//@members.77 //@members.78"/>
+  <members children="//@members.29 //@members.54 //@members.83 //@members.93" parents="//@members.76 //@members.85"/>
+  <members parents="//@members.11 //@members.61"/>
+  <members children="//@members.8" parents="//@members.24 //@members.37"/>
+  <members children="//@members.83" parents="//@members.9 //@members.31"/>
+  <members parents="//@members.43 //@members.75"/>
+  <members children="//@members.9 //@members.18 //@members.23 //@members.34 //@members.42 //@members.48 //@members.53 //@members.63 //@members.65 //@members.77 //@members.80 //@members.84" parents="//@members.77 //@members.78"/>
+  <members children="//@members.52" parents="//@members.13 //@members.74"/>
+  <members parents="//@members.16 //@members.86"/>
+  <members children="//@members.24" parents="//@members.5 //@members.48"/>
+  <members children="//@members.57" parents="//@members.37 //@members.63"/>
+  <members children="//@members.35 //@members.46 //@members.52 //@members.64 //@members.71" parents="//@members.43 //@members.99"/>
+  <members parents="//@members.0 //@members.77"/>
+  <members children="//@members.0 //@members.14 //@members.53 //@members.85" parents="//@members.27 //@members.65"/>
+  <members children="//@members.67" parents="//@members.22 //@members.96"/>
+  <members parents="//@members.44 //@members.48"/>
+  <members children="//@members.1 //@members.75" parents="//@members.43 //@members.50"/>
+  <members parents="//@members.37 //@members.38"/>
+  <members children="//@members.1" parents="//@members.80 //@members.85"/>
+  <members parents="//@members.30 //@members.74"/>
+  <members children="//@members.17" parents="//@members.28 //@members.47"/>
+  <members children="//@members.11 //@members.86 //@members.87" parents="//@members.65 //@members.77"/>
+  <members/>
+  <members children="//@members.66" parents="//@members.11 //@members.74"/>
+  <members children="//@members.39" parents="//@members.14 //@members.92"/>
+  <members children="//@members.24" parents="//@members.0 //@members.69"/>
+  <members children="//@members.12 //@members.30 //@members.47 //@members.82 //@members.91" parents="//@members.43 //@members.85"/>
+  <members children="//@members.6 //@members.13 //@members.23" parents="//@members.0 //@members.48"/>
+  <members children="//@members.50 //@members.58 //@members.69" parents="//@members.18 //@members.43"/>
+  <members children="//@members.79" parents="//@members.34 //@members.60"/>
+  <members parents="//@members.51 //@members.86"/>
+  <members parents="//@members.11 //@members.86"/>
+  <members children="//@members.62" parents="//@members.30 //@members.65"/>
+  <members children="//@members.81 //@members.96" parents="//@members.30 //@members.94"/>
+  <members parents="//@members.48 //@members.78"/>
+  <members children="//@members.2" parents="//@members.0 //@members.85"/>
+  <members children="//@members.91" parents="//@members.14 //@members.86"/>
+  <members children="//@members.22 //@members.44 //@members.56 //@members.60" parents="//@members.27 //@members.77"/>
+  <members children="//@members.42" parents="//@members.22 //@members.53"/>
+  <members children="//@members.13 //@members.31 //@members.38 //@members.90" parents="//@members.37 //@members.85"/>
+  <members children="//@members.8 //@members.15 //@members.18 //@members.28 //@members.34 //@members.37 //@members.43 //@members.49 //@members.58 //@members.74 //@members.78 //@members.89" parents="//@members.34 //@members.43"/>
+  <members children="//@members.5 //@members.19 //@members.35 //@members.37 //@members.43 //@members.71 //@members.92 //@members.99" parents="//@members.77 //@members.89"/>
+  <members parents="//@members.5 //@members.66"/>
+  <members children="//@members.10 //@members.55" parents="//@members.8 //@members.43"/>
+  <members parents="//@members.27 //@members.70"/>
+  <members children="//@members.26" parents="//@members.19 //@members.63"/>
+  <members parents="//@members.38 //@members.41"/>
+  <members parents="//@members.43 //@members.88"/>
+  <members children="//@members.36 //@members.38 //@members.55 //@members.63 //@members.72 //@members.76" parents="//@members.50 //@members.99"/>
+  <members children="//@members.16 //@members.45 //@members.67 //@members.68 //@members.73" parents="//@members.58 //@members.89"/>
+  <members children="//@members.6" parents="//@members.58 //@members.92"/>
+  <members children="//@members.84" parents="//@members.5 //@members.37"/>
+  <members children="//@members.20 //@members.27 //@members.78 //@members.86" parents="//@members.34 //@members.77"/>
+  <members children="//@members.21" parents="//@members.15 //@members.76"/>
+  <members children="//@members.19" parents="//@members.63 //@members.73"/>
+  <members children="//@members.61 //@members.87" parents="//@members.37 //@members.78"/>
+  <members children="//@members.32" parents="//@members.8 //@members.38"/>
+  <members children="//@members.9 //@members.31 //@members.70" parents="//@members.0 //@members.16"/>
+  <members parents="//@members.0 //@members.37"/>
+  <members children="//@members.51" parents="//@members.37 //@members.70"/>
+  <members children="//@members.12" parents="//@members.24 //@members.27"/>
+  <members parents="//@members.5 //@members.27"/>
+  <members children="//@members.48 //@members.85" parents="//@members.34 //@members.78"/>
+</familytree:FamilyTree>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/2_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/2_1.xmi
new file mode 100644
index 00000000..a2a7156f
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/2_1.xmi
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="ASCII"?>
+<familytree:FamilyTree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:familytree="http://www.example.org/familytree" xsi:schemaLocation="http://www.example.org/familytree ../case.study.familyTree.model/model/familytree.ecore">
+  <members children="//@members.28" parents="//@members.71 //@members.88"/>
+  <members parents="//@members.7 //@members.83"/>
+  <members children="//@members.56" parents="//@members.79 //@members.91"/>
+  <members children="//@members.37 //@members.48" parents="//@members.46 //@members.52"/>
+  <members parents="//@members.15 //@members.29"/>
+  <members parents="//@members.6 //@members.14"/>
+  <members children="//@members.5 //@members.25 //@members.30 //@members.32 //@members.39 //@members.75 //@members.81 //@members.83 //@members.92" parents="//@members.70 //@members.74"/>
+  <members children="//@members.1" parents="//@members.44 //@members.74"/>
+  <members children="//@members.59" parents="//@members.51 //@members.86"/>
+  <members/>
+  <members parents="//@members.46 //@members.58"/>
+  <members children="//@members.26 //@members.47" parents="//@members.41 //@members.75"/>
+  <members children="//@members.20 //@members.88" parents="//@members.17 //@members.93"/>
+  <members children="//@members.26 //@members.50" parents="//@members.29 //@members.79"/>
+  <members children="//@members.5 //@members.38" parents="//@members.77 //@members.78"/>
+  <members children="//@members.4 //@members.35 //@members.45" parents="//@members.46 //@members.95"/>
+  <members children="//@members.64 //@members.67 //@members.78" parents="//@members.46 //@members.95"/>
+  <members children="//@members.12 //@members.98" parents="//@members.70 //@members.75"/>
+  <members children="//@members.57" parents="//@members.61 //@members.99"/>
+  <members parents="//@members.46 //@members.63"/>
+  <members parents="//@members.12 //@members.42"/>
+  <members children="//@members.58" parents="//@members.46 //@members.54"/>
+  <members children="//@members.55" parents="//@members.62 //@members.65"/>
+  <members parents="//@members.45 //@members.93"/>
+  <members parents="//@members.54 //@members.89"/>
+  <members children="//@members.34 //@members.69" parents="//@members.6 //@members.71"/>
+  <members children="//@members.89" parents="//@members.11 //@members.13"/>
+  <members parents="//@members.70 //@members.98"/>
+  <members parents="//@members.0 //@members.87"/>
+  <members children="//@members.4 //@members.13 //@members.42 //@members.44 //@members.80" parents="//@members.74 //@members.79"/>
+  <members children="//@members.43 //@members.52 //@members.77" parents="//@members.6 //@members.34"/>
+  <members children="//@members.65" parents="//@members.69 //@members.70"/>
+  <members children="//@members.57" parents="//@members.6 //@members.68"/>
+  <members children="//@members.36 //@members.82" parents="//@members.46 //@members.86"/>
+  <members children="//@members.30 //@members.68 //@members.77" parents="//@members.25 //@members.95"/>
+  <members parents="//@members.15 //@members.46"/>
+  <members parents="//@members.33 //@members.93"/>
+  <members children="//@members.90" parents="//@members.3 //@members.95"/>
+  <members parents="//@members.14 //@members.96"/>
+  <members children="//@members.94" parents="//@members.6 //@members.70"/>
+  <members children="//@members.64" parents="//@members.93 //@members.99"/>
+  <members children="//@members.11 //@members.52 //@members.91" parents="//@members.79 //@members.95"/>
+  <members children="//@members.20 //@members.62" parents="//@members.29 //@members.86"/>
+  <members children="//@members.45 //@members.96" parents="//@members.30 //@members.71"/>
+  <members children="//@members.7 //@members.53 //@members.58" parents="//@members.29 //@members.93"/>
+  <members children="//@members.23" parents="//@members.15 //@members.43"/>
+  <members children="//@members.3 //@members.10 //@members.15 //@members.16 //@members.19 //@members.21 //@members.33 //@members.35 //@members.54 //@members.60" parents="//@members.71 //@members.74"/>
+  <members children="//@members.49" parents="//@members.11 //@members.71"/>
+  <members parents="//@members.3 //@members.79"/>
+  <members children="//@members.98" parents="//@members.47 //@members.99"/>
+  <members parents="//@members.13 //@members.63"/>
+  <members children="//@members.8 //@members.94" parents="//@members.67 //@members.96"/>
+  <members children="//@members.3 //@members.67 //@members.68 //@members.73 //@members.81" parents="//@members.30 //@members.41"/>
+  <members children="//@members.63" parents="//@members.44 //@members.79"/>
+  <members children="//@members.21 //@members.24 //@members.69 //@members.99" parents="//@members.46 //@members.79"/>
+  <members children="//@members.59" parents="//@members.22 //@members.58"/>
+  <members parents="//@members.2 //@members.73"/>
+  <members parents="//@members.18 //@members.32"/>
+  <members children="//@members.10 //@members.55 //@members.76 //@members.82" parents="//@members.21 //@members.44"/>
+  <members parents="//@members.8 //@members.55"/>
+  <members children="//@members.85" parents="//@members.46 //@members.99"/>
+  <members children="//@members.18" parents="//@members.71 //@members.73"/>
+  <members children="//@members.22" parents="//@members.42 //@members.69"/>
+  <members children="//@members.19 //@members.50" parents="//@members.53 //@members.82"/>
+  <members children="//@members.80" parents="//@members.16 //@members.40"/>
+  <members children="//@members.22 //@members.85" parents="//@members.31 //@members.99"/>
+  <members children="//@members.72" parents="//@members.81 //@members.87"/>
+  <members children="//@members.51" parents="//@members.16 //@members.52"/>
+  <members children="//@members.32 //@members.72" parents="//@members.34 //@members.52"/>
+  <members children="//@members.31 //@members.62 //@members.83 //@members.87" parents="//@members.25 //@members.54"/>
+  <members children="//@members.6 //@members.17 //@members.27 //@members.31 //@members.39 //@members.71 //@members.74 //@members.93" parents="//@members.74 //@members.95"/>
+  <members children="//@members.0 //@members.25 //@members.43 //@members.46 //@members.47 //@members.61 //@members.79 //@members.95 //@members.97 //@members.99" parents="//@members.70 //@members.95"/>
+  <members parents="//@members.66 //@members.68"/>
+  <members children="//@members.56 //@members.61" parents="//@members.52 //@members.93"/>
+  <members children="//@members.6 //@members.7 //@members.29 //@members.46 //@members.70 //@members.88 //@members.95" parents="//@members.70 //@members.95"/>
+  <members children="//@members.11 //@members.17 //@members.96" parents="//@members.6 //@members.93"/>
+  <members children="//@members.87" parents="//@members.58 //@members.92"/>
+  <members children="//@members.14" parents="//@members.30 //@members.34"/>
+  <members children="//@members.14" parents="//@members.16 //@members.91"/>
+  <members children="//@members.2 //@members.13 //@members.29 //@members.41 //@members.48 //@members.53 //@members.54 //@members.93" parents="//@members.71 //@members.95"/>
+  <members parents="//@members.29 //@members.64"/>
+  <members children="//@members.66" parents="//@members.6 //@members.52"/>
+  <members children="//@members.63" parents="//@members.33 //@members.58"/>
+  <members children="//@members.1" parents="//@members.6 //@members.69"/>
+  <members parents="//@members.86 //@members.94"/>
+  <members parents="//@members.60 //@members.65"/>
+  <members children="//@members.8 //@members.33 //@members.42 //@members.84 //@members.90" parents="//@members.92 //@members.95"/>
+  <members children="//@members.28 //@members.66" parents="//@members.69 //@members.76"/>
+  <members children="//@members.0" parents="//@members.12 //@members.74"/>
+  <members children="//@members.24" parents="//@members.26 //@members.98"/>
+  <members parents="//@members.37 //@members.86"/>
+  <members children="//@members.2 //@members.78" parents="//@members.41 //@members.93"/>
+  <members children="//@members.76 //@members.86" parents="//@members.6 //@members.95"/>
+  <members children="//@members.12 //@members.23 //@members.36 //@members.40 //@members.44 //@members.73 //@members.75 //@members.91 //@members.97" parents="//@members.70 //@members.79"/>
+  <members children="//@members.84" parents="//@members.39 //@members.51"/>
+  <members children="//@members.15 //@members.16 //@members.34 //@members.37 //@members.41 //@members.70 //@members.71 //@members.74 //@members.79 //@members.86 //@members.92" parents="//@members.71 //@members.74"/>
+  <members children="//@members.38 //@members.51" parents="//@members.43 //@members.75"/>
+  <members parents="//@members.71 //@members.93"/>
+  <members children="//@members.27 //@members.89" parents="//@members.17 //@members.49"/>
+  <members children="//@members.18 //@members.40 //@members.49 //@members.60 //@members.65" parents="//@members.54 //@members.71"/>
+</familytree:FamilyTree>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/3_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/3_1.xmi
new file mode 100644
index 00000000..d6c73be9
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/3_1.xmi
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="ASCII"?>
+<familytree:FamilyTree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:familytree="http://www.example.org/familytree" xsi:schemaLocation="http://www.example.org/familytree ../case.study.familyTree.model/model/familytree.ecore">
+  <members parents="//@members.7 //@members.77"/>
+  <members children="//@members.20" parents="//@members.55 //@members.83"/>
+  <members children="//@members.90" parents="//@members.63 //@members.76"/>
+  <members children="//@members.80" parents="//@members.26 //@members.27"/>
+  <members parents="//@members.21 //@members.85"/>
+  <members children="//@members.7 //@members.29" parents="//@members.48 //@members.61"/>
+  <members children="//@members.70" parents="//@members.35 //@members.76"/>
+  <members children="//@members.0" parents="//@members.5 //@members.67"/>
+  <members children="//@members.42" parents="//@members.12 //@members.69"/>
+  <members children="//@members.29 //@members.98" parents="//@members.11 //@members.25"/>
+  <members children="//@members.30 //@members.36 //@members.59" parents="//@members.40 //@members.55"/>
+  <members children="//@members.9 //@members.77 //@members.84" parents="//@members.19 //@members.67"/>
+  <members children="//@members.8 //@members.73 //@members.97" parents="//@members.61 //@members.76"/>
+  <members children="//@members.32 //@members.61 //@members.78 //@members.96" parents="//@members.40 //@members.56"/>
+  <members children="//@members.43 //@members.72" parents="//@members.32 //@members.62"/>
+  <members parents="//@members.53 //@members.78"/>
+  <members children="//@members.34 //@members.63" parents="//@members.25 //@members.40"/>
+  <members/>
+  <members parents="//@members.26 //@members.35"/>
+  <members children="//@members.11" parents="//@members.48 //@members.67"/>
+  <members children="//@members.28" parents="//@members.1 //@members.92"/>
+  <members children="//@members.4 //@members.35" parents="//@members.56 //@members.81"/>
+  <members parents="//@members.37 //@members.67"/>
+  <members children="//@members.41 //@members.45 //@members.85 //@members.89" parents="//@members.26 //@members.40"/>
+  <members parents="//@members.55 //@members.87"/>
+  <members children="//@members.9 //@members.16 //@members.50 //@members.70" parents="//@members.92 //@members.93"/>
+  <members children="//@members.3 //@members.18 //@members.23 //@members.35 //@members.57 //@members.75" parents="//@members.54 //@members.64"/>
+  <members children="//@members.3 //@members.28 //@members.45 //@members.52" parents="//@members.56 //@members.93"/>
+  <members parents="//@members.20 //@members.27"/>
+  <members parents="//@members.5 //@members.9"/>
+  <members children="//@members.44 //@members.88" parents="//@members.10 //@members.51"/>
+  <members parents="//@members.75 //@members.92"/>
+  <members children="//@members.14" parents="//@members.13 //@members.35"/>
+  <members parents="//@members.35 //@members.46"/>
+  <members parents="//@members.16 //@members.39"/>
+  <members children="//@members.6 //@members.18 //@members.32 //@members.33 //@members.42 //@members.95" parents="//@members.21 //@members.26"/>
+  <members children="//@members.46" parents="//@members.10 //@members.76"/>
+  <members children="//@members.22 //@members.51 //@members.58 //@members.68 //@members.83" parents="//@members.40 //@members.62"/>
+  <members children="//@members.88" parents="//@members.40 //@members.53"/>
+  <members children="//@members.34 //@members.59 //@members.61" parents="//@members.64 //@members.92"/>
+  <members children="//@members.10 //@members.13 //@members.16 //@members.23 //@members.37 //@members.38 //@members.55 //@members.67 //@members.76 //@members.79 //@members.87 //@members.91 //@members.93 //@members.95" parents="//@members.55 //@members.76"/>
+  <members parents="//@members.23 //@members.54"/>
+  <members children="//@members.43 //@members.80" parents="//@members.8 //@members.35"/>
+  <members parents="//@members.14 //@members.42"/>
+  <members children="//@members.53" parents="//@members.30 //@members.94"/>
+  <members parents="//@members.23 //@members.27"/>
+  <members children="//@members.33 //@members.99" parents="//@members.36 //@members.50"/>
+  <members parents="//@members.52 //@members.68"/>
+  <members children="//@members.5 //@members.19 //@members.62 //@members.67 //@members.75 //@members.84 //@members.89 //@members.92" parents="//@members.55 //@members.64"/>
+  <members children="//@members.69" parents="//@members.50 //@members.62"/>
+  <members children="//@members.46 //@members.49" parents="//@members.25 //@members.81"/>
+  <members children="//@members.30" parents="//@members.37 //@members.67"/>
+  <members children="//@members.47 //@members.86" parents="//@members.27 //@members.84"/>
+  <members children="//@members.15 //@members.38 //@members.65" parents="//@members.44 //@members.68"/>
+  <members children="//@members.26 //@members.41 //@members.77" parents="//@members.64 //@members.76"/>
+  <members children="//@members.1 //@members.10 //@members.24 //@members.40 //@members.48 //@members.56 //@members.64 //@members.73 //@members.76 //@members.92 //@members.94" parents="//@members.40 //@members.76"/>
+  <members children="//@members.13 //@members.21 //@members.27 //@members.58" parents="//@members.55 //@members.76"/>
+  <members parents="//@members.26 //@members.71"/>
+  <members parents="//@members.37 //@members.56"/>
+  <members parents="//@members.10 //@members.39"/>
+  <members parents="//@members.75 //@members.94"/>
+  <members children="//@members.5 //@members.12 //@members.97" parents="//@members.13 //@members.39"/>
+  <members children="//@members.14 //@members.37 //@members.49" parents="//@members.48 //@members.64"/>
+  <members children="//@members.2" parents="//@members.16 //@members.81"/>
+  <members children="//@members.26 //@members.39 //@members.48 //@members.54 //@members.62 //@members.82" parents="//@members.55 //@members.76"/>
+  <members children="//@members.66" parents="//@members.53 //@members.91"/>
+  <members children="//@members.72" parents="//@members.65 //@members.97"/>
+  <members children="//@members.7 //@members.11 //@members.19 //@members.22 //@members.51 //@members.74 //@members.96" parents="//@members.40 //@members.48"/>
+  <members children="//@members.47 //@members.53 //@members.87" parents="//@members.37 //@members.93"/>
+  <members children="//@members.8" parents="//@members.49 //@members.93"/>
+  <members parents="//@members.6 //@members.25"/>
+  <members children="//@members.57" parents="//@members.81 //@members.83"/>
+  <members parents="//@members.14 //@members.66"/>
+  <members parents="//@members.12 //@members.55"/>
+  <members parents="//@members.67 //@members.91"/>
+  <members children="//@members.31 //@members.60" parents="//@members.26 //@members.48"/>
+  <members children="//@members.2 //@members.6 //@members.12 //@members.36 //@members.40 //@members.54 //@members.55 //@members.56 //@members.64 //@members.79 //@members.81 //@members.91 //@members.93" parents="//@members.40 //@members.55"/>
+  <members children="//@members.0" parents="//@members.11 //@members.54"/>
+  <members children="//@members.15" parents="//@members.13 //@members.93"/>
+  <members parents="//@members.40 //@members.76"/>
+  <members parents="//@members.3 //@members.42"/>
+  <members children="//@members.21 //@members.50 //@members.63 //@members.71 //@members.94" parents="//@members.76 //@members.93"/>
+  <members parents="//@members.64 //@members.97"/>
+  <members children="//@members.1 //@members.71" parents="//@members.37 //@members.97"/>
+  <members children="//@members.52" parents="//@members.11 //@members.48"/>
+  <members children="//@members.4" parents="//@members.23 //@members.92"/>
+  <members parents="//@members.52 //@members.95"/>
+  <members children="//@members.24 //@members.90" parents="//@members.40 //@members.68"/>
+  <members children="//@members.99" parents="//@members.30 //@members.38"/>
+  <members parents="//@members.23 //@members.48"/>
+  <members parents="//@members.2 //@members.87"/>
+  <members children="//@members.65 //@members.74" parents="//@members.40 //@members.76"/>
+  <members children="//@members.20 //@members.25 //@members.31 //@members.39 //@members.85" parents="//@members.48 //@members.55"/>
+  <members children="//@members.25 //@members.27 //@members.68 //@members.69 //@members.78 //@members.81" parents="//@members.40 //@members.76"/>
+  <members children="//@members.44 //@members.60" parents="//@members.55 //@members.81"/>
+  <members children="//@members.86 //@members.98" parents="//@members.35 //@members.40"/>
+  <members parents="//@members.13 //@members.67"/>
+  <members children="//@members.66 //@members.82 //@members.83" parents="//@members.12 //@members.61"/>
+  <members parents="//@members.9 //@members.95"/>
+  <members parents="//@members.46 //@members.88"/>
+</familytree:FamilyTree>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/4_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/4_1.xmi
new file mode 100644
index 00000000..c185adfc
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/4_1.xmi
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="ASCII"?>
+<familytree:FamilyTree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:familytree="http://www.example.org/familytree" xsi:schemaLocation="http://www.example.org/familytree ../case.study.familyTree.model/model/familytree.ecore">
+  <members children="//@members.7 //@members.8 //@members.13 //@members.14 //@members.31 //@members.63 //@members.64 //@members.78 //@members.83 //@members.87 //@members.88" parents="//@members.13 //@members.64"/>
+  <members children="//@members.79" parents="//@members.68 //@members.88"/>
+  <members children="//@members.23" parents="//@members.14 //@members.47"/>
+  <members parents="//@members.40 //@members.88"/>
+  <members parents="//@members.66 //@members.73"/>
+  <members parents="//@members.34 //@members.41"/>
+  <members parents="//@members.31 //@members.66"/>
+  <members children="//@members.17 //@members.25 //@members.52 //@members.91" parents="//@members.0 //@members.78"/>
+  <members children="//@members.28 //@members.36 //@members.41" parents="//@members.0 //@members.68"/>
+  <members parents="//@members.37 //@members.48"/>
+  <members children="//@members.30 //@members.69" parents="//@members.15 //@members.87"/>
+  <members children="//@members.17" parents="//@members.37 //@members.92"/>
+  <members children="//@members.24 //@members.54 //@members.56 //@members.99" parents="//@members.35 //@members.78"/>
+  <members children="//@members.0 //@members.53 //@members.64 //@members.68 //@members.71 //@members.72 //@members.78" parents="//@members.0 //@members.64"/>
+  <members children="//@members.2 //@members.89" parents="//@members.0 //@members.52"/>
+  <members children="//@members.10 //@members.75 //@members.87" parents="//@members.72 //@members.87"/>
+  <members children="//@members.38 //@members.59" parents="//@members.21 //@members.83"/>
+  <members parents="//@members.7 //@members.11"/>
+  <members children="//@members.31 //@members.90 //@members.92 //@members.94" parents="//@members.78 //@members.88"/>
+  <members children="//@members.50 //@members.75 //@members.82" parents="//@members.68 //@members.80"/>
+  <members children="//@members.26 //@members.48" parents="//@members.37 //@members.64"/>
+  <members children="//@members.16 //@members.59" parents="//@members.63 //@members.86"/>
+  <members parents="//@members.34 //@members.75"/>
+  <members children="//@members.90" parents="//@members.2 //@members.78"/>
+  <members children="//@members.49" parents="//@members.12 //@members.91"/>
+  <members children="//@members.51" parents="//@members.7 //@members.27"/>
+  <members children="//@members.66 //@members.85" parents="//@members.20 //@members.35"/>
+  <members children="//@members.25 //@members.67 //@members.95" parents="//@members.36 //@members.88"/>
+  <members children="//@members.39 //@members.76" parents="//@members.8 //@members.72"/>
+  <members parents="//@members.35 //@members.78"/>
+  <members children="//@members.84" parents="//@members.10 //@members.43"/>
+  <members children="//@members.6 //@members.44 //@members.62" parents="//@members.0 //@members.18"/>
+  <members parents="//@members.82 //@members.94"/>
+  <members parents="//@members.76 //@members.82"/>
+  <members children="//@members.5 //@members.22" parents="//@members.56 //@members.80"/>
+  <members children="//@members.12 //@members.26 //@members.29 //@members.51 //@members.82 //@members.95" parents="//@members.64 //@members.86"/>
+  <members children="//@members.27 //@members.53 //@members.73 //@members.93" parents="//@members.8 //@members.92"/>
+  <members children="//@members.9 //@members.11 //@members.20 //@members.74 //@members.94" parents="//@members.64 //@members.68"/>
+  <members parents="//@members.16 //@members.75"/>
+  <members parents="//@members.28 //@members.43"/>
+  <members children="//@members.3 //@members.92" parents="//@members.60 //@members.63"/>
+  <members children="//@members.5 //@members.48" parents="//@members.8 //@members.43"/>
+  <members parents="//@members.64 //@members.81"/>
+  <members children="//@members.30 //@members.39 //@members.41 //@members.54 //@members.97" parents="//@members.56 //@members.78"/>
+  <members children="//@members.46" parents="//@members.31 //@members.86"/>
+  <members/>
+  <members children="//@members.57" parents="//@members.44 //@members.68"/>
+  <members children="//@members.2 //@members.77" parents="//@members.52 //@members.92"/>
+  <members children="//@members.9 //@members.49 //@members.61 //@members.67 //@members.97" parents="//@members.20 //@members.41"/>
+  <members parents="//@members.24 //@members.48"/>
+  <members parents="//@members.19 //@members.80"/>
+  <members parents="//@members.25 //@members.35"/>
+  <members children="//@members.14 //@members.47 //@members.55 //@members.66" parents="//@members.7 //@members.78"/>
+  <members parents="//@members.13 //@members.36"/>
+  <members children="//@members.65" parents="//@members.12 //@members.43"/>
+  <members children="//@members.74" parents="//@members.52 //@members.81"/>
+  <members children="//@members.34 //@members.43 //@members.65" parents="//@members.12 //@members.64"/>
+  <members children="//@members.62" parents="//@members.46 //@members.77"/>
+  <members parents="//@members.87 //@members.92"/>
+  <members children="//@members.79" parents="//@members.16 //@members.21"/>
+  <members children="//@members.40" parents="//@members.64 //@members.87"/>
+  <members children="//@members.77" parents="//@members.48 //@members.66"/>
+  <members parents="//@members.31 //@members.57"/>
+  <members children="//@members.21 //@members.40 //@members.69 //@members.81" parents="//@members.0 //@members.68"/>
+  <members children="//@members.0 //@members.13 //@members.20 //@members.35 //@members.37 //@members.42 //@members.56 //@members.60 //@members.72 //@members.86 //@members.96" parents="//@members.0 //@members.13"/>
+  <members children="//@members.85" parents="//@members.54 //@members.56"/>
+  <members children="//@members.4 //@members.6 //@members.61 //@members.70 //@members.83" parents="//@members.26 //@members.52"/>
+  <members parents="//@members.27 //@members.48"/>
+  <members children="//@members.1 //@members.8 //@members.19 //@members.37 //@members.46 //@members.63 //@members.80 //@members.91" parents="//@members.13 //@members.87"/>
+  <members parents="//@members.10 //@members.63"/>
+  <members parents="//@members.66 //@members.92"/>
+  <members children="//@members.73" parents="//@members.13 //@members.78"/>
+  <members children="//@members.15 //@members.28 //@members.80 //@members.96" parents="//@members.13 //@members.64"/>
+  <members children="//@members.4" parents="//@members.36 //@members.71"/>
+  <members parents="//@members.37 //@members.55"/>
+  <members children="//@members.22 //@members.38" parents="//@members.15 //@members.19"/>
+  <members children="//@members.33" parents="//@members.28 //@members.82"/>
+  <members children="//@members.57" parents="//@members.47 //@members.61"/>
+  <members children="//@members.7 //@members.12 //@members.18 //@members.23 //@members.29 //@members.43 //@members.52 //@members.71 //@members.88 //@members.98" parents="//@members.0 //@members.13"/>
+  <members parents="//@members.1 //@members.59"/>
+  <members children="//@members.19 //@members.34 //@members.50 //@members.89" parents="//@members.68 //@members.72"/>
+  <members children="//@members.42 //@members.55" parents="//@members.63 //@members.88"/>
+  <members children="//@members.32 //@members.33 //@members.76 //@members.84" parents="//@members.19 //@members.35"/>
+  <members children="//@members.16 //@members.99" parents="//@members.0 //@members.66"/>
+  <members parents="//@members.30 //@members.82"/>
+  <members parents="//@members.26 //@members.65"/>
+  <members children="//@members.21 //@members.35 //@members.44 //@members.93" parents="//@members.64 //@members.87"/>
+  <members children="//@members.10 //@members.15 //@members.58 //@members.60 //@members.68 //@members.86" parents="//@members.0 //@members.15"/>
+  <members children="//@members.1 //@members.3 //@members.18 //@members.27 //@members.81" parents="//@members.0 //@members.78"/>
+  <members parents="//@members.14 //@members.80"/>
+  <members parents="//@members.18 //@members.23"/>
+  <members children="//@members.24" parents="//@members.7 //@members.68"/>
+  <members children="//@members.11 //@members.36 //@members.47 //@members.58 //@members.70" parents="//@members.18 //@members.40"/>
+  <members children="//@members.98" parents="//@members.36 //@members.86"/>
+  <members children="//@members.32" parents="//@members.18 //@members.37"/>
+  <members parents="//@members.27 //@members.35"/>
+  <members parents="//@members.64 //@members.72"/>
+  <members parents="//@members.43 //@members.48"/>
+  <members parents="//@members.78 //@members.93"/>
+  <members parents="//@members.12 //@members.83"/>
+</familytree:FamilyTree>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/5_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/5_1.xmi
new file mode 100644
index 00000000..0a806b53
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/5_1.xmi
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="ASCII"?>
+<familytree:FamilyTree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:familytree="http://www.example.org/familytree" xsi:schemaLocation="http://www.example.org/familytree ../case.study.familyTree.model/model/familytree.ecore">
+  <members parents="//@members.52 //@members.82"/>
+  <members parents="//@members.40 //@members.94"/>
+  <members children="//@members.3 //@members.16 //@members.47" parents="//@members.86 //@members.96"/>
+  <members children="//@members.79" parents="//@members.2 //@members.11"/>
+  <members children="//@members.65" parents="//@members.13 //@members.99"/>
+  <members parents="//@members.86 //@members.97"/>
+  <members children="//@members.50" parents="//@members.34 //@members.41"/>
+  <members children="//@members.12 //@members.25 //@members.34 //@members.36 //@members.39 //@members.46 //@members.51 //@members.53 //@members.75 //@members.78" parents="//@members.13 //@members.60"/>
+  <members children="//@members.35" parents="//@members.13 //@members.27"/>
+  <members children="//@members.55" parents="//@members.23 //@members.41"/>
+  <members parents="//@members.43 //@members.83"/>
+  <members children="//@members.3 //@members.35" parents="//@members.62 //@members.72"/>
+  <members children="//@members.45 //@members.46 //@members.98 //@members.99" parents="//@members.7 //@members.13"/>
+  <members children="//@members.4 //@members.7 //@members.8 //@members.12 //@members.18 //@members.44 //@members.57 //@members.58 //@members.60 //@members.70 //@members.75 //@members.86 //@members.88 //@members.96" parents="//@members.60 //@members.86"/>
+  <members parents="//@members.49 //@members.61"/>
+  <members parents="//@members.39 //@members.90"/>
+  <members parents="//@members.2 //@members.71"/>
+  <members children="//@members.95" parents="//@members.48 //@members.90"/>
+  <members children="//@members.83 //@members.93" parents="//@members.13 //@members.21"/>
+  <members parents="//@members.22 //@members.52"/>
+  <members children="//@members.37 //@members.48 //@members.90" parents="//@members.32 //@members.97"/>
+  <members children="//@members.18 //@members.22 //@members.70 //@members.92" parents="//@members.51 //@members.60"/>
+  <members children="//@members.19 //@members.81 //@members.82" parents="//@members.21 //@members.60"/>
+  <members children="//@members.9 //@members.28 //@members.33 //@members.66" parents="//@members.72 //@members.88"/>
+  <members parents="//@members.49 //@members.79"/>
+  <members children="//@members.27 //@members.52" parents="//@members.7 //@members.34"/>
+  <members parents="//@members.53 //@members.61"/>
+  <members children="//@members.8" parents="//@members.25 //@members.99"/>
+  <members children="//@members.68" parents="//@members.23 //@members.92"/>
+  <members/>
+  <members children="//@members.42 //@members.67" parents="//@members.60 //@members.92"/>
+  <members parents="//@members.37 //@members.39"/>
+  <members children="//@members.20 //@members.34 //@members.39 //@members.49" parents="//@members.86 //@members.96"/>
+  <members children="//@members.98" parents="//@members.23 //@members.78"/>
+  <members children="//@members.6 //@members.25 //@members.38 //@members.49 //@members.63 //@members.69 //@members.78 //@members.87" parents="//@members.7 //@members.32"/>
+  <members parents="//@members.8 //@members.11"/>
+  <members children="//@members.89 //@members.91" parents="//@members.7 //@members.78"/>
+  <members children="//@members.31" parents="//@members.20 //@members.57"/>
+  <members parents="//@members.34 //@members.58"/>
+  <members children="//@members.15 //@members.31 //@members.54 //@members.61 //@members.84" parents="//@members.7 //@members.32"/>
+  <members children="//@members.1" parents="//@members.47 //@members.51"/>
+  <members children="//@members.6 //@members.9 //@members.97 //@members.99" parents="//@members.51 //@members.78"/>
+  <members parents="//@members.30 //@members.88"/>
+  <members children="//@members.10 //@members.85 //@members.94" parents="//@members.55 //@members.89"/>
+  <members children="//@members.59" parents="//@members.13 //@members.67"/>
+  <members parents="//@members.12 //@members.90"/>
+  <members children="//@members.59 //@members.77 //@members.95" parents="//@members.7 //@members.12"/>
+  <members children="//@members.40" parents="//@members.2 //@members.53"/>
+  <members children="//@members.17" parents="//@members.20 //@members.51"/>
+  <members children="//@members.14 //@members.24" parents="//@members.32 //@members.34"/>
+  <members children="//@members.81" parents="//@members.6 //@members.75"/>
+  <members children="//@members.21 //@members.40 //@members.41 //@members.48 //@members.56 //@members.58 //@members.72 //@members.74 //@members.76 //@members.93" parents="//@members.7 //@members.86"/>
+  <members children="//@members.0 //@members.19 //@members.73 //@members.85" parents="//@members.25 //@members.88"/>
+  <members children="//@members.26 //@members.47" parents="//@members.7 //@members.75"/>
+  <members parents="//@members.39 //@members.60"/>
+  <members children="//@members.43 //@members.64" parents="//@members.9 //@members.71"/>
+  <members parents="//@members.51 //@members.74"/>
+  <members children="//@members.37" parents="//@members.13 //@members.89"/>
+  <members children="//@members.38 //@members.63" parents="//@members.13 //@members.51"/>
+  <members parents="//@members.44 //@members.46"/>
+  <members children="//@members.7 //@members.13 //@members.21 //@members.22 //@members.30 //@members.54 //@members.74 //@members.86 //@members.96" parents="//@members.13 //@members.86"/>
+  <members children="//@members.14 //@members.26" parents="//@members.39 //@members.75"/>
+  <members children="//@members.11 //@members.76" parents="//@members.75 //@members.89"/>
+  <members children="//@members.65" parents="//@members.34 //@members.58"/>
+  <members parents="//@members.55 //@members.83"/>
+  <members parents="//@members.4 //@members.63"/>
+  <members parents="//@members.23 //@members.83"/>
+  <members children="//@members.44" parents="//@members.30 //@members.74"/>
+  <members parents="//@members.28 //@members.97"/>
+  <members children="//@members.71 //@members.88" parents="//@members.34 //@members.96"/>
+  <members children="//@members.80 //@members.84 //@members.89" parents="//@members.13 //@members.21"/>
+  <members children="//@members.16 //@members.55 //@members.77" parents="//@members.69 //@members.74"/>
+  <members children="//@members.11 //@members.23" parents="//@members.51 //@members.75"/>
+  <members parents="//@members.52 //@members.93"/>
+  <members children="//@members.56 //@members.67 //@members.71" parents="//@members.51 //@members.60"/>
+  <members children="//@members.50 //@members.53 //@members.61 //@members.62 //@members.72" parents="//@members.7 //@members.13"/>
+  <members parents="//@members.51 //@members.62"/>
+  <members parents="//@members.46 //@members.71"/>
+  <members children="//@members.33 //@members.36 //@members.41 //@members.91 //@members.97" parents="//@members.7 //@members.34"/>
+  <members children="//@members.24" parents="//@members.3 //@members.97"/>
+  <members parents="//@members.70 //@members.91"/>
+  <members parents="//@members.22 //@members.50"/>
+  <members children="//@members.0" parents="//@members.22 //@members.84"/>
+  <members children="//@members.10 //@members.64 //@members.66 //@members.90" parents="//@members.18 //@members.89"/>
+  <members children="//@members.82" parents="//@members.39 //@members.70"/>
+  <members parents="//@members.43 //@members.52"/>
+  <members children="//@members.2 //@members.5 //@members.13 //@members.32 //@members.51 //@members.60" parents="//@members.13 //@members.60"/>
+  <members parents="//@members.34 //@members.99"/>
+  <members children="//@members.23 //@members.42 //@members.52" parents="//@members.13 //@members.69"/>
+  <members children="//@members.43 //@members.57 //@members.62 //@members.83" parents="//@members.36 //@members.70"/>
+  <members children="//@members.15 //@members.17 //@members.45" parents="//@members.20 //@members.83"/>
+  <members children="//@members.80 //@members.92 //@members.94" parents="//@members.36 //@members.78"/>
+  <members children="//@members.28 //@members.30" parents="//@members.21 //@members.91"/>
+  <members children="//@members.73" parents="//@members.18 //@members.51"/>
+  <members children="//@members.1" parents="//@members.43 //@members.91"/>
+  <members parents="//@members.17 //@members.46"/>
+  <members children="//@members.2 //@members.32 //@members.69" parents="//@members.13 //@members.60"/>
+  <members children="//@members.5 //@members.20 //@members.68 //@members.79" parents="//@members.41 //@members.78"/>
+  <members parents="//@members.12 //@members.33"/>
+  <members children="//@members.4 //@members.27 //@members.87" parents="//@members.12 //@members.41"/>
+</familytree:FamilyTree>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/6_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/6_1.xmi
new file mode 100644
index 00000000..7718a1a4
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/6_1.xmi
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="ASCII"?>
+<familytree:FamilyTree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:familytree="http://www.example.org/familytree" xsi:schemaLocation="http://www.example.org/familytree ../case.study.familyTree.model/model/familytree.ecore">
+  <members children="//@members.16 //@members.22 //@members.25 //@members.30 //@members.67 //@members.96" parents="//@members.49 //@members.53"/>
+  <members parents="//@members.2 //@members.68"/>
+  <members children="//@members.1 //@members.8 //@members.22 //@members.37 //@members.74" parents="//@members.36 //@members.41"/>
+  <members children="//@members.43 //@members.87" parents="//@members.9 //@members.49"/>
+  <members children="//@members.45" parents="//@members.10 //@members.27"/>
+  <members children="//@members.43 //@members.47" parents="//@members.44 //@members.73"/>
+  <members children="//@members.48" parents="//@members.41 //@members.72"/>
+  <members parents="//@members.19 //@members.96"/>
+  <members children="//@members.30 //@members.54 //@members.93" parents="//@members.2 //@members.39"/>
+  <members children="//@members.3 //@members.19 //@members.35 //@members.36 //@members.38 //@members.39 //@members.42 //@members.49 //@members.50 //@members.82 //@members.90 //@members.93 //@members.97" parents="//@members.36 //@members.39"/>
+  <members children="//@members.4 //@members.21 //@members.66" parents="//@members.31 //@members.49"/>
+  <members children="//@members.14 //@members.88" parents="//@members.20 //@members.55"/>
+  <members children="//@members.99" parents="//@members.50 //@members.63"/>
+  <members children="//@members.20" parents="//@members.36 //@members.41"/>
+  <members parents="//@members.11 //@members.69"/>
+  <members parents="//@members.38 //@members.56"/>
+  <members children="//@members.23 //@members.48" parents="//@members.0 //@members.36"/>
+  <members children="//@members.27 //@members.56" parents="//@members.42 //@members.86"/>
+  <members parents="//@members.45 //@members.96"/>
+  <members children="//@members.7" parents="//@members.9 //@members.31"/>
+  <members children="//@members.11 //@members.34 //@members.86" parents="//@members.13 //@members.71"/>
+  <members children="//@members.98" parents="//@members.10 //@members.53"/>
+  <members children="//@members.68" parents="//@members.0 //@members.2"/>
+  <members parents="//@members.16 //@members.71"/>
+  <members children="//@members.69 //@members.77 //@members.94 //@members.96" parents="//@members.61 //@members.97"/>
+  <members parents="//@members.0 //@members.38"/>
+  <members parents="//@members.32 //@members.49"/>
+  <members children="//@members.4 //@members.65" parents="//@members.17 //@members.86"/>
+  <members parents="//@members.61 //@members.88"/>
+  <members parents="//@members.70 //@members.95"/>
+  <members children="//@members.80" parents="//@members.0 //@members.8"/>
+  <members children="//@members.10 //@members.19" parents="//@members.55 //@members.59"/>
+  <members children="//@members.26" parents="//@members.82 //@members.84"/>
+  <members parents="//@members.61 //@members.89"/>
+  <members parents="//@members.20 //@members.67"/>
+  <members parents="//@members.9 //@members.44"/>
+  <members children="//@members.2 //@members.9 //@members.13 //@members.16 //@members.41 //@members.42 //@members.53 //@members.59 //@members.62 //@members.82" parents="//@members.9 //@members.39"/>
+  <members children="//@members.63" parents="//@members.2 //@members.86"/>
+  <members children="//@members.15 //@members.25 //@members.47 //@members.70" parents="//@members.9 //@members.62"/>
+  <members children="//@members.8 //@members.9 //@members.36 //@members.41 //@members.45 //@members.53 //@members.61 //@members.64 //@members.84" parents="//@members.9 //@members.53"/>
+  <members children="//@members.89" parents="//@members.67 //@members.73"/>
+  <members children="//@members.2 //@members.6 //@members.13 //@members.71" parents="//@members.36 //@members.39"/>
+  <members children="//@members.17 //@members.49 //@members.60" parents="//@members.9 //@members.36"/>
+  <members children="//@members.99" parents="//@members.3 //@members.5"/>
+  <members children="//@members.5 //@members.35 //@members.59 //@members.67 //@members.76" parents="//@members.53 //@members.82"/>
+  <members children="//@members.18 //@members.46 //@members.52" parents="//@members.4 //@members.39"/>
+  <members parents="//@members.45 //@members.98"/>
+  <members children="//@members.65 //@members.68" parents="//@members.5 //@members.38"/>
+  <members parents="//@members.6 //@members.16"/>
+  <members children="//@members.0 //@members.3 //@members.10 //@members.26 //@members.97" parents="//@members.9 //@members.42"/>
+  <members children="//@members.12 //@members.55 //@members.88" parents="//@members.9 //@members.54"/>
+  <members parents="//@members.59 //@members.62"/>
+  <members parents="//@members.45 //@members.69"/>
+  <members children="//@members.0 //@members.21 //@members.39 //@members.44 //@members.62 //@members.83 //@members.86 //@members.90 //@members.92" parents="//@members.36 //@members.39"/>
+  <members children="//@members.50" parents="//@members.8 //@members.83"/>
+  <members children="//@members.11 //@members.31 //@members.64" parents="//@members.50 //@members.73"/>
+  <members children="//@members.15 //@members.75" parents="//@members.17 //@members.64"/>
+  <members/>
+  <members parents="//@members.91 //@members.98"/>
+  <members children="//@members.31 //@members.51" parents="//@members.36 //@members.44"/>
+  <members children="//@members.94" parents="//@members.42 //@members.95"/>
+  <members children="//@members.24 //@members.28 //@members.33 //@members.66" parents="//@members.39 //@members.84"/>
+  <members children="//@members.38 //@members.51 //@members.69 //@members.70 //@members.73" parents="//@members.36 //@members.53"/>
+  <members children="//@members.12 //@members.81" parents="//@members.37 //@members.82"/>
+  <members children="//@members.56" parents="//@members.39 //@members.55"/>
+  <members parents="//@members.27 //@members.47"/>
+  <members parents="//@members.10 //@members.61"/>
+  <members children="//@members.34 //@members.40 //@members.77" parents="//@members.0 //@members.44"/>
+  <members children="//@members.1" parents="//@members.22 //@members.47"/>
+  <members children="//@members.14 //@members.52" parents="//@members.24 //@members.62"/>
+  <members children="//@members.29 //@members.81 //@members.91" parents="//@members.38 //@members.62"/>
+  <members children="//@members.20 //@members.23 //@members.74 //@members.85 //@members.92" parents="//@members.41 //@members.82"/>
+  <members children="//@members.6" parents="//@members.74 //@members.90"/>
+  <members children="//@members.5 //@members.40 //@members.55 //@members.78 //@members.83" parents="//@members.62 //@members.90"/>
+  <members children="//@members.72 //@members.78 //@members.95" parents="//@members.2 //@members.71"/>
+  <members children="//@members.80" parents="//@members.56 //@members.82"/>
+  <members children="//@members.89" parents="//@members.44 //@members.88"/>
+  <members parents="//@members.24 //@members.67"/>
+  <members parents="//@members.73 //@members.74"/>
+  <members parents="//@members.88 //@members.92"/>
+  <members parents="//@members.30 //@members.75"/>
+  <members parents="//@members.63 //@members.70"/>
+  <members children="//@members.32 //@members.44 //@members.63 //@members.71 //@members.75 //@members.95" parents="//@members.9 //@members.36"/>
+  <members children="//@members.54 //@members.84 //@members.87" parents="//@members.53 //@members.73"/>
+  <members children="//@members.32 //@members.61" parents="//@members.39 //@members.83"/>
+  <members parents="//@members.71 //@members.90"/>
+  <members children="//@members.17 //@members.27 //@members.37" parents="//@members.20 //@members.53"/>
+  <members parents="//@members.3 //@members.83"/>
+  <members children="//@members.28 //@members.76 //@members.79 //@members.91" parents="//@members.11 //@members.50"/>
+  <members children="//@members.33" parents="//@members.40 //@members.76"/>
+  <members children="//@members.72 //@members.73 //@members.85" parents="//@members.9 //@members.53"/>
+  <members children="//@members.58" parents="//@members.70 //@members.88"/>
+  <members children="//@members.79 //@members.98" parents="//@members.53 //@members.71"/>
+  <members parents="//@members.8 //@members.9"/>
+  <members parents="//@members.24 //@members.60"/>
+  <members children="//@members.29 //@members.60" parents="//@members.74 //@members.82"/>
+  <members children="//@members.7 //@members.18" parents="//@members.0 //@members.24"/>
+  <members children="//@members.24" parents="//@members.9 //@members.49"/>
+  <members children="//@members.46 //@members.58" parents="//@members.21 //@members.92"/>
+  <members parents="//@members.12 //@members.43"/>
+</familytree:FamilyTree>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/7_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/7_1.xmi
new file mode 100644
index 00000000..55a1f039
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/7_1.xmi
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="ASCII"?>
+<familytree:FamilyTree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:familytree="http://www.example.org/familytree" xsi:schemaLocation="http://www.example.org/familytree ../case.study.familyTree.model/model/familytree.ecore">
+  <members children="//@members.62" parents="//@members.6 //@members.12"/>
+  <members parents="//@members.73 //@members.97"/>
+  <members parents="//@members.4 //@members.59"/>
+  <members children="//@members.30 //@members.94" parents="//@members.10 //@members.51"/>
+  <members children="//@members.2 //@members.66 //@members.88 //@members.98" parents="//@members.30 //@members.72"/>
+  <members children="//@members.21 //@members.32 //@members.43" parents="//@members.11 //@members.42"/>
+  <members children="//@members.0 //@members.14 //@members.40 //@members.45 //@members.46 //@members.48 //@members.51 //@members.76 //@members.92 //@members.96" parents="//@members.36 //@members.49"/>
+  <members children="//@members.57 //@members.61" parents="//@members.44 //@members.91"/>
+  <members parents="//@members.66 //@members.87"/>
+  <members children="//@members.12 //@members.20" parents="//@members.36 //@members.72"/>
+  <members children="//@members.3 //@members.25 //@members.63 //@members.80" parents="//@members.36 //@members.83"/>
+  <members children="//@members.5 //@members.64 //@members.86 //@members.91 //@members.99" parents="//@members.37 //@members.50"/>
+  <members children="//@members.0" parents="//@members.9 //@members.56"/>
+  <members parents="//@members.47 //@members.70"/>
+  <members children="//@members.39 //@members.84" parents="//@members.6 //@members.63"/>
+  <members children="//@members.26 //@members.82" parents="//@members.36 //@members.38"/>
+  <members children="//@members.23" parents="//@members.44 //@members.99"/>
+  <members children="//@members.28 //@members.41 //@members.76 //@members.83 //@members.87 //@members.88" parents="//@members.41 //@members.83"/>
+  <members parents="//@members.46 //@members.61"/>
+  <members children="//@members.93" parents="//@members.76 //@members.86"/>
+  <members parents="//@members.9 //@members.80"/>
+  <members children="//@members.65 //@members.75 //@members.81" parents="//@members.5 //@members.54"/>
+  <members children="//@members.60" parents="//@members.34 //@members.83"/>
+  <members parents="//@members.16 //@members.72"/>
+  <members parents="//@members.69 //@members.89"/>
+  <members children="//@members.48" parents="//@members.10 //@members.56"/>
+  <members children="//@members.34 //@members.35 //@members.57" parents="//@members.15 //@members.44"/>
+  <members parents="//@members.41 //@members.46"/>
+  <members children="//@members.93" parents="//@members.17 //@members.72"/>
+  <members parents="//@members.50 //@members.66"/>
+  <members children="//@members.4" parents="//@members.3 //@members.78"/>
+  <members children="//@members.39 //@members.54" parents="//@members.70 //@members.79"/>
+  <members children="//@members.53" parents="//@members.5 //@members.39"/>
+  <members children="//@members.56 //@members.82" parents="//@members.78 //@members.79"/>
+  <members children="//@members.22 //@members.40" parents="//@members.26 //@members.41"/>
+  <members children="//@members.91" parents="//@members.26 //@members.36"/>
+  <members children="//@members.6 //@members.9 //@members.10 //@members.15 //@members.35 //@members.45 //@members.49 //@members.50 //@members.70 //@members.80 //@members.87" parents="//@members.41 //@members.83"/>
+  <members children="//@members.11 //@members.69 //@members.78 //@members.79" parents="//@members.70 //@members.83"/>
+  <members children="//@members.15 //@members.73 //@members.84" parents="//@members.42 //@members.72"/>
+  <members children="//@members.32" parents="//@members.14 //@members.31"/>
+  <members parents="//@members.6 //@members.34"/>
+  <members children="//@members.17 //@members.27 //@members.34 //@members.36 //@members.44 //@members.62 //@members.70 //@members.79 //@members.83 //@members.86 //@members.89 //@members.95" parents="//@members.17 //@members.83"/>
+  <members children="//@members.5 //@members.38" parents="//@members.44 //@members.76"/>
+  <members children="//@members.90" parents="//@members.5 //@members.99"/>
+  <members children="//@members.7 //@members.16 //@members.26 //@members.42 //@members.46 //@members.47 //@members.52" parents="//@members.41 //@members.72"/>
+  <members children="//@members.74" parents="//@members.6 //@members.36"/>
+  <members children="//@members.18 //@members.27" parents="//@members.6 //@members.44"/>
+  <members children="//@members.13 //@members.51 //@members.90" parents="//@members.44 //@members.49"/>
+  <members parents="//@members.6 //@members.25"/>
+  <members children="//@members.6 //@members.47" parents="//@members.36 //@members.83"/>
+  <members children="//@members.11 //@members.29 //@members.66 //@members.97" parents="//@members.36 //@members.51"/>
+  <members children="//@members.3 //@members.50 //@members.67 //@members.99" parents="//@members.6 //@members.47"/>
+  <members children="//@members.77" parents="//@members.44 //@members.76"/>
+  <members parents="//@members.32 //@members.62"/>
+  <members children="//@members.21" parents="//@members.31 //@members.76"/>
+  <members parents="//@members.57 //@members.58"/>
+  <members children="//@members.12 //@members.25" parents="//@members.33 //@members.63"/>
+  <members children="//@members.55 //@members.77" parents="//@members.7 //@members.26"/>
+  <members children="//@members.55 //@members.81" parents="//@members.61 //@members.89"/>
+  <members children="//@members.2 //@members.67 //@members.71 //@members.74" parents="//@members.83 //@members.87"/>
+  <members parents="//@members.22 //@members.77"/>
+  <members children="//@members.18 //@members.58" parents="//@members.7 //@members.76"/>
+  <members children="//@members.53 //@members.65" parents="//@members.0 //@members.41"/>
+  <members children="//@members.14 //@members.56 //@members.97" parents="//@members.10 //@members.92"/>
+  <members parents="//@members.11 //@members.69"/>
+  <members parents="//@members.21 //@members.62"/>
+  <members children="//@members.8 //@members.29" parents="//@members.4 //@members.50"/>
+  <members parents="//@members.51 //@members.59"/>
+  <members parents="//@members.70 //@members.87"/>
+  <members children="//@members.24 //@members.64" parents="//@members.37 //@members.86"/>
+  <members children="//@members.13 //@members.31 //@members.37 //@members.68 //@members.72" parents="//@members.36 //@members.41"/>
+  <members parents="//@members.59 //@members.79"/>
+  <members children="//@members.4 //@members.9 //@members.23 //@members.28 //@members.38 //@members.44 //@members.78" parents="//@members.70 //@members.76"/>
+  <members children="//@members.1" parents="//@members.38 //@members.94"/>
+  <members parents="//@members.45 //@members.59"/>
+  <members parents="//@members.21 //@members.96"/>
+  <members children="//@members.19 //@members.42 //@members.52 //@members.54 //@members.61 //@members.72 //@members.89" parents="//@members.6 //@members.17"/>
+  <members children="//@members.60" parents="//@members.52 //@members.57"/>
+  <members children="//@members.30 //@members.33 //@members.94 //@members.95 //@members.98" parents="//@members.37 //@members.72"/>
+  <members children="//@members.31 //@members.33 //@members.71 //@members.92" parents="//@members.37 //@members.41"/>
+  <members children="//@members.20" parents="//@members.10 //@members.36"/>
+  <members parents="//@members.21 //@members.58"/>
+  <members parents="//@members.15 //@members.33"/>
+  <members children="//@members.10 //@members.17 //@members.22 //@members.36 //@members.37 //@members.41 //@members.49 //@members.59" parents="//@members.17 //@members.41"/>
+  <members parents="//@members.14 //@members.38"/>
+  <members/>
+  <members children="//@members.19 //@members.69" parents="//@members.11 //@members.41"/>
+  <members children="//@members.8 //@members.59 //@members.68" parents="//@members.17 //@members.36"/>
+  <members parents="//@members.4 //@members.17"/>
+  <members children="//@members.24 //@members.58" parents="//@members.41 //@members.76"/>
+  <members parents="//@members.43 //@members.47"/>
+  <members children="//@members.7" parents="//@members.11 //@members.35"/>
+  <members children="//@members.63" parents="//@members.6 //@members.79"/>
+  <members parents="//@members.19 //@members.28"/>
+  <members children="//@members.73" parents="//@members.3 //@members.78"/>
+  <members parents="//@members.41 //@members.78"/>
+  <members children="//@members.75" parents="//@members.6 //@members.97"/>
+  <members children="//@members.1 //@members.96" parents="//@members.50 //@members.63"/>
+  <members parents="//@members.4 //@members.78"/>
+  <members children="//@members.16 //@members.43" parents="//@members.11 //@members.51"/>
+</familytree:FamilyTree>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/8_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/8_1.xmi
new file mode 100644
index 00000000..d0ad5be7
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/8_1.xmi
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="ASCII"?>
+<familytree:FamilyTree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:familytree="http://www.example.org/familytree" xsi:schemaLocation="http://www.example.org/familytree ../case.study.familyTree.model/model/familytree.ecore">
+  <members children="//@members.16 //@members.62" parents="//@members.51 //@members.64"/>
+  <members parents="//@members.30 //@members.51"/>
+  <members children="//@members.11 //@members.13 //@members.26 //@members.34 //@members.46 //@members.56 //@members.79" parents="//@members.26 //@members.34"/>
+  <members children="//@members.12 //@members.22" parents="//@members.13 //@members.55"/>
+  <members children="//@members.41 //@members.45" parents="//@members.18 //@members.19"/>
+  <members children="//@members.60" parents="//@members.50 //@members.89"/>
+  <members children="//@members.68" parents="//@members.39 //@members.78"/>
+  <members parents="//@members.31 //@members.48"/>
+  <members children="//@members.85" parents="//@members.94 //@members.99"/>
+  <members parents="//@members.11 //@members.79"/>
+  <members children="//@members.19 //@members.50 //@members.62 //@members.77 //@members.78 //@members.81" parents="//@members.34 //@members.65"/>
+  <members children="//@members.9 //@members.14 //@members.73 //@members.92" parents="//@members.2 //@members.18"/>
+  <members children="//@members.38 //@members.63" parents="//@members.3 //@members.19"/>
+  <members children="//@members.3 //@members.35 //@members.41 //@members.47 //@members.55" parents="//@members.2 //@members.80"/>
+  <members children="//@members.16 //@members.17" parents="//@members.11 //@members.50"/>
+  <members children="//@members.67" parents="//@members.75 //@members.94"/>
+  <members parents="//@members.0 //@members.14"/>
+  <members children="//@members.33" parents="//@members.14 //@members.44"/>
+  <members children="//@members.4 //@members.11 //@members.40 //@members.42 //@members.48 //@members.57 //@members.80 //@members.95 //@members.98" parents="//@members.26 //@members.65"/>
+  <members children="//@members.4 //@members.12 //@members.51 //@members.72" parents="//@members.10 //@members.78"/>
+  <members children="//@members.25 //@members.56 //@members.74 //@members.77 //@members.89" parents="//@members.26 //@members.79"/>
+  <members parents="//@members.41 //@members.78"/>
+  <members parents="//@members.3 //@members.41"/>
+  <members parents="//@members.79 //@members.81"/>
+  <members children="//@members.31 //@members.61 //@members.85" parents="//@members.34 //@members.50"/>
+  <members children="//@members.44 //@members.86" parents="//@members.20 //@members.91"/>
+  <members children="//@members.2 //@members.18 //@members.20 //@members.65 //@members.80 //@members.84" parents="//@members.2 //@members.34"/>
+  <members parents="//@members.36 //@members.50"/>
+  <members children="//@members.29" parents="//@members.32 //@members.35"/>
+  <members parents="//@members.28 //@members.54"/>
+  <members children="//@members.1" parents="//@members.57 //@members.86"/>
+  <members children="//@members.7 //@members.59" parents="//@members.24 //@members.38"/>
+  <members children="//@members.28 //@members.54" parents="//@members.48 //@members.75"/>
+  <members parents="//@members.17 //@members.48"/>
+  <members children="//@members.2 //@members.10 //@members.24 //@members.26 //@members.65 //@members.71 //@members.90" parents="//@members.2 //@members.90"/>
+  <members children="//@members.28 //@members.36 //@members.63 //@members.75 //@members.93" parents="//@members.13 //@members.79"/>
+  <members children="//@members.27" parents="//@members.35 //@members.99"/>
+  <members children="//@members.38 //@members.83 //@members.86 //@members.99" parents="//@members.56 //@members.94"/>
+  <members children="//@members.31 //@members.60" parents="//@members.12 //@members.37"/>
+  <members children="//@members.6 //@members.94" parents="//@members.90 //@members.95"/>
+  <members children="//@members.54 //@members.87" parents="//@members.18 //@members.50"/>
+  <members children="//@members.21 //@members.22" parents="//@members.4 //@members.13"/>
+  <members parents="//@members.18 //@members.89"/>
+  <members/>
+  <members children="//@members.17" parents="//@members.25 //@members.56"/>
+  <members parents="//@members.4 //@members.73"/>
+  <members children="//@members.49 //@members.71 //@members.76" parents="//@members.2 //@members.80"/>
+  <members children="//@members.48 //@members.49 //@members.55 //@members.57 //@members.75 //@members.78 //@members.89" parents="//@members.13 //@members.56"/>
+  <members children="//@members.7 //@members.32 //@members.33 //@members.61" parents="//@members.18 //@members.47"/>
+  <members children="//@members.83 //@members.96" parents="//@members.46 //@members.47"/>
+  <members children="//@members.5 //@members.14 //@members.24 //@members.27 //@members.40 //@members.91" parents="//@members.10 //@members.90"/>
+  <members children="//@members.0 //@members.1" parents="//@members.19 //@members.78"/>
+  <members parents="//@members.73 //@members.86"/>
+  <members children="//@members.67" parents="//@members.87 //@members.90"/>
+  <members children="//@members.29 //@members.98" parents="//@members.32 //@members.40"/>
+  <members children="//@members.3 //@members.58 //@members.64 //@members.70 //@members.72" parents="//@members.13 //@members.47"/>
+  <members children="//@members.37 //@members.44 //@members.47" parents="//@members.2 //@members.20"/>
+  <members children="//@members.30" parents="//@members.18 //@members.47"/>
+  <members children="//@members.96" parents="//@members.55 //@members.94"/>
+  <members parents="//@members.31 //@members.74"/>
+  <members parents="//@members.5 //@members.38"/>
+  <members parents="//@members.24 //@members.48"/>
+  <members parents="//@members.0 //@members.10"/>
+  <members parents="//@members.12 //@members.35"/>
+  <members children="//@members.0 //@members.66 //@members.69 //@members.74" parents="//@members.55 //@members.78"/>
+  <members children="//@members.10 //@members.18 //@members.68 //@members.69 //@members.90 //@members.97" parents="//@members.26 //@members.34"/>
+  <members children="//@members.88" parents="//@members.64 //@members.79"/>
+  <members parents="//@members.15 //@members.53"/>
+  <members parents="//@members.6 //@members.65"/>
+  <members children="//@members.91 //@members.93" parents="//@members.64 //@members.65"/>
+  <members parents="//@members.55 //@members.93"/>
+  <members children="//@members.87" parents="//@members.34 //@members.46"/>
+  <members parents="//@members.19 //@members.55"/>
+  <members children="//@members.45 //@members.52" parents="//@members.11 //@members.79"/>
+  <members children="//@members.59 //@members.84" parents="//@members.20 //@members.64"/>
+  <members children="//@members.15 //@members.32 //@members.76 //@members.82" parents="//@members.35 //@members.47"/>
+  <members parents="//@members.46 //@members.75"/>
+  <members children="//@members.88" parents="//@members.10 //@members.20"/>
+  <members children="//@members.6 //@members.19 //@members.21 //@members.51 //@members.64 //@members.82 //@members.92" parents="//@members.10 //@members.47"/>
+  <members children="//@members.9 //@members.20 //@members.23 //@members.35 //@members.66 //@members.73" parents="//@members.2 //@members.80"/>
+  <members children="//@members.13 //@members.46 //@members.79 //@members.94" parents="//@members.18 //@members.26"/>
+  <members children="//@members.23" parents="//@members.10 //@members.90"/>
+  <members parents="//@members.75 //@members.78"/>
+  <members parents="//@members.37 //@members.49"/>
+  <members parents="//@members.26 //@members.74"/>
+  <members parents="//@members.8 //@members.24"/>
+  <members children="//@members.30 //@members.52" parents="//@members.25 //@members.37"/>
+  <members children="//@members.53" parents="//@members.40 //@members.71"/>
+  <members parents="//@members.66 //@members.77"/>
+  <members children="//@members.5 //@members.42" parents="//@members.20 //@members.47"/>
+  <members children="//@members.34 //@members.39 //@members.50 //@members.53 //@members.81 //@members.95" parents="//@members.34 //@members.65"/>
+  <members children="//@members.25" parents="//@members.50 //@members.69"/>
+  <members parents="//@members.11 //@members.78"/>
+  <members children="//@members.70" parents="//@members.35 //@members.69"/>
+  <members children="//@members.8 //@members.15 //@members.37 //@members.58 //@members.99" parents="//@members.39 //@members.80"/>
+  <members children="//@members.39" parents="//@members.18 //@members.90"/>
+  <members parents="//@members.49 //@members.58"/>
+  <members parents="//@members.65 //@members.98"/>
+  <members children="//@members.97" parents="//@members.18 //@members.54"/>
+  <members children="//@members.8 //@members.36" parents="//@members.37 //@members.94"/>
+</familytree:FamilyTree>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/9_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/9_1.xmi
new file mode 100644
index 00000000..885e350b
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/9_1.xmi
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="ASCII"?>
+<familytree:FamilyTree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:familytree="http://www.example.org/familytree" xsi:schemaLocation="http://www.example.org/familytree ../case.study.familyTree.model/model/familytree.ecore">
+  <members parents="//@members.22 //@members.95"/>
+  <members parents="//@members.26 //@members.67"/>
+  <members parents="//@members.15 //@members.42"/>
+  <members parents="//@members.4 //@members.28"/>
+  <members children="//@members.3 //@members.7 //@members.17 //@members.30 //@members.42" parents="//@members.24 //@members.45"/>
+  <members parents="//@members.25 //@members.26"/>
+  <members children="//@members.12 //@members.13 //@members.17 //@members.24 //@members.27 //@members.30 //@members.45 //@members.52 //@members.57 //@members.77" parents="//@members.12 //@members.52"/>
+  <members children="//@members.32" parents="//@members.4 //@members.65"/>
+  <members parents="//@members.15 //@members.17"/>
+  <members children="//@members.38 //@members.47 //@members.71" parents="//@members.42 //@members.66"/>
+  <members children="//@members.21 //@members.61 //@members.82" parents="//@members.53 //@members.99"/>
+  <members parents="//@members.78 //@members.92"/>
+  <members children="//@members.6 //@members.18 //@members.27 //@members.45 //@members.50 //@members.61 //@members.77 //@members.78" parents="//@members.6 //@members.77"/>
+  <members children="//@members.37 //@members.63 //@members.99" parents="//@members.6 //@members.27"/>
+  <members children="//@members.16 //@members.85" parents="//@members.49 //@members.53"/>
+  <members children="//@members.2 //@members.8" parents="//@members.19 //@members.99"/>
+  <members parents="//@members.14 //@members.93"/>
+  <members children="//@members.8 //@members.29 //@members.86" parents="//@members.4 //@members.6"/>
+  <members children="//@members.34" parents="//@members.12 //@members.41"/>
+  <members children="//@members.15 //@members.20 //@members.22" parents="//@members.51 //@members.55"/>
+  <members children="//@members.94" parents="//@members.19 //@members.46"/>
+  <members children="//@members.22" parents="//@members.10 //@members.65"/>
+  <members children="//@members.0" parents="//@members.19 //@members.21"/>
+  <members parents="//@members.50 //@members.69"/>
+  <members children="//@members.4 //@members.26 //@members.51 //@members.57 //@members.63 //@members.64" parents="//@members.6 //@members.77"/>
+  <members children="//@members.5" parents="//@members.41 //@members.99"/>
+  <members children="//@members.1 //@members.5" parents="//@members.24 //@members.28"/>
+  <members children="//@members.13 //@members.28 //@members.58 //@members.67 //@members.68 //@members.72 //@members.79 //@members.84 //@members.96" parents="//@members.6 //@members.12"/>
+  <members children="//@members.3 //@members.26" parents="//@members.27 //@members.66"/>
+  <members parents="//@members.17 //@members.73"/>
+  <members parents="//@members.4 //@members.6"/>
+  <members parents="//@members.46 //@members.67"/>
+  <members children="//@members.80 //@members.89" parents="//@members.7 //@members.84"/>
+  <members parents="//@members.73 //@members.79"/>
+  <members parents="//@members.18 //@members.75"/>
+  <members children="//@members.40 //@members.73 //@members.97" parents="//@members.45 //@members.63"/>
+  <members children="//@members.39 //@members.41 //@members.55" parents="//@members.65 //@members.92"/>
+  <members children="//@members.43 //@members.90" parents="//@members.13 //@members.69"/>
+  <members parents="//@members.9 //@members.40"/>
+  <members parents="//@members.36 //@members.57"/>
+  <members children="//@members.38 //@members.54" parents="//@members.35 //@members.58"/>
+  <members children="//@members.18 //@members.25 //@members.48 //@members.96" parents="//@members.36 //@members.53"/>
+  <members children="//@members.2 //@members.9" parents="//@members.4 //@members.58"/>
+  <members children="//@members.72 //@members.98" parents="//@members.37 //@members.49"/>
+  <members parents="//@members.80 //@members.86"/>
+  <members children="//@members.4 //@members.35 //@members.51 //@members.53 //@members.65 //@members.70 //@members.92" parents="//@members.6 //@members.12"/>
+  <members children="//@members.20 //@members.31" parents="//@members.57 //@members.84"/>
+  <members children="//@members.70 //@members.88 //@members.98" parents="//@members.9 //@members.58"/>
+  <members parents="//@members.41 //@members.53"/>
+  <members children="//@members.14 //@members.43" parents="//@members.66 //@members.67"/>
+  <members children="//@members.23 //@members.69 //@members.95" parents="//@members.12 //@members.67"/>
+  <members children="//@members.19 //@members.67 //@members.80" parents="//@members.24 //@members.45"/>
+  <members children="//@members.6 //@members.56 //@members.58 //@members.86 //@members.87" parents="//@members.6 //@members.77"/>
+  <members children="//@members.10 //@members.14 //@members.41 //@members.48 //@members.56 //@members.83 //@members.93" parents="//@members.45 //@members.67"/>
+  <members children="//@members.79" parents="//@members.40 //@members.99"/>
+  <members children="//@members.19 //@members.68" parents="//@members.36 //@members.87"/>
+  <members parents="//@members.52 //@members.53"/>
+  <members children="//@members.39 //@members.46 //@members.59 //@members.66" parents="//@members.6 //@members.24"/>
+  <members children="//@members.40 //@members.42 //@members.47 //@members.75 //@members.81 //@members.87 //@members.92 //@members.99" parents="//@members.27 //@members.52"/>
+  <members children="//@members.85 //@members.88" parents="//@members.57 //@members.87"/>
+  <members parents="//@members.63 //@members.66"/>
+  <members children="//@members.91" parents="//@members.10 //@members.12"/>
+  <members/>
+  <members children="//@members.35 //@members.60 //@members.82" parents="//@members.13 //@members.24"/>
+  <members children="//@members.75" parents="//@members.24 //@members.69"/>
+  <members children="//@members.7 //@members.21 //@members.36 //@members.78" parents="//@members.45 //@members.87"/>
+  <members children="//@members.9 //@members.28 //@members.49 //@members.60" parents="//@members.57 //@members.77"/>
+  <members children="//@members.1 //@members.31 //@members.49 //@members.50 //@members.53 //@members.69" parents="//@members.27 //@members.51"/>
+  <members parents="//@members.27 //@members.55"/>
+  <members children="//@members.23 //@members.37 //@members.64" parents="//@members.50 //@members.67"/>
+  <members parents="//@members.45 //@members.47"/>
+  <members parents="//@members.9 //@members.72"/>
+  <members children="//@members.71" parents="//@members.27 //@members.43"/>
+  <members children="//@members.29 //@members.33 //@members.94 //@members.97" parents="//@members.35 //@members.92"/>
+  <members parents="//@members.85 //@members.98"/>
+  <members children="//@members.34" parents="//@members.58 //@members.64"/>
+  <members parents="//@members.80 //@members.83"/>
+  <members children="//@members.12 //@members.24 //@members.52 //@members.66 //@members.93" parents="//@members.6 //@members.12"/>
+  <members children="//@members.11" parents="//@members.12 //@members.65"/>
+  <members children="//@members.33" parents="//@members.27 //@members.54"/>
+  <members children="//@members.44 //@members.76" parents="//@members.32 //@members.51"/>
+  <members children="//@members.91 //@members.95" parents="//@members.58 //@members.99"/>
+  <members parents="//@members.10 //@members.63"/>
+  <members children="//@members.76" parents="//@members.53 //@members.86"/>
+  <members children="//@members.32 //@members.46" parents="//@members.27 //@members.99"/>
+  <members children="//@members.74" parents="//@members.14 //@members.59"/>
+  <members children="//@members.44 //@members.83" parents="//@members.17 //@members.52"/>
+  <members children="//@members.55 //@members.59 //@members.65" parents="//@members.52 //@members.58"/>
+  <members parents="//@members.47 //@members.59"/>
+  <members parents="//@members.32 //@members.99"/>
+  <members parents="//@members.37 //@members.92"/>
+  <members parents="//@members.61 //@members.81"/>
+  <members children="//@members.11 //@members.36 //@members.73 //@members.90" parents="//@members.45 //@members.58"/>
+  <members children="//@members.16" parents="//@members.53 //@members.77"/>
+  <members parents="//@members.20 //@members.73"/>
+  <members children="//@members.0" parents="//@members.50 //@members.81"/>
+  <members parents="//@members.27 //@members.41"/>
+  <members parents="//@members.35 //@members.73"/>
+  <members children="//@members.74" parents="//@members.43 //@members.47"/>
+  <members children="//@members.10 //@members.15 //@members.25 //@members.54 //@members.81 //@members.84 //@members.89" parents="//@members.13 //@members.58"/>
+</familytree:FamilyTree>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/10_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/10_1.xmi
new file mode 100644
index 00000000..7a8f6972
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/10_1.xmi
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="ASCII"?>
+<satellite:InterferometryMission xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:satellite="http://www.example.org/satellite" xsi:schemaLocation="http://www.example.org/satellite ../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore">
+  <groundStationNetwork>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+  </groundStationNetwork>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.26/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1" frequency="8000" pathLength="385000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.7/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.6/@commSubsystem.1" frequency="8000" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1" frequency="8000" pathLength="385000"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.8/@commSubsystem.0" frequency="300" pathLength="150"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.10/@commSubsystem.1" frequency="8000" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.1/@commSubsystem.1" frequency="8000" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.21/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.6/@commSubsystem.1" frequency="8000" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.7/@commSubsystem.0" frequency="8000" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1" frequency="8000" pathLength="385000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.12/@commSubsystem.0" frequency="8000" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.26/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.19/@commSubsystem.0" frequency="8000" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.4/@commSubsystem.1" frequency="300" pathLength="150"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.19/@commSubsystem.0" frequency="8000" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.7/@commSubsystem.0" frequency="8000" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.1/@commSubsystem.0" frequency="8000" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.2/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@spacecraft.17/@commSubsystem.0" frequency="26500" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1" frequency="8000" pathLength="385000"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.26/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.7/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+</satellite:InterferometryMission>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/1_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/1_1.xmi
new file mode 100644
index 00000000..2c5fcb8a
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/1_1.xmi
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="ASCII"?>
+<satellite:InterferometryMission xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:satellite="http://www.example.org/satellite" xsi:schemaLocation="http://www.example.org/satellite ../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore">
+  <groundStationNetwork>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
+  </groundStationNetwork>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.18/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.20/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.20/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.6/@commSubsystem.0" frequency="8000" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.16/@commSubsystem.0" frequency="8000" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1" frequency="26500" pathLength="385000"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.20/@commSubsystem.1" frequency="8000" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.16/@commSubsystem.0" frequency="8000" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.2/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.2/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.12/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.4/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.2/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.16/@commSubsystem.0" frequency="8000" pathLength="150"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.13/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.13/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.1/@commSubsystem.1" frequency="8000" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.12/@commSubsystem.0" frequency="300" pathLength="150"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.20/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.6/@commSubsystem.1" frequency="8000" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.1/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.18/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.4/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+</satellite:InterferometryMission>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/2_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/2_1.xmi
new file mode 100644
index 00000000..6be77d9b
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/2_1.xmi
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="ASCII"?>
+<satellite:InterferometryMission xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:satellite="http://www.example.org/satellite" xsi:schemaLocation="http://www.example.org/satellite ../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore">
+  <groundStationNetwork>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+  </groundStationNetwork>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.13/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.7/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.12/@commSubsystem.1" frequency="8000" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1" frequency="8000" pathLength="385000"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1" frequency="8000" pathLength="385000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@spacecraft.18/@commSubsystem.0" frequency="26500" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.19/@commSubsystem.1" frequency="8000" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.15/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.3/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.1/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.13/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.4/@commSubsystem.1" frequency="8000" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.4/@commSubsystem.0" frequency="8000" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.3/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.4/@commSubsystem.0" frequency="8000" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.3/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.0/@commSubsystem.1" frequency="300" pathLength="150"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1" frequency="8000" pathLength="385000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.1/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1" frequency="8000" pathLength="385000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.14/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1" frequency="8000" pathLength="385000"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1" frequency="8000" pathLength="385000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.4/@commSubsystem.1" frequency="8000" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.14/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+</satellite:InterferometryMission>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/3_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/3_1.xmi
new file mode 100644
index 00000000..3f21991a
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/3_1.xmi
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="ASCII"?>
+<satellite:InterferometryMission xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:satellite="http://www.example.org/satellite" xsi:schemaLocation="http://www.example.org/satellite ../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore">
+  <groundStationNetwork>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+  </groundStationNetwork>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.17/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1" frequency="8000" pathLength="385000"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@spacecraft.24/@commSubsystem.0" frequency="26500" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.1/@commSubsystem.1" frequency="8000" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.14/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1" frequency="8000" pathLength="385000"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0" frequency="26500" pathLength="385000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.5/@commSubsystem.1" frequency="8000" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.17/@commSubsystem.0" frequency="8000" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.17/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.19/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.25/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.16/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.10/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.17/@commSubsystem.0" frequency="8000" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.19/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1" frequency="8000" pathLength="385000"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.17/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1" frequency="8000" pathLength="385000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.19/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.16/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1" frequency="8000" pathLength="385000"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0" frequency="26500" pathLength="385000"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.21/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+</satellite:InterferometryMission>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/4_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/4_1.xmi
new file mode 100644
index 00000000..497c7d03
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/4_1.xmi
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="ASCII"?>
+<satellite:InterferometryMission xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:satellite="http://www.example.org/satellite" xsi:schemaLocation="http://www.example.org/satellite ../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore">
+  <groundStationNetwork>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
+  </groundStationNetwork>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1" frequency="26500" pathLength="385000"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.2/@commSubsystem.0" frequency="300" pathLength="150"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0" frequency="8000" pathLength="385000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.20/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.8/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0" frequency="8000" pathLength="385000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.15/@commSubsystem.0" frequency="8000" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.13/@commSubsystem.0" frequency="8000" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@spacecraft.0/@commSubsystem.0" frequency="26500" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.16/@commSubsystem.1" frequency="8000" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0" frequency="8000" pathLength="385000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.8/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.0/@commSubsystem.1" frequency="8000" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0" frequency="8000" pathLength="385000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.0/@commSubsystem.1" frequency="8000" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0" frequency="8000" pathLength="385000"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.8/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.8/@commSubsystem.1" frequency="8000" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.8/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.12/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.18/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.16/@commSubsystem.1" frequency="8000" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.4/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.20/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+</satellite:InterferometryMission>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/5_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/5_1.xmi
new file mode 100644
index 00000000..1194f5d0
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/5_1.xmi
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="ASCII"?>
+<satellite:InterferometryMission xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:satellite="http://www.example.org/satellite" xsi:schemaLocation="http://www.example.org/satellite ../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore">
+  <groundStationNetwork>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+  </groundStationNetwork>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.21/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.10/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.23/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.13/@commSubsystem.0" frequency="8000" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.2/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1" frequency="8000" pathLength="385000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.23/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@spacecraft.1/@commSubsystem.1" frequency="26500" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.13/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.21/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.17/@commSubsystem.1" frequency="8000" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.0/@commSubsystem.1" frequency="8000" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.5/@commSubsystem.0" frequency="8000" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.9/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.5/@commSubsystem.1" frequency="8000" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.0/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.0/@commSubsystem.1" frequency="8000" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.11/@commSubsystem.0" frequency="8000" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.18/@commSubsystem.1" frequency="8000" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.24/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.22/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.23/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.9/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.9/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+</satellite:InterferometryMission>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/6_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/6_1.xmi
new file mode 100644
index 00000000..cf399d44
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/6_1.xmi
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="ASCII"?>
+<satellite:InterferometryMission xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:satellite="http://www.example.org/satellite" xsi:schemaLocation="http://www.example.org/satellite ../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore">
+  <groundStationNetwork>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
+  </groundStationNetwork>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0" frequency="26500" pathLength="385000"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.2/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.0/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.0/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.11/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.24/@commSubsystem.0" frequency="8000" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@spacecraft.0/@commSubsystem.0" frequency="26500" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.15/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.14/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.13/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.1/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.22/@commSubsystem.1" frequency="8000" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.11/@commSubsystem.0" frequency="8000" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.13/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.8/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.3/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.18/@commSubsystem.1" frequency="8000" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.19/@commSubsystem.0" frequency="8000" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.4/@commSubsystem.0" frequency="8000" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.7/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.0/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.11/@commSubsystem.0" frequency="8000" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.22/@commSubsystem.1" frequency="8000" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+</satellite:InterferometryMission>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/7_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/7_1.xmi
new file mode 100644
index 00000000..bd1a4072
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/7_1.xmi
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="ASCII"?>
+<satellite:InterferometryMission xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:satellite="http://www.example.org/satellite" xsi:schemaLocation="http://www.example.org/satellite ../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore">
+  <groundStationNetwork>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
+  </groundStationNetwork>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0" frequency="26500" pathLength="385000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.15/@commSubsystem.1" frequency="8000" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.4/@commSubsystem.0" frequency="8000" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0" frequency="26500" pathLength="385000"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.19/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.22/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.18/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.8/@commSubsystem.1" frequency="8000" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.18/@commSubsystem.1" frequency="8000" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@spacecraft.3/@commSubsystem.0" frequency="26500" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.14/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.22/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.18/@commSubsystem.1" frequency="8000" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.19/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.23/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.16/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.8/@commSubsystem.0" frequency="8000" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@spacecraft.3/@commSubsystem.0" frequency="26500" pathLength="150"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.2/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.16/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.14/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+</satellite:InterferometryMission>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/8_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/8_1.xmi
new file mode 100644
index 00000000..51289c6a
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/8_1.xmi
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="ASCII"?>
+<satellite:InterferometryMission xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:satellite="http://www.example.org/satellite" xsi:schemaLocation="http://www.example.org/satellite ../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore">
+  <groundStationNetwork>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
+  </groundStationNetwork>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.10/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.6/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0" frequency="8000" pathLength="385000"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.7/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.5/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.10/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.3/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.9/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0" frequency="8000" pathLength="385000"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.18/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.7/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0" frequency="8000" pathLength="385000"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.11/@commSubsystem.0" frequency="8000" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@spacecraft.20/@commSubsystem.1" frequency="26500" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.1/@commSubsystem.1" frequency="300" pathLength="150"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.19/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.7/@commSubsystem.1" frequency="8000" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@spacecraft.13/@commSubsystem.1" frequency="26500" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.2/@commSubsystem.1" frequency="8000" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.18/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.7/@commSubsystem.1" frequency="8000" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.2/@commSubsystem.1" frequency="8000" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0" frequency="8000" pathLength="385000"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.7/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0" frequency="8000" pathLength="385000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+</satellite:InterferometryMission>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/9_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/9_1.xmi
new file mode 100644
index 00000000..a9adec32
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/9_1.xmi
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="ASCII"?>
+<satellite:InterferometryMission xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:satellite="http://www.example.org/satellite" xsi:schemaLocation="http://www.example.org/satellite ../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore">
+  <groundStationNetwork>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
+  </groundStationNetwork>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.7/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.15/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0" frequency="8000" pathLength="385000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0" frequency="8000" pathLength="385000"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0" frequency="8000" pathLength="385000"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.24/@commSubsystem.0" frequency="8000" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0" frequency="8000" pathLength="385000"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.4/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.2/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.4/@commSubsystem.0" frequency="8000" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.16/@commSubsystem.1" frequency="8000" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.25/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.17/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.20/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.8/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.20/@commSubsystem.0" frequency="8000" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.20/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.7/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.17/@commSubsystem.1" frequency="300" pathLength="150"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.8/@commSubsystem.1" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.9/@commSubsystem.0" frequency="8000" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@spacecraft.16/@commSubsystem.0" frequency="26500" pathLength="150"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0" frequency="8000" pathLength="385000"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.10/@commSubsystem.1" frequency="8000" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.17/@commSubsystem.0" frequency="300" pathLength="150"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+</satellite:InterferometryMission>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/10_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/10_1.xmi
new file mode 100644
index 00000000..77457289
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/10_1.xmi
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="ASCII"?>
+<satellite:InterferometryMission xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:satellite="http://www.example.org/satellite" xsi:schemaLocation="http://www.example.org/satellite ../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore">
+  <groundStationNetwork>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
+  </groundStationNetwork>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.25/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.11/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.17/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.11/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.20/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.11/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@spacecraft.1/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.19/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.25/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.11/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.18/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.17/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.25/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.25/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.11/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.16/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.9/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.2/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.24/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.13/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+</satellite:InterferometryMission>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/1_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/1_1.xmi
new file mode 100644
index 00000000..65c314e9
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/1_1.xmi
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="ASCII"?>
+<satellite:InterferometryMission xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:satellite="http://www.example.org/satellite" xsi:schemaLocation="http://www.example.org/satellite ../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore">
+  <groundStationNetwork>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+  </groundStationNetwork>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.17/@commSubsystem.1"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.24/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.20/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.20/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.21/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.20/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.24/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.27/@commSubsystem.1"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.21/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.14/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.22/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.21/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.12/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.14/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.6/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.19/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.12/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.14/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.14/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.16/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.20/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.24/@commSubsystem.0"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.7/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.24/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+</satellite:InterferometryMission>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/2_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/2_1.xmi
new file mode 100644
index 00000000..2b219e7a
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/2_1.xmi
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="ASCII"?>
+<satellite:InterferometryMission xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:satellite="http://www.example.org/satellite" xsi:schemaLocation="http://www.example.org/satellite ../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore">
+  <groundStationNetwork>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+  </groundStationNetwork>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.19/@commSubsystem.0"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.12/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@spacecraft.13/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.13/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.24/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.24/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.19/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.16/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.8/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.25/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.20/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.13/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.19/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.19/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.22/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.24/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.2/@commSubsystem.0"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.2/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+</satellite:InterferometryMission>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/3_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/3_1.xmi
new file mode 100644
index 00000000..c1ce3de5
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/3_1.xmi
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="ASCII"?>
+<satellite:InterferometryMission xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:satellite="http://www.example.org/satellite" xsi:schemaLocation="http://www.example.org/satellite ../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore">
+  <groundStationNetwork>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+  </groundStationNetwork>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.4/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.17/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@spacecraft.18/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.14/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.4/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.15/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.11/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.18/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.14/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.20/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.25/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.14/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.19/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.20/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.24/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.8/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.17/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+</satellite:InterferometryMission>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/4_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/4_1.xmi
new file mode 100644
index 00000000..969d3315
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/4_1.xmi
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="ASCII"?>
+<satellite:InterferometryMission xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:satellite="http://www.example.org/satellite" xsi:schemaLocation="http://www.example.org/satellite ../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore">
+  <groundStationNetwork>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
+  </groundStationNetwork>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.13/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@spacecraft.19/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.6/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.17/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.17/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.17/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.20/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.7/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.17/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.6/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.12/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.0/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.8/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.23/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.17/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.6/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.0/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.12/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.4/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.5/@commSubsystem.1"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.0/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.6/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+</satellite:InterferometryMission>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/5_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/5_1.xmi
new file mode 100644
index 00000000..8c017bd5
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/5_1.xmi
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="ASCII"?>
+<satellite:InterferometryMission xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:satellite="http://www.example.org/satellite" xsi:schemaLocation="http://www.example.org/satellite ../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore">
+  <groundStationNetwork>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
+  </groundStationNetwork>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.22/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.22/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.4/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.8/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.4/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.9/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.11/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.6/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@spacecraft.14/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.9/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.12/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.21/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.2/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.11/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.16/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.23/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.8/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.23/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.8/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+</satellite:InterferometryMission>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/6_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/6_1.xmi
new file mode 100644
index 00000000..3dd5ffa8
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/6_1.xmi
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="ASCII"?>
+<satellite:InterferometryMission xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:satellite="http://www.example.org/satellite" xsi:schemaLocation="http://www.example.org/satellite ../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore">
+  <groundStationNetwork>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
+  </groundStationNetwork>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.6/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.6/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.24/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.8/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.12/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.8/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.14/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.8/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.6/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.17/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.12/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.12/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.8/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.23/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.25/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.5/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.12/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.10/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.5/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.25/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.17/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+</satellite:InterferometryMission>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/7_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/7_1.xmi
new file mode 100644
index 00000000..635410f2
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/7_1.xmi
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="ASCII"?>
+<satellite:InterferometryMission xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:satellite="http://www.example.org/satellite" xsi:schemaLocation="http://www.example.org/satellite ../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore">
+  <groundStationNetwork>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+  </groundStationNetwork>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.3/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.19/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.13/@commSubsystem.1"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.19/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.19/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.5/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.23/@commSubsystem.1"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.3/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.16/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.17/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.20/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.3/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.3/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.12/@commSubsystem.0"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@spacecraft.0/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.7/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+</satellite:InterferometryMission>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/8_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/8_1.xmi
new file mode 100644
index 00000000..ec0985dc
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/8_1.xmi
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="ASCII"?>
+<satellite:InterferometryMission xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:satellite="http://www.example.org/satellite" xsi:schemaLocation="http://www.example.org/satellite ../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore">
+  <groundStationNetwork>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+  </groundStationNetwork>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.9/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.16/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.25/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.8/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.25/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.25/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.25/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.16/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.19/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.17/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.13/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.13/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.0/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.18/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.20/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@spacecraft.23/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.11/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.25/@commSubsystem.0"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+</satellite:InterferometryMission>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/9_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/9_1.xmi
new file mode 100644
index 00000000..dc2ccc91
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/9_1.xmi
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="ASCII"?>
+<satellite:InterferometryMission xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:satellite="http://www.example.org/satellite" xsi:schemaLocation="http://www.example.org/satellite ../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore">
+  <groundStationNetwork>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
+  </groundStationNetwork>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.2/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.17/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.6/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.5/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.19/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.6/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.8/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.24/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.20/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@spacecraft.11/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.14/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.4/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.16/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.15/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.19/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.4/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.2/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.20/@commSubsystem.1"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.25/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.16/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.20/@commSubsystem.1"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat6U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.12/@commSubsystem.1"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.19/@commSubsystem.1"/>
+    <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:SmallSat">
+    <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.6/@commSubsystem.0"/>
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem xsi:type="satellite:XCommSubsystem"/>
+    <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.16/@commSubsystem.0"/>
+    <payload xsi:type="satellite:InterferometryPayload"/>
+  </spacecraft>
+</satellite:InterferometryMission>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/10_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/10_1.xmi
new file mode 100644
index 00000000..1abe751c
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/10_1.xmi
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="ASCII"?>
+<TaxCardWithRoot:Resource xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore" xsi:schemaLocation="http:///TaxCardWithRoot.ecore ../case.study.pledge.model/model/TaxationWithRoot.ecore">
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" separation_cause="DIVORCE" id9="">
+      <individual_A SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" separation_cause="DIVORCE" id9="">
+      <individual_A SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" separation_cause="SEPARATION_DE_FAIT" id9="">
+      <individual_A SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" id9="">
+      <individual_A SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" id9="">
+      <individual_A SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+</TaxCardWithRoot:Resource>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/1_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/1_1.xmi
new file mode 100644
index 00000000..ea419150
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/1_1.xmi
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="ASCII"?>
+<TaxCardWithRoot:Resource xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore" xsi:schemaLocation="http:///TaxCardWithRoot.ecore ../case.study.pledge.model/model/TaxationWithRoot.ecore">
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" id9="">
+      <individual_A SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" separation_cause="SEPARATION_BY_COURT" id9="">
+      <individual_A SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" separation_cause="SEPARATION_DE_FAIT" id9="">
+      <individual_A SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" separation_cause="DIVORCE" id9="">
+      <individual_A SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" separation_cause="DIVORCE" id9="">
+      <individual_A SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+</TaxCardWithRoot:Resource>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/2_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/2_1.xmi
new file mode 100644
index 00000000..30352906
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/2_1.xmi
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="ASCII"?>
+<TaxCardWithRoot:Resource xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore" xsi:schemaLocation="http:///TaxCardWithRoot.ecore ../case.study.pledge.model/model/TaxationWithRoot.ecore">
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" separation_cause="SEPARATION_DE_FAIT" id9="">
+      <individual_A SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" id9="">
+      <individual_A SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" separation_cause="DIVORCE" id9="">
+      <individual_A SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" id9="">
+      <individual_A SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" separation_cause="SEPARATION_DE_FAIT" id9="">
+      <individual_A SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+</TaxCardWithRoot:Resource>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/3_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/3_1.xmi
new file mode 100644
index 00000000..deae653a
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/3_1.xmi
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="ASCII"?>
+<TaxCardWithRoot:Resource xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore" xsi:schemaLocation="http:///TaxCardWithRoot.ecore ../case.study.pledge.model/model/TaxationWithRoot.ecore">
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" separation_cause="DIVORCE" id9="">
+      <individual_A SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" id9="">
+      <individual_A SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" separation_cause="SEPARATION_BY_COURT" id9="">
+      <individual_A SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" id9="">
+      <individual_A SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" separation_cause="SEPARATION_BY_COURT" id9="">
+      <individual_A SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+</TaxCardWithRoot:Resource>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/4_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/4_1.xmi
new file mode 100644
index 00000000..ab317053
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/4_1.xmi
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="ASCII"?>
+<TaxCardWithRoot:Resource xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore" xsi:schemaLocation="http:///TaxCardWithRoot.ecore ../case.study.pledge.model/model/TaxationWithRoot.ecore">
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" separation_cause="DIVORCE" id9="">
+      <individual_A SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" id9="">
+      <individual_A SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" id9="">
+      <individual_A SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" separation_cause="SEPARATION_DE_FAIT" id9="">
+      <individual_A SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" separation_cause="SEPARATION_BY_COURT" id9="">
+      <individual_A SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+</TaxCardWithRoot:Resource>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/5_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/5_1.xmi
new file mode 100644
index 00000000..2163e7cb
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/5_1.xmi
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="ASCII"?>
+<TaxCardWithRoot:Resource xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore" xsi:schemaLocation="http:///TaxCardWithRoot.ecore ../case.study.pledge.model/model/TaxationWithRoot.ecore">
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" separation_cause="DIVORCE" id9="">
+      <individual_A SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" separation_cause="SEPARATION_BY_COURT" id9="">
+      <individual_A SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" id9="">
+      <individual_A SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" separation_cause="SEPARATION_BY_COURT" id9="">
+      <individual_A SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" separation_cause="SEPARATION_BY_COURT" id9="">
+      <individual_A SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+</TaxCardWithRoot:Resource>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/6_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/6_1.xmi
new file mode 100644
index 00000000..7b76f910
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/6_1.xmi
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="ASCII"?>
+<TaxCardWithRoot:Resource xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore" xsi:schemaLocation="http:///TaxCardWithRoot.ecore ../case.study.pledge.model/model/TaxationWithRoot.ecore">
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" id9="">
+      <individual_A SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" id9="">
+      <individual_A SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1" expenses=""/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1" expenses=" "/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1" expenses=""/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" id9="">
+      <individual_A SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1" expenses=""/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1" expenses=" "/>
+      <individual_B xsi:type="TaxCardWithRoot:Resident_Tax_Payer" SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1" expenses="">
+        <from_agent expense=""/>
+        <incomes xsi:type="TaxCardWithRoot:Foreign_Income">
+          <income_type xsi:type="TaxCardWithRoot:Agriculture_and_Forestry_Income" id8=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <expenses expense_purpose="DEPENDENCE_CARE" id4="" beneficiary=""/>
+          <expenses xsi:type="TaxCardWithRoot:Special_Expense_DS" expense_purpose="ALIMONY" id4="" beneficiary=""/>
+          <expenses xsi:type="TaxCardWithRoot:Professional_Expense" expense_purpose="DEPENDENCE_CARE" from_agent="//@contains.2/@parents/@individual_B.3/@from_agent" id4="" beneficiary=""/>
+          <expenses xsi:type="TaxCardWithRoot:Miscellaneous_Expense_FO" id4="" beneficiary=""/>
+          <expenses xsi:type="TaxCardWithRoot:Travel_Expense_FD" id4="" beneficiary=""/>
+          <expenses xsi:type="TaxCardWithRoot:Miscellaneous_Expense_FO" expense_purpose="ALIMONY" id4="" beneficiary=""/>
+          <expenses xsi:type="TaxCardWithRoot:Miscellaneous_Expense_FO" expense_purpose="RECURRENT_DEPT" id4="" beneficiary=""/>
+        </incomes>
+        <incomes xsi:type="TaxCardWithRoot:Local_Income">
+          <income_type xsi:type="TaxCardWithRoot:Agriculture_and_Forestry_Income" id8=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <expenses xsi:type="TaxCardWithRoot:Professional_Expense" expense_purpose="DEPENDENCE_CARE" id4="" beneficiary=""/>
+          <expenses xsi:type="TaxCardWithRoot:Loss_Carryforward" expense_purpose="RECURRENT_DEPT" id4="" beneficiary=""/>
+          <expenses xsi:type="TaxCardWithRoot:Loss_Carryforward" expense_purpose="HOUSE_CARE" id4="" beneficiary=""/>
+        </incomes>
+        <incomes xsi:type="TaxCardWithRoot:Foreign_Income">
+          <income_type xsi:type="TaxCardWithRoot:Capital_and_Investments_Income" id8=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <expenses xsi:type="TaxCardWithRoot:Travel_Expense_FD" expense_purpose="CHILD_CARE" id4="" beneficiary=""/>
+          <expenses xsi:type="TaxCardWithRoot:Special_Expense_DS" expense_purpose="HOUSE_CARE" id4="" beneficiary=""/>
+          <expenses expense_purpose="ALIMONY" id4="" beneficiary=""/>
+          <expenses xsi:type="TaxCardWithRoot:Special_Expense_DS" expense_purpose="CHILD_CARE" id4="" beneficiary=""/>
+        </incomes>
+        <from_law id=""/>
+      </individual_B>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" separation_cause="SEPARATION_DE_FAIT" id9="">
+      <individual_A SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1" expenses=" "/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" separation_cause="SEPARATION_DE_FAIT" id9="">
+      <individual_A SSNo="" birth_year="1918" birth_month="1" birth_day="1" expenses=""/>
+      <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1" expenses=""/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1" expenses=" "/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+</TaxCardWithRoot:Resource>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/7_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/7_1.xmi
new file mode 100644
index 00000000..cb046b8a
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/7_1.xmi
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="ASCII"?>
+<TaxCardWithRoot:Resource xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore" xsi:schemaLocation="http:///TaxCardWithRoot.ecore ../case.study.pledge.model/model/TaxationWithRoot.ecore">
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" separation_cause="SEPARATION_DE_FAIT" id9="">
+      <individual_A SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" separation_cause="SEPARATION_BY_COURT" id9="">
+      <individual_A SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" id9="">
+      <individual_A SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" id9="">
+      <individual_A SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" separation_cause="DIVORCE" id9="">
+      <individual_A SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+</TaxCardWithRoot:Resource>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/8_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/8_1.xmi
new file mode 100644
index 00000000..a27739a2
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/8_1.xmi
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="ASCII"?>
+<TaxCardWithRoot:Resource xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore" xsi:schemaLocation="http:///TaxCardWithRoot.ecore ../case.study.pledge.model/model/TaxationWithRoot.ecore">
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" separation_cause="SEPARATION_DE_FAIT" id9="">
+      <individual_A SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" separation_cause="SEPARATION_BY_COURT" id9="">
+      <individual_A SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" separation_cause="DIVORCE" id9="">
+      <individual_A SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" separation_cause="DIVORCE" id9="">
+      <individual_A SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" separation_cause="DIVORCE" id9="">
+      <individual_A SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+</TaxCardWithRoot:Resource>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/9_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/9_1.xmi
new file mode 100644
index 00000000..f1fdd254
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/9_1.xmi
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="ASCII"?>
+<TaxCardWithRoot:Resource xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore" xsi:schemaLocation="http:///TaxCardWithRoot.ecore ../case.study.pledge.model/model/TaxationWithRoot.ecore">
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" separation_cause="DIVORCE" id9="">
+      <individual_A SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" id9="">
+      <individual_A SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" separation_cause="DIVORCE" id9="">
+      <individual_A SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" separation_cause="SEPARATION_BY_COURT" id9="">
+      <individual_A SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" separation_cause="DIVORCE" id9="">
+      <individual_A SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
+      <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+</TaxCardWithRoot:Resource>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/10_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/10_1.xmi
new file mode 100644
index 00000000..d59f3d80
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/10_1.xmi
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="ASCII"?>
+<TaxCardWithRoot:Resource xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore" xsi:schemaLocation="http:///TaxCardWithRoot.ecore ../case.study.pledge.model/model/TaxationWithRoot.ecore">
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Partnership_Record" id9="">
+      <individual_A SSNo="" disability_type="NONE"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="D"/>
+      <individual_B SSNo="" disability_type="C"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo="" disability_type="C"/>
+      <individual_B SSNo="" disability_type="A"/>
+      <individual_B SSNo="" disability_type="A"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo="" disability_type="A"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="C"/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo="" disability_type="C"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="C"/>
+      <individual_B SSNo="" disability_type="A"/>
+      <individual_B SSNo="" disability_type="D"/>
+      <individual_B SSNo="" disability_type="A"/>
+      <individual_B SSNo="" disability_type="C"/>
+      <individual_B SSNo="" disability_type="A"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="A"/>
+      <individual_B SSNo="" disability_type="D"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="A"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="C"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo="" disability_type="D"/>
+      <individual_B SSNo="" disability_type="D"/>
+      <individual_B SSNo=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+</TaxCardWithRoot:Resource>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/1_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/1_1.xmi
new file mode 100644
index 00000000..052c7f8f
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/1_1.xmi
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="ASCII"?>
+<TaxCardWithRoot:Resource xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore" xsi:schemaLocation="http:///TaxCardWithRoot.ecore ../case.study.pledge.model/model/TaxationWithRoot.ecore">
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Partnership_Record" separation_cause="SEPARATION_BY_COURT" id9="">
+      <individual_A SSNo="" disability_type="C"/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="D"/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo="" disability_type="D"/>
+      <individual_B SSNo="" disability_type="D"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo="" disability_type="A"/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="C"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="C"/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="D"/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo="" disability_type="A"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="C"/>
+      <individual_B SSNo="" disability_type="D"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="C"/>
+      <individual_B SSNo="" disability_type="C"/>
+      <individual_B SSNo="" disability_type="A"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="C"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo="" disability_type="C"/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo="" disability_type="A"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+</TaxCardWithRoot:Resource>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/2_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/2_1.xmi
new file mode 100644
index 00000000..f947f108
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/2_1.xmi
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="ASCII"?>
+<TaxCardWithRoot:Resource xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore" xsi:schemaLocation="http:///TaxCardWithRoot.ecore ../case.study.pledge.model/model/TaxationWithRoot.ecore">
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Marriage_Record" separation_cause="DIVORCE" id9="">
+      <individual_A SSNo=""/>
+      <individual_B SSNo="" disability_type="D"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="D"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="D"/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="D"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="D"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="A"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="C"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="D"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="D"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="C"/>
+      <individual_B SSNo="" disability_type="D"/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo="" disability_type="C"/>
+      <individual_B SSNo="" disability_type="D"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo="" disability_type="D"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="D"/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="A"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="C"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+</TaxCardWithRoot:Resource>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/3_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/3_1.xmi
new file mode 100644
index 00000000..30989757
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/3_1.xmi
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="ASCII"?>
+<TaxCardWithRoot:Resource xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore" xsi:schemaLocation="http:///TaxCardWithRoot.ecore ../case.study.pledge.model/model/TaxationWithRoot.ecore">
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Partnership_Record" separation_cause="DIVORCE" id9="">
+      <individual_A SSNo="" disability_type="E" expenses="  "/>
+      <individual_B SSNo="" disability_type="OTHER" expenses=" "/>
+      <individual_B xsi:type="TaxCardWithRoot:Resident_Tax_Payer" SSNo="" expenses="   ">
+        <from_agent expense=""/>
+        <incomes xsi:type="TaxCardWithRoot:Local_Income">
+          <income_type xsi:type="TaxCardWithRoot:Rentals_and_Leases_Income" id8="" is_periodic="false"/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+        </incomes>
+        <incomes xsi:type="TaxCardWithRoot:Foreign_Income">
+          <income_type xsi:type="TaxCardWithRoot:Agriculture_and_Forestry_Income" id8=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <expenses xsi:type="TaxCardWithRoot:Professional_Expense" expense_purpose="CHILD_CARE" from_agent="//@contains.0/@parents/@individual_B.1/@from_agent" id4="" beneficiary=""/>
+          <expenses xsi:type="TaxCardWithRoot:Spousal_Expense_AC" expense_purpose="HOUSE_CARE" id4="" beneficiary=""/>
+          <expenses xsi:type="TaxCardWithRoot:Donation" expense_purpose="HOUSE_CARE" id4="" beneficiary="" beneficiary1=""/>
+          <expenses xsi:type="TaxCardWithRoot:Donation" expense_purpose="DEPENDENCE_CARE" id4="" beneficiary="" beneficiary1=""/>
+          <expenses xsi:type="TaxCardWithRoot:Special_Expense_DS" id4="" beneficiary=""/>
+          <expenses xsi:type="TaxCardWithRoot:Special_Expense_DS" expense_purpose="CHILD_CARE" id4=""/>
+          <expenses xsi:type="TaxCardWithRoot:Special_Expense_DS" expense_purpose="ALIMONY" id4="" beneficiary=""/>
+          <expenses xsi:type="TaxCardWithRoot:Travel_Expense_FD" expense_purpose="CHILD_CARE" id4="" beneficiary=""/>
+          <expenses xsi:type="TaxCardWithRoot:Travel_Expense_FD" expense_purpose="ALIMONY" id4="" beneficiary=""/>
+          <expenses xsi:type="TaxCardWithRoot:Interest_Expense" expense_purpose="HOUSE_CARE" id4="" beneficiary=""/>
+          <expenses xsi:type="TaxCardWithRoot:Interest_Expense" id4="" beneficiary=""/>
+          <expenses xsi:type="TaxCardWithRoot:Professional_Expense" expense_purpose="HOUSE_CARE" id4="" beneficiary=""/>
+          <expenses xsi:type="TaxCardWithRoot:Special_Expense_DS" expense_purpose="CHILD_CARE" id4="" beneficiary=""/>
+        </incomes>
+        <incomes xsi:type="TaxCardWithRoot:Foreign_Income">
+          <income_type xsi:type="TaxCardWithRoot:Agriculture_and_Forestry_Income" id8=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <expenses xsi:type="TaxCardWithRoot:Interest_Expense" expense_purpose="HOUSE_CARE" id4="" beneficiary=""/>
+          <expenses xsi:type="TaxCardWithRoot:Interest_Expense" expense_purpose="ALIMONY" id4="" beneficiary=""/>
+          <expenses xsi:type="TaxCardWithRoot:Spousal_Expense_AC" expense_purpose="RECURRENT_DEPT" id4="" beneficiary=""/>
+          <expenses xsi:type="TaxCardWithRoot:Donation" id4="" beneficiary="" beneficiary1=""/>
+          <expenses xsi:type="TaxCardWithRoot:Miscellaneous_Expense_FO" expense_purpose="CHILD_CARE" id4="" beneficiary=""/>
+          <expenses xsi:type="TaxCardWithRoot:Loss_Carryforward" id4="" beneficiary=""/>
+          <expenses xsi:type="TaxCardWithRoot:Travel_Expense_FD" expense_purpose="RECURRENT_DEPT" id4=""/>
+          <expenses xsi:type="TaxCardWithRoot:Travel_Expense_FD" expense_purpose="DEPENDENCE_CARE" id4="" beneficiary=""/>
+          <expenses xsi:type="TaxCardWithRoot:Special_Expense_DS" id4="" beneficiary=""/>
+        </incomes>
+        <incomes xsi:type="TaxCardWithRoot:Foreign_Income">
+          <income_type xsi:type="TaxCardWithRoot:Agriculture_and_Forestry_Income" id8=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <expenses expense_purpose="DEPENDENCE_CARE" id4="" beneficiary=""/>
+          <expenses xsi:type="TaxCardWithRoot:Spousal_Expense_AC" expense_purpose="HOUSE_CARE" id4="" beneficiary=""/>
+          <expenses xsi:type="TaxCardWithRoot:Travel_Expense_FD" expense_purpose="CHILD_CARE" id4=""/>
+        </incomes>
+        <from_law id=""/>
+      </individual_B>
+      <individual_B SSNo="" disability_type="A" expenses=" "/>
+      <individual_B SSNo="" expenses="  "/>
+      <individual_B SSNo="" disability_type="C" expenses="     "/>
+      <individual_B SSNo="" expenses=""/>
+      <individual_B SSNo="" disability_type="NONE" expenses=""/>
+      <individual_B SSNo="" disability_type="D"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+</TaxCardWithRoot:Resource>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/4_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/4_1.xmi
new file mode 100644
index 00000000..3a75ed9b
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/4_1.xmi
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="ASCII"?>
+<TaxCardWithRoot:Resource xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore" xsi:schemaLocation="http:///TaxCardWithRoot.ecore ../case.study.pledge.model/model/TaxationWithRoot.ecore">
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Partnership_Record" separation_cause="SEPARATION_DE_FAIT" id9="">
+      <individual_A SSNo=""/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="A"/>
+      <individual_B SSNo="" disability_type="D"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo="" disability_type="A"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="C"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="D"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="D"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="C"/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo="" disability_type="A"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="A"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo="" disability_type="D"/>
+      <individual_B SSNo="" disability_type="D"/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo="" disability_type="D"/>
+      <individual_B SSNo="" disability_type="C"/>
+      <individual_B SSNo="" disability_type="C"/>
+      <individual_B SSNo="" disability_type="C"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+</TaxCardWithRoot:Resource>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/5_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/5_1.xmi
new file mode 100644
index 00000000..f6fdaf85
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/5_1.xmi
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="ASCII"?>
+<TaxCardWithRoot:Resource xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore" xsi:schemaLocation="http:///TaxCardWithRoot.ecore ../case.study.pledge.model/model/TaxationWithRoot.ecore">
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Marriage_Record" separation_cause="DIVORCE" id9="">
+      <individual_A SSNo="" disability_type="NONE"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo="" disability_type="C"/>
+      <individual_B SSNo="" disability_type="C"/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="C"/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="A"/>
+      <individual_B SSNo="" disability_type="C"/>
+      <individual_B SSNo="" disability_type="A"/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo="" disability_type="C"/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="A"/>
+      <individual_B SSNo="" disability_type="A"/>
+      <individual_B SSNo="" disability_type="D"/>
+      <individual_B SSNo="" disability_type="C"/>
+      <individual_B SSNo="" disability_type="D"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="A"/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo="" disability_type="C"/>
+      <individual_B SSNo="" disability_type="A"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="D"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="A"/>
+      <individual_B SSNo=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+</TaxCardWithRoot:Resource>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/6_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/6_1.xmi
new file mode 100644
index 00000000..cf7f6a35
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/6_1.xmi
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="ASCII"?>
+<TaxCardWithRoot:Resource xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore" xsi:schemaLocation="http:///TaxCardWithRoot.ecore ../case.study.pledge.model/model/TaxationWithRoot.ecore">
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Partnership_Record" separation_cause="SEPARATION_DE_FAIT" id9="">
+      <individual_A SSNo="" disability_type="C"/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="C"/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="D"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo="" disability_type="C"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="A"/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="A"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="C"/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo="" disability_type="A"/>
+      <individual_B SSNo="" disability_type="A"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo="" disability_type="A"/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="C"/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo="" disability_type="D"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+</TaxCardWithRoot:Resource>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/7_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/7_1.xmi
new file mode 100644
index 00000000..9f9b1389
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/7_1.xmi
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="ASCII"?>
+<TaxCardWithRoot:Resource xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore" xsi:schemaLocation="http:///TaxCardWithRoot.ecore ../case.study.pledge.model/model/TaxationWithRoot.ecore">
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Partnership_Record" separation_cause="SEPARATION_DE_FAIT" id9="">
+      <individual_A SSNo="" disability_type="C" expenses="   "/>
+      <individual_B SSNo="" disability_type="NONE" expenses=" "/>
+      <individual_B xsi:type="TaxCardWithRoot:Non_Resident_Tax_Payer" SSNo="" disability_type="E" expenses="">
+        <from_agent expense=""/>
+        <incomes xsi:type="TaxCardWithRoot:Foreign_Income">
+          <income_type xsi:type="TaxCardWithRoot:Pensions_and_Annuities_Income" id8=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <expenses xsi:type="TaxCardWithRoot:Miscellaneous_Expense_FO" expense_purpose="HOUSE_CARE" id4="" beneficiary=""/>
+          <expenses xsi:type="TaxCardWithRoot:Donation" expense_purpose="DEPENDENCE_CARE" dependent="" id4="" beneficiary="" beneficiary1=""/>
+          <expenses xsi:type="TaxCardWithRoot:Special_Expense_DS" expense_purpose="CHILD_CARE" dependent="" id4="" beneficiary=""/>
+          <expenses expense_purpose="HOUSE_CARE" id4="" beneficiary=""/>
+          <expenses xsi:type="TaxCardWithRoot:Travel_Expense_FD" expense_purpose="HOUSE_CARE" dependent="" id4="" beneficiary=""/>
+          <expenses xsi:type="TaxCardWithRoot:Loss_Carryforward" expense_purpose="RECURRENT_DEPT" dependent="" id4="" beneficiary=""/>
+          <expenses xsi:type="TaxCardWithRoot:Miscellaneous_Expense_FO" expense_purpose="DEPENDENCE_CARE" dependent="" id4="" beneficiary=""/>
+          <expenses xsi:type="TaxCardWithRoot:Travel_Expense_FD" expense_purpose="HOUSE_CARE" id4="" beneficiary=""/>
+          <expenses xsi:type="TaxCardWithRoot:Loss_Carryforward" expense_purpose="DEPENDENCE_CARE" id4="" beneficiary=""/>
+          <expenses xsi:type="TaxCardWithRoot:Special_Expense_DS" id4="" beneficiary=""/>
+          <expenses xsi:type="TaxCardWithRoot:Interest_Expense" expense_purpose="CHILD_CARE" id4="" beneficiary=""/>
+        </incomes>
+        <incomes xsi:type="TaxCardWithRoot:Foreign_Income">
+          <income_type xsi:type="TaxCardWithRoot:Employment_Income" id8=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <expenses xsi:type="TaxCardWithRoot:Spousal_Expense_AC" expense_purpose="CHILD_CARE" id4="" beneficiary=""/>
+          <expenses xsi:type="TaxCardWithRoot:Donation" expense_purpose="RECURRENT_DEPT" id4="" beneficiary1=""/>
+          <expenses xsi:type="TaxCardWithRoot:Loss_Carryforward" expense_purpose="CHILD_CARE" id4="" beneficiary=""/>
+          <expenses expense_purpose="DEPENDENCE_CARE" dependent="" id4="" beneficiary=""/>
+          <expenses xsi:type="TaxCardWithRoot:Professional_Expense" expense_purpose="HOUSE_CARE" dependent="" id4="" beneficiary=""/>
+          <expenses xsi:type="TaxCardWithRoot:Interest_Expense" expense_purpose="RECURRENT_DEPT" dependent="" id4="" beneficiary=""/>
+          <expenses xsi:type="TaxCardWithRoot:Professional_Expense" expense_purpose="HOUSE_CARE" dependent="" id4="" beneficiary=""/>
+          <expenses xsi:type="TaxCardWithRoot:Professional_Expense" expense_purpose="ALIMONY" dependent="" id4="" beneficiary=""/>
+          <expenses xsi:type="TaxCardWithRoot:Miscellaneous_Expense_FO" expense_purpose="CHILD_CARE" from_agent="//@contains.0/@parents/@individual_B.1/@from_agent" id4="" beneficiary=""/>
+          <expenses xsi:type="TaxCardWithRoot:Loss_Carryforward" expense_purpose="CHILD_CARE" id4="" beneficiary=""/>
+          <expenses xsi:type="TaxCardWithRoot:Loss_Carryforward" expense_purpose="ALIMONY" id4="" beneficiary=""/>
+          <expenses xsi:type="TaxCardWithRoot:Donation" expense_purpose="DEPENDENCE_CARE" id4="" beneficiary="" beneficiary1=""/>
+        </incomes>
+        <incomes xsi:type="TaxCardWithRoot:Foreign_Income">
+          <income_type xsi:type="TaxCardWithRoot:Employment_Income" id8=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <expenses xsi:type="TaxCardWithRoot:Professional_Expense" id4="" beneficiary=""/>
+        </incomes>
+        <incomes xsi:type="TaxCardWithRoot:Foreign_Income">
+          <income_type xsi:type="TaxCardWithRoot:Rentals_and_Leases_Income" id8="" is_periodic="false"/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <details id5=""/>
+          <expenses xsi:type="TaxCardWithRoot:Special_Expense_DS" id4="" beneficiary=""/>
+        </incomes>
+        <from_law id=""/>
+      </individual_B>
+      <individual_B SSNo="" expenses=""/>
+      <individual_B SSNo="" disability_type="D" expenses=" "/>
+      <individual_B SSNo="" disability_type="OTHER" expenses=" "/>
+      <individual_B SSNo="" disability_type="C" expenses=" "/>
+      <individual_B SSNo="" expenses=" "/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo="" disability_type="B" expenses="  "/>
+      <individual_B SSNo="" disability_type="A" expenses="   "/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+    <children SSNo="" disability_type="B" expenses="" dependent_type="NOT_OWN_CHILD" expense="         "/>
+  </contains>
+</TaxCardWithRoot:Resource>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/8_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/8_1.xmi
new file mode 100644
index 00000000..449a1402
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/8_1.xmi
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="ASCII"?>
+<TaxCardWithRoot:Resource xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore" xsi:schemaLocation="http:///TaxCardWithRoot.ecore ../case.study.pledge.model/model/TaxationWithRoot.ecore">
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Marriage_Record" id9="">
+      <individual_A SSNo="" disability_type="D"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="A"/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo="" disability_type="A"/>
+      <individual_B SSNo="" disability_type="A"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="A"/>
+      <individual_B SSNo="" disability_type="A"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="D"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="C"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="A"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="D"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="A"/>
+      <individual_B SSNo="" disability_type="A"/>
+      <individual_B SSNo="" disability_type="C"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="D"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="C"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="D"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+</TaxCardWithRoot:Resource>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/9_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/9_1.xmi
new file mode 100644
index 00000000..aabb97a2
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/9_1.xmi
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="ASCII"?>
+<TaxCardWithRoot:Resource xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore" xsi:schemaLocation="http:///TaxCardWithRoot.ecore ../case.study.pledge.model/model/TaxationWithRoot.ecore">
+  <contains id1="">
+    <parents xsi:type="TaxCardWithRoot:Partnership_Record" id9="">
+      <individual_A SSNo="" disability_type="A"/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo="" disability_type="A"/>
+      <individual_B SSNo="" disability_type="C"/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo="" disability_type="A"/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="D"/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo="" disability_type="D"/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo="" disability_type="C"/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="C"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="D"/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo="" disability_type="C"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="NONE"/>
+      <individual_B SSNo="" disability_type="A"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="A"/>
+      <individual_B SSNo="" disability_type="A"/>
+      <individual_B SSNo="" disability_type="C"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="OTHER"/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo="" disability_type="A"/>
+      <individual_B SSNo=""/>
+      <individual_B SSNo="" disability_type="A"/>
+      <individual_B SSNo="" disability_type="E"/>
+      <individual_B SSNo="" disability_type="B"/>
+      <individual_B SSNo="" disability_type="D"/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+      <properties id10=""/>
+    </parents>
+  </contains>
+</TaxCardWithRoot:Resource>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/diversity.csv b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/diversity.csv
new file mode 100644
index 00000000..a44968ad
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/diversity.csv
@@ -0,0 +1,60 @@
+FamilyTree,inputs/FamilyTree/1_1.xmi,0.992
+FamilyTree,inputs/FamilyTree/2_1.xmi,0.959349593495935
+FamilyTree,inputs/FamilyTree/3_1.xmi,0.9508196721311475
+FamilyTree,inputs/FamilyTree/4_1.xmi,0.952
+FamilyTree,inputs/FamilyTree/5_1.xmi,0.967479674796748
+FamilyTree,inputs/FamilyTree/6_1.xmi,0.9426229508196722
+FamilyTree,inputs/FamilyTree/7_1.xmi,0.9586776859504132
+FamilyTree,inputs/FamilyTree/8_1.xmi,0.959349593495935
+FamilyTree,inputs/FamilyTree/9_1.xmi,0.991869918699187
+FamilyTree,inputs/FamilyTree/10_1.xmi,0.992
+Satellite,inputs/Satellite/1_1.xmi,0.7818181818181819
+Satellite,inputs/Satellite/2_1.xmi,0.8348623853211009
+Satellite,inputs/Satellite/3_1.xmi,0.7727272727272727
+Satellite,inputs/Satellite/4_1.xmi,0.7636363636363637
+Satellite,inputs/Satellite/5_1.xmi,0.8165137614678899
+Satellite,inputs/Satellite/6_1.xmi,0.7064220183486238
+Satellite,inputs/Satellite/7_1.xmi,0.8165137614678899
+Satellite,inputs/Satellite/8_1.xmi,0.7247706422018348
+Satellite,inputs/Satellite/9_1.xmi,0.7927927927927928
+Satellite,inputs/Satellite/10_1.xmi,0.7168141592920354
+Taxation,inputs/Taxation/1_1.xmi,0.6795580110497238
+Taxation,inputs/Taxation/2_1.xmi,0.6978021978021978
+Taxation,inputs/Taxation/3_1.xmi,0.6795580110497238
+Taxation,inputs/Taxation/4_1.xmi,0.6574585635359116
+Taxation,inputs/Taxation/5_1.xmi,0.6629834254143646
+Taxation,inputs/Taxation/6_1.xmi,0.7431693989071039
+Taxation,inputs/Taxation/7_1.xmi,0.6978021978021978
+Taxation,inputs/Taxation/8_1.xmi,0.6574585635359116
+Taxation,inputs/Taxation/9_1.xmi,0.6795580110497238
+Taxation,inputs/Taxation/10_1.xmi,0.6906077348066298
+FamilyTreeNoNum,inputs/FamilyTreeNoNum/1_1.xmi,0.7788461538461539
+FamilyTreeNoNum,inputs/FamilyTreeNoNum/2_1.xmi,0.7980769230769231
+FamilyTreeNoNum,inputs/FamilyTreeNoNum/3_1.xmi,0.8076923076923077
+FamilyTreeNoNum,inputs/FamilyTreeNoNum/4_1.xmi,0.7980769230769231
+FamilyTreeNoNum,inputs/FamilyTreeNoNum/5_1.xmi,0.8173076923076923
+FamilyTreeNoNum,inputs/FamilyTreeNoNum/6_1.xmi,0.8173076923076923
+FamilyTreeNoNum,inputs/FamilyTreeNoNum/7_1.xmi,0.8173076923076923
+FamilyTreeNoNum,inputs/FamilyTreeNoNum/8_1.xmi,0.7788461538461539
+FamilyTreeNoNum,inputs/FamilyTreeNoNum/9_1.xmi,0.7884615384615384
+FamilyTreeNoNum,inputs/FamilyTreeNoNum/10_1.xmi,0.8076923076923077
+SatelliteNoNum,inputs/SatelliteNoNum/1_1.xmi,0.7614678899082569
+SatelliteNoNum,inputs/SatelliteNoNum/2_1.xmi,0.8380952380952381
+SatelliteNoNum,inputs/SatelliteNoNum/3_1.xmi,0.8055555555555556
+SatelliteNoNum,inputs/SatelliteNoNum/4_1.xmi,0.7818181818181819
+SatelliteNoNum,inputs/SatelliteNoNum/5_1.xmi,0.6929824561403509
+SatelliteNoNum,inputs/SatelliteNoNum/6_1.xmi,0.7870370370370371
+SatelliteNoNum,inputs/SatelliteNoNum/7_1.xmi,0.7523809523809524
+SatelliteNoNum,inputs/SatelliteNoNum/8_1.xmi,0.7777777777777778
+SatelliteNoNum,inputs/SatelliteNoNum/9_1.xmi,0.7363636363636363
+SatelliteNoNum,inputs/SatelliteNoNum/10_1.xmi,0.8055555555555556
+TaxationNoNum,inputs/TaxationNoNum/1_1.xmi,0.4883720930232558
+TaxationNoNum,inputs/TaxationNoNum/2_1.xmi,0.4883720930232558
+TaxationNoNum,inputs/TaxationNoNum/3_1.xmi,0.6994219653179191
+TaxationNoNum,inputs/TaxationNoNum/4_1.xmi,0.4883720930232558
+TaxationNoNum,inputs/TaxationNoNum/5_1.xmi,0.4883720930232558
+TaxationNoNum,inputs/TaxationNoNum/6_1.xmi,0.4883720930232558
+TaxationNoNum,inputs/TaxationNoNum/7_1.xmi,0.6954022988505747
+TaxationNoNum,inputs/TaxationNoNum/8_1.xmi,0.4883720930232558
+TaxationNoNum,inputs/TaxationNoNum/9_1.xmi,0.4883720930232558
+TaxationNoNum,inputs/TaxationNoNum/10_1.xmi,0.4883720930232558
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/model/TaxationWithRoot.ecore b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/model/TaxationWithRoot.ecore
new file mode 100644
index 00000000..4c418a20
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/model/TaxationWithRoot.ecore
@@ -0,0 +1,551 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="TaxationWithRoot" nsURI="http:///TaxCardWithRoot.ecore" nsPrefix="TaxCardWithRoot">
+  <eAnnotations source="http://www.eclipse.org/OCL/Import">
+    <details key="ecore" value="http://www.eclipse.org/emf/2002/Ecore"/>
+  </eAnnotations>
+  <eClassifiers xsi:type="ecore:EEnum" name="Grantor">
+    <eLiterals name="WWW" literal="WWW"/>
+    <eLiterals name="Employer" value="1" literal="Employer"/>
+    <eLiterals name="MMM" value="2" literal="MMM"/>
+    <eLiterals name="UUU" value="3" literal="UUU"/>
+    <eLiterals name="YYY" value="4" literal="YYY"/>
+    <eLiterals name="OOO" value="5" literal="OOO"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Constants" abstract="true">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="MAXIMUM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
+        defaultValueLiteral="3480.0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="MAXIMUM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
+        defaultValueLiteral="3600.0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="MINIMUM_SALARY" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble" defaultValueLiteral="1500.0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="FLAT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
+        defaultValueLiteral="4500.0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="MAXIMUM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
+        defaultValueLiteral="20.0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="MINIMUM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
+        defaultValueLiteral="120.0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
+        defaultValueLiteral="0.0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
+        defaultValueLiteral="24000.0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="MAXIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
+        defaultValueLiteral="99.0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="MAXIMAL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
+        defaultValueLiteral="30.0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="MINIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
+        defaultValueLiteral="4.0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="FLAT_RATE_CIM_DAILY" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble" defaultValueLiteral="2.0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="FLAT_RATE_CIM_MONTHLY"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
+        defaultValueLiteral="62.0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="FLAT_RATE_CIM_YEARLY" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble" defaultValueLiteral="750.0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="FLAT_RATE_CIP_DAILY" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble" defaultValueLiteral="1.0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="FLAT_RATE_CIP_MONTHLY"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
+        defaultValueLiteral="25.0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="FLAT_RATE_CIP_YEARLY" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble" defaultValueLiteral="30.0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="FLAT_RATE_CIS_DAILY" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble" defaultValueLiteral="1.0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="FLAT_RATE_CIS_MONTHLY"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
+        defaultValueLiteral="25.0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="FLAT_RATE_CIS_YEARLY" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble" defaultValueLiteral="300.0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="FLAT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
+        defaultValueLiteral="99.0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_DS"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="DISABILITY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="Disability_Types">
+    <eLiterals name="beug"/>
+    <eLiterals name="NONE" value="1"/>
+    <eLiterals name="A" value="2" literal="A"/>
+    <eLiterals name="B" value="3" literal="B"/>
+    <eLiterals name="C" value="4" literal="C"/>
+    <eLiterals name="D" value="5" literal="D"/>
+    <eLiterals name="E" value="6" literal="E"/>
+    <eLiterals name="OTHER" value="7"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="Country">
+    <eLiterals name="ZZ" literal="ZZ"/>
+    <eLiterals name="FF" value="1" literal="FF"/>
+    <eLiterals name="BB" value="2" literal="BB"/>
+    <eLiterals name="DD" value="3" literal="DD"/>
+    <eLiterals name="NN" value="4" literal="NN"/>
+    <eLiterals name="OTHER" value="5" literal="OTHER"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="Tax_Office">
+    <eLiterals name="RTS_2" literal="RTS_2"/>
+    <eLiterals name="RTS_3" value="1" literal="RTS_3"/>
+    <eLiterals name="RTS_4" value="2" literal="RTS_4"/>
+    <eLiterals name="RTS_5" value="3" literal="RTS_5"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="Tax_Class_Category">
+    <eLiterals name="One" literal="One"/>
+    <eLiterals name="One_A" value="1" literal="One_A"/>
+    <eLiterals name="Two" value="2" literal="Two"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="Job_Activity">
+    <eLiterals name="Salary" literal="Salary"/>
+    <eLiterals name="Pension" value="1" literal="Pension"/>
+    <eLiterals name="Annuity" value="2" literal="Annuity"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="Town">
+    <eLiterals name="LL" literal="LL"/>
+    <eLiterals name="BB" value="1" literal="BB"/>
+    <eLiterals name="SS" value="2" literal="SS"/>
+    <eLiterals name="TT" value="3" literal="TT"/>
+    <eLiterals name="Other" value="4" literal="Other"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="CE_Type">
+    <eLiterals name="INALIDITY_AND_INFIRMITY" literal="INALIDITY_AND_INFIRMITY"/>
+    <eLiterals name="DEPENDENCE_AND_CARE_EXCLUDING_CHLIDREN_NOT_PART_OF_HOUSEHOLD"
+        value="1" literal="DEPENDENCE_AND_CARE_EXCLUDING_CHLIDREN_NOT_PART_OF_HOUSEHOLD"/>
+    <eLiterals name="CARE_FOR_CHILDREN_NOT_BEING_PART_OF_HOUSEHOLD" value="2" literal="CARE_FOR_CHILDREN_NOT_BEING_PART_OF_HOUSEHOLD"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="Expense_Purpose">
+    <eLiterals name="HOUSE_CARE" literal="HOUSE_CARE"/>
+    <eLiterals name="CHILD_CARE" value="1" literal="CHILD_CARE"/>
+    <eLiterals name="DEPENDENCE_CARE" value="2" literal="DEPENDENCE_CARE"/>
+    <eLiterals name="OTHER" value="3" literal="OTHER"/>
+    <eLiterals name="ALIMONY" value="4"/>
+    <eLiterals name="RECURRENT_DEPT" value="5"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="Dependent_Type">
+    <eLiterals name="CHILD" literal="CHILD"/>
+    <eLiterals name="SPOUSE" value="1" literal="SPOUSE"/>
+    <eLiterals name="RELATIVE" value="2" literal="RELATIVE"/>
+    <eLiterals name="OTHER_FAMILY_MEMBER" value="3" literal="OTHER_FAMILY_MEMBER"/>
+    <eLiterals name="NOT_OWN_CHILD" value="4"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Income_Tax">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="taxPayer" lowerBound="1"
+        eType="#//Tax_Payer"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="tax_amount" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="tax_year" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id6" ordered="false" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" iD="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Tax_Payer" abstract="true" eSuperTypes="#//Physical_Person #//Tax_Case">
+    <eAnnotations source="duplicates">
+      <contents xsi:type="ecore:EReference" name="expenses" ordered="false" upperBound="-1"
+          eType="#//Expense" containment="true">
+        <eAnnotations source="redefines" references="#//Physical_Person/expenses"/>
+      </contents>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="dependents" ordered="false"
+        upperBound="6" eType="#//Dependent" containment="true" eOpposite="#//Dependent/responsible_person"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="from_agent" lowerBound="1"
+        eType="#//FromAgent" containment="true" eOpposite="#//FromAgent/taxPayer"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="incomes" ordered="false"
+        lowerBound="1" upperBound="-1" eType="#//Income" containment="true" eOpposite="#//Income/taxPayer"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="from_law" lowerBound="1"
+        eType="#//FromLaw" containment="true" eOpposite="#//FromLaw/taxPayer"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Physical_Person">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="SSNo" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+        iD="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="addresses" ordered="false"
+        upperBound="-1" eType="#//Address" eOpposite="#//Address/taxPayer"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="birth_year" ordered="false"
+        unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="disability_percentage"
+        ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="disability_type" ordered="false"
+        unique="false" lowerBound="1" eType="#//Disability_Types"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="birth_month" ordered="false"
+        unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="birth_day" ordered="false"
+        unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="expenses" ordered="false"
+        upperBound="-1" eType="#//Expense" eOpposite="#//Expense/beneficiary"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="is_widower" ordered="false"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Address">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="country" lowerBound="1"
+        eType="#//Country" defaultValueLiteral="ZZ"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="street" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="zipCode" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="city" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id2" ordered="false" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" iD="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="taxPayer" ordered="false"
+        upperBound="-1" eType="#//Physical_Person" eOpposite="#//Physical_Person/addresses"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Expense">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="declared_amount" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="expense_purpose" lowerBound="1"
+        eType="#//Expense_Purpose" defaultValueLiteral="OTHER"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="dependent" eType="#//Dependent"
+        eOpposite="#//Dependent/expense"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="from_agent" ordered="false"
+        eType="#//FromAgent" eOpposite="#//FromAgent/expense"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="income" lowerBound="1"
+        eType="#//Income" eOpposite="#//Income/expenses"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id4" ordered="false" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" iD="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="beneficiary" ordered="false"
+        eType="#//Physical_Person" eOpposite="#//Physical_Person/expenses"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Dependent" eSuperTypes="#//Physical_Person">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="dependent_type" lowerBound="1"
+        eType="#//Dependent_Type"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="responsible_person" eType="#//Tax_Payer"
+        eOpposite="#//Tax_Payer/dependents"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="continued_studies" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="false"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="allowances" ordered="false"
+        eType="#//External_Allowance" containment="true" eOpposite="#//External_Allowance/person"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="household" ordered="false"
+        eType="#//Household" eOpposite="#//Household/children"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="from_agent" ordered="false"
+        eType="#//FromAgent" eOpposite="#//FromAgent/dependent"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="expense" ordered="false"
+        upperBound="-1" eType="#//Expense" eOpposite="#//Expense/dependent"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="External_Allowance">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="grantor" lowerBound="1"
+        eType="#//Grantor"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="starting_year" ordered="false"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="ending_year" ordered="false"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="reciver" ordered="false"
+        lowerBound="1" eType="#//Physical_Person"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id5" ordered="false" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" iD="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="person" ordered="false"
+        lowerBound="1" eType="#//Dependent" eOpposite="#//Dependent/allowances"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Household" eSuperTypes="#//Tax_Case">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="parents" ordered="false"
+        lowerBound="1" eType="#//Legal_Union_Record" containment="true" eOpposite="#//Legal_Union_Record/household"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id1" ordered="false" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" iD="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="children" ordered="false"
+        upperBound="-1" eType="#//Dependent" containment="true" eOpposite="#//Dependent/household"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Legal_Union_Record" abstract="true">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="start_year" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="end_year" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="separation_cause" ordered="false"
+        lowerBound="1" eType="#//Separation_Causes"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="individual_A" ordered="false"
+        lowerBound="1" eType="#//Physical_Person" containment="true">
+      <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
+        <details key="body" value="legal_union_A"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="individual_B" ordered="false"
+        lowerBound="1" upperBound="-1" eType="#//Physical_Person" containment="true">
+      <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
+        <details key="body" value="legal_union_B"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="properties" ordered="false"
+        lowerBound="1" upperBound="-1" eType="#//Tax_Property" containment="true"
+        eOpposite="#//Tax_Property/union_record"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mutual_agreement" ordered="false"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id9" ordered="false" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" iD="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="household" ordered="false"
+        lowerBound="1" eType="#//Household" eOpposite="#//Household/parents"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="Separation_Causes">
+    <eLiterals name="NONE"/>
+    <eLiterals name="DIVORCE" value="1"/>
+    <eLiterals name="SEPARATION_DE_FAIT" value="2"/>
+    <eLiterals name="SEPARATION_BY_COURT" value="3"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Tax_Property">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="starting_year" ordered="false"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id10" ordered="false" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" iD="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="union_record" ordered="false"
+        lowerBound="1" eType="#//Legal_Union_Record" eOpposite="#//Legal_Union_Record/properties"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Tax_Case" abstract="true" interface="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="FromAgent">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="taxPayer" lowerBound="1"
+        eType="#//Tax_Payer" eOpposite="#//Tax_Payer/from_agent"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="is_dependent_eligible_for_CE_Not_In_Houshold_Children_Care"
+        ordered="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="expense" ordered="false"
+        eType="#//Expense" eOpposite="#//Expense/from_agent"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="is_eligible_debt" ordered="false"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="dependent" ordered="false"
+        eType="#//Dependent" eOpposite="#//Dependent/from_agent"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Income" abstract="true">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="income_amount" ordered="false"
+        unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
+        <details key="derivation" value="let non_null_amounts:OrderedSet(Income_Detail)=self.details->select(det:Income_Detail|det.amount>0)->asOrderedSet() in&#xA;non_null_amounts->collect(amount)->min()"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="income_type" lowerBound="1"
+        eType="#//Income_Type" containment="true" eOpposite="#//Income_Type/income"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="tax_card" eType="#//Tax_Card"
+        containment="true" eOpposite="#//Tax_Card/income"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="tax_liability" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="taxPayer" ordered="false"
+        lowerBound="1" eType="#//Tax_Payer" eOpposite="#//Tax_Payer/incomes"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="details" lowerBound="12"
+        upperBound="12" eType="#//Income_Detail" containment="true" eOpposite="#//Income_Detail/income"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="num" ordered="false" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt" iD="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="expenses" ordered="false"
+        upperBound="-1" eType="#//Expense" containment="true" eOpposite="#//Expense/income"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Income_Type" abstract="true">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id8" ordered="false" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" iD="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="income" lowerBound="1"
+        eType="#//Income" eOpposite="#//Income/income_type"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Tax_Card">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="card_identifier" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+        iD="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="tax_office" lowerBound="1"
+        eType="#//Tax_Office"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="percentage_of_witholding"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="tax_payers_name_surname"
+        ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="tax_payers_partner_name_surname"
+        ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="tax_payers_address" eType="#//Address"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="jobs_Employer_SSNo" ordered="false"
+        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="jobs_employers_name" ordered="false"
+        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="jobs_activity_type" lowerBound="1"
+        eType="#//Job_Activity"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="jobs_place_of_work" lowerBound="1"
+        eType="#//Town"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="deduction_FD_daily" ordered="false"
+        unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
+        defaultValueLiteral="0.0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="deduction_FD_monthly" ordered="false"
+        unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
+        defaultValueLiteral="0.0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="deduction_AC_daily" unique="false"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
+        defaultValueLiteral="0.0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="deduction_AC_monthly" unique="false"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
+        defaultValueLiteral="0.0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="deduction_AC_yearly" unique="false"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
+        defaultValueLiteral="0.0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="deduction_CE_daily" unique="false"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
+        defaultValueLiteral="0.0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="deduction_CE_monthly" unique="false"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
+        defaultValueLiteral="0.0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="deduction_CE_yearly" unique="false"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
+        defaultValueLiteral="0.0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="deduction_DS_daily" unique="false"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
+        defaultValueLiteral="0.0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="deduction_DS_monthly" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble" defaultValueLiteral="0.0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="deduction_FO_daily" unique="false"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
+        defaultValueLiteral="0.0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="deduction_FO_monthly" unique="false"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
+        defaultValueLiteral="0.0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="deduction_FO_yearly" unique="false"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
+        defaultValueLiteral="0.0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="credit_CIS_daily" unique="false"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
+        defaultValueLiteral="0.0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="credit_CIS_monthly" unique="false"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
+        defaultValueLiteral="0.0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="credit_CIM_daily" unique="false"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
+        defaultValueLiteral="0.0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="validity" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="income_Tax_Credit" ordered="false"
+        upperBound="-1" eType="#//Income_Tax_Credit" eOpposite="#//Income_Tax_Credit/taxation_Frame"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="previous" eType="#//Tax_Card"
+        eOpposite="#//Tax_Card/current_tax_card"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="current_tax_card" eType="#//Tax_Card"
+        eOpposite="#//Tax_Card/previous"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="credit_CIM_yearly" ordered="false"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="deduction_DS_Alimony_yearly"
+        ordered="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="deduction_DS_Debt_yearly"
+        ordered="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="income" lowerBound="1"
+        eType="#//Income" eOpposite="#//Income/tax_card"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Income_Tax_Credit">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="grantedBy" lowerBound="1"
+        eType="#//Grantor"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="taxPayer" eType="#//Tax_Payer"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="tax_year" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="yearly" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble" defaultValueLiteral="300.0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="monthly" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble" defaultValueLiteral="25.0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="daily" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
+        defaultValueLiteral="1.0"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id7" ordered="false" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" iD="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="taxation_Frame" eType="#//Tax_Card"
+        eOpposite="#//Tax_Card/income_Tax_Credit"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Income_Detail">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="amount" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="is_worked" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="distance" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="worked_days" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="is_contributing_CNS" ordered="false"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id5" ordered="false" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" iD="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="income" lowerBound="1"
+        eType="#//Income" eOpposite="#//Income/details"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="FromLaw">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" ordered="false" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" iD="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="taxPayer" lowerBound="1"
+        eType="#//Tax_Payer" eOpposite="#//Tax_Payer/from_law"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Fiscal_Address" eSuperTypes="#//Address"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Habitual_Address" eSuperTypes="#//Address"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Marriage_Record" eSuperTypes="#//Legal_Union_Record"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Non_Resident_Tax_Payer" eSuperTypes="#//Tax_Payer">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="is_assimilated_to_resident"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+        defaultValueLiteral="false"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Partnership_Record" eSuperTypes="#//Legal_Union_Record"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Resident_Tax_Payer" eSuperTypes="#//Tax_Payer"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Trade_and_Business_Income" eSuperTypes="#//Income_Type"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Agriculture_and_Forestry_Income" eSuperTypes="#//Income_Type"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Pensions_and_Annuities_Income" eSuperTypes="#//Income_Type">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="occasional_payement" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+        defaultValueLiteral="false"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Capital_and_Investments_Income" eSuperTypes="#//Income_Type"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Employment_Income" eSuperTypes="#//Income_Type"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Rentals_and_Leases_Income" eSuperTypes="#//Income_Type">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="is_periodic" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Foreign_Income" eSuperTypes="#//Income"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Local_Income" eSuperTypes="#//Income"/>
+  <eClassifiers xsi:type="ecore:EClass" name="CIM" eSuperTypes="#//Income_Tax_Credit"/>
+  <eClassifiers xsi:type="ecore:EClass" name="CIP" eSuperTypes="#//Income_Tax_Credit"/>
+  <eClassifiers xsi:type="ecore:EClass" name="CIS" eSuperTypes="#//Income_Tax_Credit"/>
+  <eClassifiers xsi:type="ecore:EEnum" name="Category_of_Permanent_Expense">
+    <eLiterals name="MISCELLANEOUS_DEBT" literal="MISCELLANEOUS_DEBT"/>
+    <eLiterals name="ALIMONY" value="1" literal="ALIMONY"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="Category_of_Health_and_Pension_Insurances">
+    <eLiterals name="MANDATORY_HEALTH_AND_PENSION_INSURANCE" literal="MANDATORY_HEALTH_AND_PENSION_INSURANCE"/>
+    <eLiterals name="ADDITIONAL_EMPLOYERS_PENSION_INSURANCE" value="1" literal="ADDITIONAL_EMPLOYERS_PENSION_INSURANCE"/>
+    <eLiterals name="CONTINUED_HEALTH_AND_PENSION_INSURANCE" value="2" literal="CONTINUED_HEALTH_AND_PENSION_INSURANCE"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="Category_of_Private_Insurance_and_Plan">
+    <eLiterals name="PRIVATE_INSURANCE" literal="PRIVATE_INSURANCE"/>
+    <eLiterals name="PRIVATE_LIFE_INSURANCE" value="1" literal="PRIVATE_LIFE_INSURANCE"/>
+    <eLiterals name="COMPANY_MEMBERS_PRIVATE_INSURANCE" value="2" literal="COMPANY_MEMBERS_PRIVATE_INSURANCE"/>
+    <eLiterals name="HOUSING_SAVING_PLAN" value="3" literal="HOUSING_SAVING_PLAN"/>
+    <eLiterals name="OLD_AGE_PENSION_PLAN" value="4" literal="OLD_AGE_PENSION_PLAN"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Permanent_Expense" eSuperTypes="#//Special_Expense_DS">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="category" lowerBound="1"
+        eType="#//Category_of_Permanent_Expense"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Special_Expense_DS" eSuperTypes="#//Expense"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Interest_Expense" eSuperTypes="#//Special_Expense_DS"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Private_Insurance_and_Plan" eSuperTypes="#//Special_Expense_DS">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="category" lowerBound="1"
+        eType="#//Category_of_Private_Insurance_and_Plan"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="duration_of_contract" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Health_and_Pension_Insurance" eSuperTypes="#//Special_Expense_DS">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="category" lowerBound="1"
+        eType="#//Category_of_Health_and_Pension_Insurances"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="is_related_to_additional_salary"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+        defaultValueLiteral="false"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Donation" eSuperTypes="#//Special_Expense_DS">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="beneficiary1" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="is_donation_reported" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Loss_Carryforward" eSuperTypes="#//Special_Expense_DS"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Spousal_Expense_AC" eSuperTypes="#//Expense"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Extraordinary_Expense_CE" eSuperTypes="#//Expense">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="thresholded_deduction_percentage"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="ce_type" lowerBound="1"
+        eType="#//CE_Type"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Travel_Expense_FD" eSuperTypes="#//Professional_Expense"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Professional_Expense" eSuperTypes="#//Expense"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Miscellaneous_Expense_FO" eSuperTypes="#//Professional_Expense"/>
+  <eClassifiers xsi:type="ecore:EEnum" name="Legal_Union_Types">
+    <eLiterals name="MARIAGE"/>
+    <eLiterals name="PARTNERSHIP" value="1"/>
+    <eLiterals name="OTHER" value="2"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Resource">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="contains" upperBound="-1"
+        eType="#//Household" containment="true"/>
+  </eClassifiers>
+</ecore:EPackage>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/model/TaxationWithRoot.genmodel b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/model/TaxationWithRoot.genmodel
new file mode 100644
index 00000000..c3466ca0
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/model/TaxationWithRoot.genmodel
@@ -0,0 +1,344 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/models20.diversity-calculator/src" modelPluginID="models20.diversity-calculator"
+    modelName="TaxationWithRoot" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false"
+    operationReflection="true" importOrganizing="true">
+  <foreignModel>TaxationWithRoot.ecore</foreignModel>
+  <genPackages prefix="TaxationWithRoot" disposableProviderFactory="true" ecorePackage="TaxationWithRoot.ecore#/">
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="TaxationWithRoot.ecore#//Grantor">
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Grantor/WWW"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Grantor/Employer"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Grantor/MMM"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Grantor/UUU"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Grantor/YYY"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Grantor/OOO"/>
+    </genEnums>
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="TaxationWithRoot.ecore#//Disability_Types">
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Disability_Types/beug"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Disability_Types/NONE"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Disability_Types/A"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Disability_Types/B"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Disability_Types/C"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Disability_Types/D"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Disability_Types/E"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Disability_Types/OTHER"/>
+    </genEnums>
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="TaxationWithRoot.ecore#//Country">
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Country/ZZ"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Country/FF"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Country/BB"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Country/DD"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Country/NN"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Country/OTHER"/>
+    </genEnums>
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="TaxationWithRoot.ecore#//Tax_Office">
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Tax_Office/RTS_2"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Tax_Office/RTS_3"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Tax_Office/RTS_4"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Tax_Office/RTS_5"/>
+    </genEnums>
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="TaxationWithRoot.ecore#//Tax_Class_Category">
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Tax_Class_Category/One"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Tax_Class_Category/One_A"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Tax_Class_Category/Two"/>
+    </genEnums>
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="TaxationWithRoot.ecore#//Job_Activity">
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Job_Activity/Salary"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Job_Activity/Pension"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Job_Activity/Annuity"/>
+    </genEnums>
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="TaxationWithRoot.ecore#//Town">
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Town/LL"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Town/BB"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Town/SS"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Town/TT"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Town/Other"/>
+    </genEnums>
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="TaxationWithRoot.ecore#//CE_Type">
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//CE_Type/INALIDITY_AND_INFIRMITY"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//CE_Type/DEPENDENCE_AND_CARE_EXCLUDING_CHLIDREN_NOT_PART_OF_HOUSEHOLD"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//CE_Type/CARE_FOR_CHILDREN_NOT_BEING_PART_OF_HOUSEHOLD"/>
+    </genEnums>
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="TaxationWithRoot.ecore#//Expense_Purpose">
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Expense_Purpose/HOUSE_CARE"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Expense_Purpose/CHILD_CARE"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Expense_Purpose/DEPENDENCE_CARE"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Expense_Purpose/OTHER"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Expense_Purpose/ALIMONY"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Expense_Purpose/RECURRENT_DEPT"/>
+    </genEnums>
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="TaxationWithRoot.ecore#//Dependent_Type">
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Dependent_Type/CHILD"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Dependent_Type/SPOUSE"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Dependent_Type/RELATIVE"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Dependent_Type/OTHER_FAMILY_MEMBER"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Dependent_Type/NOT_OWN_CHILD"/>
+    </genEnums>
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="TaxationWithRoot.ecore#//Separation_Causes">
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Separation_Causes/NONE"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Separation_Causes/DIVORCE"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Separation_Causes/SEPARATION_DE_FAIT"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Separation_Causes/SEPARATION_BY_COURT"/>
+    </genEnums>
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="TaxationWithRoot.ecore#//Category_of_Permanent_Expense">
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Category_of_Permanent_Expense/MISCELLANEOUS_DEBT"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Category_of_Permanent_Expense/ALIMONY"/>
+    </genEnums>
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="TaxationWithRoot.ecore#//Category_of_Health_and_Pension_Insurances">
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Category_of_Health_and_Pension_Insurances/MANDATORY_HEALTH_AND_PENSION_INSURANCE"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Category_of_Health_and_Pension_Insurances/ADDITIONAL_EMPLOYERS_PENSION_INSURANCE"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Category_of_Health_and_Pension_Insurances/CONTINUED_HEALTH_AND_PENSION_INSURANCE"/>
+    </genEnums>
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="TaxationWithRoot.ecore#//Category_of_Private_Insurance_and_Plan">
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Category_of_Private_Insurance_and_Plan/PRIVATE_INSURANCE"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Category_of_Private_Insurance_and_Plan/PRIVATE_LIFE_INSURANCE"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Category_of_Private_Insurance_and_Plan/COMPANY_MEMBERS_PRIVATE_INSURANCE"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Category_of_Private_Insurance_and_Plan/HOUSING_SAVING_PLAN"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Category_of_Private_Insurance_and_Plan/OLD_AGE_PENSION_PLAN"/>
+    </genEnums>
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="TaxationWithRoot.ecore#//Legal_Union_Types">
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Legal_Union_Types/MARIAGE"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Legal_Union_Types/PARTNERSHIP"/>
+      <genEnumLiterals ecoreEnumLiteral="TaxationWithRoot.ecore#//Legal_Union_Types/OTHER"/>
+    </genEnums>
+    <genClasses image="false" ecoreClass="TaxationWithRoot.ecore#//Constants">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Constants/MAXIMUM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Constants/MAXIMUM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Constants/MINIMUM_SALARY"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Constants/FLAT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Constants/MAXIMUM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Constants/MINIMUM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Constants/MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Constants/MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Constants/MAXIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Constants/MAXIMAL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Constants/MINIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Constants/FLAT_RATE_CIM_DAILY"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Constants/FLAT_RATE_CIM_MONTHLY"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Constants/FLAT_RATE_CIM_YEARLY"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Constants/FLAT_RATE_CIP_DAILY"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Constants/FLAT_RATE_CIP_MONTHLY"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Constants/FLAT_RATE_CIP_YEARLY"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Constants/FLAT_RATE_CIS_DAILY"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Constants/FLAT_RATE_CIS_MONTHLY"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Constants/FLAT_RATE_CIS_YEARLY"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Constants/FLAT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Constants/MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_DS"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Constants/FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Constants/DISABILITY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Constants/MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE"/>
+    </genClasses>
+    <genClasses ecoreClass="TaxationWithRoot.ecore#//Income_Tax">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference TaxationWithRoot.ecore#//Income_Tax/taxPayer"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Income_Tax/tax_amount"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Income_Tax/tax_year"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Income_Tax/id6"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="TaxationWithRoot.ecore#//Tax_Payer">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference TaxationWithRoot.ecore#//Tax_Payer/dependents"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference TaxationWithRoot.ecore#//Tax_Payer/from_agent"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference TaxationWithRoot.ecore#//Tax_Payer/incomes"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference TaxationWithRoot.ecore#//Tax_Payer/from_law"/>
+    </genClasses>
+    <genClasses ecoreClass="TaxationWithRoot.ecore#//Physical_Person">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Physical_Person/SSNo"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference TaxationWithRoot.ecore#//Physical_Person/addresses"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Physical_Person/birth_year"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Physical_Person/disability_percentage"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Physical_Person/disability_type"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Physical_Person/birth_month"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Physical_Person/birth_day"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference TaxationWithRoot.ecore#//Physical_Person/expenses"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Physical_Person/is_widower"/>
+    </genClasses>
+    <genClasses ecoreClass="TaxationWithRoot.ecore#//Address">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Address/country"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Address/street"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Address/zipCode"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Address/city"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Address/id2"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference TaxationWithRoot.ecore#//Address/taxPayer"/>
+    </genClasses>
+    <genClasses ecoreClass="TaxationWithRoot.ecore#//Expense">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Expense/declared_amount"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Expense/expense_purpose"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference TaxationWithRoot.ecore#//Expense/dependent"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference TaxationWithRoot.ecore#//Expense/from_agent"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference TaxationWithRoot.ecore#//Expense/income"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Expense/id4"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference TaxationWithRoot.ecore#//Expense/beneficiary"/>
+    </genClasses>
+    <genClasses ecoreClass="TaxationWithRoot.ecore#//Dependent">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Dependent/dependent_type"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference TaxationWithRoot.ecore#//Dependent/responsible_person"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Dependent/continued_studies"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference TaxationWithRoot.ecore#//Dependent/allowances"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference TaxationWithRoot.ecore#//Dependent/household"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference TaxationWithRoot.ecore#//Dependent/from_agent"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference TaxationWithRoot.ecore#//Dependent/expense"/>
+    </genClasses>
+    <genClasses ecoreClass="TaxationWithRoot.ecore#//External_Allowance">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//External_Allowance/grantor"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//External_Allowance/starting_year"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//External_Allowance/ending_year"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference TaxationWithRoot.ecore#//External_Allowance/reciver"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//External_Allowance/id5"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference TaxationWithRoot.ecore#//External_Allowance/person"/>
+    </genClasses>
+    <genClasses ecoreClass="TaxationWithRoot.ecore#//Household">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference TaxationWithRoot.ecore#//Household/parents"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Household/id1"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference TaxationWithRoot.ecore#//Household/children"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="TaxationWithRoot.ecore#//Legal_Union_Record">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Legal_Union_Record/start_year"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Legal_Union_Record/end_year"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Legal_Union_Record/separation_cause"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference TaxationWithRoot.ecore#//Legal_Union_Record/individual_A"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference TaxationWithRoot.ecore#//Legal_Union_Record/individual_B"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference TaxationWithRoot.ecore#//Legal_Union_Record/properties"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Legal_Union_Record/mutual_agreement"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Legal_Union_Record/id9"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference TaxationWithRoot.ecore#//Legal_Union_Record/household"/>
+    </genClasses>
+    <genClasses ecoreClass="TaxationWithRoot.ecore#//Tax_Property">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Tax_Property/starting_year"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Tax_Property/id10"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference TaxationWithRoot.ecore#//Tax_Property/union_record"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="TaxationWithRoot.ecore#//Tax_Case"/>
+    <genClasses ecoreClass="TaxationWithRoot.ecore#//FromAgent">
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference TaxationWithRoot.ecore#//FromAgent/taxPayer"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//FromAgent/is_dependent_eligible_for_CE_Not_In_Houshold_Children_Care"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference TaxationWithRoot.ecore#//FromAgent/expense"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//FromAgent/is_eligible_debt"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference TaxationWithRoot.ecore#//FromAgent/dependent"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="TaxationWithRoot.ecore#//Income">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Income/income_amount"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference TaxationWithRoot.ecore#//Income/income_type"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference TaxationWithRoot.ecore#//Income/tax_card"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Income/tax_liability"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference TaxationWithRoot.ecore#//Income/taxPayer"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference TaxationWithRoot.ecore#//Income/details"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Income/num"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference TaxationWithRoot.ecore#//Income/expenses"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="TaxationWithRoot.ecore#//Income_Type">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Income_Type/id8"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference TaxationWithRoot.ecore#//Income_Type/income"/>
+    </genClasses>
+    <genClasses ecoreClass="TaxationWithRoot.ecore#//Tax_Card">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Tax_Card/card_identifier"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Tax_Card/tax_office"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Tax_Card/percentage_of_witholding"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Tax_Card/tax_payers_name_surname"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Tax_Card/tax_payers_partner_name_surname"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference TaxationWithRoot.ecore#//Tax_Card/tax_payers_address"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Tax_Card/jobs_Employer_SSNo"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Tax_Card/jobs_employers_name"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Tax_Card/jobs_activity_type"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Tax_Card/jobs_place_of_work"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Tax_Card/deduction_FD_daily"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Tax_Card/deduction_FD_monthly"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Tax_Card/deduction_AC_daily"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Tax_Card/deduction_AC_monthly"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Tax_Card/deduction_AC_yearly"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Tax_Card/deduction_CE_daily"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Tax_Card/deduction_CE_monthly"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Tax_Card/deduction_CE_yearly"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Tax_Card/deduction_DS_daily"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Tax_Card/deduction_DS_monthly"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Tax_Card/deduction_FO_daily"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Tax_Card/deduction_FO_monthly"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Tax_Card/deduction_FO_yearly"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Tax_Card/credit_CIS_daily"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Tax_Card/credit_CIS_monthly"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Tax_Card/credit_CIM_daily"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Tax_Card/validity"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference TaxationWithRoot.ecore#//Tax_Card/income_Tax_Credit"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference TaxationWithRoot.ecore#//Tax_Card/previous"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference TaxationWithRoot.ecore#//Tax_Card/current_tax_card"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Tax_Card/credit_CIM_yearly"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Tax_Card/deduction_DS_Alimony_yearly"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Tax_Card/deduction_DS_Debt_yearly"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference TaxationWithRoot.ecore#//Tax_Card/income"/>
+    </genClasses>
+    <genClasses ecoreClass="TaxationWithRoot.ecore#//Income_Tax_Credit">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Income_Tax_Credit/grantedBy"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference TaxationWithRoot.ecore#//Income_Tax_Credit/taxPayer"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Income_Tax_Credit/tax_year"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Income_Tax_Credit/yearly"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Income_Tax_Credit/monthly"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Income_Tax_Credit/daily"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Income_Tax_Credit/id7"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference TaxationWithRoot.ecore#//Income_Tax_Credit/taxation_Frame"/>
+    </genClasses>
+    <genClasses ecoreClass="TaxationWithRoot.ecore#//Income_Detail">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Income_Detail/amount"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Income_Detail/is_worked"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Income_Detail/distance"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Income_Detail/worked_days"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Income_Detail/is_contributing_CNS"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Income_Detail/id5"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference TaxationWithRoot.ecore#//Income_Detail/income"/>
+    </genClasses>
+    <genClasses ecoreClass="TaxationWithRoot.ecore#//FromLaw">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//FromLaw/id"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference TaxationWithRoot.ecore#//FromLaw/taxPayer"/>
+    </genClasses>
+    <genClasses ecoreClass="TaxationWithRoot.ecore#//Fiscal_Address"/>
+    <genClasses ecoreClass="TaxationWithRoot.ecore#//Habitual_Address"/>
+    <genClasses ecoreClass="TaxationWithRoot.ecore#//Marriage_Record"/>
+    <genClasses ecoreClass="TaxationWithRoot.ecore#//Non_Resident_Tax_Payer">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Non_Resident_Tax_Payer/is_assimilated_to_resident"/>
+    </genClasses>
+    <genClasses ecoreClass="TaxationWithRoot.ecore#//Partnership_Record"/>
+    <genClasses ecoreClass="TaxationWithRoot.ecore#//Resident_Tax_Payer"/>
+    <genClasses ecoreClass="TaxationWithRoot.ecore#//Trade_and_Business_Income"/>
+    <genClasses ecoreClass="TaxationWithRoot.ecore#//Agriculture_and_Forestry_Income"/>
+    <genClasses ecoreClass="TaxationWithRoot.ecore#//Pensions_and_Annuities_Income">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Pensions_and_Annuities_Income/occasional_payement"/>
+    </genClasses>
+    <genClasses ecoreClass="TaxationWithRoot.ecore#//Capital_and_Investments_Income"/>
+    <genClasses ecoreClass="TaxationWithRoot.ecore#//Employment_Income"/>
+    <genClasses ecoreClass="TaxationWithRoot.ecore#//Rentals_and_Leases_Income">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Rentals_and_Leases_Income/is_periodic"/>
+    </genClasses>
+    <genClasses ecoreClass="TaxationWithRoot.ecore#//Foreign_Income"/>
+    <genClasses ecoreClass="TaxationWithRoot.ecore#//Local_Income"/>
+    <genClasses ecoreClass="TaxationWithRoot.ecore#//CIM"/>
+    <genClasses ecoreClass="TaxationWithRoot.ecore#//CIP"/>
+    <genClasses ecoreClass="TaxationWithRoot.ecore#//CIS"/>
+    <genClasses ecoreClass="TaxationWithRoot.ecore#//Permanent_Expense">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Permanent_Expense/category"/>
+    </genClasses>
+    <genClasses ecoreClass="TaxationWithRoot.ecore#//Special_Expense_DS"/>
+    <genClasses ecoreClass="TaxationWithRoot.ecore#//Interest_Expense"/>
+    <genClasses ecoreClass="TaxationWithRoot.ecore#//Private_Insurance_and_Plan">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Private_Insurance_and_Plan/category"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Private_Insurance_and_Plan/duration_of_contract"/>
+    </genClasses>
+    <genClasses ecoreClass="TaxationWithRoot.ecore#//Health_and_Pension_Insurance">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Health_and_Pension_Insurance/category"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Health_and_Pension_Insurance/is_related_to_additional_salary"/>
+    </genClasses>
+    <genClasses ecoreClass="TaxationWithRoot.ecore#//Donation">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Donation/beneficiary1"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Donation/is_donation_reported"/>
+    </genClasses>
+    <genClasses ecoreClass="TaxationWithRoot.ecore#//Loss_Carryforward"/>
+    <genClasses ecoreClass="TaxationWithRoot.ecore#//Spousal_Expense_AC"/>
+    <genClasses ecoreClass="TaxationWithRoot.ecore#//Extraordinary_Expense_CE">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Extraordinary_Expense_CE/thresholded_deduction_percentage"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TaxationWithRoot.ecore#//Extraordinary_Expense_CE/ce_type"/>
+    </genClasses>
+    <genClasses ecoreClass="TaxationWithRoot.ecore#//Travel_Expense_FD"/>
+    <genClasses ecoreClass="TaxationWithRoot.ecore#//Professional_Expense"/>
+    <genClasses ecoreClass="TaxationWithRoot.ecore#//Miscellaneous_Expense_FO"/>
+    <genClasses ecoreClass="TaxationWithRoot.ecore#//Resource">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference TaxationWithRoot.ecore#//Resource/contains"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/model/familytree.ecore b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/model/familytree.ecore
new file mode 100644
index 00000000..128e5c63
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/model/familytree.ecore
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="familytree" nsURI="http://www.example.org/familytree" nsPrefix="familytree">
+  <eClassifiers xsi:type="ecore:EClass" name="FamilyTree">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="members" upperBound="-1"
+        eType="#//Member" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Member">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="age" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+        defaultValueLiteral="0"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
+        eType="#//Member" eOpposite="#//Member/parents"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="parents" upperBound="2"
+        eType="#//Member" eOpposite="#//Member/children"/>
+  </eClassifiers>
+</ecore:EPackage>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/model/familytree.genmodel b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/model/familytree.genmodel
new file mode 100644
index 00000000..e3c59b05
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/model/familytree.genmodel
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/models20.diversity-calculator/src" modelPluginID="models20.diversity-calculator"
+    modelName="Familytree" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false"
+    operationReflection="true" importOrganizing="true">
+  <foreignModel>familytree.ecore</foreignModel>
+  <genPackages prefix="Familytree" disposableProviderFactory="true" ecorePackage="familytree.ecore#/">
+    <genClasses ecoreClass="familytree.ecore#//FamilyTree">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference familytree.ecore#//FamilyTree/members"/>
+    </genClasses>
+    <genClasses ecoreClass="familytree.ecore#//Member">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute familytree.ecore#//Member/name"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute familytree.ecore#//Member/age"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference familytree.ecore#//Member/children"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference familytree.ecore#//Member/parents"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/model/satellite.ecore b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/model/satellite.ecore
new file mode 100644
index 00000000..6595c0a8
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/model/satellite.ecore
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="satellite" nsURI="http://www.example.org/satellite" nsPrefix="satellite">
+  <eClassifiers xsi:type="ecore:EClass" name="ConstellationMission" abstract="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="groundStationNetwork" lowerBound="1"
+        eType="#//GroundStationNetwork" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="spacecraft" lowerBound="2"
+        upperBound="-1" eType="#//Spacecraft" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="InterferometryMission" eSuperTypes="#//ConstellationMission">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="observationTime" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="CommunicatingElement" abstract="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="commSubsystem" lowerBound="1"
+        upperBound="2" eType="#//CommSubsystem" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="GroundStationNetwork" eSuperTypes="#//CommunicatingElement"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Spacecraft" abstract="true" eSuperTypes="#//CommunicatingElement">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="payload" eType="#//Payload"
+        containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="CommSubsystem" abstract="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="target" eType="#//CommSubsystem"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="frequency" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="pathLength" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Payload" abstract="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="InterferometryPayload" eSuperTypes="#//Payload"/>
+  <eClassifiers xsi:type="ecore:EClass" name="CubeSat3U" eSuperTypes="#//CubeSat"/>
+  <eClassifiers xsi:type="ecore:EClass" name="CubeSat6U" eSuperTypes="#//CubeSat"/>
+  <eClassifiers xsi:type="ecore:EClass" name="SmallSat" eSuperTypes="#//Spacecraft"/>
+  <eClassifiers xsi:type="ecore:EClass" name="CubeSat" abstract="true" eSuperTypes="#//Spacecraft"/>
+  <eClassifiers xsi:type="ecore:EClass" name="UHFCommSubsystem" eSuperTypes="#//CommSubsystem"/>
+  <eClassifiers xsi:type="ecore:EClass" name="XCommSubsystem" eSuperTypes="#//CommSubsystem"/>
+  <eClassifiers xsi:type="ecore:EClass" name="KaCommSubsystem" eSuperTypes="#//CommSubsystem"/>
+</ecore:EPackage>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/model/satellite.genmodel b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/model/satellite.genmodel
new file mode 100644
index 00000000..61fa45ac
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/model/satellite.genmodel
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/models20.diversity-calculator/src" modelPluginID="models20.diversity-calculator"
+    modelName="Satellite" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false"
+    operationReflection="true" importOrganizing="true">
+  <foreignModel>satellite.ecore</foreignModel>
+  <genPackages prefix="Satellite" disposableProviderFactory="true" ecorePackage="satellite.ecore#/">
+    <genClasses image="false" ecoreClass="satellite.ecore#//ConstellationMission">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference satellite.ecore#//ConstellationMission/groundStationNetwork"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference satellite.ecore#//ConstellationMission/spacecraft"/>
+    </genClasses>
+    <genClasses ecoreClass="satellite.ecore#//InterferometryMission">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute satellite.ecore#//InterferometryMission/observationTime"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="satellite.ecore#//CommunicatingElement">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference satellite.ecore#//CommunicatingElement/commSubsystem"/>
+    </genClasses>
+    <genClasses ecoreClass="satellite.ecore#//GroundStationNetwork"/>
+    <genClasses image="false" ecoreClass="satellite.ecore#//Spacecraft">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference satellite.ecore#//Spacecraft/payload"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="satellite.ecore#//CommSubsystem">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference satellite.ecore#//CommSubsystem/target"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute satellite.ecore#//CommSubsystem/frequency"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute satellite.ecore#//CommSubsystem/pathLength"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="satellite.ecore#//Payload"/>
+    <genClasses ecoreClass="satellite.ecore#//InterferometryPayload"/>
+    <genClasses ecoreClass="satellite.ecore#//CubeSat3U"/>
+    <genClasses ecoreClass="satellite.ecore#//CubeSat6U"/>
+    <genClasses ecoreClass="satellite.ecore#//SmallSat"/>
+    <genClasses image="false" ecoreClass="satellite.ecore#//CubeSat"/>
+    <genClasses ecoreClass="satellite.ecore#//UHFCommSubsystem"/>
+    <genClasses ecoreClass="satellite.ecore#//XCommSubsystem"/>
+    <genClasses ecoreClass="satellite.ecore#//KaCommSubsystem"/>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/plugin.properties b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/plugin.properties
new file mode 100644
index 00000000..9bb141b1
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/plugin.properties
@@ -0,0 +1,4 @@
+#
+
+pluginName = Diversity-calculator
+providerName = www.example.org
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/plugin.xml b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/plugin.xml
new file mode 100644
index 00000000..fdf84365
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/plugin.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+-->
+
+<plugin>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated familytree -->
+      <package
+            uri="http://www.example.org/familytree"
+            class="familytree.FamilytreePackage"
+            genModel="model/familytree.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated satellite -->
+      <package
+            uri="http://www.example.org/satellite"
+            class="satellite.SatellitePackage"
+            genModel="model/satellite.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated TaxationWithRoot -->
+      <package
+            uri="http:///TaxCardWithRoot.ecore"
+            class="TaxationWithRoot.TaxationWithRootPackage"
+            genModel="model/TaxationWithRoot.genmodel"/>
+   </extension>
+
+</plugin>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Address.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Address.java
new file mode 100644
index 00000000..87d21f5d
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Address.java
@@ -0,0 +1,159 @@
+/**
+ */
+package TaxationWithRoot;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Address</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.Address#getCountry <em>Country</em>}</li>
+ *   <li>{@link TaxationWithRoot.Address#getStreet <em>Street</em>}</li>
+ *   <li>{@link TaxationWithRoot.Address#getZipCode <em>Zip Code</em>}</li>
+ *   <li>{@link TaxationWithRoot.Address#getCity <em>City</em>}</li>
+ *   <li>{@link TaxationWithRoot.Address#getId2 <em>Id2</em>}</li>
+ *   <li>{@link TaxationWithRoot.Address#getTaxPayer <em>Tax Payer</em>}</li>
+ * </ul>
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getAddress()
+ * @model
+ * @generated
+ */
+public interface Address extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Country</b></em>' attribute.
+	 * The default value is <code>"ZZ"</code>.
+	 * The literals are from the enumeration {@link TaxationWithRoot.Country}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Country</em>' attribute.
+	 * @see TaxationWithRoot.Country
+	 * @see #setCountry(Country)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getAddress_Country()
+	 * @model default="ZZ" required="true"
+	 * @generated
+	 */
+	Country getCountry();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Address#getCountry <em>Country</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Country</em>' attribute.
+	 * @see TaxationWithRoot.Country
+	 * @see #getCountry()
+	 * @generated
+	 */
+	void setCountry(Country value);
+
+	/**
+	 * Returns the value of the '<em><b>Street</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Street</em>' attribute.
+	 * @see #setStreet(String)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getAddress_Street()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getStreet();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Address#getStreet <em>Street</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Street</em>' attribute.
+	 * @see #getStreet()
+	 * @generated
+	 */
+	void setStreet(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Zip Code</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Zip Code</em>' attribute.
+	 * @see #setZipCode(String)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getAddress_ZipCode()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getZipCode();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Address#getZipCode <em>Zip Code</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Zip Code</em>' attribute.
+	 * @see #getZipCode()
+	 * @generated
+	 */
+	void setZipCode(String value);
+
+	/**
+	 * Returns the value of the '<em><b>City</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>City</em>' attribute.
+	 * @see #setCity(String)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getAddress_City()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getCity();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Address#getCity <em>City</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>City</em>' attribute.
+	 * @see #getCity()
+	 * @generated
+	 */
+	void setCity(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Id2</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Id2</em>' attribute.
+	 * @see #setId2(String)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getAddress_Id2()
+	 * @model id="true" required="true" ordered="false"
+	 * @generated
+	 */
+	String getId2();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Address#getId2 <em>Id2</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Id2</em>' attribute.
+	 * @see #getId2()
+	 * @generated
+	 */
+	void setId2(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Tax Payer</b></em>' reference list.
+	 * The list contents are of type {@link TaxationWithRoot.Physical_Person}.
+	 * It is bidirectional and its opposite is '{@link TaxationWithRoot.Physical_Person#getAddresses <em>Addresses</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Tax Payer</em>' reference list.
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getAddress_TaxPayer()
+	 * @see TaxationWithRoot.Physical_Person#getAddresses
+	 * @model opposite="addresses" ordered="false"
+	 * @generated
+	 */
+	EList<Physical_Person> getTaxPayer();
+
+} // Address
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Agriculture_and_Forestry_Income.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Agriculture_and_Forestry_Income.java
new file mode 100644
index 00000000..6805baf4
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Agriculture_and_Forestry_Income.java
@@ -0,0 +1,17 @@
+/**
+ */
+package TaxationWithRoot;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Agriculture and Forestry Income</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getAgriculture_and_Forestry_Income()
+ * @model
+ * @generated
+ */
+public interface Agriculture_and_Forestry_Income extends Income_Type {
+} // Agriculture_and_Forestry_Income
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/CE_Type.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/CE_Type.java
new file mode 100644
index 00000000..7d592da3
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/CE_Type.java
@@ -0,0 +1,232 @@
+/**
+ */
+package TaxationWithRoot;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.Enumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>CE Type</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * @see TaxationWithRoot.TaxationWithRootPackage#getCE_Type()
+ * @model
+ * @generated
+ */
+public enum CE_Type implements Enumerator {
+	/**
+	 * The '<em><b>INALIDITY AND INFIRMITY</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #INALIDITY_AND_INFIRMITY_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	INALIDITY_AND_INFIRMITY(0, "INALIDITY_AND_INFIRMITY", "INALIDITY_AND_INFIRMITY"),
+
+	/**
+	 * The '<em><b>DEPENDENCE AND CARE EXCLUDING CHLIDREN NOT PART OF HOUSEHOLD</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #DEPENDENCE_AND_CARE_EXCLUDING_CHLIDREN_NOT_PART_OF_HOUSEHOLD_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	DEPENDENCE_AND_CARE_EXCLUDING_CHLIDREN_NOT_PART_OF_HOUSEHOLD(1, "DEPENDENCE_AND_CARE_EXCLUDING_CHLIDREN_NOT_PART_OF_HOUSEHOLD", "DEPENDENCE_AND_CARE_EXCLUDING_CHLIDREN_NOT_PART_OF_HOUSEHOLD"),
+
+	/**
+	 * The '<em><b>CARE FOR CHILDREN NOT BEING PART OF HOUSEHOLD</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #CARE_FOR_CHILDREN_NOT_BEING_PART_OF_HOUSEHOLD_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	CARE_FOR_CHILDREN_NOT_BEING_PART_OF_HOUSEHOLD(2, "CARE_FOR_CHILDREN_NOT_BEING_PART_OF_HOUSEHOLD", "CARE_FOR_CHILDREN_NOT_BEING_PART_OF_HOUSEHOLD");
+
+	/**
+	 * The '<em><b>INALIDITY AND INFIRMITY</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #INALIDITY_AND_INFIRMITY
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int INALIDITY_AND_INFIRMITY_VALUE = 0;
+
+	/**
+	 * The '<em><b>DEPENDENCE AND CARE EXCLUDING CHLIDREN NOT PART OF HOUSEHOLD</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #DEPENDENCE_AND_CARE_EXCLUDING_CHLIDREN_NOT_PART_OF_HOUSEHOLD
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int DEPENDENCE_AND_CARE_EXCLUDING_CHLIDREN_NOT_PART_OF_HOUSEHOLD_VALUE = 1;
+
+	/**
+	 * The '<em><b>CARE FOR CHILDREN NOT BEING PART OF HOUSEHOLD</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #CARE_FOR_CHILDREN_NOT_BEING_PART_OF_HOUSEHOLD
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int CARE_FOR_CHILDREN_NOT_BEING_PART_OF_HOUSEHOLD_VALUE = 2;
+
+	/**
+	 * An array of all the '<em><b>CE Type</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static final CE_Type[] VALUES_ARRAY =
+		new CE_Type[] {
+			INALIDITY_AND_INFIRMITY,
+			DEPENDENCE_AND_CARE_EXCLUDING_CHLIDREN_NOT_PART_OF_HOUSEHOLD,
+			CARE_FOR_CHILDREN_NOT_BEING_PART_OF_HOUSEHOLD,
+		};
+
+	/**
+	 * A public read-only list of all the '<em><b>CE Type</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<CE_Type> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+	/**
+	 * Returns the '<em><b>CE Type</b></em>' literal with the specified literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static CE_Type get(String literal) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			CE_Type result = VALUES_ARRAY[i];
+			if (result.toString().equals(literal)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>CE Type</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static CE_Type getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			CE_Type result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>CE Type</b></em>' literal with the specified integer value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static CE_Type get(int value) {
+		switch (value) {
+			case INALIDITY_AND_INFIRMITY_VALUE: return INALIDITY_AND_INFIRMITY;
+			case DEPENDENCE_AND_CARE_EXCLUDING_CHLIDREN_NOT_PART_OF_HOUSEHOLD_VALUE: return DEPENDENCE_AND_CARE_EXCLUDING_CHLIDREN_NOT_PART_OF_HOUSEHOLD;
+			case CARE_FOR_CHILDREN_NOT_BEING_PART_OF_HOUSEHOLD_VALUE: return CARE_FOR_CHILDREN_NOT_BEING_PART_OF_HOUSEHOLD;
+		}
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final int value;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String name;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String literal;
+
+	/**
+	 * Only this class can construct instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private CE_Type(int value, String name, String literal) {
+		this.value = value;
+		this.name = name;
+		this.literal = literal;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getValue() {
+	  return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getName() {
+	  return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getLiteral() {
+	  return literal;
+	}
+
+	/**
+	 * Returns the literal value of the enumerator, which is its string representation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		return literal;
+	}
+	
+} //CE_Type
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/CIM.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/CIM.java
new file mode 100644
index 00000000..1e754ff5
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/CIM.java
@@ -0,0 +1,17 @@
+/**
+ */
+package TaxationWithRoot;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>CIM</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getCIM()
+ * @model
+ * @generated
+ */
+public interface CIM extends Income_Tax_Credit {
+} // CIM
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/CIP.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/CIP.java
new file mode 100644
index 00000000..96ad2a1a
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/CIP.java
@@ -0,0 +1,17 @@
+/**
+ */
+package TaxationWithRoot;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>CIP</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getCIP()
+ * @model
+ * @generated
+ */
+public interface CIP extends Income_Tax_Credit {
+} // CIP
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/CIS.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/CIS.java
new file mode 100644
index 00000000..1b0ec4f5
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/CIS.java
@@ -0,0 +1,17 @@
+/**
+ */
+package TaxationWithRoot;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>CIS</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getCIS()
+ * @model
+ * @generated
+ */
+public interface CIS extends Income_Tax_Credit {
+} // CIS
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Capital_and_Investments_Income.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Capital_and_Investments_Income.java
new file mode 100644
index 00000000..b7c42dc3
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Capital_and_Investments_Income.java
@@ -0,0 +1,17 @@
+/**
+ */
+package TaxationWithRoot;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Capital and Investments Income</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getCapital_and_Investments_Income()
+ * @model
+ * @generated
+ */
+public interface Capital_and_Investments_Income extends Income_Type {
+} // Capital_and_Investments_Income
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Category_of_Health_and_Pension_Insurances.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Category_of_Health_and_Pension_Insurances.java
new file mode 100644
index 00000000..d5ee7a37
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Category_of_Health_and_Pension_Insurances.java
@@ -0,0 +1,232 @@
+/**
+ */
+package TaxationWithRoot;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.Enumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Category of Health and Pension Insurances</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * @see TaxationWithRoot.TaxationWithRootPackage#getCategory_of_Health_and_Pension_Insurances()
+ * @model
+ * @generated
+ */
+public enum Category_of_Health_and_Pension_Insurances implements Enumerator {
+	/**
+	 * The '<em><b>MANDATORY HEALTH AND PENSION INSURANCE</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #MANDATORY_HEALTH_AND_PENSION_INSURANCE_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	MANDATORY_HEALTH_AND_PENSION_INSURANCE(0, "MANDATORY_HEALTH_AND_PENSION_INSURANCE", "MANDATORY_HEALTH_AND_PENSION_INSURANCE"),
+
+	/**
+	 * The '<em><b>ADDITIONAL EMPLOYERS PENSION INSURANCE</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #ADDITIONAL_EMPLOYERS_PENSION_INSURANCE_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	ADDITIONAL_EMPLOYERS_PENSION_INSURANCE(1, "ADDITIONAL_EMPLOYERS_PENSION_INSURANCE", "ADDITIONAL_EMPLOYERS_PENSION_INSURANCE"),
+
+	/**
+	 * The '<em><b>CONTINUED HEALTH AND PENSION INSURANCE</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #CONTINUED_HEALTH_AND_PENSION_INSURANCE_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	CONTINUED_HEALTH_AND_PENSION_INSURANCE(2, "CONTINUED_HEALTH_AND_PENSION_INSURANCE", "CONTINUED_HEALTH_AND_PENSION_INSURANCE");
+
+	/**
+	 * The '<em><b>MANDATORY HEALTH AND PENSION INSURANCE</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #MANDATORY_HEALTH_AND_PENSION_INSURANCE
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int MANDATORY_HEALTH_AND_PENSION_INSURANCE_VALUE = 0;
+
+	/**
+	 * The '<em><b>ADDITIONAL EMPLOYERS PENSION INSURANCE</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #ADDITIONAL_EMPLOYERS_PENSION_INSURANCE
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int ADDITIONAL_EMPLOYERS_PENSION_INSURANCE_VALUE = 1;
+
+	/**
+	 * The '<em><b>CONTINUED HEALTH AND PENSION INSURANCE</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #CONTINUED_HEALTH_AND_PENSION_INSURANCE
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int CONTINUED_HEALTH_AND_PENSION_INSURANCE_VALUE = 2;
+
+	/**
+	 * An array of all the '<em><b>Category of Health and Pension Insurances</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static final Category_of_Health_and_Pension_Insurances[] VALUES_ARRAY =
+		new Category_of_Health_and_Pension_Insurances[] {
+			MANDATORY_HEALTH_AND_PENSION_INSURANCE,
+			ADDITIONAL_EMPLOYERS_PENSION_INSURANCE,
+			CONTINUED_HEALTH_AND_PENSION_INSURANCE,
+		};
+
+	/**
+	 * A public read-only list of all the '<em><b>Category of Health and Pension Insurances</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<Category_of_Health_and_Pension_Insurances> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+	/**
+	 * Returns the '<em><b>Category of Health and Pension Insurances</b></em>' literal with the specified literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Category_of_Health_and_Pension_Insurances get(String literal) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			Category_of_Health_and_Pension_Insurances result = VALUES_ARRAY[i];
+			if (result.toString().equals(literal)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Category of Health and Pension Insurances</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Category_of_Health_and_Pension_Insurances getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			Category_of_Health_and_Pension_Insurances result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Category of Health and Pension Insurances</b></em>' literal with the specified integer value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Category_of_Health_and_Pension_Insurances get(int value) {
+		switch (value) {
+			case MANDATORY_HEALTH_AND_PENSION_INSURANCE_VALUE: return MANDATORY_HEALTH_AND_PENSION_INSURANCE;
+			case ADDITIONAL_EMPLOYERS_PENSION_INSURANCE_VALUE: return ADDITIONAL_EMPLOYERS_PENSION_INSURANCE;
+			case CONTINUED_HEALTH_AND_PENSION_INSURANCE_VALUE: return CONTINUED_HEALTH_AND_PENSION_INSURANCE;
+		}
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final int value;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String name;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String literal;
+
+	/**
+	 * Only this class can construct instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private Category_of_Health_and_Pension_Insurances(int value, String name, String literal) {
+		this.value = value;
+		this.name = name;
+		this.literal = literal;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getValue() {
+	  return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getName() {
+	  return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getLiteral() {
+	  return literal;
+	}
+
+	/**
+	 * Returns the literal value of the enumerator, which is its string representation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		return literal;
+	}
+	
+} //Category_of_Health_and_Pension_Insurances
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Category_of_Permanent_Expense.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Category_of_Permanent_Expense.java
new file mode 100644
index 00000000..8eabeaf7
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Category_of_Permanent_Expense.java
@@ -0,0 +1,209 @@
+/**
+ */
+package TaxationWithRoot;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.Enumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Category of Permanent Expense</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * @see TaxationWithRoot.TaxationWithRootPackage#getCategory_of_Permanent_Expense()
+ * @model
+ * @generated
+ */
+public enum Category_of_Permanent_Expense implements Enumerator {
+	/**
+	 * The '<em><b>MISCELLANEOUS DEBT</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #MISCELLANEOUS_DEBT_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	MISCELLANEOUS_DEBT(0, "MISCELLANEOUS_DEBT", "MISCELLANEOUS_DEBT"),
+
+	/**
+	 * The '<em><b>ALIMONY</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #ALIMONY_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	ALIMONY(1, "ALIMONY", "ALIMONY");
+
+	/**
+	 * The '<em><b>MISCELLANEOUS DEBT</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #MISCELLANEOUS_DEBT
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int MISCELLANEOUS_DEBT_VALUE = 0;
+
+	/**
+	 * The '<em><b>ALIMONY</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #ALIMONY
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int ALIMONY_VALUE = 1;
+
+	/**
+	 * An array of all the '<em><b>Category of Permanent Expense</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static final Category_of_Permanent_Expense[] VALUES_ARRAY =
+		new Category_of_Permanent_Expense[] {
+			MISCELLANEOUS_DEBT,
+			ALIMONY,
+		};
+
+	/**
+	 * A public read-only list of all the '<em><b>Category of Permanent Expense</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<Category_of_Permanent_Expense> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+	/**
+	 * Returns the '<em><b>Category of Permanent Expense</b></em>' literal with the specified literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Category_of_Permanent_Expense get(String literal) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			Category_of_Permanent_Expense result = VALUES_ARRAY[i];
+			if (result.toString().equals(literal)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Category of Permanent Expense</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Category_of_Permanent_Expense getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			Category_of_Permanent_Expense result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Category of Permanent Expense</b></em>' literal with the specified integer value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Category_of_Permanent_Expense get(int value) {
+		switch (value) {
+			case MISCELLANEOUS_DEBT_VALUE: return MISCELLANEOUS_DEBT;
+			case ALIMONY_VALUE: return ALIMONY;
+		}
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final int value;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String name;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String literal;
+
+	/**
+	 * Only this class can construct instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private Category_of_Permanent_Expense(int value, String name, String literal) {
+		this.value = value;
+		this.name = name;
+		this.literal = literal;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getValue() {
+	  return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getName() {
+	  return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getLiteral() {
+	  return literal;
+	}
+
+	/**
+	 * Returns the literal value of the enumerator, which is its string representation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		return literal;
+	}
+	
+} //Category_of_Permanent_Expense
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Category_of_Private_Insurance_and_Plan.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Category_of_Private_Insurance_and_Plan.java
new file mode 100644
index 00000000..fa3ddd8f
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Category_of_Private_Insurance_and_Plan.java
@@ -0,0 +1,278 @@
+/**
+ */
+package TaxationWithRoot;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.Enumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Category of Private Insurance and Plan</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * @see TaxationWithRoot.TaxationWithRootPackage#getCategory_of_Private_Insurance_and_Plan()
+ * @model
+ * @generated
+ */
+public enum Category_of_Private_Insurance_and_Plan implements Enumerator {
+	/**
+	 * The '<em><b>PRIVATE INSURANCE</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #PRIVATE_INSURANCE_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	PRIVATE_INSURANCE(0, "PRIVATE_INSURANCE", "PRIVATE_INSURANCE"),
+
+	/**
+	 * The '<em><b>PRIVATE LIFE INSURANCE</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #PRIVATE_LIFE_INSURANCE_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	PRIVATE_LIFE_INSURANCE(1, "PRIVATE_LIFE_INSURANCE", "PRIVATE_LIFE_INSURANCE"),
+
+	/**
+	 * The '<em><b>COMPANY MEMBERS PRIVATE INSURANCE</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #COMPANY_MEMBERS_PRIVATE_INSURANCE_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	COMPANY_MEMBERS_PRIVATE_INSURANCE(2, "COMPANY_MEMBERS_PRIVATE_INSURANCE", "COMPANY_MEMBERS_PRIVATE_INSURANCE"),
+
+	/**
+	 * The '<em><b>HOUSING SAVING PLAN</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #HOUSING_SAVING_PLAN_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	HOUSING_SAVING_PLAN(3, "HOUSING_SAVING_PLAN", "HOUSING_SAVING_PLAN"),
+
+	/**
+	 * The '<em><b>OLD AGE PENSION PLAN</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #OLD_AGE_PENSION_PLAN_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	OLD_AGE_PENSION_PLAN(4, "OLD_AGE_PENSION_PLAN", "OLD_AGE_PENSION_PLAN");
+
+	/**
+	 * The '<em><b>PRIVATE INSURANCE</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #PRIVATE_INSURANCE
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int PRIVATE_INSURANCE_VALUE = 0;
+
+	/**
+	 * The '<em><b>PRIVATE LIFE INSURANCE</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #PRIVATE_LIFE_INSURANCE
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int PRIVATE_LIFE_INSURANCE_VALUE = 1;
+
+	/**
+	 * The '<em><b>COMPANY MEMBERS PRIVATE INSURANCE</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #COMPANY_MEMBERS_PRIVATE_INSURANCE
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int COMPANY_MEMBERS_PRIVATE_INSURANCE_VALUE = 2;
+
+	/**
+	 * The '<em><b>HOUSING SAVING PLAN</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #HOUSING_SAVING_PLAN
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int HOUSING_SAVING_PLAN_VALUE = 3;
+
+	/**
+	 * The '<em><b>OLD AGE PENSION PLAN</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #OLD_AGE_PENSION_PLAN
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int OLD_AGE_PENSION_PLAN_VALUE = 4;
+
+	/**
+	 * An array of all the '<em><b>Category of Private Insurance and Plan</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static final Category_of_Private_Insurance_and_Plan[] VALUES_ARRAY =
+		new Category_of_Private_Insurance_and_Plan[] {
+			PRIVATE_INSURANCE,
+			PRIVATE_LIFE_INSURANCE,
+			COMPANY_MEMBERS_PRIVATE_INSURANCE,
+			HOUSING_SAVING_PLAN,
+			OLD_AGE_PENSION_PLAN,
+		};
+
+	/**
+	 * A public read-only list of all the '<em><b>Category of Private Insurance and Plan</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<Category_of_Private_Insurance_and_Plan> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+	/**
+	 * Returns the '<em><b>Category of Private Insurance and Plan</b></em>' literal with the specified literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Category_of_Private_Insurance_and_Plan get(String literal) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			Category_of_Private_Insurance_and_Plan result = VALUES_ARRAY[i];
+			if (result.toString().equals(literal)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Category of Private Insurance and Plan</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Category_of_Private_Insurance_and_Plan getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			Category_of_Private_Insurance_and_Plan result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Category of Private Insurance and Plan</b></em>' literal with the specified integer value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Category_of_Private_Insurance_and_Plan get(int value) {
+		switch (value) {
+			case PRIVATE_INSURANCE_VALUE: return PRIVATE_INSURANCE;
+			case PRIVATE_LIFE_INSURANCE_VALUE: return PRIVATE_LIFE_INSURANCE;
+			case COMPANY_MEMBERS_PRIVATE_INSURANCE_VALUE: return COMPANY_MEMBERS_PRIVATE_INSURANCE;
+			case HOUSING_SAVING_PLAN_VALUE: return HOUSING_SAVING_PLAN;
+			case OLD_AGE_PENSION_PLAN_VALUE: return OLD_AGE_PENSION_PLAN;
+		}
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final int value;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String name;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String literal;
+
+	/**
+	 * Only this class can construct instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private Category_of_Private_Insurance_and_Plan(int value, String name, String literal) {
+		this.value = value;
+		this.name = name;
+		this.literal = literal;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getValue() {
+	  return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getName() {
+	  return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getLiteral() {
+	  return literal;
+	}
+
+	/**
+	 * Returns the literal value of the enumerator, which is its string representation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		return literal;
+	}
+	
+} //Category_of_Private_Insurance_and_Plan
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Constants.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Constants.java
new file mode 100644
index 00000000..03298992
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Constants.java
@@ -0,0 +1,619 @@
+/**
+ */
+package TaxationWithRoot;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Constants</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.Constants#getMAXIMUM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD <em>MAXIMUM CE RATE FOR CHILD NOT BEING PART OF HOUSEHOLD</em>}</li>
+ *   <li>{@link TaxationWithRoot.Constants#getMAXIMUM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE <em>MAXIMUM CE RATE FOR HOUSE CARE AND CHILD PART OF THE HOUSEHOLD CARE</em>}</li>
+ *   <li>{@link TaxationWithRoot.Constants#getMINIMUM_SALARY <em>MINIMUM SALARY</em>}</li>
+ *   <li>{@link TaxationWithRoot.Constants#getFLAT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION <em>FLAT RATE FOR EXTRA PROFESSIONAL DEDUCTION</em>}</li>
+ *   <li>{@link TaxationWithRoot.Constants#getMAXIMUM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS <em>MAXIMUM DEDUCTIBLE PERCENTAGE FOR DONATIONS</em>}</li>
+ *   <li>{@link TaxationWithRoot.Constants#getMINIMUM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS <em>MINIMUM DEDUCTIBLE AMOUNT FOR DONATIONS</em>}</li>
+ *   <li>{@link TaxationWithRoot.Constants#getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC <em>MAXIMUM DEDUCTIBLE AMOUNT FOR ADDITIONAL PENSION AND INSURANC</em>}</li>
+ *   <li>{@link TaxationWithRoot.Constants#getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE <em>MAXIMUM DEDUCTIBLE AMOUNT FOR ALIMONY EXPENSE</em>}</li>
+ *   <li>{@link TaxationWithRoot.Constants#getMAXIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION <em>MAXIMAL DISTANCE FOR TRAVEL EXPENSE DEDUCTION</em>}</li>
+ *   <li>{@link TaxationWithRoot.Constants#getMAXIMAL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION <em>MAXIMAL FLAT DISTANCE FOR TRAVEL EXPENSE DEDUCTION</em>}</li>
+ *   <li>{@link TaxationWithRoot.Constants#getMINIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION <em>MINIMAL DISTANCE FOR TRAVEL EXPENSE DEDUCTION</em>}</li>
+ *   <li>{@link TaxationWithRoot.Constants#getFLAT_RATE_CIM_DAILY <em>FLAT RATE CIM DAILY</em>}</li>
+ *   <li>{@link TaxationWithRoot.Constants#getFLAT_RATE_CIM_MONTHLY <em>FLAT RATE CIM MONTHLY</em>}</li>
+ *   <li>{@link TaxationWithRoot.Constants#getFLAT_RATE_CIM_YEARLY <em>FLAT RATE CIM YEARLY</em>}</li>
+ *   <li>{@link TaxationWithRoot.Constants#getFLAT_RATE_CIP_DAILY <em>FLAT RATE CIP DAILY</em>}</li>
+ *   <li>{@link TaxationWithRoot.Constants#getFLAT_RATE_CIP_MONTHLY <em>FLAT RATE CIP MONTHLY</em>}</li>
+ *   <li>{@link TaxationWithRoot.Constants#getFLAT_RATE_CIP_YEARLY <em>FLAT RATE CIP YEARLY</em>}</li>
+ *   <li>{@link TaxationWithRoot.Constants#getFLAT_RATE_CIS_DAILY <em>FLAT RATE CIS DAILY</em>}</li>
+ *   <li>{@link TaxationWithRoot.Constants#getFLAT_RATE_CIS_MONTHLY <em>FLAT RATE CIS MONTHLY</em>}</li>
+ *   <li>{@link TaxationWithRoot.Constants#getFLAT_RATE_CIS_YEARLY <em>FLAT RATE CIS YEARLY</em>}</li>
+ *   <li>{@link TaxationWithRoot.Constants#getFLAT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT <em>FLAT RATE FOR TRAVEL EXPENSE PER UNIT</em>}</li>
+ *   <li>{@link TaxationWithRoot.Constants#getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_DS <em>MAXIMUM DEDUCTIBLE AMOUNT FOR DS</em>}</li>
+ *   <li>{@link TaxationWithRoot.Constants#getFLAT_RATE_FOR_MISCELLANEOUS_EXPENSE <em>FLAT RATE FOR MISCELLANEOUS EXPENSE</em>}</li>
+ *   <li>{@link TaxationWithRoot.Constants#getDISABILITY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE <em>DISABILITY FLAT RATE FOR MISCELLANEOUS EXPENSE</em>}</li>
+ *   <li>{@link TaxationWithRoot.Constants#getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE <em>MAXIMUM DEDUCTIBLE AMOUNT FOR ADDITIONAL PENSION AND INSURANCE</em>}</li>
+ * </ul>
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getConstants()
+ * @model abstract="true"
+ * @generated
+ */
+public interface Constants extends EObject {
+	/**
+	 * Returns the value of the '<em><b>MAXIMUM CE RATE FOR CHILD NOT BEING PART OF HOUSEHOLD</b></em>' attribute.
+	 * The default value is <code>"3480.0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>MAXIMUM CE RATE FOR CHILD NOT BEING PART OF HOUSEHOLD</em>' attribute.
+	 * @see #setMAXIMUM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getConstants_MAXIMUM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD()
+	 * @model default="3480.0" required="true"
+	 * @generated
+	 */
+	double getMAXIMUM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Constants#getMAXIMUM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD <em>MAXIMUM CE RATE FOR CHILD NOT BEING PART OF HOUSEHOLD</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>MAXIMUM CE RATE FOR CHILD NOT BEING PART OF HOUSEHOLD</em>' attribute.
+	 * @see #getMAXIMUM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD()
+	 * @generated
+	 */
+	void setMAXIMUM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD(double value);
+
+	/**
+	 * Returns the value of the '<em><b>MAXIMUM CE RATE FOR HOUSE CARE AND CHILD PART OF THE HOUSEHOLD CARE</b></em>' attribute.
+	 * The default value is <code>"3600.0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>MAXIMUM CE RATE FOR HOUSE CARE AND CHILD PART OF THE HOUSEHOLD CARE</em>' attribute.
+	 * @see #setMAXIMUM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getConstants_MAXIMUM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE()
+	 * @model default="3600.0" required="true"
+	 * @generated
+	 */
+	double getMAXIMUM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Constants#getMAXIMUM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE <em>MAXIMUM CE RATE FOR HOUSE CARE AND CHILD PART OF THE HOUSEHOLD CARE</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>MAXIMUM CE RATE FOR HOUSE CARE AND CHILD PART OF THE HOUSEHOLD CARE</em>' attribute.
+	 * @see #getMAXIMUM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE()
+	 * @generated
+	 */
+	void setMAXIMUM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE(double value);
+
+	/**
+	 * Returns the value of the '<em><b>MINIMUM SALARY</b></em>' attribute.
+	 * The default value is <code>"1500.0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>MINIMUM SALARY</em>' attribute.
+	 * @see #setMINIMUM_SALARY(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getConstants_MINIMUM_SALARY()
+	 * @model default="1500.0" required="true"
+	 * @generated
+	 */
+	double getMINIMUM_SALARY();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Constants#getMINIMUM_SALARY <em>MINIMUM SALARY</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>MINIMUM SALARY</em>' attribute.
+	 * @see #getMINIMUM_SALARY()
+	 * @generated
+	 */
+	void setMINIMUM_SALARY(double value);
+
+	/**
+	 * Returns the value of the '<em><b>FLAT RATE FOR EXTRA PROFESSIONAL DEDUCTION</b></em>' attribute.
+	 * The default value is <code>"4500.0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>FLAT RATE FOR EXTRA PROFESSIONAL DEDUCTION</em>' attribute.
+	 * @see #setFLAT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getConstants_FLAT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION()
+	 * @model default="4500.0" required="true"
+	 * @generated
+	 */
+	double getFLAT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Constants#getFLAT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION <em>FLAT RATE FOR EXTRA PROFESSIONAL DEDUCTION</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>FLAT RATE FOR EXTRA PROFESSIONAL DEDUCTION</em>' attribute.
+	 * @see #getFLAT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION()
+	 * @generated
+	 */
+	void setFLAT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION(double value);
+
+	/**
+	 * Returns the value of the '<em><b>MAXIMUM DEDUCTIBLE PERCENTAGE FOR DONATIONS</b></em>' attribute.
+	 * The default value is <code>"20.0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>MAXIMUM DEDUCTIBLE PERCENTAGE FOR DONATIONS</em>' attribute.
+	 * @see #setMAXIMUM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getConstants_MAXIMUM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS()
+	 * @model default="20.0" required="true"
+	 * @generated
+	 */
+	double getMAXIMUM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Constants#getMAXIMUM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS <em>MAXIMUM DEDUCTIBLE PERCENTAGE FOR DONATIONS</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>MAXIMUM DEDUCTIBLE PERCENTAGE FOR DONATIONS</em>' attribute.
+	 * @see #getMAXIMUM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS()
+	 * @generated
+	 */
+	void setMAXIMUM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS(double value);
+
+	/**
+	 * Returns the value of the '<em><b>MINIMUM DEDUCTIBLE AMOUNT FOR DONATIONS</b></em>' attribute.
+	 * The default value is <code>"120.0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>MINIMUM DEDUCTIBLE AMOUNT FOR DONATIONS</em>' attribute.
+	 * @see #setMINIMUM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getConstants_MINIMUM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS()
+	 * @model default="120.0" required="true"
+	 * @generated
+	 */
+	double getMINIMUM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Constants#getMINIMUM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS <em>MINIMUM DEDUCTIBLE AMOUNT FOR DONATIONS</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>MINIMUM DEDUCTIBLE AMOUNT FOR DONATIONS</em>' attribute.
+	 * @see #getMINIMUM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS()
+	 * @generated
+	 */
+	void setMINIMUM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS(double value);
+
+	/**
+	 * Returns the value of the '<em><b>MAXIMUM DEDUCTIBLE AMOUNT FOR ADDITIONAL PENSION AND INSURANC</b></em>' attribute.
+	 * The default value is <code>"0.0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>MAXIMUM DEDUCTIBLE AMOUNT FOR ADDITIONAL PENSION AND INSURANC</em>' attribute.
+	 * @see #setMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getConstants_MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC()
+	 * @model default="0.0" required="true"
+	 * @generated
+	 */
+	double getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Constants#getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC <em>MAXIMUM DEDUCTIBLE AMOUNT FOR ADDITIONAL PENSION AND INSURANC</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>MAXIMUM DEDUCTIBLE AMOUNT FOR ADDITIONAL PENSION AND INSURANC</em>' attribute.
+	 * @see #getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC()
+	 * @generated
+	 */
+	void setMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC(double value);
+
+	/**
+	 * Returns the value of the '<em><b>MAXIMUM DEDUCTIBLE AMOUNT FOR ALIMONY EXPENSE</b></em>' attribute.
+	 * The default value is <code>"24000.0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>MAXIMUM DEDUCTIBLE AMOUNT FOR ALIMONY EXPENSE</em>' attribute.
+	 * @see #setMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getConstants_MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE()
+	 * @model default="24000.0" required="true"
+	 * @generated
+	 */
+	double getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Constants#getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE <em>MAXIMUM DEDUCTIBLE AMOUNT FOR ALIMONY EXPENSE</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>MAXIMUM DEDUCTIBLE AMOUNT FOR ALIMONY EXPENSE</em>' attribute.
+	 * @see #getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE()
+	 * @generated
+	 */
+	void setMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE(double value);
+
+	/**
+	 * Returns the value of the '<em><b>MAXIMAL DISTANCE FOR TRAVEL EXPENSE DEDUCTION</b></em>' attribute.
+	 * The default value is <code>"99.0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>MAXIMAL DISTANCE FOR TRAVEL EXPENSE DEDUCTION</em>' attribute.
+	 * @see #setMAXIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getConstants_MAXIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION()
+	 * @model default="99.0" required="true"
+	 * @generated
+	 */
+	double getMAXIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Constants#getMAXIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION <em>MAXIMAL DISTANCE FOR TRAVEL EXPENSE DEDUCTION</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>MAXIMAL DISTANCE FOR TRAVEL EXPENSE DEDUCTION</em>' attribute.
+	 * @see #getMAXIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION()
+	 * @generated
+	 */
+	void setMAXIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION(double value);
+
+	/**
+	 * Returns the value of the '<em><b>MAXIMAL FLAT DISTANCE FOR TRAVEL EXPENSE DEDUCTION</b></em>' attribute.
+	 * The default value is <code>"30.0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>MAXIMAL FLAT DISTANCE FOR TRAVEL EXPENSE DEDUCTION</em>' attribute.
+	 * @see #setMAXIMAL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getConstants_MAXIMAL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION()
+	 * @model default="30.0" required="true"
+	 * @generated
+	 */
+	double getMAXIMAL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Constants#getMAXIMAL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION <em>MAXIMAL FLAT DISTANCE FOR TRAVEL EXPENSE DEDUCTION</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>MAXIMAL FLAT DISTANCE FOR TRAVEL EXPENSE DEDUCTION</em>' attribute.
+	 * @see #getMAXIMAL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION()
+	 * @generated
+	 */
+	void setMAXIMAL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION(double value);
+
+	/**
+	 * Returns the value of the '<em><b>MINIMAL DISTANCE FOR TRAVEL EXPENSE DEDUCTION</b></em>' attribute.
+	 * The default value is <code>"4.0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>MINIMAL DISTANCE FOR TRAVEL EXPENSE DEDUCTION</em>' attribute.
+	 * @see #setMINIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getConstants_MINIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION()
+	 * @model default="4.0" required="true"
+	 * @generated
+	 */
+	double getMINIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Constants#getMINIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION <em>MINIMAL DISTANCE FOR TRAVEL EXPENSE DEDUCTION</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>MINIMAL DISTANCE FOR TRAVEL EXPENSE DEDUCTION</em>' attribute.
+	 * @see #getMINIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION()
+	 * @generated
+	 */
+	void setMINIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION(double value);
+
+	/**
+	 * Returns the value of the '<em><b>FLAT RATE CIM DAILY</b></em>' attribute.
+	 * The default value is <code>"2.0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>FLAT RATE CIM DAILY</em>' attribute.
+	 * @see #setFLAT_RATE_CIM_DAILY(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getConstants_FLAT_RATE_CIM_DAILY()
+	 * @model default="2.0" required="true"
+	 * @generated
+	 */
+	double getFLAT_RATE_CIM_DAILY();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Constants#getFLAT_RATE_CIM_DAILY <em>FLAT RATE CIM DAILY</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>FLAT RATE CIM DAILY</em>' attribute.
+	 * @see #getFLAT_RATE_CIM_DAILY()
+	 * @generated
+	 */
+	void setFLAT_RATE_CIM_DAILY(double value);
+
+	/**
+	 * Returns the value of the '<em><b>FLAT RATE CIM MONTHLY</b></em>' attribute.
+	 * The default value is <code>"62.0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>FLAT RATE CIM MONTHLY</em>' attribute.
+	 * @see #setFLAT_RATE_CIM_MONTHLY(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getConstants_FLAT_RATE_CIM_MONTHLY()
+	 * @model default="62.0" required="true"
+	 * @generated
+	 */
+	double getFLAT_RATE_CIM_MONTHLY();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Constants#getFLAT_RATE_CIM_MONTHLY <em>FLAT RATE CIM MONTHLY</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>FLAT RATE CIM MONTHLY</em>' attribute.
+	 * @see #getFLAT_RATE_CIM_MONTHLY()
+	 * @generated
+	 */
+	void setFLAT_RATE_CIM_MONTHLY(double value);
+
+	/**
+	 * Returns the value of the '<em><b>FLAT RATE CIM YEARLY</b></em>' attribute.
+	 * The default value is <code>"750.0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>FLAT RATE CIM YEARLY</em>' attribute.
+	 * @see #setFLAT_RATE_CIM_YEARLY(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getConstants_FLAT_RATE_CIM_YEARLY()
+	 * @model default="750.0" required="true"
+	 * @generated
+	 */
+	double getFLAT_RATE_CIM_YEARLY();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Constants#getFLAT_RATE_CIM_YEARLY <em>FLAT RATE CIM YEARLY</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>FLAT RATE CIM YEARLY</em>' attribute.
+	 * @see #getFLAT_RATE_CIM_YEARLY()
+	 * @generated
+	 */
+	void setFLAT_RATE_CIM_YEARLY(double value);
+
+	/**
+	 * Returns the value of the '<em><b>FLAT RATE CIP DAILY</b></em>' attribute.
+	 * The default value is <code>"1.0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>FLAT RATE CIP DAILY</em>' attribute.
+	 * @see #setFLAT_RATE_CIP_DAILY(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getConstants_FLAT_RATE_CIP_DAILY()
+	 * @model default="1.0" required="true"
+	 * @generated
+	 */
+	double getFLAT_RATE_CIP_DAILY();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Constants#getFLAT_RATE_CIP_DAILY <em>FLAT RATE CIP DAILY</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>FLAT RATE CIP DAILY</em>' attribute.
+	 * @see #getFLAT_RATE_CIP_DAILY()
+	 * @generated
+	 */
+	void setFLAT_RATE_CIP_DAILY(double value);
+
+	/**
+	 * Returns the value of the '<em><b>FLAT RATE CIP MONTHLY</b></em>' attribute.
+	 * The default value is <code>"25.0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>FLAT RATE CIP MONTHLY</em>' attribute.
+	 * @see #setFLAT_RATE_CIP_MONTHLY(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getConstants_FLAT_RATE_CIP_MONTHLY()
+	 * @model default="25.0" required="true"
+	 * @generated
+	 */
+	double getFLAT_RATE_CIP_MONTHLY();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Constants#getFLAT_RATE_CIP_MONTHLY <em>FLAT RATE CIP MONTHLY</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>FLAT RATE CIP MONTHLY</em>' attribute.
+	 * @see #getFLAT_RATE_CIP_MONTHLY()
+	 * @generated
+	 */
+	void setFLAT_RATE_CIP_MONTHLY(double value);
+
+	/**
+	 * Returns the value of the '<em><b>FLAT RATE CIP YEARLY</b></em>' attribute.
+	 * The default value is <code>"30.0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>FLAT RATE CIP YEARLY</em>' attribute.
+	 * @see #setFLAT_RATE_CIP_YEARLY(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getConstants_FLAT_RATE_CIP_YEARLY()
+	 * @model default="30.0" required="true"
+	 * @generated
+	 */
+	double getFLAT_RATE_CIP_YEARLY();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Constants#getFLAT_RATE_CIP_YEARLY <em>FLAT RATE CIP YEARLY</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>FLAT RATE CIP YEARLY</em>' attribute.
+	 * @see #getFLAT_RATE_CIP_YEARLY()
+	 * @generated
+	 */
+	void setFLAT_RATE_CIP_YEARLY(double value);
+
+	/**
+	 * Returns the value of the '<em><b>FLAT RATE CIS DAILY</b></em>' attribute.
+	 * The default value is <code>"1.0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>FLAT RATE CIS DAILY</em>' attribute.
+	 * @see #setFLAT_RATE_CIS_DAILY(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getConstants_FLAT_RATE_CIS_DAILY()
+	 * @model default="1.0" required="true"
+	 * @generated
+	 */
+	double getFLAT_RATE_CIS_DAILY();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Constants#getFLAT_RATE_CIS_DAILY <em>FLAT RATE CIS DAILY</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>FLAT RATE CIS DAILY</em>' attribute.
+	 * @see #getFLAT_RATE_CIS_DAILY()
+	 * @generated
+	 */
+	void setFLAT_RATE_CIS_DAILY(double value);
+
+	/**
+	 * Returns the value of the '<em><b>FLAT RATE CIS MONTHLY</b></em>' attribute.
+	 * The default value is <code>"25.0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>FLAT RATE CIS MONTHLY</em>' attribute.
+	 * @see #setFLAT_RATE_CIS_MONTHLY(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getConstants_FLAT_RATE_CIS_MONTHLY()
+	 * @model default="25.0" required="true"
+	 * @generated
+	 */
+	double getFLAT_RATE_CIS_MONTHLY();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Constants#getFLAT_RATE_CIS_MONTHLY <em>FLAT RATE CIS MONTHLY</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>FLAT RATE CIS MONTHLY</em>' attribute.
+	 * @see #getFLAT_RATE_CIS_MONTHLY()
+	 * @generated
+	 */
+	void setFLAT_RATE_CIS_MONTHLY(double value);
+
+	/**
+	 * Returns the value of the '<em><b>FLAT RATE CIS YEARLY</b></em>' attribute.
+	 * The default value is <code>"300.0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>FLAT RATE CIS YEARLY</em>' attribute.
+	 * @see #setFLAT_RATE_CIS_YEARLY(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getConstants_FLAT_RATE_CIS_YEARLY()
+	 * @model default="300.0" required="true"
+	 * @generated
+	 */
+	double getFLAT_RATE_CIS_YEARLY();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Constants#getFLAT_RATE_CIS_YEARLY <em>FLAT RATE CIS YEARLY</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>FLAT RATE CIS YEARLY</em>' attribute.
+	 * @see #getFLAT_RATE_CIS_YEARLY()
+	 * @generated
+	 */
+	void setFLAT_RATE_CIS_YEARLY(double value);
+
+	/**
+	 * Returns the value of the '<em><b>FLAT RATE FOR TRAVEL EXPENSE PER UNIT</b></em>' attribute.
+	 * The default value is <code>"99.0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>FLAT RATE FOR TRAVEL EXPENSE PER UNIT</em>' attribute.
+	 * @see #setFLAT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getConstants_FLAT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT()
+	 * @model default="99.0" required="true"
+	 * @generated
+	 */
+	double getFLAT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Constants#getFLAT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT <em>FLAT RATE FOR TRAVEL EXPENSE PER UNIT</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>FLAT RATE FOR TRAVEL EXPENSE PER UNIT</em>' attribute.
+	 * @see #getFLAT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT()
+	 * @generated
+	 */
+	void setFLAT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT(double value);
+
+	/**
+	 * Returns the value of the '<em><b>MAXIMUM DEDUCTIBLE AMOUNT FOR DS</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>MAXIMUM DEDUCTIBLE AMOUNT FOR DS</em>' attribute.
+	 * @see #setMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_DS(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getConstants_MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_DS()
+	 * @model required="true"
+	 * @generated
+	 */
+	double getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_DS();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Constants#getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_DS <em>MAXIMUM DEDUCTIBLE AMOUNT FOR DS</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>MAXIMUM DEDUCTIBLE AMOUNT FOR DS</em>' attribute.
+	 * @see #getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_DS()
+	 * @generated
+	 */
+	void setMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_DS(double value);
+
+	/**
+	 * Returns the value of the '<em><b>FLAT RATE FOR MISCELLANEOUS EXPENSE</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>FLAT RATE FOR MISCELLANEOUS EXPENSE</em>' attribute.
+	 * @see #setFLAT_RATE_FOR_MISCELLANEOUS_EXPENSE(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getConstants_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE()
+	 * @model required="true"
+	 * @generated
+	 */
+	double getFLAT_RATE_FOR_MISCELLANEOUS_EXPENSE();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Constants#getFLAT_RATE_FOR_MISCELLANEOUS_EXPENSE <em>FLAT RATE FOR MISCELLANEOUS EXPENSE</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>FLAT RATE FOR MISCELLANEOUS EXPENSE</em>' attribute.
+	 * @see #getFLAT_RATE_FOR_MISCELLANEOUS_EXPENSE()
+	 * @generated
+	 */
+	void setFLAT_RATE_FOR_MISCELLANEOUS_EXPENSE(double value);
+
+	/**
+	 * Returns the value of the '<em><b>DISABILITY FLAT RATE FOR MISCELLANEOUS EXPENSE</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>DISABILITY FLAT RATE FOR MISCELLANEOUS EXPENSE</em>' attribute.
+	 * @see #setDISABILITY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getConstants_DISABILITY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE()
+	 * @model required="true"
+	 * @generated
+	 */
+	double getDISABILITY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Constants#getDISABILITY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE <em>DISABILITY FLAT RATE FOR MISCELLANEOUS EXPENSE</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>DISABILITY FLAT RATE FOR MISCELLANEOUS EXPENSE</em>' attribute.
+	 * @see #getDISABILITY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE()
+	 * @generated
+	 */
+	void setDISABILITY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE(double value);
+
+	/**
+	 * Returns the value of the '<em><b>MAXIMUM DEDUCTIBLE AMOUNT FOR ADDITIONAL PENSION AND INSURANCE</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>MAXIMUM DEDUCTIBLE AMOUNT FOR ADDITIONAL PENSION AND INSURANCE</em>' attribute.
+	 * @see #setMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getConstants_MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE()
+	 * @model required="true"
+	 * @generated
+	 */
+	double getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Constants#getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE <em>MAXIMUM DEDUCTIBLE AMOUNT FOR ADDITIONAL PENSION AND INSURANCE</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>MAXIMUM DEDUCTIBLE AMOUNT FOR ADDITIONAL PENSION AND INSURANCE</em>' attribute.
+	 * @see #getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE()
+	 * @generated
+	 */
+	void setMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE(double value);
+
+} // Constants
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Country.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Country.java
new file mode 100644
index 00000000..d8c066c1
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Country.java
@@ -0,0 +1,301 @@
+/**
+ */
+package TaxationWithRoot;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.Enumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Country</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * @see TaxationWithRoot.TaxationWithRootPackage#getCountry()
+ * @model
+ * @generated
+ */
+public enum Country implements Enumerator {
+	/**
+	 * The '<em><b>ZZ</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #ZZ_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	ZZ(0, "ZZ", "ZZ"),
+
+	/**
+	 * The '<em><b>FF</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #FF_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	FF(1, "FF", "FF"),
+
+	/**
+	 * The '<em><b>BB</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #BB_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	BB(2, "BB", "BB"),
+
+	/**
+	 * The '<em><b>DD</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #DD_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	DD(3, "DD", "DD"),
+
+	/**
+	 * The '<em><b>NN</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #NN_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	NN(4, "NN", "NN"),
+
+	/**
+	 * The '<em><b>OTHER</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #OTHER_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	OTHER(5, "OTHER", "OTHER");
+
+	/**
+	 * The '<em><b>ZZ</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #ZZ
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int ZZ_VALUE = 0;
+
+	/**
+	 * The '<em><b>FF</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #FF
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int FF_VALUE = 1;
+
+	/**
+	 * The '<em><b>BB</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #BB
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int BB_VALUE = 2;
+
+	/**
+	 * The '<em><b>DD</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #DD
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int DD_VALUE = 3;
+
+	/**
+	 * The '<em><b>NN</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #NN
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int NN_VALUE = 4;
+
+	/**
+	 * The '<em><b>OTHER</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #OTHER
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int OTHER_VALUE = 5;
+
+	/**
+	 * An array of all the '<em><b>Country</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static final Country[] VALUES_ARRAY =
+		new Country[] {
+			ZZ,
+			FF,
+			BB,
+			DD,
+			NN,
+			OTHER,
+		};
+
+	/**
+	 * A public read-only list of all the '<em><b>Country</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<Country> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+	/**
+	 * Returns the '<em><b>Country</b></em>' literal with the specified literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Country get(String literal) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			Country result = VALUES_ARRAY[i];
+			if (result.toString().equals(literal)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Country</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Country getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			Country result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Country</b></em>' literal with the specified integer value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Country get(int value) {
+		switch (value) {
+			case ZZ_VALUE: return ZZ;
+			case FF_VALUE: return FF;
+			case BB_VALUE: return BB;
+			case DD_VALUE: return DD;
+			case NN_VALUE: return NN;
+			case OTHER_VALUE: return OTHER;
+		}
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final int value;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String name;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String literal;
+
+	/**
+	 * Only this class can construct instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private Country(int value, String name, String literal) {
+		this.value = value;
+		this.name = name;
+		this.literal = literal;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getValue() {
+	  return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getName() {
+	  return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getLiteral() {
+	  return literal;
+	}
+
+	/**
+	 * Returns the literal value of the enumerator, which is its string representation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		return literal;
+	}
+	
+} //Country
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Dependent.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Dependent.java
new file mode 100644
index 00000000..3445d08f
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Dependent.java
@@ -0,0 +1,188 @@
+/**
+ */
+package TaxationWithRoot;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Dependent</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.Dependent#getDependent_type <em>Dependent type</em>}</li>
+ *   <li>{@link TaxationWithRoot.Dependent#getResponsible_person <em>Responsible person</em>}</li>
+ *   <li>{@link TaxationWithRoot.Dependent#isContinued_studies <em>Continued studies</em>}</li>
+ *   <li>{@link TaxationWithRoot.Dependent#getAllowances <em>Allowances</em>}</li>
+ *   <li>{@link TaxationWithRoot.Dependent#getHousehold <em>Household</em>}</li>
+ *   <li>{@link TaxationWithRoot.Dependent#getFrom_agent <em>From agent</em>}</li>
+ *   <li>{@link TaxationWithRoot.Dependent#getExpense <em>Expense</em>}</li>
+ * </ul>
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getDependent()
+ * @model
+ * @generated
+ */
+public interface Dependent extends Physical_Person {
+	/**
+	 * Returns the value of the '<em><b>Dependent type</b></em>' attribute.
+	 * The literals are from the enumeration {@link TaxationWithRoot.Dependent_Type}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Dependent type</em>' attribute.
+	 * @see TaxationWithRoot.Dependent_Type
+	 * @see #setDependent_type(Dependent_Type)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getDependent_Dependent_type()
+	 * @model required="true"
+	 * @generated
+	 */
+	Dependent_Type getDependent_type();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Dependent#getDependent_type <em>Dependent type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Dependent type</em>' attribute.
+	 * @see TaxationWithRoot.Dependent_Type
+	 * @see #getDependent_type()
+	 * @generated
+	 */
+	void setDependent_type(Dependent_Type value);
+
+	/**
+	 * Returns the value of the '<em><b>Responsible person</b></em>' container reference.
+	 * It is bidirectional and its opposite is '{@link TaxationWithRoot.Tax_Payer#getDependents <em>Dependents</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Responsible person</em>' container reference.
+	 * @see #setResponsible_person(Tax_Payer)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getDependent_Responsible_person()
+	 * @see TaxationWithRoot.Tax_Payer#getDependents
+	 * @model opposite="dependents" transient="false"
+	 * @generated
+	 */
+	Tax_Payer getResponsible_person();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Dependent#getResponsible_person <em>Responsible person</em>}' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Responsible person</em>' container reference.
+	 * @see #getResponsible_person()
+	 * @generated
+	 */
+	void setResponsible_person(Tax_Payer value);
+
+	/**
+	 * Returns the value of the '<em><b>Continued studies</b></em>' attribute.
+	 * The default value is <code>"false"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Continued studies</em>' attribute.
+	 * @see #setContinued_studies(boolean)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getDependent_Continued_studies()
+	 * @model default="false" required="true"
+	 * @generated
+	 */
+	boolean isContinued_studies();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Dependent#isContinued_studies <em>Continued studies</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Continued studies</em>' attribute.
+	 * @see #isContinued_studies()
+	 * @generated
+	 */
+	void setContinued_studies(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Allowances</b></em>' containment reference.
+	 * It is bidirectional and its opposite is '{@link TaxationWithRoot.External_Allowance#getPerson <em>Person</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Allowances</em>' containment reference.
+	 * @see #setAllowances(External_Allowance)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getDependent_Allowances()
+	 * @see TaxationWithRoot.External_Allowance#getPerson
+	 * @model opposite="person" containment="true" ordered="false"
+	 * @generated
+	 */
+	External_Allowance getAllowances();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Dependent#getAllowances <em>Allowances</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Allowances</em>' containment reference.
+	 * @see #getAllowances()
+	 * @generated
+	 */
+	void setAllowances(External_Allowance value);
+
+	/**
+	 * Returns the value of the '<em><b>Household</b></em>' container reference.
+	 * It is bidirectional and its opposite is '{@link TaxationWithRoot.Household#getChildren <em>Children</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Household</em>' container reference.
+	 * @see #setHousehold(Household)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getDependent_Household()
+	 * @see TaxationWithRoot.Household#getChildren
+	 * @model opposite="children" transient="false" ordered="false"
+	 * @generated
+	 */
+	Household getHousehold();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Dependent#getHousehold <em>Household</em>}' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Household</em>' container reference.
+	 * @see #getHousehold()
+	 * @generated
+	 */
+	void setHousehold(Household value);
+
+	/**
+	 * Returns the value of the '<em><b>From agent</b></em>' reference.
+	 * It is bidirectional and its opposite is '{@link TaxationWithRoot.FromAgent#getDependent <em>Dependent</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>From agent</em>' reference.
+	 * @see #setFrom_agent(FromAgent)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getDependent_From_agent()
+	 * @see TaxationWithRoot.FromAgent#getDependent
+	 * @model opposite="dependent" ordered="false"
+	 * @generated
+	 */
+	FromAgent getFrom_agent();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Dependent#getFrom_agent <em>From agent</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>From agent</em>' reference.
+	 * @see #getFrom_agent()
+	 * @generated
+	 */
+	void setFrom_agent(FromAgent value);
+
+	/**
+	 * Returns the value of the '<em><b>Expense</b></em>' reference list.
+	 * The list contents are of type {@link TaxationWithRoot.Expense}.
+	 * It is bidirectional and its opposite is '{@link TaxationWithRoot.Expense#getDependent <em>Dependent</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Expense</em>' reference list.
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getDependent_Expense()
+	 * @see TaxationWithRoot.Expense#getDependent
+	 * @model opposite="dependent" ordered="false"
+	 * @generated
+	 */
+	EList<Expense> getExpense();
+
+} // Dependent
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Dependent_Type.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Dependent_Type.java
new file mode 100644
index 00000000..84502484
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Dependent_Type.java
@@ -0,0 +1,278 @@
+/**
+ */
+package TaxationWithRoot;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.Enumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Dependent Type</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * @see TaxationWithRoot.TaxationWithRootPackage#getDependent_Type()
+ * @model
+ * @generated
+ */
+public enum Dependent_Type implements Enumerator {
+	/**
+	 * The '<em><b>CHILD</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #CHILD_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	CHILD(0, "CHILD", "CHILD"),
+
+	/**
+	 * The '<em><b>SPOUSE</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #SPOUSE_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	SPOUSE(1, "SPOUSE", "SPOUSE"),
+
+	/**
+	 * The '<em><b>RELATIVE</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #RELATIVE_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	RELATIVE(2, "RELATIVE", "RELATIVE"),
+
+	/**
+	 * The '<em><b>OTHER FAMILY MEMBER</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #OTHER_FAMILY_MEMBER_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	OTHER_FAMILY_MEMBER(3, "OTHER_FAMILY_MEMBER", "OTHER_FAMILY_MEMBER"),
+
+	/**
+	 * The '<em><b>NOT OWN CHILD</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #NOT_OWN_CHILD_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	NOT_OWN_CHILD(4, "NOT_OWN_CHILD", "NOT_OWN_CHILD");
+
+	/**
+	 * The '<em><b>CHILD</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #CHILD
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int CHILD_VALUE = 0;
+
+	/**
+	 * The '<em><b>SPOUSE</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #SPOUSE
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int SPOUSE_VALUE = 1;
+
+	/**
+	 * The '<em><b>RELATIVE</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #RELATIVE
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int RELATIVE_VALUE = 2;
+
+	/**
+	 * The '<em><b>OTHER FAMILY MEMBER</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #OTHER_FAMILY_MEMBER
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int OTHER_FAMILY_MEMBER_VALUE = 3;
+
+	/**
+	 * The '<em><b>NOT OWN CHILD</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #NOT_OWN_CHILD
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int NOT_OWN_CHILD_VALUE = 4;
+
+	/**
+	 * An array of all the '<em><b>Dependent Type</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static final Dependent_Type[] VALUES_ARRAY =
+		new Dependent_Type[] {
+			CHILD,
+			SPOUSE,
+			RELATIVE,
+			OTHER_FAMILY_MEMBER,
+			NOT_OWN_CHILD,
+		};
+
+	/**
+	 * A public read-only list of all the '<em><b>Dependent Type</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<Dependent_Type> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+	/**
+	 * Returns the '<em><b>Dependent Type</b></em>' literal with the specified literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Dependent_Type get(String literal) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			Dependent_Type result = VALUES_ARRAY[i];
+			if (result.toString().equals(literal)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Dependent Type</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Dependent_Type getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			Dependent_Type result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Dependent Type</b></em>' literal with the specified integer value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Dependent_Type get(int value) {
+		switch (value) {
+			case CHILD_VALUE: return CHILD;
+			case SPOUSE_VALUE: return SPOUSE;
+			case RELATIVE_VALUE: return RELATIVE;
+			case OTHER_FAMILY_MEMBER_VALUE: return OTHER_FAMILY_MEMBER;
+			case NOT_OWN_CHILD_VALUE: return NOT_OWN_CHILD;
+		}
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final int value;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String name;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String literal;
+
+	/**
+	 * Only this class can construct instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private Dependent_Type(int value, String name, String literal) {
+		this.value = value;
+		this.name = name;
+		this.literal = literal;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getValue() {
+	  return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getName() {
+	  return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getLiteral() {
+	  return literal;
+	}
+
+	/**
+	 * Returns the literal value of the enumerator, which is its string representation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		return literal;
+	}
+	
+} //Dependent_Type
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Disability_Types.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Disability_Types.java
new file mode 100644
index 00000000..043d49fe
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Disability_Types.java
@@ -0,0 +1,347 @@
+/**
+ */
+package TaxationWithRoot;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.Enumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Disability Types</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * @see TaxationWithRoot.TaxationWithRootPackage#getDisability_Types()
+ * @model
+ * @generated
+ */
+public enum Disability_Types implements Enumerator {
+	/**
+	 * The '<em><b>Beug</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #BEUG_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	BEUG(0, "beug", "beug"),
+
+	/**
+	 * The '<em><b>NONE</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #NONE_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	NONE(1, "NONE", "NONE"),
+
+	/**
+	 * The '<em><b>A</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #A_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	A(2, "A", "A"),
+
+	/**
+	 * The '<em><b>B</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #B_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	B(3, "B", "B"),
+
+	/**
+	 * The '<em><b>C</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #C_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	C(4, "C", "C"),
+
+	/**
+	 * The '<em><b>D</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #D_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	D(5, "D", "D"),
+
+	/**
+	 * The '<em><b>E</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #E_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	E(6, "E", "E"),
+
+	/**
+	 * The '<em><b>OTHER</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #OTHER_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	OTHER(7, "OTHER", "OTHER");
+
+	/**
+	 * The '<em><b>Beug</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #BEUG
+	 * @model name="beug"
+	 * @generated
+	 * @ordered
+	 */
+	public static final int BEUG_VALUE = 0;
+
+	/**
+	 * The '<em><b>NONE</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #NONE
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int NONE_VALUE = 1;
+
+	/**
+	 * The '<em><b>A</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #A
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int A_VALUE = 2;
+
+	/**
+	 * The '<em><b>B</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #B
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int B_VALUE = 3;
+
+	/**
+	 * The '<em><b>C</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #C
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int C_VALUE = 4;
+
+	/**
+	 * The '<em><b>D</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #D
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int D_VALUE = 5;
+
+	/**
+	 * The '<em><b>E</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #E
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int E_VALUE = 6;
+
+	/**
+	 * The '<em><b>OTHER</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #OTHER
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int OTHER_VALUE = 7;
+
+	/**
+	 * An array of all the '<em><b>Disability Types</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static final Disability_Types[] VALUES_ARRAY =
+		new Disability_Types[] {
+			BEUG,
+			NONE,
+			A,
+			B,
+			C,
+			D,
+			E,
+			OTHER,
+		};
+
+	/**
+	 * A public read-only list of all the '<em><b>Disability Types</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<Disability_Types> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+	/**
+	 * Returns the '<em><b>Disability Types</b></em>' literal with the specified literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Disability_Types get(String literal) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			Disability_Types result = VALUES_ARRAY[i];
+			if (result.toString().equals(literal)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Disability Types</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Disability_Types getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			Disability_Types result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Disability Types</b></em>' literal with the specified integer value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Disability_Types get(int value) {
+		switch (value) {
+			case BEUG_VALUE: return BEUG;
+			case NONE_VALUE: return NONE;
+			case A_VALUE: return A;
+			case B_VALUE: return B;
+			case C_VALUE: return C;
+			case D_VALUE: return D;
+			case E_VALUE: return E;
+			case OTHER_VALUE: return OTHER;
+		}
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final int value;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String name;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String literal;
+
+	/**
+	 * Only this class can construct instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private Disability_Types(int value, String name, String literal) {
+		this.value = value;
+		this.name = name;
+		this.literal = literal;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getValue() {
+	  return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getName() {
+	  return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getLiteral() {
+	  return literal;
+	}
+
+	/**
+	 * Returns the literal value of the enumerator, which is its string representation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		return literal;
+	}
+	
+} //Disability_Types
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Donation.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Donation.java
new file mode 100644
index 00000000..64adc154
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Donation.java
@@ -0,0 +1,68 @@
+/**
+ */
+package TaxationWithRoot;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Donation</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.Donation#getBeneficiary1 <em>Beneficiary1</em>}</li>
+ *   <li>{@link TaxationWithRoot.Donation#isIs_donation_reported <em>Is donation reported</em>}</li>
+ * </ul>
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getDonation()
+ * @model
+ * @generated
+ */
+public interface Donation extends Special_Expense_DS {
+	/**
+	 * Returns the value of the '<em><b>Beneficiary1</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Beneficiary1</em>' attribute.
+	 * @see #setBeneficiary1(String)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getDonation_Beneficiary1()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getBeneficiary1();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Donation#getBeneficiary1 <em>Beneficiary1</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Beneficiary1</em>' attribute.
+	 * @see #getBeneficiary1()
+	 * @generated
+	 */
+	void setBeneficiary1(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Is donation reported</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Is donation reported</em>' attribute.
+	 * @see #setIs_donation_reported(boolean)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getDonation_Is_donation_reported()
+	 * @model required="true"
+	 * @generated
+	 */
+	boolean isIs_donation_reported();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Donation#isIs_donation_reported <em>Is donation reported</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Is donation reported</em>' attribute.
+	 * @see #isIs_donation_reported()
+	 * @generated
+	 */
+	void setIs_donation_reported(boolean value);
+
+} // Donation
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Employment_Income.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Employment_Income.java
new file mode 100644
index 00000000..09b87818
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Employment_Income.java
@@ -0,0 +1,17 @@
+/**
+ */
+package TaxationWithRoot;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Employment Income</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getEmployment_Income()
+ * @model
+ * @generated
+ */
+public interface Employment_Income extends Income_Type {
+} // Employment_Income
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Expense.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Expense.java
new file mode 100644
index 00000000..00f5271e
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Expense.java
@@ -0,0 +1,196 @@
+/**
+ */
+package TaxationWithRoot;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Expense</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.Expense#getDeclared_amount <em>Declared amount</em>}</li>
+ *   <li>{@link TaxationWithRoot.Expense#getExpense_purpose <em>Expense purpose</em>}</li>
+ *   <li>{@link TaxationWithRoot.Expense#getDependent <em>Dependent</em>}</li>
+ *   <li>{@link TaxationWithRoot.Expense#getFrom_agent <em>From agent</em>}</li>
+ *   <li>{@link TaxationWithRoot.Expense#getIncome <em>Income</em>}</li>
+ *   <li>{@link TaxationWithRoot.Expense#getId4 <em>Id4</em>}</li>
+ *   <li>{@link TaxationWithRoot.Expense#getBeneficiary <em>Beneficiary</em>}</li>
+ * </ul>
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getExpense()
+ * @model
+ * @generated
+ */
+public interface Expense extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Declared amount</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Declared amount</em>' attribute.
+	 * @see #setDeclared_amount(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getExpense_Declared_amount()
+	 * @model required="true"
+	 * @generated
+	 */
+	double getDeclared_amount();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Expense#getDeclared_amount <em>Declared amount</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Declared amount</em>' attribute.
+	 * @see #getDeclared_amount()
+	 * @generated
+	 */
+	void setDeclared_amount(double value);
+
+	/**
+	 * Returns the value of the '<em><b>Expense purpose</b></em>' attribute.
+	 * The default value is <code>"OTHER"</code>.
+	 * The literals are from the enumeration {@link TaxationWithRoot.Expense_Purpose}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Expense purpose</em>' attribute.
+	 * @see TaxationWithRoot.Expense_Purpose
+	 * @see #setExpense_purpose(Expense_Purpose)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getExpense_Expense_purpose()
+	 * @model default="OTHER" required="true"
+	 * @generated
+	 */
+	Expense_Purpose getExpense_purpose();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Expense#getExpense_purpose <em>Expense purpose</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Expense purpose</em>' attribute.
+	 * @see TaxationWithRoot.Expense_Purpose
+	 * @see #getExpense_purpose()
+	 * @generated
+	 */
+	void setExpense_purpose(Expense_Purpose value);
+
+	/**
+	 * Returns the value of the '<em><b>Dependent</b></em>' reference.
+	 * It is bidirectional and its opposite is '{@link TaxationWithRoot.Dependent#getExpense <em>Expense</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Dependent</em>' reference.
+	 * @see #setDependent(Dependent)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getExpense_Dependent()
+	 * @see TaxationWithRoot.Dependent#getExpense
+	 * @model opposite="expense"
+	 * @generated
+	 */
+	Dependent getDependent();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Expense#getDependent <em>Dependent</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Dependent</em>' reference.
+	 * @see #getDependent()
+	 * @generated
+	 */
+	void setDependent(Dependent value);
+
+	/**
+	 * Returns the value of the '<em><b>From agent</b></em>' reference.
+	 * It is bidirectional and its opposite is '{@link TaxationWithRoot.FromAgent#getExpense <em>Expense</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>From agent</em>' reference.
+	 * @see #setFrom_agent(FromAgent)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getExpense_From_agent()
+	 * @see TaxationWithRoot.FromAgent#getExpense
+	 * @model opposite="expense" ordered="false"
+	 * @generated
+	 */
+	FromAgent getFrom_agent();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Expense#getFrom_agent <em>From agent</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>From agent</em>' reference.
+	 * @see #getFrom_agent()
+	 * @generated
+	 */
+	void setFrom_agent(FromAgent value);
+
+	/**
+	 * Returns the value of the '<em><b>Income</b></em>' container reference.
+	 * It is bidirectional and its opposite is '{@link TaxationWithRoot.Income#getExpenses <em>Expenses</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Income</em>' container reference.
+	 * @see #setIncome(Income)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getExpense_Income()
+	 * @see TaxationWithRoot.Income#getExpenses
+	 * @model opposite="expenses" required="true" transient="false"
+	 * @generated
+	 */
+	Income getIncome();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Expense#getIncome <em>Income</em>}' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Income</em>' container reference.
+	 * @see #getIncome()
+	 * @generated
+	 */
+	void setIncome(Income value);
+
+	/**
+	 * Returns the value of the '<em><b>Id4</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Id4</em>' attribute.
+	 * @see #setId4(String)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getExpense_Id4()
+	 * @model id="true" required="true" ordered="false"
+	 * @generated
+	 */
+	String getId4();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Expense#getId4 <em>Id4</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Id4</em>' attribute.
+	 * @see #getId4()
+	 * @generated
+	 */
+	void setId4(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Beneficiary</b></em>' reference.
+	 * It is bidirectional and its opposite is '{@link TaxationWithRoot.Physical_Person#getExpenses <em>Expenses</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Beneficiary</em>' reference.
+	 * @see #setBeneficiary(Physical_Person)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getExpense_Beneficiary()
+	 * @see TaxationWithRoot.Physical_Person#getExpenses
+	 * @model opposite="expenses" ordered="false"
+	 * @generated
+	 */
+	Physical_Person getBeneficiary();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Expense#getBeneficiary <em>Beneficiary</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Beneficiary</em>' reference.
+	 * @see #getBeneficiary()
+	 * @generated
+	 */
+	void setBeneficiary(Physical_Person value);
+
+} // Expense
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Expense_Purpose.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Expense_Purpose.java
new file mode 100644
index 00000000..e392c8da
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Expense_Purpose.java
@@ -0,0 +1,301 @@
+/**
+ */
+package TaxationWithRoot;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.Enumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Expense Purpose</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * @see TaxationWithRoot.TaxationWithRootPackage#getExpense_Purpose()
+ * @model
+ * @generated
+ */
+public enum Expense_Purpose implements Enumerator {
+	/**
+	 * The '<em><b>HOUSE CARE</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #HOUSE_CARE_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	HOUSE_CARE(0, "HOUSE_CARE", "HOUSE_CARE"),
+
+	/**
+	 * The '<em><b>CHILD CARE</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #CHILD_CARE_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	CHILD_CARE(1, "CHILD_CARE", "CHILD_CARE"),
+
+	/**
+	 * The '<em><b>DEPENDENCE CARE</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #DEPENDENCE_CARE_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	DEPENDENCE_CARE(2, "DEPENDENCE_CARE", "DEPENDENCE_CARE"),
+
+	/**
+	 * The '<em><b>OTHER</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #OTHER_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	OTHER(3, "OTHER", "OTHER"),
+
+	/**
+	 * The '<em><b>ALIMONY</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #ALIMONY_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	ALIMONY(4, "ALIMONY", "ALIMONY"),
+
+	/**
+	 * The '<em><b>RECURRENT DEPT</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #RECURRENT_DEPT_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	RECURRENT_DEPT(5, "RECURRENT_DEPT", "RECURRENT_DEPT");
+
+	/**
+	 * The '<em><b>HOUSE CARE</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #HOUSE_CARE
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int HOUSE_CARE_VALUE = 0;
+
+	/**
+	 * The '<em><b>CHILD CARE</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #CHILD_CARE
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int CHILD_CARE_VALUE = 1;
+
+	/**
+	 * The '<em><b>DEPENDENCE CARE</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #DEPENDENCE_CARE
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int DEPENDENCE_CARE_VALUE = 2;
+
+	/**
+	 * The '<em><b>OTHER</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #OTHER
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int OTHER_VALUE = 3;
+
+	/**
+	 * The '<em><b>ALIMONY</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #ALIMONY
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int ALIMONY_VALUE = 4;
+
+	/**
+	 * The '<em><b>RECURRENT DEPT</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #RECURRENT_DEPT
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int RECURRENT_DEPT_VALUE = 5;
+
+	/**
+	 * An array of all the '<em><b>Expense Purpose</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static final Expense_Purpose[] VALUES_ARRAY =
+		new Expense_Purpose[] {
+			HOUSE_CARE,
+			CHILD_CARE,
+			DEPENDENCE_CARE,
+			OTHER,
+			ALIMONY,
+			RECURRENT_DEPT,
+		};
+
+	/**
+	 * A public read-only list of all the '<em><b>Expense Purpose</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<Expense_Purpose> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+	/**
+	 * Returns the '<em><b>Expense Purpose</b></em>' literal with the specified literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Expense_Purpose get(String literal) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			Expense_Purpose result = VALUES_ARRAY[i];
+			if (result.toString().equals(literal)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Expense Purpose</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Expense_Purpose getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			Expense_Purpose result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Expense Purpose</b></em>' literal with the specified integer value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Expense_Purpose get(int value) {
+		switch (value) {
+			case HOUSE_CARE_VALUE: return HOUSE_CARE;
+			case CHILD_CARE_VALUE: return CHILD_CARE;
+			case DEPENDENCE_CARE_VALUE: return DEPENDENCE_CARE;
+			case OTHER_VALUE: return OTHER;
+			case ALIMONY_VALUE: return ALIMONY;
+			case RECURRENT_DEPT_VALUE: return RECURRENT_DEPT;
+		}
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final int value;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String name;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String literal;
+
+	/**
+	 * Only this class can construct instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private Expense_Purpose(int value, String name, String literal) {
+		this.value = value;
+		this.name = name;
+		this.literal = literal;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getValue() {
+	  return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getName() {
+	  return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getLiteral() {
+	  return literal;
+	}
+
+	/**
+	 * Returns the literal value of the enumerator, which is its string representation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		return literal;
+	}
+	
+} //Expense_Purpose
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/External_Allowance.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/External_Allowance.java
new file mode 100644
index 00000000..1527b0f0
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/External_Allowance.java
@@ -0,0 +1,166 @@
+/**
+ */
+package TaxationWithRoot;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>External Allowance</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.External_Allowance#getGrantor <em>Grantor</em>}</li>
+ *   <li>{@link TaxationWithRoot.External_Allowance#getStarting_year <em>Starting year</em>}</li>
+ *   <li>{@link TaxationWithRoot.External_Allowance#getEnding_year <em>Ending year</em>}</li>
+ *   <li>{@link TaxationWithRoot.External_Allowance#getReciver <em>Reciver</em>}</li>
+ *   <li>{@link TaxationWithRoot.External_Allowance#getId5 <em>Id5</em>}</li>
+ *   <li>{@link TaxationWithRoot.External_Allowance#getPerson <em>Person</em>}</li>
+ * </ul>
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getExternal_Allowance()
+ * @model
+ * @generated
+ */
+public interface External_Allowance extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Grantor</b></em>' attribute.
+	 * The literals are from the enumeration {@link TaxationWithRoot.Grantor}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Grantor</em>' attribute.
+	 * @see TaxationWithRoot.Grantor
+	 * @see #setGrantor(Grantor)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getExternal_Allowance_Grantor()
+	 * @model required="true"
+	 * @generated
+	 */
+	Grantor getGrantor();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.External_Allowance#getGrantor <em>Grantor</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Grantor</em>' attribute.
+	 * @see TaxationWithRoot.Grantor
+	 * @see #getGrantor()
+	 * @generated
+	 */
+	void setGrantor(Grantor value);
+
+	/**
+	 * Returns the value of the '<em><b>Starting year</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Starting year</em>' attribute.
+	 * @see #setStarting_year(int)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getExternal_Allowance_Starting_year()
+	 * @model required="true" ordered="false"
+	 * @generated
+	 */
+	int getStarting_year();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.External_Allowance#getStarting_year <em>Starting year</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Starting year</em>' attribute.
+	 * @see #getStarting_year()
+	 * @generated
+	 */
+	void setStarting_year(int value);
+
+	/**
+	 * Returns the value of the '<em><b>Ending year</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Ending year</em>' attribute.
+	 * @see #setEnding_year(int)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getExternal_Allowance_Ending_year()
+	 * @model required="true" ordered="false"
+	 * @generated
+	 */
+	int getEnding_year();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.External_Allowance#getEnding_year <em>Ending year</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Ending year</em>' attribute.
+	 * @see #getEnding_year()
+	 * @generated
+	 */
+	void setEnding_year(int value);
+
+	/**
+	 * Returns the value of the '<em><b>Reciver</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Reciver</em>' reference.
+	 * @see #setReciver(Physical_Person)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getExternal_Allowance_Reciver()
+	 * @model required="true" ordered="false"
+	 * @generated
+	 */
+	Physical_Person getReciver();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.External_Allowance#getReciver <em>Reciver</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Reciver</em>' reference.
+	 * @see #getReciver()
+	 * @generated
+	 */
+	void setReciver(Physical_Person value);
+
+	/**
+	 * Returns the value of the '<em><b>Id5</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Id5</em>' attribute.
+	 * @see #setId5(String)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getExternal_Allowance_Id5()
+	 * @model id="true" required="true" ordered="false"
+	 * @generated
+	 */
+	String getId5();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.External_Allowance#getId5 <em>Id5</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Id5</em>' attribute.
+	 * @see #getId5()
+	 * @generated
+	 */
+	void setId5(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Person</b></em>' container reference.
+	 * It is bidirectional and its opposite is '{@link TaxationWithRoot.Dependent#getAllowances <em>Allowances</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Person</em>' container reference.
+	 * @see #setPerson(Dependent)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getExternal_Allowance_Person()
+	 * @see TaxationWithRoot.Dependent#getAllowances
+	 * @model opposite="allowances" required="true" transient="false" ordered="false"
+	 * @generated
+	 */
+	Dependent getPerson();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.External_Allowance#getPerson <em>Person</em>}' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Person</em>' container reference.
+	 * @see #getPerson()
+	 * @generated
+	 */
+	void setPerson(Dependent value);
+
+} // External_Allowance
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Extraordinary_Expense_CE.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Extraordinary_Expense_CE.java
new file mode 100644
index 00000000..288041bd
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Extraordinary_Expense_CE.java
@@ -0,0 +1,71 @@
+/**
+ */
+package TaxationWithRoot;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Extraordinary Expense CE</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.Extraordinary_Expense_CE#getThresholded_deduction_percentage <em>Thresholded deduction percentage</em>}</li>
+ *   <li>{@link TaxationWithRoot.Extraordinary_Expense_CE#getCe_type <em>Ce type</em>}</li>
+ * </ul>
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getExtraordinary_Expense_CE()
+ * @model
+ * @generated
+ */
+public interface Extraordinary_Expense_CE extends Expense {
+	/**
+	 * Returns the value of the '<em><b>Thresholded deduction percentage</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Thresholded deduction percentage</em>' attribute.
+	 * @see #setThresholded_deduction_percentage(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getExtraordinary_Expense_CE_Thresholded_deduction_percentage()
+	 * @model required="true"
+	 * @generated
+	 */
+	double getThresholded_deduction_percentage();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Extraordinary_Expense_CE#getThresholded_deduction_percentage <em>Thresholded deduction percentage</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Thresholded deduction percentage</em>' attribute.
+	 * @see #getThresholded_deduction_percentage()
+	 * @generated
+	 */
+	void setThresholded_deduction_percentage(double value);
+
+	/**
+	 * Returns the value of the '<em><b>Ce type</b></em>' attribute.
+	 * The literals are from the enumeration {@link TaxationWithRoot.CE_Type}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Ce type</em>' attribute.
+	 * @see TaxationWithRoot.CE_Type
+	 * @see #setCe_type(CE_Type)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getExtraordinary_Expense_CE_Ce_type()
+	 * @model required="true"
+	 * @generated
+	 */
+	CE_Type getCe_type();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Extraordinary_Expense_CE#getCe_type <em>Ce type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Ce type</em>' attribute.
+	 * @see TaxationWithRoot.CE_Type
+	 * @see #getCe_type()
+	 * @generated
+	 */
+	void setCe_type(CE_Type value);
+
+} // Extraordinary_Expense_CE
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Fiscal_Address.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Fiscal_Address.java
new file mode 100644
index 00000000..a2ab90b1
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Fiscal_Address.java
@@ -0,0 +1,17 @@
+/**
+ */
+package TaxationWithRoot;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Fiscal Address</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getFiscal_Address()
+ * @model
+ * @generated
+ */
+public interface Fiscal_Address extends Address {
+} // Fiscal_Address
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Foreign_Income.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Foreign_Income.java
new file mode 100644
index 00000000..1cd90a59
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Foreign_Income.java
@@ -0,0 +1,17 @@
+/**
+ */
+package TaxationWithRoot;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Foreign Income</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getForeign_Income()
+ * @model
+ * @generated
+ */
+public interface Foreign_Income extends Income {
+} // Foreign_Income
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/FromAgent.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/FromAgent.java
new file mode 100644
index 00000000..e6706938
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/FromAgent.java
@@ -0,0 +1,144 @@
+/**
+ */
+package TaxationWithRoot;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>From Agent</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.FromAgent#getTaxPayer <em>Tax Payer</em>}</li>
+ *   <li>{@link TaxationWithRoot.FromAgent#isIs_dependent_eligible_for_CE_Not_In_Houshold_Children_Care <em>Is dependent eligible for CE Not In Houshold Children Care</em>}</li>
+ *   <li>{@link TaxationWithRoot.FromAgent#getExpense <em>Expense</em>}</li>
+ *   <li>{@link TaxationWithRoot.FromAgent#isIs_eligible_debt <em>Is eligible debt</em>}</li>
+ *   <li>{@link TaxationWithRoot.FromAgent#getDependent <em>Dependent</em>}</li>
+ * </ul>
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getFromAgent()
+ * @model
+ * @generated
+ */
+public interface FromAgent extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Tax Payer</b></em>' container reference.
+	 * It is bidirectional and its opposite is '{@link TaxationWithRoot.Tax_Payer#getFrom_agent <em>From agent</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Tax Payer</em>' container reference.
+	 * @see #setTaxPayer(Tax_Payer)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getFromAgent_TaxPayer()
+	 * @see TaxationWithRoot.Tax_Payer#getFrom_agent
+	 * @model opposite="from_agent" required="true" transient="false"
+	 * @generated
+	 */
+	Tax_Payer getTaxPayer();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.FromAgent#getTaxPayer <em>Tax Payer</em>}' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Tax Payer</em>' container reference.
+	 * @see #getTaxPayer()
+	 * @generated
+	 */
+	void setTaxPayer(Tax_Payer value);
+
+	/**
+	 * Returns the value of the '<em><b>Is dependent eligible for CE Not In Houshold Children Care</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Is dependent eligible for CE Not In Houshold Children Care</em>' attribute.
+	 * @see #setIs_dependent_eligible_for_CE_Not_In_Houshold_Children_Care(boolean)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getFromAgent_Is_dependent_eligible_for_CE_Not_In_Houshold_Children_Care()
+	 * @model required="true" ordered="false"
+	 * @generated
+	 */
+	boolean isIs_dependent_eligible_for_CE_Not_In_Houshold_Children_Care();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.FromAgent#isIs_dependent_eligible_for_CE_Not_In_Houshold_Children_Care <em>Is dependent eligible for CE Not In Houshold Children Care</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Is dependent eligible for CE Not In Houshold Children Care</em>' attribute.
+	 * @see #isIs_dependent_eligible_for_CE_Not_In_Houshold_Children_Care()
+	 * @generated
+	 */
+	void setIs_dependent_eligible_for_CE_Not_In_Houshold_Children_Care(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Expense</b></em>' reference.
+	 * It is bidirectional and its opposite is '{@link TaxationWithRoot.Expense#getFrom_agent <em>From agent</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Expense</em>' reference.
+	 * @see #setExpense(Expense)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getFromAgent_Expense()
+	 * @see TaxationWithRoot.Expense#getFrom_agent
+	 * @model opposite="from_agent" ordered="false"
+	 * @generated
+	 */
+	Expense getExpense();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.FromAgent#getExpense <em>Expense</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Expense</em>' reference.
+	 * @see #getExpense()
+	 * @generated
+	 */
+	void setExpense(Expense value);
+
+	/**
+	 * Returns the value of the '<em><b>Is eligible debt</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Is eligible debt</em>' attribute.
+	 * @see #setIs_eligible_debt(boolean)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getFromAgent_Is_eligible_debt()
+	 * @model required="true" ordered="false"
+	 * @generated
+	 */
+	boolean isIs_eligible_debt();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.FromAgent#isIs_eligible_debt <em>Is eligible debt</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Is eligible debt</em>' attribute.
+	 * @see #isIs_eligible_debt()
+	 * @generated
+	 */
+	void setIs_eligible_debt(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Dependent</b></em>' reference.
+	 * It is bidirectional and its opposite is '{@link TaxationWithRoot.Dependent#getFrom_agent <em>From agent</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Dependent</em>' reference.
+	 * @see #setDependent(Dependent)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getFromAgent_Dependent()
+	 * @see TaxationWithRoot.Dependent#getFrom_agent
+	 * @model opposite="from_agent" ordered="false"
+	 * @generated
+	 */
+	Dependent getDependent();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.FromAgent#getDependent <em>Dependent</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Dependent</em>' reference.
+	 * @see #getDependent()
+	 * @generated
+	 */
+	void setDependent(Dependent value);
+
+} // FromAgent
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/FromLaw.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/FromLaw.java
new file mode 100644
index 00000000..34c08e55
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/FromLaw.java
@@ -0,0 +1,71 @@
+/**
+ */
+package TaxationWithRoot;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>From Law</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.FromLaw#getId <em>Id</em>}</li>
+ *   <li>{@link TaxationWithRoot.FromLaw#getTaxPayer <em>Tax Payer</em>}</li>
+ * </ul>
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getFromLaw()
+ * @model
+ * @generated
+ */
+public interface FromLaw extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Id</em>' attribute.
+	 * @see #setId(String)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getFromLaw_Id()
+	 * @model id="true" required="true" ordered="false"
+	 * @generated
+	 */
+	String getId();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.FromLaw#getId <em>Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * @see #getId()
+	 * @generated
+	 */
+	void setId(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Tax Payer</b></em>' container reference.
+	 * It is bidirectional and its opposite is '{@link TaxationWithRoot.Tax_Payer#getFrom_law <em>From law</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Tax Payer</em>' container reference.
+	 * @see #setTaxPayer(Tax_Payer)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getFromLaw_TaxPayer()
+	 * @see TaxationWithRoot.Tax_Payer#getFrom_law
+	 * @model opposite="from_law" required="true" transient="false"
+	 * @generated
+	 */
+	Tax_Payer getTaxPayer();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.FromLaw#getTaxPayer <em>Tax Payer</em>}' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Tax Payer</em>' container reference.
+	 * @see #getTaxPayer()
+	 * @generated
+	 */
+	void setTaxPayer(Tax_Payer value);
+
+} // FromLaw
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Grantor.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Grantor.java
new file mode 100644
index 00000000..e5da891f
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Grantor.java
@@ -0,0 +1,301 @@
+/**
+ */
+package TaxationWithRoot;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.Enumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Grantor</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * @see TaxationWithRoot.TaxationWithRootPackage#getGrantor()
+ * @model
+ * @generated
+ */
+public enum Grantor implements Enumerator {
+	/**
+	 * The '<em><b>WWW</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #WWW_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	WWW(0, "WWW", "WWW"),
+
+	/**
+	 * The '<em><b>Employer</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #EMPLOYER_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	EMPLOYER(1, "Employer", "Employer"),
+
+	/**
+	 * The '<em><b>MMM</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #MMM_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	MMM(2, "MMM", "MMM"),
+
+	/**
+	 * The '<em><b>UUU</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #UUU_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	UUU(3, "UUU", "UUU"),
+
+	/**
+	 * The '<em><b>YYY</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #YYY_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	YYY(4, "YYY", "YYY"),
+
+	/**
+	 * The '<em><b>OOO</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #OOO_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	OOO(5, "OOO", "OOO");
+
+	/**
+	 * The '<em><b>WWW</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #WWW
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int WWW_VALUE = 0;
+
+	/**
+	 * The '<em><b>Employer</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #EMPLOYER
+	 * @model name="Employer"
+	 * @generated
+	 * @ordered
+	 */
+	public static final int EMPLOYER_VALUE = 1;
+
+	/**
+	 * The '<em><b>MMM</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #MMM
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int MMM_VALUE = 2;
+
+	/**
+	 * The '<em><b>UUU</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #UUU
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int UUU_VALUE = 3;
+
+	/**
+	 * The '<em><b>YYY</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #YYY
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int YYY_VALUE = 4;
+
+	/**
+	 * The '<em><b>OOO</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #OOO
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int OOO_VALUE = 5;
+
+	/**
+	 * An array of all the '<em><b>Grantor</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static final Grantor[] VALUES_ARRAY =
+		new Grantor[] {
+			WWW,
+			EMPLOYER,
+			MMM,
+			UUU,
+			YYY,
+			OOO,
+		};
+
+	/**
+	 * A public read-only list of all the '<em><b>Grantor</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<Grantor> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+	/**
+	 * Returns the '<em><b>Grantor</b></em>' literal with the specified literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Grantor get(String literal) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			Grantor result = VALUES_ARRAY[i];
+			if (result.toString().equals(literal)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Grantor</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Grantor getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			Grantor result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Grantor</b></em>' literal with the specified integer value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Grantor get(int value) {
+		switch (value) {
+			case WWW_VALUE: return WWW;
+			case EMPLOYER_VALUE: return EMPLOYER;
+			case MMM_VALUE: return MMM;
+			case UUU_VALUE: return UUU;
+			case YYY_VALUE: return YYY;
+			case OOO_VALUE: return OOO;
+		}
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final int value;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String name;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String literal;
+
+	/**
+	 * Only this class can construct instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private Grantor(int value, String name, String literal) {
+		this.value = value;
+		this.name = name;
+		this.literal = literal;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getValue() {
+	  return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getName() {
+	  return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getLiteral() {
+	  return literal;
+	}
+
+	/**
+	 * Returns the literal value of the enumerator, which is its string representation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		return literal;
+	}
+	
+} //Grantor
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Habitual_Address.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Habitual_Address.java
new file mode 100644
index 00000000..5cd30ec1
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Habitual_Address.java
@@ -0,0 +1,17 @@
+/**
+ */
+package TaxationWithRoot;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Habitual Address</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getHabitual_Address()
+ * @model
+ * @generated
+ */
+public interface Habitual_Address extends Address {
+} // Habitual_Address
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Health_and_Pension_Insurance.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Health_and_Pension_Insurance.java
new file mode 100644
index 00000000..03e4b1ce
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Health_and_Pension_Insurance.java
@@ -0,0 +1,72 @@
+/**
+ */
+package TaxationWithRoot;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Health and Pension Insurance</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.Health_and_Pension_Insurance#getCategory <em>Category</em>}</li>
+ *   <li>{@link TaxationWithRoot.Health_and_Pension_Insurance#isIs_related_to_additional_salary <em>Is related to additional salary</em>}</li>
+ * </ul>
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getHealth_and_Pension_Insurance()
+ * @model
+ * @generated
+ */
+public interface Health_and_Pension_Insurance extends Special_Expense_DS {
+	/**
+	 * Returns the value of the '<em><b>Category</b></em>' attribute.
+	 * The literals are from the enumeration {@link TaxationWithRoot.Category_of_Health_and_Pension_Insurances}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Category</em>' attribute.
+	 * @see TaxationWithRoot.Category_of_Health_and_Pension_Insurances
+	 * @see #setCategory(Category_of_Health_and_Pension_Insurances)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getHealth_and_Pension_Insurance_Category()
+	 * @model required="true"
+	 * @generated
+	 */
+	Category_of_Health_and_Pension_Insurances getCategory();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Health_and_Pension_Insurance#getCategory <em>Category</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Category</em>' attribute.
+	 * @see TaxationWithRoot.Category_of_Health_and_Pension_Insurances
+	 * @see #getCategory()
+	 * @generated
+	 */
+	void setCategory(Category_of_Health_and_Pension_Insurances value);
+
+	/**
+	 * Returns the value of the '<em><b>Is related to additional salary</b></em>' attribute.
+	 * The default value is <code>"false"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Is related to additional salary</em>' attribute.
+	 * @see #setIs_related_to_additional_salary(boolean)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getHealth_and_Pension_Insurance_Is_related_to_additional_salary()
+	 * @model default="false" required="true"
+	 * @generated
+	 */
+	boolean isIs_related_to_additional_salary();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Health_and_Pension_Insurance#isIs_related_to_additional_salary <em>Is related to additional salary</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Is related to additional salary</em>' attribute.
+	 * @see #isIs_related_to_additional_salary()
+	 * @generated
+	 */
+	void setIs_related_to_additional_salary(boolean value);
+
+} // Health_and_Pension_Insurance
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Household.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Household.java
new file mode 100644
index 00000000..49eedc03
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Household.java
@@ -0,0 +1,86 @@
+/**
+ */
+package TaxationWithRoot;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Household</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.Household#getParents <em>Parents</em>}</li>
+ *   <li>{@link TaxationWithRoot.Household#getId1 <em>Id1</em>}</li>
+ *   <li>{@link TaxationWithRoot.Household#getChildren <em>Children</em>}</li>
+ * </ul>
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getHousehold()
+ * @model
+ * @generated
+ */
+public interface Household extends Tax_Case {
+	/**
+	 * Returns the value of the '<em><b>Parents</b></em>' containment reference.
+	 * It is bidirectional and its opposite is '{@link TaxationWithRoot.Legal_Union_Record#getHousehold <em>Household</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Parents</em>' containment reference.
+	 * @see #setParents(Legal_Union_Record)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getHousehold_Parents()
+	 * @see TaxationWithRoot.Legal_Union_Record#getHousehold
+	 * @model opposite="household" containment="true" required="true" ordered="false"
+	 * @generated
+	 */
+	Legal_Union_Record getParents();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Household#getParents <em>Parents</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Parents</em>' containment reference.
+	 * @see #getParents()
+	 * @generated
+	 */
+	void setParents(Legal_Union_Record value);
+
+	/**
+	 * Returns the value of the '<em><b>Id1</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Id1</em>' attribute.
+	 * @see #setId1(String)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getHousehold_Id1()
+	 * @model id="true" required="true" ordered="false"
+	 * @generated
+	 */
+	String getId1();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Household#getId1 <em>Id1</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Id1</em>' attribute.
+	 * @see #getId1()
+	 * @generated
+	 */
+	void setId1(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Children</b></em>' containment reference list.
+	 * The list contents are of type {@link TaxationWithRoot.Dependent}.
+	 * It is bidirectional and its opposite is '{@link TaxationWithRoot.Dependent#getHousehold <em>Household</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Children</em>' containment reference list.
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getHousehold_Children()
+	 * @see TaxationWithRoot.Dependent#getHousehold
+	 * @model opposite="household" containment="true" ordered="false"
+	 * @generated
+	 */
+	EList<Dependent> getChildren();
+
+} // Household
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Income.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Income.java
new file mode 100644
index 00000000..b3720e37
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Income.java
@@ -0,0 +1,200 @@
+/**
+ */
+package TaxationWithRoot;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Income</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.Income#getIncome_amount <em>Income amount</em>}</li>
+ *   <li>{@link TaxationWithRoot.Income#getIncome_type <em>Income type</em>}</li>
+ *   <li>{@link TaxationWithRoot.Income#getTax_card <em>Tax card</em>}</li>
+ *   <li>{@link TaxationWithRoot.Income#getTax_liability <em>Tax liability</em>}</li>
+ *   <li>{@link TaxationWithRoot.Income#getTaxPayer <em>Tax Payer</em>}</li>
+ *   <li>{@link TaxationWithRoot.Income#getDetails <em>Details</em>}</li>
+ *   <li>{@link TaxationWithRoot.Income#getNum <em>Num</em>}</li>
+ *   <li>{@link TaxationWithRoot.Income#getExpenses <em>Expenses</em>}</li>
+ * </ul>
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getIncome()
+ * @model abstract="true"
+ * @generated
+ */
+public interface Income extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Income amount</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Income amount</em>' attribute.
+	 * @see #setIncome_amount(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getIncome_Income_amount()
+	 * @model unique="false" required="true" ordered="false"
+	 *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot derivation='let non_null_amounts:OrderedSet(Income_Detail)=self.details-&gt;select(det:Income_Detail|det.amount&gt;0)-&gt;asOrderedSet() in\nnon_null_amounts-&gt;collect(amount)-&gt;min()'"
+	 * @generated
+	 */
+	double getIncome_amount();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Income#getIncome_amount <em>Income amount</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Income amount</em>' attribute.
+	 * @see #getIncome_amount()
+	 * @generated
+	 */
+	void setIncome_amount(double value);
+
+	/**
+	 * Returns the value of the '<em><b>Income type</b></em>' containment reference.
+	 * It is bidirectional and its opposite is '{@link TaxationWithRoot.Income_Type#getIncome <em>Income</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Income type</em>' containment reference.
+	 * @see #setIncome_type(Income_Type)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getIncome_Income_type()
+	 * @see TaxationWithRoot.Income_Type#getIncome
+	 * @model opposite="income" containment="true" required="true"
+	 * @generated
+	 */
+	Income_Type getIncome_type();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Income#getIncome_type <em>Income type</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Income type</em>' containment reference.
+	 * @see #getIncome_type()
+	 * @generated
+	 */
+	void setIncome_type(Income_Type value);
+
+	/**
+	 * Returns the value of the '<em><b>Tax card</b></em>' containment reference.
+	 * It is bidirectional and its opposite is '{@link TaxationWithRoot.Tax_Card#getIncome <em>Income</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Tax card</em>' containment reference.
+	 * @see #setTax_card(Tax_Card)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getIncome_Tax_card()
+	 * @see TaxationWithRoot.Tax_Card#getIncome
+	 * @model opposite="income" containment="true"
+	 * @generated
+	 */
+	Tax_Card getTax_card();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Income#getTax_card <em>Tax card</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Tax card</em>' containment reference.
+	 * @see #getTax_card()
+	 * @generated
+	 */
+	void setTax_card(Tax_Card value);
+
+	/**
+	 * Returns the value of the '<em><b>Tax liability</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Tax liability</em>' attribute.
+	 * @see #setTax_liability(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getIncome_Tax_liability()
+	 * @model required="true"
+	 * @generated
+	 */
+	double getTax_liability();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Income#getTax_liability <em>Tax liability</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Tax liability</em>' attribute.
+	 * @see #getTax_liability()
+	 * @generated
+	 */
+	void setTax_liability(double value);
+
+	/**
+	 * Returns the value of the '<em><b>Tax Payer</b></em>' container reference.
+	 * It is bidirectional and its opposite is '{@link TaxationWithRoot.Tax_Payer#getIncomes <em>Incomes</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Tax Payer</em>' container reference.
+	 * @see #setTaxPayer(Tax_Payer)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getIncome_TaxPayer()
+	 * @see TaxationWithRoot.Tax_Payer#getIncomes
+	 * @model opposite="incomes" required="true" transient="false" ordered="false"
+	 * @generated
+	 */
+	Tax_Payer getTaxPayer();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Income#getTaxPayer <em>Tax Payer</em>}' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Tax Payer</em>' container reference.
+	 * @see #getTaxPayer()
+	 * @generated
+	 */
+	void setTaxPayer(Tax_Payer value);
+
+	/**
+	 * Returns the value of the '<em><b>Details</b></em>' containment reference list.
+	 * The list contents are of type {@link TaxationWithRoot.Income_Detail}.
+	 * It is bidirectional and its opposite is '{@link TaxationWithRoot.Income_Detail#getIncome <em>Income</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Details</em>' containment reference list.
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getIncome_Details()
+	 * @see TaxationWithRoot.Income_Detail#getIncome
+	 * @model opposite="income" containment="true" lower="12" upper="12"
+	 * @generated
+	 */
+	EList<Income_Detail> getDetails();
+
+	/**
+	 * Returns the value of the '<em><b>Num</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Num</em>' attribute.
+	 * @see #setNum(int)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getIncome_Num()
+	 * @model id="true" required="true" ordered="false"
+	 * @generated
+	 */
+	int getNum();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Income#getNum <em>Num</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Num</em>' attribute.
+	 * @see #getNum()
+	 * @generated
+	 */
+	void setNum(int value);
+
+	/**
+	 * Returns the value of the '<em><b>Expenses</b></em>' containment reference list.
+	 * The list contents are of type {@link TaxationWithRoot.Expense}.
+	 * It is bidirectional and its opposite is '{@link TaxationWithRoot.Expense#getIncome <em>Income</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Expenses</em>' containment reference list.
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getIncome_Expenses()
+	 * @see TaxationWithRoot.Expense#getIncome
+	 * @model opposite="income" containment="true" ordered="false"
+	 * @generated
+	 */
+	EList<Expense> getExpenses();
+
+} // Income
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Income_Detail.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Income_Detail.java
new file mode 100644
index 00000000..d1fd9091
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Income_Detail.java
@@ -0,0 +1,186 @@
+/**
+ */
+package TaxationWithRoot;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Income Detail</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.Income_Detail#getAmount <em>Amount</em>}</li>
+ *   <li>{@link TaxationWithRoot.Income_Detail#isIs_worked <em>Is worked</em>}</li>
+ *   <li>{@link TaxationWithRoot.Income_Detail#getDistance <em>Distance</em>}</li>
+ *   <li>{@link TaxationWithRoot.Income_Detail#getWorked_days <em>Worked days</em>}</li>
+ *   <li>{@link TaxationWithRoot.Income_Detail#isIs_contributing_CNS <em>Is contributing CNS</em>}</li>
+ *   <li>{@link TaxationWithRoot.Income_Detail#getId5 <em>Id5</em>}</li>
+ *   <li>{@link TaxationWithRoot.Income_Detail#getIncome <em>Income</em>}</li>
+ * </ul>
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getIncome_Detail()
+ * @model
+ * @generated
+ */
+public interface Income_Detail extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Amount</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Amount</em>' attribute.
+	 * @see #setAmount(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getIncome_Detail_Amount()
+	 * @model required="true"
+	 * @generated
+	 */
+	double getAmount();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Income_Detail#getAmount <em>Amount</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Amount</em>' attribute.
+	 * @see #getAmount()
+	 * @generated
+	 */
+	void setAmount(double value);
+
+	/**
+	 * Returns the value of the '<em><b>Is worked</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Is worked</em>' attribute.
+	 * @see #setIs_worked(boolean)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getIncome_Detail_Is_worked()
+	 * @model required="true"
+	 * @generated
+	 */
+	boolean isIs_worked();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Income_Detail#isIs_worked <em>Is worked</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Is worked</em>' attribute.
+	 * @see #isIs_worked()
+	 * @generated
+	 */
+	void setIs_worked(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Distance</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Distance</em>' attribute.
+	 * @see #setDistance(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getIncome_Detail_Distance()
+	 * @model required="true"
+	 * @generated
+	 */
+	double getDistance();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Income_Detail#getDistance <em>Distance</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Distance</em>' attribute.
+	 * @see #getDistance()
+	 * @generated
+	 */
+	void setDistance(double value);
+
+	/**
+	 * Returns the value of the '<em><b>Worked days</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Worked days</em>' attribute.
+	 * @see #setWorked_days(int)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getIncome_Detail_Worked_days()
+	 * @model required="true"
+	 * @generated
+	 */
+	int getWorked_days();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Income_Detail#getWorked_days <em>Worked days</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Worked days</em>' attribute.
+	 * @see #getWorked_days()
+	 * @generated
+	 */
+	void setWorked_days(int value);
+
+	/**
+	 * Returns the value of the '<em><b>Is contributing CNS</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Is contributing CNS</em>' attribute.
+	 * @see #setIs_contributing_CNS(boolean)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getIncome_Detail_Is_contributing_CNS()
+	 * @model required="true" ordered="false"
+	 * @generated
+	 */
+	boolean isIs_contributing_CNS();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Income_Detail#isIs_contributing_CNS <em>Is contributing CNS</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Is contributing CNS</em>' attribute.
+	 * @see #isIs_contributing_CNS()
+	 * @generated
+	 */
+	void setIs_contributing_CNS(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Id5</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Id5</em>' attribute.
+	 * @see #setId5(String)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getIncome_Detail_Id5()
+	 * @model id="true" required="true" ordered="false"
+	 * @generated
+	 */
+	String getId5();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Income_Detail#getId5 <em>Id5</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Id5</em>' attribute.
+	 * @see #getId5()
+	 * @generated
+	 */
+	void setId5(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Income</b></em>' container reference.
+	 * It is bidirectional and its opposite is '{@link TaxationWithRoot.Income#getDetails <em>Details</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Income</em>' container reference.
+	 * @see #setIncome(Income)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getIncome_Detail_Income()
+	 * @see TaxationWithRoot.Income#getDetails
+	 * @model opposite="details" required="true" transient="false"
+	 * @generated
+	 */
+	Income getIncome();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Income_Detail#getIncome <em>Income</em>}' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Income</em>' container reference.
+	 * @see #getIncome()
+	 * @generated
+	 */
+	void setIncome(Income value);
+
+} // Income_Detail
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Income_Tax.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Income_Tax.java
new file mode 100644
index 00000000..fd142d1f
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Income_Tax.java
@@ -0,0 +1,115 @@
+/**
+ */
+package TaxationWithRoot;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Income Tax</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.Income_Tax#getTaxPayer <em>Tax Payer</em>}</li>
+ *   <li>{@link TaxationWithRoot.Income_Tax#getTax_amount <em>Tax amount</em>}</li>
+ *   <li>{@link TaxationWithRoot.Income_Tax#getTax_year <em>Tax year</em>}</li>
+ *   <li>{@link TaxationWithRoot.Income_Tax#getId6 <em>Id6</em>}</li>
+ * </ul>
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getIncome_Tax()
+ * @model
+ * @generated
+ */
+public interface Income_Tax extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Tax Payer</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Tax Payer</em>' reference.
+	 * @see #setTaxPayer(Tax_Payer)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getIncome_Tax_TaxPayer()
+	 * @model required="true"
+	 * @generated
+	 */
+	Tax_Payer getTaxPayer();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Income_Tax#getTaxPayer <em>Tax Payer</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Tax Payer</em>' reference.
+	 * @see #getTaxPayer()
+	 * @generated
+	 */
+	void setTaxPayer(Tax_Payer value);
+
+	/**
+	 * Returns the value of the '<em><b>Tax amount</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Tax amount</em>' attribute.
+	 * @see #setTax_amount(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getIncome_Tax_Tax_amount()
+	 * @model required="true"
+	 * @generated
+	 */
+	double getTax_amount();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Income_Tax#getTax_amount <em>Tax amount</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Tax amount</em>' attribute.
+	 * @see #getTax_amount()
+	 * @generated
+	 */
+	void setTax_amount(double value);
+
+	/**
+	 * Returns the value of the '<em><b>Tax year</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Tax year</em>' attribute.
+	 * @see #setTax_year(int)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getIncome_Tax_Tax_year()
+	 * @model required="true"
+	 * @generated
+	 */
+	int getTax_year();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Income_Tax#getTax_year <em>Tax year</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Tax year</em>' attribute.
+	 * @see #getTax_year()
+	 * @generated
+	 */
+	void setTax_year(int value);
+
+	/**
+	 * Returns the value of the '<em><b>Id6</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Id6</em>' attribute.
+	 * @see #setId6(String)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getIncome_Tax_Id6()
+	 * @model id="true" required="true" ordered="false"
+	 * @generated
+	 */
+	String getId6();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Income_Tax#getId6 <em>Id6</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Id6</em>' attribute.
+	 * @see #getId6()
+	 * @generated
+	 */
+	void setId6(String value);
+
+} // Income_Tax
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Income_Tax_Credit.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Income_Tax_Credit.java
new file mode 100644
index 00000000..265b713a
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Income_Tax_Credit.java
@@ -0,0 +1,215 @@
+/**
+ */
+package TaxationWithRoot;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Income Tax Credit</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.Income_Tax_Credit#getGrantedBy <em>Granted By</em>}</li>
+ *   <li>{@link TaxationWithRoot.Income_Tax_Credit#getTaxPayer <em>Tax Payer</em>}</li>
+ *   <li>{@link TaxationWithRoot.Income_Tax_Credit#getTax_year <em>Tax year</em>}</li>
+ *   <li>{@link TaxationWithRoot.Income_Tax_Credit#getYearly <em>Yearly</em>}</li>
+ *   <li>{@link TaxationWithRoot.Income_Tax_Credit#getMonthly <em>Monthly</em>}</li>
+ *   <li>{@link TaxationWithRoot.Income_Tax_Credit#getDaily <em>Daily</em>}</li>
+ *   <li>{@link TaxationWithRoot.Income_Tax_Credit#getId7 <em>Id7</em>}</li>
+ *   <li>{@link TaxationWithRoot.Income_Tax_Credit#getTaxation_Frame <em>Taxation Frame</em>}</li>
+ * </ul>
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getIncome_Tax_Credit()
+ * @model
+ * @generated
+ */
+public interface Income_Tax_Credit extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Granted By</b></em>' attribute.
+	 * The literals are from the enumeration {@link TaxationWithRoot.Grantor}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Granted By</em>' attribute.
+	 * @see TaxationWithRoot.Grantor
+	 * @see #setGrantedBy(Grantor)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getIncome_Tax_Credit_GrantedBy()
+	 * @model required="true"
+	 * @generated
+	 */
+	Grantor getGrantedBy();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Income_Tax_Credit#getGrantedBy <em>Granted By</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Granted By</em>' attribute.
+	 * @see TaxationWithRoot.Grantor
+	 * @see #getGrantedBy()
+	 * @generated
+	 */
+	void setGrantedBy(Grantor value);
+
+	/**
+	 * Returns the value of the '<em><b>Tax Payer</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Tax Payer</em>' reference.
+	 * @see #setTaxPayer(Tax_Payer)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getIncome_Tax_Credit_TaxPayer()
+	 * @model
+	 * @generated
+	 */
+	Tax_Payer getTaxPayer();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Income_Tax_Credit#getTaxPayer <em>Tax Payer</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Tax Payer</em>' reference.
+	 * @see #getTaxPayer()
+	 * @generated
+	 */
+	void setTaxPayer(Tax_Payer value);
+
+	/**
+	 * Returns the value of the '<em><b>Tax year</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Tax year</em>' attribute.
+	 * @see #setTax_year(int)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getIncome_Tax_Credit_Tax_year()
+	 * @model required="true"
+	 * @generated
+	 */
+	int getTax_year();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Income_Tax_Credit#getTax_year <em>Tax year</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Tax year</em>' attribute.
+	 * @see #getTax_year()
+	 * @generated
+	 */
+	void setTax_year(int value);
+
+	/**
+	 * Returns the value of the '<em><b>Yearly</b></em>' attribute.
+	 * The default value is <code>"300.0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Yearly</em>' attribute.
+	 * @see #setYearly(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getIncome_Tax_Credit_Yearly()
+	 * @model default="300.0" required="true"
+	 * @generated
+	 */
+	double getYearly();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Income_Tax_Credit#getYearly <em>Yearly</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Yearly</em>' attribute.
+	 * @see #getYearly()
+	 * @generated
+	 */
+	void setYearly(double value);
+
+	/**
+	 * Returns the value of the '<em><b>Monthly</b></em>' attribute.
+	 * The default value is <code>"25.0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Monthly</em>' attribute.
+	 * @see #setMonthly(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getIncome_Tax_Credit_Monthly()
+	 * @model default="25.0" required="true"
+	 * @generated
+	 */
+	double getMonthly();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Income_Tax_Credit#getMonthly <em>Monthly</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Monthly</em>' attribute.
+	 * @see #getMonthly()
+	 * @generated
+	 */
+	void setMonthly(double value);
+
+	/**
+	 * Returns the value of the '<em><b>Daily</b></em>' attribute.
+	 * The default value is <code>"1.0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Daily</em>' attribute.
+	 * @see #setDaily(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getIncome_Tax_Credit_Daily()
+	 * @model default="1.0" required="true"
+	 * @generated
+	 */
+	double getDaily();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Income_Tax_Credit#getDaily <em>Daily</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Daily</em>' attribute.
+	 * @see #getDaily()
+	 * @generated
+	 */
+	void setDaily(double value);
+
+	/**
+	 * Returns the value of the '<em><b>Id7</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Id7</em>' attribute.
+	 * @see #setId7(String)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getIncome_Tax_Credit_Id7()
+	 * @model id="true" required="true" ordered="false"
+	 * @generated
+	 */
+	String getId7();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Income_Tax_Credit#getId7 <em>Id7</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Id7</em>' attribute.
+	 * @see #getId7()
+	 * @generated
+	 */
+	void setId7(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Taxation Frame</b></em>' reference.
+	 * It is bidirectional and its opposite is '{@link TaxationWithRoot.Tax_Card#getIncome_Tax_Credit <em>Income Tax Credit</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Taxation Frame</em>' reference.
+	 * @see #setTaxation_Frame(Tax_Card)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getIncome_Tax_Credit_Taxation_Frame()
+	 * @see TaxationWithRoot.Tax_Card#getIncome_Tax_Credit
+	 * @model opposite="income_Tax_Credit"
+	 * @generated
+	 */
+	Tax_Card getTaxation_Frame();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Income_Tax_Credit#getTaxation_Frame <em>Taxation Frame</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Taxation Frame</em>' reference.
+	 * @see #getTaxation_Frame()
+	 * @generated
+	 */
+	void setTaxation_Frame(Tax_Card value);
+
+} // Income_Tax_Credit
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Income_Type.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Income_Type.java
new file mode 100644
index 00000000..56b8c117
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Income_Type.java
@@ -0,0 +1,71 @@
+/**
+ */
+package TaxationWithRoot;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Income Type</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.Income_Type#getId8 <em>Id8</em>}</li>
+ *   <li>{@link TaxationWithRoot.Income_Type#getIncome <em>Income</em>}</li>
+ * </ul>
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getIncome_Type()
+ * @model abstract="true"
+ * @generated
+ */
+public interface Income_Type extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Id8</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Id8</em>' attribute.
+	 * @see #setId8(String)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getIncome_Type_Id8()
+	 * @model id="true" required="true" ordered="false"
+	 * @generated
+	 */
+	String getId8();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Income_Type#getId8 <em>Id8</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Id8</em>' attribute.
+	 * @see #getId8()
+	 * @generated
+	 */
+	void setId8(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Income</b></em>' container reference.
+	 * It is bidirectional and its opposite is '{@link TaxationWithRoot.Income#getIncome_type <em>Income type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Income</em>' container reference.
+	 * @see #setIncome(Income)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getIncome_Type_Income()
+	 * @see TaxationWithRoot.Income#getIncome_type
+	 * @model opposite="income_type" required="true" transient="false"
+	 * @generated
+	 */
+	Income getIncome();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Income_Type#getIncome <em>Income</em>}' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Income</em>' container reference.
+	 * @see #getIncome()
+	 * @generated
+	 */
+	void setIncome(Income value);
+
+} // Income_Type
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Interest_Expense.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Interest_Expense.java
new file mode 100644
index 00000000..2544bc01
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Interest_Expense.java
@@ -0,0 +1,17 @@
+/**
+ */
+package TaxationWithRoot;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Interest Expense</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getInterest_Expense()
+ * @model
+ * @generated
+ */
+public interface Interest_Expense extends Special_Expense_DS {
+} // Interest_Expense
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Job_Activity.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Job_Activity.java
new file mode 100644
index 00000000..609fa03a
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Job_Activity.java
@@ -0,0 +1,232 @@
+/**
+ */
+package TaxationWithRoot;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.Enumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Job Activity</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * @see TaxationWithRoot.TaxationWithRootPackage#getJob_Activity()
+ * @model
+ * @generated
+ */
+public enum Job_Activity implements Enumerator {
+	/**
+	 * The '<em><b>Salary</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #SALARY_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	SALARY(0, "Salary", "Salary"),
+
+	/**
+	 * The '<em><b>Pension</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #PENSION_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	PENSION(1, "Pension", "Pension"),
+
+	/**
+	 * The '<em><b>Annuity</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #ANNUITY_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	ANNUITY(2, "Annuity", "Annuity");
+
+	/**
+	 * The '<em><b>Salary</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #SALARY
+	 * @model name="Salary"
+	 * @generated
+	 * @ordered
+	 */
+	public static final int SALARY_VALUE = 0;
+
+	/**
+	 * The '<em><b>Pension</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #PENSION
+	 * @model name="Pension"
+	 * @generated
+	 * @ordered
+	 */
+	public static final int PENSION_VALUE = 1;
+
+	/**
+	 * The '<em><b>Annuity</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #ANNUITY
+	 * @model name="Annuity"
+	 * @generated
+	 * @ordered
+	 */
+	public static final int ANNUITY_VALUE = 2;
+
+	/**
+	 * An array of all the '<em><b>Job Activity</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static final Job_Activity[] VALUES_ARRAY =
+		new Job_Activity[] {
+			SALARY,
+			PENSION,
+			ANNUITY,
+		};
+
+	/**
+	 * A public read-only list of all the '<em><b>Job Activity</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<Job_Activity> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+	/**
+	 * Returns the '<em><b>Job Activity</b></em>' literal with the specified literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Job_Activity get(String literal) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			Job_Activity result = VALUES_ARRAY[i];
+			if (result.toString().equals(literal)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Job Activity</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Job_Activity getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			Job_Activity result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Job Activity</b></em>' literal with the specified integer value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Job_Activity get(int value) {
+		switch (value) {
+			case SALARY_VALUE: return SALARY;
+			case PENSION_VALUE: return PENSION;
+			case ANNUITY_VALUE: return ANNUITY;
+		}
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final int value;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String name;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String literal;
+
+	/**
+	 * Only this class can construct instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private Job_Activity(int value, String name, String literal) {
+		this.value = value;
+		this.name = name;
+		this.literal = literal;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getValue() {
+	  return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getName() {
+	  return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getLiteral() {
+	  return literal;
+	}
+
+	/**
+	 * Returns the literal value of the enumerator, which is its string representation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		return literal;
+	}
+	
+} //Job_Activity
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Legal_Union_Record.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Legal_Union_Record.java
new file mode 100644
index 00000000..0f6da732
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Legal_Union_Record.java
@@ -0,0 +1,221 @@
+/**
+ */
+package TaxationWithRoot;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Legal Union Record</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.Legal_Union_Record#getStart_year <em>Start year</em>}</li>
+ *   <li>{@link TaxationWithRoot.Legal_Union_Record#getEnd_year <em>End year</em>}</li>
+ *   <li>{@link TaxationWithRoot.Legal_Union_Record#getSeparation_cause <em>Separation cause</em>}</li>
+ *   <li>{@link TaxationWithRoot.Legal_Union_Record#getIndividual_A <em>Individual A</em>}</li>
+ *   <li>{@link TaxationWithRoot.Legal_Union_Record#getIndividual_B <em>Individual B</em>}</li>
+ *   <li>{@link TaxationWithRoot.Legal_Union_Record#getProperties <em>Properties</em>}</li>
+ *   <li>{@link TaxationWithRoot.Legal_Union_Record#isMutual_agreement <em>Mutual agreement</em>}</li>
+ *   <li>{@link TaxationWithRoot.Legal_Union_Record#getId9 <em>Id9</em>}</li>
+ *   <li>{@link TaxationWithRoot.Legal_Union_Record#getHousehold <em>Household</em>}</li>
+ * </ul>
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getLegal_Union_Record()
+ * @model abstract="true"
+ * @generated
+ */
+public interface Legal_Union_Record extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Start year</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Start year</em>' attribute.
+	 * @see #setStart_year(int)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getLegal_Union_Record_Start_year()
+	 * @model required="true"
+	 * @generated
+	 */
+	int getStart_year();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Legal_Union_Record#getStart_year <em>Start year</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Start year</em>' attribute.
+	 * @see #getStart_year()
+	 * @generated
+	 */
+	void setStart_year(int value);
+
+	/**
+	 * Returns the value of the '<em><b>End year</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>End year</em>' attribute.
+	 * @see #setEnd_year(int)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getLegal_Union_Record_End_year()
+	 * @model required="true"
+	 * @generated
+	 */
+	int getEnd_year();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Legal_Union_Record#getEnd_year <em>End year</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>End year</em>' attribute.
+	 * @see #getEnd_year()
+	 * @generated
+	 */
+	void setEnd_year(int value);
+
+	/**
+	 * Returns the value of the '<em><b>Separation cause</b></em>' attribute.
+	 * The literals are from the enumeration {@link TaxationWithRoot.Separation_Causes}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Separation cause</em>' attribute.
+	 * @see TaxationWithRoot.Separation_Causes
+	 * @see #setSeparation_cause(Separation_Causes)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getLegal_Union_Record_Separation_cause()
+	 * @model required="true" ordered="false"
+	 * @generated
+	 */
+	Separation_Causes getSeparation_cause();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Legal_Union_Record#getSeparation_cause <em>Separation cause</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Separation cause</em>' attribute.
+	 * @see TaxationWithRoot.Separation_Causes
+	 * @see #getSeparation_cause()
+	 * @generated
+	 */
+	void setSeparation_cause(Separation_Causes value);
+
+	/**
+	 * Returns the value of the '<em><b>Individual A</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Individual A</em>' containment reference.
+	 * @see #setIndividual_A(Physical_Person)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getLegal_Union_Record_Individual_A()
+	 * @model containment="true" required="true" ordered="false"
+	 *        annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='legal_union_A'"
+	 * @generated
+	 */
+	Physical_Person getIndividual_A();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Legal_Union_Record#getIndividual_A <em>Individual A</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Individual A</em>' containment reference.
+	 * @see #getIndividual_A()
+	 * @generated
+	 */
+	void setIndividual_A(Physical_Person value);
+
+	/**
+	 * Returns the value of the '<em><b>Individual B</b></em>' containment reference list.
+	 * The list contents are of type {@link TaxationWithRoot.Physical_Person}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Individual B</em>' containment reference list.
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getLegal_Union_Record_Individual_B()
+	 * @model containment="true" required="true" ordered="false"
+	 *        annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='legal_union_B'"
+	 * @generated
+	 */
+	EList<Physical_Person> getIndividual_B();
+
+	/**
+	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.
+	 * The list contents are of type {@link TaxationWithRoot.Tax_Property}.
+	 * It is bidirectional and its opposite is '{@link TaxationWithRoot.Tax_Property#getUnion_record <em>Union record</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Properties</em>' containment reference list.
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getLegal_Union_Record_Properties()
+	 * @see TaxationWithRoot.Tax_Property#getUnion_record
+	 * @model opposite="union_record" containment="true" required="true" ordered="false"
+	 * @generated
+	 */
+	EList<Tax_Property> getProperties();
+
+	/**
+	 * Returns the value of the '<em><b>Mutual agreement</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Mutual agreement</em>' attribute.
+	 * @see #setMutual_agreement(boolean)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getLegal_Union_Record_Mutual_agreement()
+	 * @model required="true" ordered="false"
+	 * @generated
+	 */
+	boolean isMutual_agreement();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Legal_Union_Record#isMutual_agreement <em>Mutual agreement</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Mutual agreement</em>' attribute.
+	 * @see #isMutual_agreement()
+	 * @generated
+	 */
+	void setMutual_agreement(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Id9</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Id9</em>' attribute.
+	 * @see #setId9(String)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getLegal_Union_Record_Id9()
+	 * @model id="true" required="true" ordered="false"
+	 * @generated
+	 */
+	String getId9();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Legal_Union_Record#getId9 <em>Id9</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Id9</em>' attribute.
+	 * @see #getId9()
+	 * @generated
+	 */
+	void setId9(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Household</b></em>' container reference.
+	 * It is bidirectional and its opposite is '{@link TaxationWithRoot.Household#getParents <em>Parents</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Household</em>' container reference.
+	 * @see #setHousehold(Household)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getLegal_Union_Record_Household()
+	 * @see TaxationWithRoot.Household#getParents
+	 * @model opposite="parents" required="true" transient="false" ordered="false"
+	 * @generated
+	 */
+	Household getHousehold();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Legal_Union_Record#getHousehold <em>Household</em>}' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Household</em>' container reference.
+	 * @see #getHousehold()
+	 * @generated
+	 */
+	void setHousehold(Household value);
+
+} // Legal_Union_Record
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Legal_Union_Types.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Legal_Union_Types.java
new file mode 100644
index 00000000..cfd7d06c
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Legal_Union_Types.java
@@ -0,0 +1,232 @@
+/**
+ */
+package TaxationWithRoot;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.Enumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Legal Union Types</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * @see TaxationWithRoot.TaxationWithRootPackage#getLegal_Union_Types()
+ * @model
+ * @generated
+ */
+public enum Legal_Union_Types implements Enumerator {
+	/**
+	 * The '<em><b>MARIAGE</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #MARIAGE_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	MARIAGE(0, "MARIAGE", "MARIAGE"),
+
+	/**
+	 * The '<em><b>PARTNERSHIP</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #PARTNERSHIP_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	PARTNERSHIP(1, "PARTNERSHIP", "PARTNERSHIP"),
+
+	/**
+	 * The '<em><b>OTHER</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #OTHER_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	OTHER(2, "OTHER", "OTHER");
+
+	/**
+	 * The '<em><b>MARIAGE</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #MARIAGE
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int MARIAGE_VALUE = 0;
+
+	/**
+	 * The '<em><b>PARTNERSHIP</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #PARTNERSHIP
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int PARTNERSHIP_VALUE = 1;
+
+	/**
+	 * The '<em><b>OTHER</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #OTHER
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int OTHER_VALUE = 2;
+
+	/**
+	 * An array of all the '<em><b>Legal Union Types</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static final Legal_Union_Types[] VALUES_ARRAY =
+		new Legal_Union_Types[] {
+			MARIAGE,
+			PARTNERSHIP,
+			OTHER,
+		};
+
+	/**
+	 * A public read-only list of all the '<em><b>Legal Union Types</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<Legal_Union_Types> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+	/**
+	 * Returns the '<em><b>Legal Union Types</b></em>' literal with the specified literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Legal_Union_Types get(String literal) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			Legal_Union_Types result = VALUES_ARRAY[i];
+			if (result.toString().equals(literal)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Legal Union Types</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Legal_Union_Types getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			Legal_Union_Types result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Legal Union Types</b></em>' literal with the specified integer value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Legal_Union_Types get(int value) {
+		switch (value) {
+			case MARIAGE_VALUE: return MARIAGE;
+			case PARTNERSHIP_VALUE: return PARTNERSHIP;
+			case OTHER_VALUE: return OTHER;
+		}
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final int value;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String name;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String literal;
+
+	/**
+	 * Only this class can construct instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private Legal_Union_Types(int value, String name, String literal) {
+		this.value = value;
+		this.name = name;
+		this.literal = literal;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getValue() {
+	  return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getName() {
+	  return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getLiteral() {
+	  return literal;
+	}
+
+	/**
+	 * Returns the literal value of the enumerator, which is its string representation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		return literal;
+	}
+	
+} //Legal_Union_Types
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Local_Income.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Local_Income.java
new file mode 100644
index 00000000..0e0e7a1b
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Local_Income.java
@@ -0,0 +1,17 @@
+/**
+ */
+package TaxationWithRoot;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Local Income</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getLocal_Income()
+ * @model
+ * @generated
+ */
+public interface Local_Income extends Income {
+} // Local_Income
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Loss_Carryforward.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Loss_Carryforward.java
new file mode 100644
index 00000000..2da6ca94
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Loss_Carryforward.java
@@ -0,0 +1,17 @@
+/**
+ */
+package TaxationWithRoot;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Loss Carryforward</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getLoss_Carryforward()
+ * @model
+ * @generated
+ */
+public interface Loss_Carryforward extends Special_Expense_DS {
+} // Loss_Carryforward
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Marriage_Record.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Marriage_Record.java
new file mode 100644
index 00000000..168390ed
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Marriage_Record.java
@@ -0,0 +1,17 @@
+/**
+ */
+package TaxationWithRoot;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Marriage Record</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getMarriage_Record()
+ * @model
+ * @generated
+ */
+public interface Marriage_Record extends Legal_Union_Record {
+} // Marriage_Record
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Miscellaneous_Expense_FO.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Miscellaneous_Expense_FO.java
new file mode 100644
index 00000000..19c6aa70
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Miscellaneous_Expense_FO.java
@@ -0,0 +1,17 @@
+/**
+ */
+package TaxationWithRoot;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Miscellaneous Expense FO</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getMiscellaneous_Expense_FO()
+ * @model
+ * @generated
+ */
+public interface Miscellaneous_Expense_FO extends Professional_Expense {
+} // Miscellaneous_Expense_FO
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Non_Resident_Tax_Payer.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Non_Resident_Tax_Payer.java
new file mode 100644
index 00000000..42f60ddc
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Non_Resident_Tax_Payer.java
@@ -0,0 +1,46 @@
+/**
+ */
+package TaxationWithRoot;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Non Resident Tax Payer</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.Non_Resident_Tax_Payer#isIs_assimilated_to_resident <em>Is assimilated to resident</em>}</li>
+ * </ul>
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getNon_Resident_Tax_Payer()
+ * @model
+ * @generated
+ */
+public interface Non_Resident_Tax_Payer extends Tax_Payer {
+	/**
+	 * Returns the value of the '<em><b>Is assimilated to resident</b></em>' attribute.
+	 * The default value is <code>"false"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Is assimilated to resident</em>' attribute.
+	 * @see #setIs_assimilated_to_resident(boolean)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getNon_Resident_Tax_Payer_Is_assimilated_to_resident()
+	 * @model default="false" required="true"
+	 * @generated
+	 */
+	boolean isIs_assimilated_to_resident();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Non_Resident_Tax_Payer#isIs_assimilated_to_resident <em>Is assimilated to resident</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Is assimilated to resident</em>' attribute.
+	 * @see #isIs_assimilated_to_resident()
+	 * @generated
+	 */
+	void setIs_assimilated_to_resident(boolean value);
+
+} // Non_Resident_Tax_Payer
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Partnership_Record.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Partnership_Record.java
new file mode 100644
index 00000000..4f290dbd
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Partnership_Record.java
@@ -0,0 +1,17 @@
+/**
+ */
+package TaxationWithRoot;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Partnership Record</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getPartnership_Record()
+ * @model
+ * @generated
+ */
+public interface Partnership_Record extends Legal_Union_Record {
+} // Partnership_Record
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Pensions_and_Annuities_Income.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Pensions_and_Annuities_Income.java
new file mode 100644
index 00000000..c3a252ff
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Pensions_and_Annuities_Income.java
@@ -0,0 +1,46 @@
+/**
+ */
+package TaxationWithRoot;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Pensions and Annuities Income</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.Pensions_and_Annuities_Income#isOccasional_payement <em>Occasional payement</em>}</li>
+ * </ul>
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getPensions_and_Annuities_Income()
+ * @model
+ * @generated
+ */
+public interface Pensions_and_Annuities_Income extends Income_Type {
+	/**
+	 * Returns the value of the '<em><b>Occasional payement</b></em>' attribute.
+	 * The default value is <code>"false"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Occasional payement</em>' attribute.
+	 * @see #setOccasional_payement(boolean)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getPensions_and_Annuities_Income_Occasional_payement()
+	 * @model default="false"
+	 * @generated
+	 */
+	boolean isOccasional_payement();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Pensions_and_Annuities_Income#isOccasional_payement <em>Occasional payement</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Occasional payement</em>' attribute.
+	 * @see #isOccasional_payement()
+	 * @generated
+	 */
+	void setOccasional_payement(boolean value);
+
+} // Pensions_and_Annuities_Income
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Permanent_Expense.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Permanent_Expense.java
new file mode 100644
index 00000000..e116cd2c
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Permanent_Expense.java
@@ -0,0 +1,48 @@
+/**
+ */
+package TaxationWithRoot;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Permanent Expense</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.Permanent_Expense#getCategory <em>Category</em>}</li>
+ * </ul>
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getPermanent_Expense()
+ * @model
+ * @generated
+ */
+public interface Permanent_Expense extends Special_Expense_DS {
+	/**
+	 * Returns the value of the '<em><b>Category</b></em>' attribute.
+	 * The literals are from the enumeration {@link TaxationWithRoot.Category_of_Permanent_Expense}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Category</em>' attribute.
+	 * @see TaxationWithRoot.Category_of_Permanent_Expense
+	 * @see #setCategory(Category_of_Permanent_Expense)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getPermanent_Expense_Category()
+	 * @model required="true"
+	 * @generated
+	 */
+	Category_of_Permanent_Expense getCategory();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Permanent_Expense#getCategory <em>Category</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Category</em>' attribute.
+	 * @see TaxationWithRoot.Category_of_Permanent_Expense
+	 * @see #getCategory()
+	 * @generated
+	 */
+	void setCategory(Category_of_Permanent_Expense value);
+
+} // Permanent_Expense
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Physical_Person.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Physical_Person.java
new file mode 100644
index 00000000..94ba6a49
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Physical_Person.java
@@ -0,0 +1,219 @@
+/**
+ */
+package TaxationWithRoot;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Physical Person</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.Physical_Person#getSSNo <em>SS No</em>}</li>
+ *   <li>{@link TaxationWithRoot.Physical_Person#getAddresses <em>Addresses</em>}</li>
+ *   <li>{@link TaxationWithRoot.Physical_Person#getBirth_year <em>Birth year</em>}</li>
+ *   <li>{@link TaxationWithRoot.Physical_Person#getDisability_percentage <em>Disability percentage</em>}</li>
+ *   <li>{@link TaxationWithRoot.Physical_Person#getDisability_type <em>Disability type</em>}</li>
+ *   <li>{@link TaxationWithRoot.Physical_Person#getBirth_month <em>Birth month</em>}</li>
+ *   <li>{@link TaxationWithRoot.Physical_Person#getBirth_day <em>Birth day</em>}</li>
+ *   <li>{@link TaxationWithRoot.Physical_Person#getExpenses <em>Expenses</em>}</li>
+ *   <li>{@link TaxationWithRoot.Physical_Person#isIs_widower <em>Is widower</em>}</li>
+ * </ul>
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getPhysical_Person()
+ * @model
+ * @generated
+ */
+public interface Physical_Person extends EObject {
+	/**
+	 * Returns the value of the '<em><b>SS No</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>SS No</em>' attribute.
+	 * @see #setSSNo(String)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getPhysical_Person_SSNo()
+	 * @model id="true" required="true"
+	 * @generated
+	 */
+	String getSSNo();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Physical_Person#getSSNo <em>SS No</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>SS No</em>' attribute.
+	 * @see #getSSNo()
+	 * @generated
+	 */
+	void setSSNo(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Addresses</b></em>' reference list.
+	 * The list contents are of type {@link TaxationWithRoot.Address}.
+	 * It is bidirectional and its opposite is '{@link TaxationWithRoot.Address#getTaxPayer <em>Tax Payer</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Addresses</em>' reference list.
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getPhysical_Person_Addresses()
+	 * @see TaxationWithRoot.Address#getTaxPayer
+	 * @model opposite="taxPayer" ordered="false"
+	 * @generated
+	 */
+	EList<Address> getAddresses();
+
+	/**
+	 * Returns the value of the '<em><b>Birth year</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Birth year</em>' attribute.
+	 * @see #setBirth_year(int)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getPhysical_Person_Birth_year()
+	 * @model unique="false" required="true" ordered="false"
+	 * @generated
+	 */
+	int getBirth_year();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Physical_Person#getBirth_year <em>Birth year</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Birth year</em>' attribute.
+	 * @see #getBirth_year()
+	 * @generated
+	 */
+	void setBirth_year(int value);
+
+	/**
+	 * Returns the value of the '<em><b>Disability percentage</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Disability percentage</em>' attribute.
+	 * @see #setDisability_percentage(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getPhysical_Person_Disability_percentage()
+	 * @model unique="false" required="true" ordered="false"
+	 * @generated
+	 */
+	double getDisability_percentage();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Physical_Person#getDisability_percentage <em>Disability percentage</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Disability percentage</em>' attribute.
+	 * @see #getDisability_percentage()
+	 * @generated
+	 */
+	void setDisability_percentage(double value);
+
+	/**
+	 * Returns the value of the '<em><b>Disability type</b></em>' attribute.
+	 * The literals are from the enumeration {@link TaxationWithRoot.Disability_Types}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Disability type</em>' attribute.
+	 * @see TaxationWithRoot.Disability_Types
+	 * @see #setDisability_type(Disability_Types)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getPhysical_Person_Disability_type()
+	 * @model unique="false" required="true" ordered="false"
+	 * @generated
+	 */
+	Disability_Types getDisability_type();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Physical_Person#getDisability_type <em>Disability type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Disability type</em>' attribute.
+	 * @see TaxationWithRoot.Disability_Types
+	 * @see #getDisability_type()
+	 * @generated
+	 */
+	void setDisability_type(Disability_Types value);
+
+	/**
+	 * Returns the value of the '<em><b>Birth month</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Birth month</em>' attribute.
+	 * @see #setBirth_month(int)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getPhysical_Person_Birth_month()
+	 * @model unique="false" required="true" ordered="false"
+	 * @generated
+	 */
+	int getBirth_month();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Physical_Person#getBirth_month <em>Birth month</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Birth month</em>' attribute.
+	 * @see #getBirth_month()
+	 * @generated
+	 */
+	void setBirth_month(int value);
+
+	/**
+	 * Returns the value of the '<em><b>Birth day</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Birth day</em>' attribute.
+	 * @see #setBirth_day(int)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getPhysical_Person_Birth_day()
+	 * @model unique="false" required="true" ordered="false"
+	 * @generated
+	 */
+	int getBirth_day();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Physical_Person#getBirth_day <em>Birth day</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Birth day</em>' attribute.
+	 * @see #getBirth_day()
+	 * @generated
+	 */
+	void setBirth_day(int value);
+
+	/**
+	 * Returns the value of the '<em><b>Expenses</b></em>' reference list.
+	 * The list contents are of type {@link TaxationWithRoot.Expense}.
+	 * It is bidirectional and its opposite is '{@link TaxationWithRoot.Expense#getBeneficiary <em>Beneficiary</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Expenses</em>' reference list.
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getPhysical_Person_Expenses()
+	 * @see TaxationWithRoot.Expense#getBeneficiary
+	 * @model opposite="beneficiary" ordered="false"
+	 * @generated
+	 */
+	EList<Expense> getExpenses();
+
+	/**
+	 * Returns the value of the '<em><b>Is widower</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Is widower</em>' attribute.
+	 * @see #setIs_widower(boolean)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getPhysical_Person_Is_widower()
+	 * @model required="true" ordered="false"
+	 * @generated
+	 */
+	boolean isIs_widower();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Physical_Person#isIs_widower <em>Is widower</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Is widower</em>' attribute.
+	 * @see #isIs_widower()
+	 * @generated
+	 */
+	void setIs_widower(boolean value);
+
+} // Physical_Person
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Private_Insurance_and_Plan.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Private_Insurance_and_Plan.java
new file mode 100644
index 00000000..38f8b82c
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Private_Insurance_and_Plan.java
@@ -0,0 +1,71 @@
+/**
+ */
+package TaxationWithRoot;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Private Insurance and Plan</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.Private_Insurance_and_Plan#getCategory <em>Category</em>}</li>
+ *   <li>{@link TaxationWithRoot.Private_Insurance_and_Plan#getDuration_of_contract <em>Duration of contract</em>}</li>
+ * </ul>
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getPrivate_Insurance_and_Plan()
+ * @model
+ * @generated
+ */
+public interface Private_Insurance_and_Plan extends Special_Expense_DS {
+	/**
+	 * Returns the value of the '<em><b>Category</b></em>' attribute.
+	 * The literals are from the enumeration {@link TaxationWithRoot.Category_of_Private_Insurance_and_Plan}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Category</em>' attribute.
+	 * @see TaxationWithRoot.Category_of_Private_Insurance_and_Plan
+	 * @see #setCategory(Category_of_Private_Insurance_and_Plan)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getPrivate_Insurance_and_Plan_Category()
+	 * @model required="true"
+	 * @generated
+	 */
+	Category_of_Private_Insurance_and_Plan getCategory();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Private_Insurance_and_Plan#getCategory <em>Category</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Category</em>' attribute.
+	 * @see TaxationWithRoot.Category_of_Private_Insurance_and_Plan
+	 * @see #getCategory()
+	 * @generated
+	 */
+	void setCategory(Category_of_Private_Insurance_and_Plan value);
+
+	/**
+	 * Returns the value of the '<em><b>Duration of contract</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Duration of contract</em>' attribute.
+	 * @see #setDuration_of_contract(int)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getPrivate_Insurance_and_Plan_Duration_of_contract()
+	 * @model required="true"
+	 * @generated
+	 */
+	int getDuration_of_contract();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Private_Insurance_and_Plan#getDuration_of_contract <em>Duration of contract</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Duration of contract</em>' attribute.
+	 * @see #getDuration_of_contract()
+	 * @generated
+	 */
+	void setDuration_of_contract(int value);
+
+} // Private_Insurance_and_Plan
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Professional_Expense.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Professional_Expense.java
new file mode 100644
index 00000000..a926679d
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Professional_Expense.java
@@ -0,0 +1,17 @@
+/**
+ */
+package TaxationWithRoot;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Professional Expense</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getProfessional_Expense()
+ * @model
+ * @generated
+ */
+public interface Professional_Expense extends Expense {
+} // Professional_Expense
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Rentals_and_Leases_Income.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Rentals_and_Leases_Income.java
new file mode 100644
index 00000000..da50a973
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Rentals_and_Leases_Income.java
@@ -0,0 +1,46 @@
+/**
+ */
+package TaxationWithRoot;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Rentals and Leases Income</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.Rentals_and_Leases_Income#isIs_periodic <em>Is periodic</em>}</li>
+ * </ul>
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getRentals_and_Leases_Income()
+ * @model
+ * @generated
+ */
+public interface Rentals_and_Leases_Income extends Income_Type {
+	/**
+	 * Returns the value of the '<em><b>Is periodic</b></em>' attribute.
+	 * The default value is <code>"true"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Is periodic</em>' attribute.
+	 * @see #setIs_periodic(boolean)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getRentals_and_Leases_Income_Is_periodic()
+	 * @model default="true" required="true"
+	 * @generated
+	 */
+	boolean isIs_periodic();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Rentals_and_Leases_Income#isIs_periodic <em>Is periodic</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Is periodic</em>' attribute.
+	 * @see #isIs_periodic()
+	 * @generated
+	 */
+	void setIs_periodic(boolean value);
+
+} // Rentals_and_Leases_Income
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Resident_Tax_Payer.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Resident_Tax_Payer.java
new file mode 100644
index 00000000..a0220f0c
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Resident_Tax_Payer.java
@@ -0,0 +1,17 @@
+/**
+ */
+package TaxationWithRoot;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Resident Tax Payer</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getResident_Tax_Payer()
+ * @model
+ * @generated
+ */
+public interface Resident_Tax_Payer extends Tax_Payer {
+} // Resident_Tax_Payer
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Resource.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Resource.java
new file mode 100644
index 00000000..44afe03f
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Resource.java
@@ -0,0 +1,38 @@
+/**
+ */
+package TaxationWithRoot;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Resource</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.Resource#getContains <em>Contains</em>}</li>
+ * </ul>
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getResource()
+ * @model
+ * @generated
+ */
+public interface Resource extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Contains</b></em>' containment reference list.
+	 * The list contents are of type {@link TaxationWithRoot.Household}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Contains</em>' containment reference list.
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getResource_Contains()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<Household> getContains();
+
+} // Resource
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Separation_Causes.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Separation_Causes.java
new file mode 100644
index 00000000..f30fd8e3
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Separation_Causes.java
@@ -0,0 +1,255 @@
+/**
+ */
+package TaxationWithRoot;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.Enumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Separation Causes</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * @see TaxationWithRoot.TaxationWithRootPackage#getSeparation_Causes()
+ * @model
+ * @generated
+ */
+public enum Separation_Causes implements Enumerator {
+	/**
+	 * The '<em><b>NONE</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #NONE_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	NONE(0, "NONE", "NONE"),
+
+	/**
+	 * The '<em><b>DIVORCE</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #DIVORCE_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	DIVORCE(1, "DIVORCE", "DIVORCE"),
+
+	/**
+	 * The '<em><b>SEPARATION DE FAIT</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #SEPARATION_DE_FAIT_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	SEPARATION_DE_FAIT(2, "SEPARATION_DE_FAIT", "SEPARATION_DE_FAIT"),
+
+	/**
+	 * The '<em><b>SEPARATION BY COURT</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #SEPARATION_BY_COURT_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	SEPARATION_BY_COURT(3, "SEPARATION_BY_COURT", "SEPARATION_BY_COURT");
+
+	/**
+	 * The '<em><b>NONE</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #NONE
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int NONE_VALUE = 0;
+
+	/**
+	 * The '<em><b>DIVORCE</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #DIVORCE
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int DIVORCE_VALUE = 1;
+
+	/**
+	 * The '<em><b>SEPARATION DE FAIT</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #SEPARATION_DE_FAIT
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int SEPARATION_DE_FAIT_VALUE = 2;
+
+	/**
+	 * The '<em><b>SEPARATION BY COURT</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #SEPARATION_BY_COURT
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int SEPARATION_BY_COURT_VALUE = 3;
+
+	/**
+	 * An array of all the '<em><b>Separation Causes</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static final Separation_Causes[] VALUES_ARRAY =
+		new Separation_Causes[] {
+			NONE,
+			DIVORCE,
+			SEPARATION_DE_FAIT,
+			SEPARATION_BY_COURT,
+		};
+
+	/**
+	 * A public read-only list of all the '<em><b>Separation Causes</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<Separation_Causes> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+	/**
+	 * Returns the '<em><b>Separation Causes</b></em>' literal with the specified literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Separation_Causes get(String literal) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			Separation_Causes result = VALUES_ARRAY[i];
+			if (result.toString().equals(literal)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Separation Causes</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Separation_Causes getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			Separation_Causes result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Separation Causes</b></em>' literal with the specified integer value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Separation_Causes get(int value) {
+		switch (value) {
+			case NONE_VALUE: return NONE;
+			case DIVORCE_VALUE: return DIVORCE;
+			case SEPARATION_DE_FAIT_VALUE: return SEPARATION_DE_FAIT;
+			case SEPARATION_BY_COURT_VALUE: return SEPARATION_BY_COURT;
+		}
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final int value;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String name;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String literal;
+
+	/**
+	 * Only this class can construct instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private Separation_Causes(int value, String name, String literal) {
+		this.value = value;
+		this.name = name;
+		this.literal = literal;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getValue() {
+	  return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getName() {
+	  return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getLiteral() {
+	  return literal;
+	}
+
+	/**
+	 * Returns the literal value of the enumerator, which is its string representation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		return literal;
+	}
+	
+} //Separation_Causes
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Special_Expense_DS.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Special_Expense_DS.java
new file mode 100644
index 00000000..e4d340b8
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Special_Expense_DS.java
@@ -0,0 +1,17 @@
+/**
+ */
+package TaxationWithRoot;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Special Expense DS</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getSpecial_Expense_DS()
+ * @model
+ * @generated
+ */
+public interface Special_Expense_DS extends Expense {
+} // Special_Expense_DS
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Spousal_Expense_AC.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Spousal_Expense_AC.java
new file mode 100644
index 00000000..7a24a619
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Spousal_Expense_AC.java
@@ -0,0 +1,17 @@
+/**
+ */
+package TaxationWithRoot;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Spousal Expense AC</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getSpousal_Expense_AC()
+ * @model
+ * @generated
+ */
+public interface Spousal_Expense_AC extends Expense {
+} // Spousal_Expense_AC
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Tax_Card.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Tax_Card.java
new file mode 100644
index 00000000..fd668208
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Tax_Card.java
@@ -0,0 +1,810 @@
+/**
+ */
+package TaxationWithRoot;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Tax Card</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.Tax_Card#getCard_identifier <em>Card identifier</em>}</li>
+ *   <li>{@link TaxationWithRoot.Tax_Card#getTax_office <em>Tax office</em>}</li>
+ *   <li>{@link TaxationWithRoot.Tax_Card#getPercentage_of_witholding <em>Percentage of witholding</em>}</li>
+ *   <li>{@link TaxationWithRoot.Tax_Card#getTax_payers_name_surname <em>Tax payers name surname</em>}</li>
+ *   <li>{@link TaxationWithRoot.Tax_Card#getTax_payers_partner_name_surname <em>Tax payers partner name surname</em>}</li>
+ *   <li>{@link TaxationWithRoot.Tax_Card#getTax_payers_address <em>Tax payers address</em>}</li>
+ *   <li>{@link TaxationWithRoot.Tax_Card#getJobs_Employer_SSNo <em>Jobs Employer SS No</em>}</li>
+ *   <li>{@link TaxationWithRoot.Tax_Card#getJobs_employers_name <em>Jobs employers name</em>}</li>
+ *   <li>{@link TaxationWithRoot.Tax_Card#getJobs_activity_type <em>Jobs activity type</em>}</li>
+ *   <li>{@link TaxationWithRoot.Tax_Card#getJobs_place_of_work <em>Jobs place of work</em>}</li>
+ *   <li>{@link TaxationWithRoot.Tax_Card#getDeduction_FD_daily <em>Deduction FD daily</em>}</li>
+ *   <li>{@link TaxationWithRoot.Tax_Card#getDeduction_FD_monthly <em>Deduction FD monthly</em>}</li>
+ *   <li>{@link TaxationWithRoot.Tax_Card#getDeduction_AC_daily <em>Deduction AC daily</em>}</li>
+ *   <li>{@link TaxationWithRoot.Tax_Card#getDeduction_AC_monthly <em>Deduction AC monthly</em>}</li>
+ *   <li>{@link TaxationWithRoot.Tax_Card#getDeduction_AC_yearly <em>Deduction AC yearly</em>}</li>
+ *   <li>{@link TaxationWithRoot.Tax_Card#getDeduction_CE_daily <em>Deduction CE daily</em>}</li>
+ *   <li>{@link TaxationWithRoot.Tax_Card#getDeduction_CE_monthly <em>Deduction CE monthly</em>}</li>
+ *   <li>{@link TaxationWithRoot.Tax_Card#getDeduction_CE_yearly <em>Deduction CE yearly</em>}</li>
+ *   <li>{@link TaxationWithRoot.Tax_Card#getDeduction_DS_daily <em>Deduction DS daily</em>}</li>
+ *   <li>{@link TaxationWithRoot.Tax_Card#getDeduction_DS_monthly <em>Deduction DS monthly</em>}</li>
+ *   <li>{@link TaxationWithRoot.Tax_Card#getDeduction_FO_daily <em>Deduction FO daily</em>}</li>
+ *   <li>{@link TaxationWithRoot.Tax_Card#getDeduction_FO_monthly <em>Deduction FO monthly</em>}</li>
+ *   <li>{@link TaxationWithRoot.Tax_Card#getDeduction_FO_yearly <em>Deduction FO yearly</em>}</li>
+ *   <li>{@link TaxationWithRoot.Tax_Card#getCredit_CIS_daily <em>Credit CIS daily</em>}</li>
+ *   <li>{@link TaxationWithRoot.Tax_Card#getCredit_CIS_monthly <em>Credit CIS monthly</em>}</li>
+ *   <li>{@link TaxationWithRoot.Tax_Card#getCredit_CIM_daily <em>Credit CIM daily</em>}</li>
+ *   <li>{@link TaxationWithRoot.Tax_Card#isValidity <em>Validity</em>}</li>
+ *   <li>{@link TaxationWithRoot.Tax_Card#getIncome_Tax_Credit <em>Income Tax Credit</em>}</li>
+ *   <li>{@link TaxationWithRoot.Tax_Card#getPrevious <em>Previous</em>}</li>
+ *   <li>{@link TaxationWithRoot.Tax_Card#getCurrent_tax_card <em>Current tax card</em>}</li>
+ *   <li>{@link TaxationWithRoot.Tax_Card#getCredit_CIM_yearly <em>Credit CIM yearly</em>}</li>
+ *   <li>{@link TaxationWithRoot.Tax_Card#getDeduction_DS_Alimony_yearly <em>Deduction DS Alimony yearly</em>}</li>
+ *   <li>{@link TaxationWithRoot.Tax_Card#getDeduction_DS_Debt_yearly <em>Deduction DS Debt yearly</em>}</li>
+ *   <li>{@link TaxationWithRoot.Tax_Card#getIncome <em>Income</em>}</li>
+ * </ul>
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Card()
+ * @model
+ * @generated
+ */
+public interface Tax_Card extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Card identifier</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Card identifier</em>' attribute.
+	 * @see #setCard_identifier(String)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Card_Card_identifier()
+	 * @model id="true"
+	 * @generated
+	 */
+	String getCard_identifier();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Tax_Card#getCard_identifier <em>Card identifier</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Card identifier</em>' attribute.
+	 * @see #getCard_identifier()
+	 * @generated
+	 */
+	void setCard_identifier(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Tax office</b></em>' attribute.
+	 * The literals are from the enumeration {@link TaxationWithRoot.Tax_Office}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Tax office</em>' attribute.
+	 * @see TaxationWithRoot.Tax_Office
+	 * @see #setTax_office(Tax_Office)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Card_Tax_office()
+	 * @model required="true"
+	 * @generated
+	 */
+	Tax_Office getTax_office();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Tax_Card#getTax_office <em>Tax office</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Tax office</em>' attribute.
+	 * @see TaxationWithRoot.Tax_Office
+	 * @see #getTax_office()
+	 * @generated
+	 */
+	void setTax_office(Tax_Office value);
+
+	/**
+	 * Returns the value of the '<em><b>Percentage of witholding</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Percentage of witholding</em>' attribute.
+	 * @see #setPercentage_of_witholding(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Card_Percentage_of_witholding()
+	 * @model required="true"
+	 * @generated
+	 */
+	double getPercentage_of_witholding();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Tax_Card#getPercentage_of_witholding <em>Percentage of witholding</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Percentage of witholding</em>' attribute.
+	 * @see #getPercentage_of_witholding()
+	 * @generated
+	 */
+	void setPercentage_of_witholding(double value);
+
+	/**
+	 * Returns the value of the '<em><b>Tax payers name surname</b></em>' attribute list.
+	 * The list contents are of type {@link java.lang.String}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Tax payers name surname</em>' attribute list.
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Card_Tax_payers_name_surname()
+	 * @model ordered="false"
+	 * @generated
+	 */
+	EList<String> getTax_payers_name_surname();
+
+	/**
+	 * Returns the value of the '<em><b>Tax payers partner name surname</b></em>' attribute list.
+	 * The list contents are of type {@link java.lang.String}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Tax payers partner name surname</em>' attribute list.
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Card_Tax_payers_partner_name_surname()
+	 * @model ordered="false"
+	 * @generated
+	 */
+	EList<String> getTax_payers_partner_name_surname();
+
+	/**
+	 * Returns the value of the '<em><b>Tax payers address</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Tax payers address</em>' reference.
+	 * @see #setTax_payers_address(Address)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Card_Tax_payers_address()
+	 * @model
+	 * @generated
+	 */
+	Address getTax_payers_address();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Tax_Card#getTax_payers_address <em>Tax payers address</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Tax payers address</em>' reference.
+	 * @see #getTax_payers_address()
+	 * @generated
+	 */
+	void setTax_payers_address(Address value);
+
+	/**
+	 * Returns the value of the '<em><b>Jobs Employer SS No</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Jobs Employer SS No</em>' attribute.
+	 * @see #setJobs_Employer_SSNo(String)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Card_Jobs_Employer_SSNo()
+	 * @model unique="false" ordered="false"
+	 * @generated
+	 */
+	String getJobs_Employer_SSNo();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Tax_Card#getJobs_Employer_SSNo <em>Jobs Employer SS No</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Jobs Employer SS No</em>' attribute.
+	 * @see #getJobs_Employer_SSNo()
+	 * @generated
+	 */
+	void setJobs_Employer_SSNo(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Jobs employers name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Jobs employers name</em>' attribute.
+	 * @see #setJobs_employers_name(String)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Card_Jobs_employers_name()
+	 * @model unique="false" ordered="false"
+	 * @generated
+	 */
+	String getJobs_employers_name();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Tax_Card#getJobs_employers_name <em>Jobs employers name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Jobs employers name</em>' attribute.
+	 * @see #getJobs_employers_name()
+	 * @generated
+	 */
+	void setJobs_employers_name(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Jobs activity type</b></em>' attribute.
+	 * The literals are from the enumeration {@link TaxationWithRoot.Job_Activity}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Jobs activity type</em>' attribute.
+	 * @see TaxationWithRoot.Job_Activity
+	 * @see #setJobs_activity_type(Job_Activity)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Card_Jobs_activity_type()
+	 * @model required="true"
+	 * @generated
+	 */
+	Job_Activity getJobs_activity_type();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Tax_Card#getJobs_activity_type <em>Jobs activity type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Jobs activity type</em>' attribute.
+	 * @see TaxationWithRoot.Job_Activity
+	 * @see #getJobs_activity_type()
+	 * @generated
+	 */
+	void setJobs_activity_type(Job_Activity value);
+
+	/**
+	 * Returns the value of the '<em><b>Jobs place of work</b></em>' attribute.
+	 * The literals are from the enumeration {@link TaxationWithRoot.Town}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Jobs place of work</em>' attribute.
+	 * @see TaxationWithRoot.Town
+	 * @see #setJobs_place_of_work(Town)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Card_Jobs_place_of_work()
+	 * @model required="true"
+	 * @generated
+	 */
+	Town getJobs_place_of_work();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Tax_Card#getJobs_place_of_work <em>Jobs place of work</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Jobs place of work</em>' attribute.
+	 * @see TaxationWithRoot.Town
+	 * @see #getJobs_place_of_work()
+	 * @generated
+	 */
+	void setJobs_place_of_work(Town value);
+
+	/**
+	 * Returns the value of the '<em><b>Deduction FD daily</b></em>' attribute.
+	 * The default value is <code>"0.0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Deduction FD daily</em>' attribute.
+	 * @see #setDeduction_FD_daily(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Card_Deduction_FD_daily()
+	 * @model default="0.0" unique="false" required="true" ordered="false"
+	 * @generated
+	 */
+	double getDeduction_FD_daily();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Tax_Card#getDeduction_FD_daily <em>Deduction FD daily</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Deduction FD daily</em>' attribute.
+	 * @see #getDeduction_FD_daily()
+	 * @generated
+	 */
+	void setDeduction_FD_daily(double value);
+
+	/**
+	 * Returns the value of the '<em><b>Deduction FD monthly</b></em>' attribute.
+	 * The default value is <code>"0.0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Deduction FD monthly</em>' attribute.
+	 * @see #setDeduction_FD_monthly(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Card_Deduction_FD_monthly()
+	 * @model default="0.0" unique="false" required="true" ordered="false"
+	 * @generated
+	 */
+	double getDeduction_FD_monthly();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Tax_Card#getDeduction_FD_monthly <em>Deduction FD monthly</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Deduction FD monthly</em>' attribute.
+	 * @see #getDeduction_FD_monthly()
+	 * @generated
+	 */
+	void setDeduction_FD_monthly(double value);
+
+	/**
+	 * Returns the value of the '<em><b>Deduction AC daily</b></em>' attribute.
+	 * The default value is <code>"0.0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Deduction AC daily</em>' attribute.
+	 * @see #setDeduction_AC_daily(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Card_Deduction_AC_daily()
+	 * @model default="0.0" unique="false" required="true"
+	 * @generated
+	 */
+	double getDeduction_AC_daily();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Tax_Card#getDeduction_AC_daily <em>Deduction AC daily</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Deduction AC daily</em>' attribute.
+	 * @see #getDeduction_AC_daily()
+	 * @generated
+	 */
+	void setDeduction_AC_daily(double value);
+
+	/**
+	 * Returns the value of the '<em><b>Deduction AC monthly</b></em>' attribute.
+	 * The default value is <code>"0.0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Deduction AC monthly</em>' attribute.
+	 * @see #setDeduction_AC_monthly(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Card_Deduction_AC_monthly()
+	 * @model default="0.0" unique="false" required="true"
+	 * @generated
+	 */
+	double getDeduction_AC_monthly();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Tax_Card#getDeduction_AC_monthly <em>Deduction AC monthly</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Deduction AC monthly</em>' attribute.
+	 * @see #getDeduction_AC_monthly()
+	 * @generated
+	 */
+	void setDeduction_AC_monthly(double value);
+
+	/**
+	 * Returns the value of the '<em><b>Deduction AC yearly</b></em>' attribute.
+	 * The default value is <code>"0.0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Deduction AC yearly</em>' attribute.
+	 * @see #setDeduction_AC_yearly(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Card_Deduction_AC_yearly()
+	 * @model default="0.0" unique="false" required="true"
+	 * @generated
+	 */
+	double getDeduction_AC_yearly();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Tax_Card#getDeduction_AC_yearly <em>Deduction AC yearly</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Deduction AC yearly</em>' attribute.
+	 * @see #getDeduction_AC_yearly()
+	 * @generated
+	 */
+	void setDeduction_AC_yearly(double value);
+
+	/**
+	 * Returns the value of the '<em><b>Deduction CE daily</b></em>' attribute.
+	 * The default value is <code>"0.0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Deduction CE daily</em>' attribute.
+	 * @see #setDeduction_CE_daily(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Card_Deduction_CE_daily()
+	 * @model default="0.0" unique="false" required="true"
+	 * @generated
+	 */
+	double getDeduction_CE_daily();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Tax_Card#getDeduction_CE_daily <em>Deduction CE daily</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Deduction CE daily</em>' attribute.
+	 * @see #getDeduction_CE_daily()
+	 * @generated
+	 */
+	void setDeduction_CE_daily(double value);
+
+	/**
+	 * Returns the value of the '<em><b>Deduction CE monthly</b></em>' attribute.
+	 * The default value is <code>"0.0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Deduction CE monthly</em>' attribute.
+	 * @see #setDeduction_CE_monthly(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Card_Deduction_CE_monthly()
+	 * @model default="0.0" unique="false" required="true"
+	 * @generated
+	 */
+	double getDeduction_CE_monthly();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Tax_Card#getDeduction_CE_monthly <em>Deduction CE monthly</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Deduction CE monthly</em>' attribute.
+	 * @see #getDeduction_CE_monthly()
+	 * @generated
+	 */
+	void setDeduction_CE_monthly(double value);
+
+	/**
+	 * Returns the value of the '<em><b>Deduction CE yearly</b></em>' attribute.
+	 * The default value is <code>"0.0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Deduction CE yearly</em>' attribute.
+	 * @see #setDeduction_CE_yearly(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Card_Deduction_CE_yearly()
+	 * @model default="0.0" unique="false" required="true"
+	 * @generated
+	 */
+	double getDeduction_CE_yearly();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Tax_Card#getDeduction_CE_yearly <em>Deduction CE yearly</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Deduction CE yearly</em>' attribute.
+	 * @see #getDeduction_CE_yearly()
+	 * @generated
+	 */
+	void setDeduction_CE_yearly(double value);
+
+	/**
+	 * Returns the value of the '<em><b>Deduction DS daily</b></em>' attribute.
+	 * The default value is <code>"0.0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Deduction DS daily</em>' attribute.
+	 * @see #setDeduction_DS_daily(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Card_Deduction_DS_daily()
+	 * @model default="0.0" unique="false" required="true"
+	 * @generated
+	 */
+	double getDeduction_DS_daily();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Tax_Card#getDeduction_DS_daily <em>Deduction DS daily</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Deduction DS daily</em>' attribute.
+	 * @see #getDeduction_DS_daily()
+	 * @generated
+	 */
+	void setDeduction_DS_daily(double value);
+
+	/**
+	 * Returns the value of the '<em><b>Deduction DS monthly</b></em>' attribute.
+	 * The default value is <code>"0.0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Deduction DS monthly</em>' attribute.
+	 * @see #setDeduction_DS_monthly(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Card_Deduction_DS_monthly()
+	 * @model default="0.0" required="true"
+	 * @generated
+	 */
+	double getDeduction_DS_monthly();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Tax_Card#getDeduction_DS_monthly <em>Deduction DS monthly</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Deduction DS monthly</em>' attribute.
+	 * @see #getDeduction_DS_monthly()
+	 * @generated
+	 */
+	void setDeduction_DS_monthly(double value);
+
+	/**
+	 * Returns the value of the '<em><b>Deduction FO daily</b></em>' attribute.
+	 * The default value is <code>"0.0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Deduction FO daily</em>' attribute.
+	 * @see #setDeduction_FO_daily(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Card_Deduction_FO_daily()
+	 * @model default="0.0" unique="false" required="true"
+	 * @generated
+	 */
+	double getDeduction_FO_daily();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Tax_Card#getDeduction_FO_daily <em>Deduction FO daily</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Deduction FO daily</em>' attribute.
+	 * @see #getDeduction_FO_daily()
+	 * @generated
+	 */
+	void setDeduction_FO_daily(double value);
+
+	/**
+	 * Returns the value of the '<em><b>Deduction FO monthly</b></em>' attribute.
+	 * The default value is <code>"0.0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Deduction FO monthly</em>' attribute.
+	 * @see #setDeduction_FO_monthly(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Card_Deduction_FO_monthly()
+	 * @model default="0.0" unique="false" required="true"
+	 * @generated
+	 */
+	double getDeduction_FO_monthly();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Tax_Card#getDeduction_FO_monthly <em>Deduction FO monthly</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Deduction FO monthly</em>' attribute.
+	 * @see #getDeduction_FO_monthly()
+	 * @generated
+	 */
+	void setDeduction_FO_monthly(double value);
+
+	/**
+	 * Returns the value of the '<em><b>Deduction FO yearly</b></em>' attribute.
+	 * The default value is <code>"0.0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Deduction FO yearly</em>' attribute.
+	 * @see #setDeduction_FO_yearly(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Card_Deduction_FO_yearly()
+	 * @model default="0.0" unique="false" required="true"
+	 * @generated
+	 */
+	double getDeduction_FO_yearly();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Tax_Card#getDeduction_FO_yearly <em>Deduction FO yearly</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Deduction FO yearly</em>' attribute.
+	 * @see #getDeduction_FO_yearly()
+	 * @generated
+	 */
+	void setDeduction_FO_yearly(double value);
+
+	/**
+	 * Returns the value of the '<em><b>Credit CIS daily</b></em>' attribute.
+	 * The default value is <code>"0.0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Credit CIS daily</em>' attribute.
+	 * @see #setCredit_CIS_daily(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Card_Credit_CIS_daily()
+	 * @model default="0.0" unique="false" required="true"
+	 * @generated
+	 */
+	double getCredit_CIS_daily();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Tax_Card#getCredit_CIS_daily <em>Credit CIS daily</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Credit CIS daily</em>' attribute.
+	 * @see #getCredit_CIS_daily()
+	 * @generated
+	 */
+	void setCredit_CIS_daily(double value);
+
+	/**
+	 * Returns the value of the '<em><b>Credit CIS monthly</b></em>' attribute.
+	 * The default value is <code>"0.0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Credit CIS monthly</em>' attribute.
+	 * @see #setCredit_CIS_monthly(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Card_Credit_CIS_monthly()
+	 * @model default="0.0" unique="false" required="true"
+	 * @generated
+	 */
+	double getCredit_CIS_monthly();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Tax_Card#getCredit_CIS_monthly <em>Credit CIS monthly</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Credit CIS monthly</em>' attribute.
+	 * @see #getCredit_CIS_monthly()
+	 * @generated
+	 */
+	void setCredit_CIS_monthly(double value);
+
+	/**
+	 * Returns the value of the '<em><b>Credit CIM daily</b></em>' attribute.
+	 * The default value is <code>"0.0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Credit CIM daily</em>' attribute.
+	 * @see #setCredit_CIM_daily(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Card_Credit_CIM_daily()
+	 * @model default="0.0" unique="false" required="true"
+	 * @generated
+	 */
+	double getCredit_CIM_daily();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Tax_Card#getCredit_CIM_daily <em>Credit CIM daily</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Credit CIM daily</em>' attribute.
+	 * @see #getCredit_CIM_daily()
+	 * @generated
+	 */
+	void setCredit_CIM_daily(double value);
+
+	/**
+	 * Returns the value of the '<em><b>Validity</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Validity</em>' attribute.
+	 * @see #setValidity(boolean)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Card_Validity()
+	 * @model required="true"
+	 * @generated
+	 */
+	boolean isValidity();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Tax_Card#isValidity <em>Validity</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Validity</em>' attribute.
+	 * @see #isValidity()
+	 * @generated
+	 */
+	void setValidity(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Income Tax Credit</b></em>' reference list.
+	 * The list contents are of type {@link TaxationWithRoot.Income_Tax_Credit}.
+	 * It is bidirectional and its opposite is '{@link TaxationWithRoot.Income_Tax_Credit#getTaxation_Frame <em>Taxation Frame</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Income Tax Credit</em>' reference list.
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Card_Income_Tax_Credit()
+	 * @see TaxationWithRoot.Income_Tax_Credit#getTaxation_Frame
+	 * @model opposite="taxation_Frame" ordered="false"
+	 * @generated
+	 */
+	EList<Income_Tax_Credit> getIncome_Tax_Credit();
+
+	/**
+	 * Returns the value of the '<em><b>Previous</b></em>' reference.
+	 * It is bidirectional and its opposite is '{@link TaxationWithRoot.Tax_Card#getCurrent_tax_card <em>Current tax card</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Previous</em>' reference.
+	 * @see #setPrevious(Tax_Card)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Card_Previous()
+	 * @see TaxationWithRoot.Tax_Card#getCurrent_tax_card
+	 * @model opposite="current_tax_card"
+	 * @generated
+	 */
+	Tax_Card getPrevious();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Tax_Card#getPrevious <em>Previous</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Previous</em>' reference.
+	 * @see #getPrevious()
+	 * @generated
+	 */
+	void setPrevious(Tax_Card value);
+
+	/**
+	 * Returns the value of the '<em><b>Current tax card</b></em>' reference.
+	 * It is bidirectional and its opposite is '{@link TaxationWithRoot.Tax_Card#getPrevious <em>Previous</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Current tax card</em>' reference.
+	 * @see #setCurrent_tax_card(Tax_Card)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Card_Current_tax_card()
+	 * @see TaxationWithRoot.Tax_Card#getPrevious
+	 * @model opposite="previous"
+	 * @generated
+	 */
+	Tax_Card getCurrent_tax_card();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Tax_Card#getCurrent_tax_card <em>Current tax card</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Current tax card</em>' reference.
+	 * @see #getCurrent_tax_card()
+	 * @generated
+	 */
+	void setCurrent_tax_card(Tax_Card value);
+
+	/**
+	 * Returns the value of the '<em><b>Credit CIM yearly</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Credit CIM yearly</em>' attribute.
+	 * @see #setCredit_CIM_yearly(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Card_Credit_CIM_yearly()
+	 * @model required="true" ordered="false"
+	 * @generated
+	 */
+	double getCredit_CIM_yearly();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Tax_Card#getCredit_CIM_yearly <em>Credit CIM yearly</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Credit CIM yearly</em>' attribute.
+	 * @see #getCredit_CIM_yearly()
+	 * @generated
+	 */
+	void setCredit_CIM_yearly(double value);
+
+	/**
+	 * Returns the value of the '<em><b>Deduction DS Alimony yearly</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Deduction DS Alimony yearly</em>' attribute.
+	 * @see #setDeduction_DS_Alimony_yearly(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Card_Deduction_DS_Alimony_yearly()
+	 * @model required="true" ordered="false"
+	 * @generated
+	 */
+	double getDeduction_DS_Alimony_yearly();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Tax_Card#getDeduction_DS_Alimony_yearly <em>Deduction DS Alimony yearly</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Deduction DS Alimony yearly</em>' attribute.
+	 * @see #getDeduction_DS_Alimony_yearly()
+	 * @generated
+	 */
+	void setDeduction_DS_Alimony_yearly(double value);
+
+	/**
+	 * Returns the value of the '<em><b>Deduction DS Debt yearly</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Deduction DS Debt yearly</em>' attribute.
+	 * @see #setDeduction_DS_Debt_yearly(double)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Card_Deduction_DS_Debt_yearly()
+	 * @model required="true" ordered="false"
+	 * @generated
+	 */
+	double getDeduction_DS_Debt_yearly();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Tax_Card#getDeduction_DS_Debt_yearly <em>Deduction DS Debt yearly</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Deduction DS Debt yearly</em>' attribute.
+	 * @see #getDeduction_DS_Debt_yearly()
+	 * @generated
+	 */
+	void setDeduction_DS_Debt_yearly(double value);
+
+	/**
+	 * Returns the value of the '<em><b>Income</b></em>' container reference.
+	 * It is bidirectional and its opposite is '{@link TaxationWithRoot.Income#getTax_card <em>Tax card</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Income</em>' container reference.
+	 * @see #setIncome(Income)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Card_Income()
+	 * @see TaxationWithRoot.Income#getTax_card
+	 * @model opposite="tax_card" required="true" transient="false"
+	 * @generated
+	 */
+	Income getIncome();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Tax_Card#getIncome <em>Income</em>}' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Income</em>' container reference.
+	 * @see #getIncome()
+	 * @generated
+	 */
+	void setIncome(Income value);
+
+} // Tax_Card
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Tax_Case.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Tax_Case.java
new file mode 100644
index 00000000..251a193f
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Tax_Case.java
@@ -0,0 +1,18 @@
+/**
+ */
+package TaxationWithRoot;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Tax Case</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Case()
+ * @model interface="true" abstract="true"
+ * @generated
+ */
+public interface Tax_Case extends EObject {
+} // Tax_Case
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Tax_Class_Category.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Tax_Class_Category.java
new file mode 100644
index 00000000..9cd31c90
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Tax_Class_Category.java
@@ -0,0 +1,232 @@
+/**
+ */
+package TaxationWithRoot;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.Enumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Tax Class Category</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Class_Category()
+ * @model
+ * @generated
+ */
+public enum Tax_Class_Category implements Enumerator {
+	/**
+	 * The '<em><b>One</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #ONE_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	ONE(0, "One", "One"),
+
+	/**
+	 * The '<em><b>One A</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #ONE_A_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	ONE_A(1, "One_A", "One_A"),
+
+	/**
+	 * The '<em><b>Two</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #TWO_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	TWO(2, "Two", "Two");
+
+	/**
+	 * The '<em><b>One</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #ONE
+	 * @model name="One"
+	 * @generated
+	 * @ordered
+	 */
+	public static final int ONE_VALUE = 0;
+
+	/**
+	 * The '<em><b>One A</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #ONE_A
+	 * @model name="One_A"
+	 * @generated
+	 * @ordered
+	 */
+	public static final int ONE_A_VALUE = 1;
+
+	/**
+	 * The '<em><b>Two</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #TWO
+	 * @model name="Two"
+	 * @generated
+	 * @ordered
+	 */
+	public static final int TWO_VALUE = 2;
+
+	/**
+	 * An array of all the '<em><b>Tax Class Category</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static final Tax_Class_Category[] VALUES_ARRAY =
+		new Tax_Class_Category[] {
+			ONE,
+			ONE_A,
+			TWO,
+		};
+
+	/**
+	 * A public read-only list of all the '<em><b>Tax Class Category</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<Tax_Class_Category> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+	/**
+	 * Returns the '<em><b>Tax Class Category</b></em>' literal with the specified literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Tax_Class_Category get(String literal) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			Tax_Class_Category result = VALUES_ARRAY[i];
+			if (result.toString().equals(literal)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Tax Class Category</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Tax_Class_Category getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			Tax_Class_Category result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Tax Class Category</b></em>' literal with the specified integer value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Tax_Class_Category get(int value) {
+		switch (value) {
+			case ONE_VALUE: return ONE;
+			case ONE_A_VALUE: return ONE_A;
+			case TWO_VALUE: return TWO;
+		}
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final int value;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String name;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String literal;
+
+	/**
+	 * Only this class can construct instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private Tax_Class_Category(int value, String name, String literal) {
+		this.value = value;
+		this.name = name;
+		this.literal = literal;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getValue() {
+	  return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getName() {
+	  return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getLiteral() {
+	  return literal;
+	}
+
+	/**
+	 * Returns the literal value of the enumerator, which is its string representation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		return literal;
+	}
+	
+} //Tax_Class_Category
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Tax_Office.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Tax_Office.java
new file mode 100644
index 00000000..50a31c3a
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Tax_Office.java
@@ -0,0 +1,255 @@
+/**
+ */
+package TaxationWithRoot;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.Enumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Tax Office</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Office()
+ * @model
+ * @generated
+ */
+public enum Tax_Office implements Enumerator {
+	/**
+	 * The '<em><b>RTS 2</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #RTS_2_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	RTS_2(0, "RTS_2", "RTS_2"),
+
+	/**
+	 * The '<em><b>RTS 3</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #RTS_3_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	RTS_3(1, "RTS_3", "RTS_3"),
+
+	/**
+	 * The '<em><b>RTS 4</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #RTS_4_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	RTS_4(2, "RTS_4", "RTS_4"),
+
+	/**
+	 * The '<em><b>RTS 5</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #RTS_5_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	RTS_5(3, "RTS_5", "RTS_5");
+
+	/**
+	 * The '<em><b>RTS 2</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #RTS_2
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int RTS_2_VALUE = 0;
+
+	/**
+	 * The '<em><b>RTS 3</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #RTS_3
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int RTS_3_VALUE = 1;
+
+	/**
+	 * The '<em><b>RTS 4</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #RTS_4
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int RTS_4_VALUE = 2;
+
+	/**
+	 * The '<em><b>RTS 5</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #RTS_5
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int RTS_5_VALUE = 3;
+
+	/**
+	 * An array of all the '<em><b>Tax Office</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static final Tax_Office[] VALUES_ARRAY =
+		new Tax_Office[] {
+			RTS_2,
+			RTS_3,
+			RTS_4,
+			RTS_5,
+		};
+
+	/**
+	 * A public read-only list of all the '<em><b>Tax Office</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<Tax_Office> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+	/**
+	 * Returns the '<em><b>Tax Office</b></em>' literal with the specified literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Tax_Office get(String literal) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			Tax_Office result = VALUES_ARRAY[i];
+			if (result.toString().equals(literal)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Tax Office</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Tax_Office getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			Tax_Office result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Tax Office</b></em>' literal with the specified integer value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Tax_Office get(int value) {
+		switch (value) {
+			case RTS_2_VALUE: return RTS_2;
+			case RTS_3_VALUE: return RTS_3;
+			case RTS_4_VALUE: return RTS_4;
+			case RTS_5_VALUE: return RTS_5;
+		}
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final int value;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String name;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String literal;
+
+	/**
+	 * Only this class can construct instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private Tax_Office(int value, String name, String literal) {
+		this.value = value;
+		this.name = name;
+		this.literal = literal;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getValue() {
+	  return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getName() {
+	  return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getLiteral() {
+	  return literal;
+	}
+
+	/**
+	 * Returns the literal value of the enumerator, which is its string representation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		return literal;
+	}
+	
+} //Tax_Office
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Tax_Payer.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Tax_Payer.java
new file mode 100644
index 00000000..e2146172
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Tax_Payer.java
@@ -0,0 +1,104 @@
+/**
+ */
+package TaxationWithRoot;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Tax Payer</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.Tax_Payer#getDependents <em>Dependents</em>}</li>
+ *   <li>{@link TaxationWithRoot.Tax_Payer#getFrom_agent <em>From agent</em>}</li>
+ *   <li>{@link TaxationWithRoot.Tax_Payer#getIncomes <em>Incomes</em>}</li>
+ *   <li>{@link TaxationWithRoot.Tax_Payer#getFrom_law <em>From law</em>}</li>
+ * </ul>
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Payer()
+ * @model abstract="true"
+ *        annotation="duplicates"
+ * @generated
+ */
+public interface Tax_Payer extends Physical_Person, Tax_Case {
+	/**
+	 * Returns the value of the '<em><b>Dependents</b></em>' containment reference list.
+	 * The list contents are of type {@link TaxationWithRoot.Dependent}.
+	 * It is bidirectional and its opposite is '{@link TaxationWithRoot.Dependent#getResponsible_person <em>Responsible person</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Dependents</em>' containment reference list.
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Payer_Dependents()
+	 * @see TaxationWithRoot.Dependent#getResponsible_person
+	 * @model opposite="responsible_person" containment="true" upper="6" ordered="false"
+	 * @generated
+	 */
+	EList<Dependent> getDependents();
+
+	/**
+	 * Returns the value of the '<em><b>From agent</b></em>' containment reference.
+	 * It is bidirectional and its opposite is '{@link TaxationWithRoot.FromAgent#getTaxPayer <em>Tax Payer</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>From agent</em>' containment reference.
+	 * @see #setFrom_agent(FromAgent)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Payer_From_agent()
+	 * @see TaxationWithRoot.FromAgent#getTaxPayer
+	 * @model opposite="taxPayer" containment="true" required="true"
+	 * @generated
+	 */
+	FromAgent getFrom_agent();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Tax_Payer#getFrom_agent <em>From agent</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>From agent</em>' containment reference.
+	 * @see #getFrom_agent()
+	 * @generated
+	 */
+	void setFrom_agent(FromAgent value);
+
+	/**
+	 * Returns the value of the '<em><b>Incomes</b></em>' containment reference list.
+	 * The list contents are of type {@link TaxationWithRoot.Income}.
+	 * It is bidirectional and its opposite is '{@link TaxationWithRoot.Income#getTaxPayer <em>Tax Payer</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Incomes</em>' containment reference list.
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Payer_Incomes()
+	 * @see TaxationWithRoot.Income#getTaxPayer
+	 * @model opposite="taxPayer" containment="true" required="true" ordered="false"
+	 * @generated
+	 */
+	EList<Income> getIncomes();
+
+	/**
+	 * Returns the value of the '<em><b>From law</b></em>' containment reference.
+	 * It is bidirectional and its opposite is '{@link TaxationWithRoot.FromLaw#getTaxPayer <em>Tax Payer</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>From law</em>' containment reference.
+	 * @see #setFrom_law(FromLaw)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Payer_From_law()
+	 * @see TaxationWithRoot.FromLaw#getTaxPayer
+	 * @model opposite="taxPayer" containment="true" required="true"
+	 * @generated
+	 */
+	FromLaw getFrom_law();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Tax_Payer#getFrom_law <em>From law</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>From law</em>' containment reference.
+	 * @see #getFrom_law()
+	 * @generated
+	 */
+	void setFrom_law(FromLaw value);
+
+} // Tax_Payer
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Tax_Property.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Tax_Property.java
new file mode 100644
index 00000000..807dde5b
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Tax_Property.java
@@ -0,0 +1,94 @@
+/**
+ */
+package TaxationWithRoot;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Tax Property</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.Tax_Property#getStarting_year <em>Starting year</em>}</li>
+ *   <li>{@link TaxationWithRoot.Tax_Property#getId10 <em>Id10</em>}</li>
+ *   <li>{@link TaxationWithRoot.Tax_Property#getUnion_record <em>Union record</em>}</li>
+ * </ul>
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Property()
+ * @model
+ * @generated
+ */
+public interface Tax_Property extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Starting year</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Starting year</em>' attribute.
+	 * @see #setStarting_year(int)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Property_Starting_year()
+	 * @model required="true" ordered="false"
+	 * @generated
+	 */
+	int getStarting_year();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Tax_Property#getStarting_year <em>Starting year</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Starting year</em>' attribute.
+	 * @see #getStarting_year()
+	 * @generated
+	 */
+	void setStarting_year(int value);
+
+	/**
+	 * Returns the value of the '<em><b>Id10</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Id10</em>' attribute.
+	 * @see #setId10(String)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Property_Id10()
+	 * @model id="true" required="true" ordered="false"
+	 * @generated
+	 */
+	String getId10();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Tax_Property#getId10 <em>Id10</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Id10</em>' attribute.
+	 * @see #getId10()
+	 * @generated
+	 */
+	void setId10(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Union record</b></em>' container reference.
+	 * It is bidirectional and its opposite is '{@link TaxationWithRoot.Legal_Union_Record#getProperties <em>Properties</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Union record</em>' container reference.
+	 * @see #setUnion_record(Legal_Union_Record)
+	 * @see TaxationWithRoot.TaxationWithRootPackage#getTax_Property_Union_record()
+	 * @see TaxationWithRoot.Legal_Union_Record#getProperties
+	 * @model opposite="properties" required="true" transient="false" ordered="false"
+	 * @generated
+	 */
+	Legal_Union_Record getUnion_record();
+
+	/**
+	 * Sets the value of the '{@link TaxationWithRoot.Tax_Property#getUnion_record <em>Union record</em>}' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Union record</em>' container reference.
+	 * @see #getUnion_record()
+	 * @generated
+	 */
+	void setUnion_record(Legal_Union_Record value);
+
+} // Tax_Property
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/TaxationWithRootFactory.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/TaxationWithRootFactory.java
new file mode 100644
index 00000000..0a7a3211
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/TaxationWithRootFactory.java
@@ -0,0 +1,420 @@
+/**
+ */
+package TaxationWithRoot;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see TaxationWithRoot.TaxationWithRootPackage
+ * @generated
+ */
+public interface TaxationWithRootFactory extends EFactory {
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	TaxationWithRootFactory eINSTANCE = TaxationWithRoot.impl.TaxationWithRootFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Income Tax</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Income Tax</em>'.
+	 * @generated
+	 */
+	Income_Tax createIncome_Tax();
+
+	/**
+	 * Returns a new object of class '<em>Physical Person</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Physical Person</em>'.
+	 * @generated
+	 */
+	Physical_Person createPhysical_Person();
+
+	/**
+	 * Returns a new object of class '<em>Address</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Address</em>'.
+	 * @generated
+	 */
+	Address createAddress();
+
+	/**
+	 * Returns a new object of class '<em>Expense</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Expense</em>'.
+	 * @generated
+	 */
+	Expense createExpense();
+
+	/**
+	 * Returns a new object of class '<em>Dependent</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Dependent</em>'.
+	 * @generated
+	 */
+	Dependent createDependent();
+
+	/**
+	 * Returns a new object of class '<em>External Allowance</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>External Allowance</em>'.
+	 * @generated
+	 */
+	External_Allowance createExternal_Allowance();
+
+	/**
+	 * Returns a new object of class '<em>Household</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Household</em>'.
+	 * @generated
+	 */
+	Household createHousehold();
+
+	/**
+	 * Returns a new object of class '<em>Tax Property</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Tax Property</em>'.
+	 * @generated
+	 */
+	Tax_Property createTax_Property();
+
+	/**
+	 * Returns a new object of class '<em>From Agent</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>From Agent</em>'.
+	 * @generated
+	 */
+	FromAgent createFromAgent();
+
+	/**
+	 * Returns a new object of class '<em>Tax Card</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Tax Card</em>'.
+	 * @generated
+	 */
+	Tax_Card createTax_Card();
+
+	/**
+	 * Returns a new object of class '<em>Income Tax Credit</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Income Tax Credit</em>'.
+	 * @generated
+	 */
+	Income_Tax_Credit createIncome_Tax_Credit();
+
+	/**
+	 * Returns a new object of class '<em>Income Detail</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Income Detail</em>'.
+	 * @generated
+	 */
+	Income_Detail createIncome_Detail();
+
+	/**
+	 * Returns a new object of class '<em>From Law</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>From Law</em>'.
+	 * @generated
+	 */
+	FromLaw createFromLaw();
+
+	/**
+	 * Returns a new object of class '<em>Fiscal Address</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Fiscal Address</em>'.
+	 * @generated
+	 */
+	Fiscal_Address createFiscal_Address();
+
+	/**
+	 * Returns a new object of class '<em>Habitual Address</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Habitual Address</em>'.
+	 * @generated
+	 */
+	Habitual_Address createHabitual_Address();
+
+	/**
+	 * Returns a new object of class '<em>Marriage Record</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Marriage Record</em>'.
+	 * @generated
+	 */
+	Marriage_Record createMarriage_Record();
+
+	/**
+	 * Returns a new object of class '<em>Non Resident Tax Payer</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Non Resident Tax Payer</em>'.
+	 * @generated
+	 */
+	Non_Resident_Tax_Payer createNon_Resident_Tax_Payer();
+
+	/**
+	 * Returns a new object of class '<em>Partnership Record</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Partnership Record</em>'.
+	 * @generated
+	 */
+	Partnership_Record createPartnership_Record();
+
+	/**
+	 * Returns a new object of class '<em>Resident Tax Payer</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Resident Tax Payer</em>'.
+	 * @generated
+	 */
+	Resident_Tax_Payer createResident_Tax_Payer();
+
+	/**
+	 * Returns a new object of class '<em>Trade and Business Income</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Trade and Business Income</em>'.
+	 * @generated
+	 */
+	Trade_and_Business_Income createTrade_and_Business_Income();
+
+	/**
+	 * Returns a new object of class '<em>Agriculture and Forestry Income</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Agriculture and Forestry Income</em>'.
+	 * @generated
+	 */
+	Agriculture_and_Forestry_Income createAgriculture_and_Forestry_Income();
+
+	/**
+	 * Returns a new object of class '<em>Pensions and Annuities Income</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Pensions and Annuities Income</em>'.
+	 * @generated
+	 */
+	Pensions_and_Annuities_Income createPensions_and_Annuities_Income();
+
+	/**
+	 * Returns a new object of class '<em>Capital and Investments Income</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Capital and Investments Income</em>'.
+	 * @generated
+	 */
+	Capital_and_Investments_Income createCapital_and_Investments_Income();
+
+	/**
+	 * Returns a new object of class '<em>Employment Income</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Employment Income</em>'.
+	 * @generated
+	 */
+	Employment_Income createEmployment_Income();
+
+	/**
+	 * Returns a new object of class '<em>Rentals and Leases Income</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Rentals and Leases Income</em>'.
+	 * @generated
+	 */
+	Rentals_and_Leases_Income createRentals_and_Leases_Income();
+
+	/**
+	 * Returns a new object of class '<em>Foreign Income</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Foreign Income</em>'.
+	 * @generated
+	 */
+	Foreign_Income createForeign_Income();
+
+	/**
+	 * Returns a new object of class '<em>Local Income</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Local Income</em>'.
+	 * @generated
+	 */
+	Local_Income createLocal_Income();
+
+	/**
+	 * Returns a new object of class '<em>CIM</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>CIM</em>'.
+	 * @generated
+	 */
+	CIM createCIM();
+
+	/**
+	 * Returns a new object of class '<em>CIP</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>CIP</em>'.
+	 * @generated
+	 */
+	CIP createCIP();
+
+	/**
+	 * Returns a new object of class '<em>CIS</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>CIS</em>'.
+	 * @generated
+	 */
+	CIS createCIS();
+
+	/**
+	 * Returns a new object of class '<em>Permanent Expense</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Permanent Expense</em>'.
+	 * @generated
+	 */
+	Permanent_Expense createPermanent_Expense();
+
+	/**
+	 * Returns a new object of class '<em>Special Expense DS</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Special Expense DS</em>'.
+	 * @generated
+	 */
+	Special_Expense_DS createSpecial_Expense_DS();
+
+	/**
+	 * Returns a new object of class '<em>Interest Expense</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Interest Expense</em>'.
+	 * @generated
+	 */
+	Interest_Expense createInterest_Expense();
+
+	/**
+	 * Returns a new object of class '<em>Private Insurance and Plan</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Private Insurance and Plan</em>'.
+	 * @generated
+	 */
+	Private_Insurance_and_Plan createPrivate_Insurance_and_Plan();
+
+	/**
+	 * Returns a new object of class '<em>Health and Pension Insurance</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Health and Pension Insurance</em>'.
+	 * @generated
+	 */
+	Health_and_Pension_Insurance createHealth_and_Pension_Insurance();
+
+	/**
+	 * Returns a new object of class '<em>Donation</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Donation</em>'.
+	 * @generated
+	 */
+	Donation createDonation();
+
+	/**
+	 * Returns a new object of class '<em>Loss Carryforward</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Loss Carryforward</em>'.
+	 * @generated
+	 */
+	Loss_Carryforward createLoss_Carryforward();
+
+	/**
+	 * Returns a new object of class '<em>Spousal Expense AC</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Spousal Expense AC</em>'.
+	 * @generated
+	 */
+	Spousal_Expense_AC createSpousal_Expense_AC();
+
+	/**
+	 * Returns a new object of class '<em>Extraordinary Expense CE</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Extraordinary Expense CE</em>'.
+	 * @generated
+	 */
+	Extraordinary_Expense_CE createExtraordinary_Expense_CE();
+
+	/**
+	 * Returns a new object of class '<em>Travel Expense FD</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Travel Expense FD</em>'.
+	 * @generated
+	 */
+	Travel_Expense_FD createTravel_Expense_FD();
+
+	/**
+	 * Returns a new object of class '<em>Professional Expense</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Professional Expense</em>'.
+	 * @generated
+	 */
+	Professional_Expense createProfessional_Expense();
+
+	/**
+	 * Returns a new object of class '<em>Miscellaneous Expense FO</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Miscellaneous Expense FO</em>'.
+	 * @generated
+	 */
+	Miscellaneous_Expense_FO createMiscellaneous_Expense_FO();
+
+	/**
+	 * Returns a new object of class '<em>Resource</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Resource</em>'.
+	 * @generated
+	 */
+	Resource createResource();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	TaxationWithRootPackage getTaxationWithRootPackage();
+
+} //TaxationWithRootFactory
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/TaxationWithRootPackage.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/TaxationWithRootPackage.java
new file mode 100644
index 00000000..d0e2f041
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/TaxationWithRootPackage.java
@@ -0,0 +1,9315 @@
+/**
+ */
+package TaxationWithRoot;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ *   <li>each class,</li>
+ *   <li>each feature of each class,</li>
+ *   <li>each operation of each class,</li>
+ *   <li>each enum,</li>
+ *   <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see TaxationWithRoot.TaxationWithRootFactory
+ * @model kind="package"
+ *        annotation="http://www.eclipse.org/OCL/Import ecore='http://www.eclipse.org/emf/2002/Ecore'"
+ * @generated
+ */
+public interface TaxationWithRootPackage extends EPackage {
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "TaxationWithRoot";
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "http:///TaxCardWithRoot.ecore";
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "TaxCardWithRoot";
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	TaxationWithRootPackage eINSTANCE = TaxationWithRoot.impl.TaxationWithRootPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.ConstantsImpl <em>Constants</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.ConstantsImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getConstants()
+	 * @generated
+	 */
+	int CONSTANTS = 0;
+
+	/**
+	 * The feature id for the '<em><b>MAXIMUM CE RATE FOR CHILD NOT BEING PART OF HOUSEHOLD</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTANTS__MAXIMUM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD = 0;
+
+	/**
+	 * The feature id for the '<em><b>MAXIMUM CE RATE FOR HOUSE CARE AND CHILD PART OF THE HOUSEHOLD CARE</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTANTS__MAXIMUM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE = 1;
+
+	/**
+	 * The feature id for the '<em><b>MINIMUM SALARY</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTANTS__MINIMUM_SALARY = 2;
+
+	/**
+	 * The feature id for the '<em><b>FLAT RATE FOR EXTRA PROFESSIONAL DEDUCTION</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTANTS__FLAT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION = 3;
+
+	/**
+	 * The feature id for the '<em><b>MAXIMUM DEDUCTIBLE PERCENTAGE FOR DONATIONS</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTANTS__MAXIMUM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS = 4;
+
+	/**
+	 * The feature id for the '<em><b>MINIMUM DEDUCTIBLE AMOUNT FOR DONATIONS</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTANTS__MINIMUM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS = 5;
+
+	/**
+	 * The feature id for the '<em><b>MAXIMUM DEDUCTIBLE AMOUNT FOR ADDITIONAL PENSION AND INSURANC</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTANTS__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC = 6;
+
+	/**
+	 * The feature id for the '<em><b>MAXIMUM DEDUCTIBLE AMOUNT FOR ALIMONY EXPENSE</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTANTS__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE = 7;
+
+	/**
+	 * The feature id for the '<em><b>MAXIMAL DISTANCE FOR TRAVEL EXPENSE DEDUCTION</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTANTS__MAXIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION = 8;
+
+	/**
+	 * The feature id for the '<em><b>MAXIMAL FLAT DISTANCE FOR TRAVEL EXPENSE DEDUCTION</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTANTS__MAXIMAL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION = 9;
+
+	/**
+	 * The feature id for the '<em><b>MINIMAL DISTANCE FOR TRAVEL EXPENSE DEDUCTION</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTANTS__MINIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION = 10;
+
+	/**
+	 * The feature id for the '<em><b>FLAT RATE CIM DAILY</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTANTS__FLAT_RATE_CIM_DAILY = 11;
+
+	/**
+	 * The feature id for the '<em><b>FLAT RATE CIM MONTHLY</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTANTS__FLAT_RATE_CIM_MONTHLY = 12;
+
+	/**
+	 * The feature id for the '<em><b>FLAT RATE CIM YEARLY</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTANTS__FLAT_RATE_CIM_YEARLY = 13;
+
+	/**
+	 * The feature id for the '<em><b>FLAT RATE CIP DAILY</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTANTS__FLAT_RATE_CIP_DAILY = 14;
+
+	/**
+	 * The feature id for the '<em><b>FLAT RATE CIP MONTHLY</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTANTS__FLAT_RATE_CIP_MONTHLY = 15;
+
+	/**
+	 * The feature id for the '<em><b>FLAT RATE CIP YEARLY</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTANTS__FLAT_RATE_CIP_YEARLY = 16;
+
+	/**
+	 * The feature id for the '<em><b>FLAT RATE CIS DAILY</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTANTS__FLAT_RATE_CIS_DAILY = 17;
+
+	/**
+	 * The feature id for the '<em><b>FLAT RATE CIS MONTHLY</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTANTS__FLAT_RATE_CIS_MONTHLY = 18;
+
+	/**
+	 * The feature id for the '<em><b>FLAT RATE CIS YEARLY</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTANTS__FLAT_RATE_CIS_YEARLY = 19;
+
+	/**
+	 * The feature id for the '<em><b>FLAT RATE FOR TRAVEL EXPENSE PER UNIT</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTANTS__FLAT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT = 20;
+
+	/**
+	 * The feature id for the '<em><b>MAXIMUM DEDUCTIBLE AMOUNT FOR DS</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTANTS__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_DS = 21;
+
+	/**
+	 * The feature id for the '<em><b>FLAT RATE FOR MISCELLANEOUS EXPENSE</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTANTS__FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE = 22;
+
+	/**
+	 * The feature id for the '<em><b>DISABILITY FLAT RATE FOR MISCELLANEOUS EXPENSE</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTANTS__DISABILITY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE = 23;
+
+	/**
+	 * The feature id for the '<em><b>MAXIMUM DEDUCTIBLE AMOUNT FOR ADDITIONAL PENSION AND INSURANCE</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTANTS__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE = 24;
+
+	/**
+	 * The number of structural features of the '<em>Constants</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTANTS_FEATURE_COUNT = 25;
+
+	/**
+	 * The number of operations of the '<em>Constants</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTANTS_OPERATION_COUNT = 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.Income_TaxImpl <em>Income Tax</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.Income_TaxImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getIncome_Tax()
+	 * @generated
+	 */
+	int INCOME_TAX = 1;
+
+	/**
+	 * The feature id for the '<em><b>Tax Payer</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCOME_TAX__TAX_PAYER = 0;
+
+	/**
+	 * The feature id for the '<em><b>Tax amount</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCOME_TAX__TAX_AMOUNT = 1;
+
+	/**
+	 * The feature id for the '<em><b>Tax year</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCOME_TAX__TAX_YEAR = 2;
+
+	/**
+	 * The feature id for the '<em><b>Id6</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCOME_TAX__ID6 = 3;
+
+	/**
+	 * The number of structural features of the '<em>Income Tax</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCOME_TAX_FEATURE_COUNT = 4;
+
+	/**
+	 * The number of operations of the '<em>Income Tax</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCOME_TAX_OPERATION_COUNT = 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.Physical_PersonImpl <em>Physical Person</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.Physical_PersonImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getPhysical_Person()
+	 * @generated
+	 */
+	int PHYSICAL_PERSON = 3;
+
+	/**
+	 * The feature id for the '<em><b>SS No</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PHYSICAL_PERSON__SS_NO = 0;
+
+	/**
+	 * The feature id for the '<em><b>Addresses</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PHYSICAL_PERSON__ADDRESSES = 1;
+
+	/**
+	 * The feature id for the '<em><b>Birth year</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PHYSICAL_PERSON__BIRTH_YEAR = 2;
+
+	/**
+	 * The feature id for the '<em><b>Disability percentage</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PHYSICAL_PERSON__DISABILITY_PERCENTAGE = 3;
+
+	/**
+	 * The feature id for the '<em><b>Disability type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PHYSICAL_PERSON__DISABILITY_TYPE = 4;
+
+	/**
+	 * The feature id for the '<em><b>Birth month</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PHYSICAL_PERSON__BIRTH_MONTH = 5;
+
+	/**
+	 * The feature id for the '<em><b>Birth day</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PHYSICAL_PERSON__BIRTH_DAY = 6;
+
+	/**
+	 * The feature id for the '<em><b>Expenses</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PHYSICAL_PERSON__EXPENSES = 7;
+
+	/**
+	 * The feature id for the '<em><b>Is widower</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PHYSICAL_PERSON__IS_WIDOWER = 8;
+
+	/**
+	 * The number of structural features of the '<em>Physical Person</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PHYSICAL_PERSON_FEATURE_COUNT = 9;
+
+	/**
+	 * The number of operations of the '<em>Physical Person</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PHYSICAL_PERSON_OPERATION_COUNT = 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.Tax_PayerImpl <em>Tax Payer</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.Tax_PayerImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getTax_Payer()
+	 * @generated
+	 */
+	int TAX_PAYER = 2;
+
+	/**
+	 * The feature id for the '<em><b>SS No</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_PAYER__SS_NO = PHYSICAL_PERSON__SS_NO;
+
+	/**
+	 * The feature id for the '<em><b>Addresses</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_PAYER__ADDRESSES = PHYSICAL_PERSON__ADDRESSES;
+
+	/**
+	 * The feature id for the '<em><b>Birth year</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_PAYER__BIRTH_YEAR = PHYSICAL_PERSON__BIRTH_YEAR;
+
+	/**
+	 * The feature id for the '<em><b>Disability percentage</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_PAYER__DISABILITY_PERCENTAGE = PHYSICAL_PERSON__DISABILITY_PERCENTAGE;
+
+	/**
+	 * The feature id for the '<em><b>Disability type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_PAYER__DISABILITY_TYPE = PHYSICAL_PERSON__DISABILITY_TYPE;
+
+	/**
+	 * The feature id for the '<em><b>Birth month</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_PAYER__BIRTH_MONTH = PHYSICAL_PERSON__BIRTH_MONTH;
+
+	/**
+	 * The feature id for the '<em><b>Birth day</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_PAYER__BIRTH_DAY = PHYSICAL_PERSON__BIRTH_DAY;
+
+	/**
+	 * The feature id for the '<em><b>Expenses</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_PAYER__EXPENSES = PHYSICAL_PERSON__EXPENSES;
+
+	/**
+	 * The feature id for the '<em><b>Is widower</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_PAYER__IS_WIDOWER = PHYSICAL_PERSON__IS_WIDOWER;
+
+	/**
+	 * The feature id for the '<em><b>Dependents</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_PAYER__DEPENDENTS = PHYSICAL_PERSON_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>From agent</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_PAYER__FROM_AGENT = PHYSICAL_PERSON_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Incomes</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_PAYER__INCOMES = PHYSICAL_PERSON_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>From law</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_PAYER__FROM_LAW = PHYSICAL_PERSON_FEATURE_COUNT + 3;
+
+	/**
+	 * The number of structural features of the '<em>Tax Payer</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_PAYER_FEATURE_COUNT = PHYSICAL_PERSON_FEATURE_COUNT + 4;
+
+	/**
+	 * The number of operations of the '<em>Tax Payer</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_PAYER_OPERATION_COUNT = PHYSICAL_PERSON_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.AddressImpl <em>Address</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.AddressImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getAddress()
+	 * @generated
+	 */
+	int ADDRESS = 4;
+
+	/**
+	 * The feature id for the '<em><b>Country</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ADDRESS__COUNTRY = 0;
+
+	/**
+	 * The feature id for the '<em><b>Street</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ADDRESS__STREET = 1;
+
+	/**
+	 * The feature id for the '<em><b>Zip Code</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ADDRESS__ZIP_CODE = 2;
+
+	/**
+	 * The feature id for the '<em><b>City</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ADDRESS__CITY = 3;
+
+	/**
+	 * The feature id for the '<em><b>Id2</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ADDRESS__ID2 = 4;
+
+	/**
+	 * The feature id for the '<em><b>Tax Payer</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ADDRESS__TAX_PAYER = 5;
+
+	/**
+	 * The number of structural features of the '<em>Address</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ADDRESS_FEATURE_COUNT = 6;
+
+	/**
+	 * The number of operations of the '<em>Address</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ADDRESS_OPERATION_COUNT = 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.ExpenseImpl <em>Expense</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.ExpenseImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getExpense()
+	 * @generated
+	 */
+	int EXPENSE = 5;
+
+	/**
+	 * The feature id for the '<em><b>Declared amount</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPENSE__DECLARED_AMOUNT = 0;
+
+	/**
+	 * The feature id for the '<em><b>Expense purpose</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPENSE__EXPENSE_PURPOSE = 1;
+
+	/**
+	 * The feature id for the '<em><b>Dependent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPENSE__DEPENDENT = 2;
+
+	/**
+	 * The feature id for the '<em><b>From agent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPENSE__FROM_AGENT = 3;
+
+	/**
+	 * The feature id for the '<em><b>Income</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPENSE__INCOME = 4;
+
+	/**
+	 * The feature id for the '<em><b>Id4</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPENSE__ID4 = 5;
+
+	/**
+	 * The feature id for the '<em><b>Beneficiary</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPENSE__BENEFICIARY = 6;
+
+	/**
+	 * The number of structural features of the '<em>Expense</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPENSE_FEATURE_COUNT = 7;
+
+	/**
+	 * The number of operations of the '<em>Expense</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPENSE_OPERATION_COUNT = 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.DependentImpl <em>Dependent</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.DependentImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getDependent()
+	 * @generated
+	 */
+	int DEPENDENT = 6;
+
+	/**
+	 * The feature id for the '<em><b>SS No</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPENDENT__SS_NO = PHYSICAL_PERSON__SS_NO;
+
+	/**
+	 * The feature id for the '<em><b>Addresses</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPENDENT__ADDRESSES = PHYSICAL_PERSON__ADDRESSES;
+
+	/**
+	 * The feature id for the '<em><b>Birth year</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPENDENT__BIRTH_YEAR = PHYSICAL_PERSON__BIRTH_YEAR;
+
+	/**
+	 * The feature id for the '<em><b>Disability percentage</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPENDENT__DISABILITY_PERCENTAGE = PHYSICAL_PERSON__DISABILITY_PERCENTAGE;
+
+	/**
+	 * The feature id for the '<em><b>Disability type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPENDENT__DISABILITY_TYPE = PHYSICAL_PERSON__DISABILITY_TYPE;
+
+	/**
+	 * The feature id for the '<em><b>Birth month</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPENDENT__BIRTH_MONTH = PHYSICAL_PERSON__BIRTH_MONTH;
+
+	/**
+	 * The feature id for the '<em><b>Birth day</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPENDENT__BIRTH_DAY = PHYSICAL_PERSON__BIRTH_DAY;
+
+	/**
+	 * The feature id for the '<em><b>Expenses</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPENDENT__EXPENSES = PHYSICAL_PERSON__EXPENSES;
+
+	/**
+	 * The feature id for the '<em><b>Is widower</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPENDENT__IS_WIDOWER = PHYSICAL_PERSON__IS_WIDOWER;
+
+	/**
+	 * The feature id for the '<em><b>Dependent type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPENDENT__DEPENDENT_TYPE = PHYSICAL_PERSON_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Responsible person</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPENDENT__RESPONSIBLE_PERSON = PHYSICAL_PERSON_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Continued studies</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPENDENT__CONTINUED_STUDIES = PHYSICAL_PERSON_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Allowances</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPENDENT__ALLOWANCES = PHYSICAL_PERSON_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Household</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPENDENT__HOUSEHOLD = PHYSICAL_PERSON_FEATURE_COUNT + 4;
+
+	/**
+	 * The feature id for the '<em><b>From agent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPENDENT__FROM_AGENT = PHYSICAL_PERSON_FEATURE_COUNT + 5;
+
+	/**
+	 * The feature id for the '<em><b>Expense</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPENDENT__EXPENSE = PHYSICAL_PERSON_FEATURE_COUNT + 6;
+
+	/**
+	 * The number of structural features of the '<em>Dependent</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPENDENT_FEATURE_COUNT = PHYSICAL_PERSON_FEATURE_COUNT + 7;
+
+	/**
+	 * The number of operations of the '<em>Dependent</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPENDENT_OPERATION_COUNT = PHYSICAL_PERSON_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.External_AllowanceImpl <em>External Allowance</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.External_AllowanceImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getExternal_Allowance()
+	 * @generated
+	 */
+	int EXTERNAL_ALLOWANCE = 7;
+
+	/**
+	 * The feature id for the '<em><b>Grantor</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTERNAL_ALLOWANCE__GRANTOR = 0;
+
+	/**
+	 * The feature id for the '<em><b>Starting year</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTERNAL_ALLOWANCE__STARTING_YEAR = 1;
+
+	/**
+	 * The feature id for the '<em><b>Ending year</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTERNAL_ALLOWANCE__ENDING_YEAR = 2;
+
+	/**
+	 * The feature id for the '<em><b>Reciver</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTERNAL_ALLOWANCE__RECIVER = 3;
+
+	/**
+	 * The feature id for the '<em><b>Id5</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTERNAL_ALLOWANCE__ID5 = 4;
+
+	/**
+	 * The feature id for the '<em><b>Person</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTERNAL_ALLOWANCE__PERSON = 5;
+
+	/**
+	 * The number of structural features of the '<em>External Allowance</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTERNAL_ALLOWANCE_FEATURE_COUNT = 6;
+
+	/**
+	 * The number of operations of the '<em>External Allowance</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTERNAL_ALLOWANCE_OPERATION_COUNT = 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.Tax_Case <em>Tax Case</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.Tax_Case
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getTax_Case()
+	 * @generated
+	 */
+	int TAX_CASE = 11;
+
+	/**
+	 * The number of structural features of the '<em>Tax Case</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_CASE_FEATURE_COUNT = 0;
+
+	/**
+	 * The number of operations of the '<em>Tax Case</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_CASE_OPERATION_COUNT = 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.HouseholdImpl <em>Household</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.HouseholdImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getHousehold()
+	 * @generated
+	 */
+	int HOUSEHOLD = 8;
+
+	/**
+	 * The feature id for the '<em><b>Parents</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int HOUSEHOLD__PARENTS = TAX_CASE_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Id1</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int HOUSEHOLD__ID1 = TAX_CASE_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Children</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int HOUSEHOLD__CHILDREN = TAX_CASE_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>Household</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int HOUSEHOLD_FEATURE_COUNT = TAX_CASE_FEATURE_COUNT + 3;
+
+	/**
+	 * The number of operations of the '<em>Household</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int HOUSEHOLD_OPERATION_COUNT = TAX_CASE_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.Legal_Union_RecordImpl <em>Legal Union Record</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.Legal_Union_RecordImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getLegal_Union_Record()
+	 * @generated
+	 */
+	int LEGAL_UNION_RECORD = 9;
+
+	/**
+	 * The feature id for the '<em><b>Start year</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LEGAL_UNION_RECORD__START_YEAR = 0;
+
+	/**
+	 * The feature id for the '<em><b>End year</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LEGAL_UNION_RECORD__END_YEAR = 1;
+
+	/**
+	 * The feature id for the '<em><b>Separation cause</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LEGAL_UNION_RECORD__SEPARATION_CAUSE = 2;
+
+	/**
+	 * The feature id for the '<em><b>Individual A</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LEGAL_UNION_RECORD__INDIVIDUAL_A = 3;
+
+	/**
+	 * The feature id for the '<em><b>Individual B</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LEGAL_UNION_RECORD__INDIVIDUAL_B = 4;
+
+	/**
+	 * The feature id for the '<em><b>Properties</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LEGAL_UNION_RECORD__PROPERTIES = 5;
+
+	/**
+	 * The feature id for the '<em><b>Mutual agreement</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LEGAL_UNION_RECORD__MUTUAL_AGREEMENT = 6;
+
+	/**
+	 * The feature id for the '<em><b>Id9</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LEGAL_UNION_RECORD__ID9 = 7;
+
+	/**
+	 * The feature id for the '<em><b>Household</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LEGAL_UNION_RECORD__HOUSEHOLD = 8;
+
+	/**
+	 * The number of structural features of the '<em>Legal Union Record</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LEGAL_UNION_RECORD_FEATURE_COUNT = 9;
+
+	/**
+	 * The number of operations of the '<em>Legal Union Record</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LEGAL_UNION_RECORD_OPERATION_COUNT = 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.Tax_PropertyImpl <em>Tax Property</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.Tax_PropertyImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getTax_Property()
+	 * @generated
+	 */
+	int TAX_PROPERTY = 10;
+
+	/**
+	 * The feature id for the '<em><b>Starting year</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_PROPERTY__STARTING_YEAR = 0;
+
+	/**
+	 * The feature id for the '<em><b>Id10</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_PROPERTY__ID10 = 1;
+
+	/**
+	 * The feature id for the '<em><b>Union record</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_PROPERTY__UNION_RECORD = 2;
+
+	/**
+	 * The number of structural features of the '<em>Tax Property</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_PROPERTY_FEATURE_COUNT = 3;
+
+	/**
+	 * The number of operations of the '<em>Tax Property</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_PROPERTY_OPERATION_COUNT = 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.FromAgentImpl <em>From Agent</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.FromAgentImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getFromAgent()
+	 * @generated
+	 */
+	int FROM_AGENT = 12;
+
+	/**
+	 * The feature id for the '<em><b>Tax Payer</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FROM_AGENT__TAX_PAYER = 0;
+
+	/**
+	 * The feature id for the '<em><b>Is dependent eligible for CE Not In Houshold Children Care</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FROM_AGENT__IS_DEPENDENT_ELIGIBLE_FOR_CE_NOT_IN_HOUSHOLD_CHILDREN_CARE = 1;
+
+	/**
+	 * The feature id for the '<em><b>Expense</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FROM_AGENT__EXPENSE = 2;
+
+	/**
+	 * The feature id for the '<em><b>Is eligible debt</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FROM_AGENT__IS_ELIGIBLE_DEBT = 3;
+
+	/**
+	 * The feature id for the '<em><b>Dependent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FROM_AGENT__DEPENDENT = 4;
+
+	/**
+	 * The number of structural features of the '<em>From Agent</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FROM_AGENT_FEATURE_COUNT = 5;
+
+	/**
+	 * The number of operations of the '<em>From Agent</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FROM_AGENT_OPERATION_COUNT = 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.IncomeImpl <em>Income</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.IncomeImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getIncome()
+	 * @generated
+	 */
+	int INCOME = 13;
+
+	/**
+	 * The feature id for the '<em><b>Income amount</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCOME__INCOME_AMOUNT = 0;
+
+	/**
+	 * The feature id for the '<em><b>Income type</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCOME__INCOME_TYPE = 1;
+
+	/**
+	 * The feature id for the '<em><b>Tax card</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCOME__TAX_CARD = 2;
+
+	/**
+	 * The feature id for the '<em><b>Tax liability</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCOME__TAX_LIABILITY = 3;
+
+	/**
+	 * The feature id for the '<em><b>Tax Payer</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCOME__TAX_PAYER = 4;
+
+	/**
+	 * The feature id for the '<em><b>Details</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCOME__DETAILS = 5;
+
+	/**
+	 * The feature id for the '<em><b>Num</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCOME__NUM = 6;
+
+	/**
+	 * The feature id for the '<em><b>Expenses</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCOME__EXPENSES = 7;
+
+	/**
+	 * The number of structural features of the '<em>Income</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCOME_FEATURE_COUNT = 8;
+
+	/**
+	 * The number of operations of the '<em>Income</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCOME_OPERATION_COUNT = 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.Income_TypeImpl <em>Income Type</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.Income_TypeImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getIncome_Type()
+	 * @generated
+	 */
+	int INCOME_TYPE = 14;
+
+	/**
+	 * The feature id for the '<em><b>Id8</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCOME_TYPE__ID8 = 0;
+
+	/**
+	 * The feature id for the '<em><b>Income</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCOME_TYPE__INCOME = 1;
+
+	/**
+	 * The number of structural features of the '<em>Income Type</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCOME_TYPE_FEATURE_COUNT = 2;
+
+	/**
+	 * The number of operations of the '<em>Income Type</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCOME_TYPE_OPERATION_COUNT = 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.Tax_CardImpl <em>Tax Card</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.Tax_CardImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getTax_Card()
+	 * @generated
+	 */
+	int TAX_CARD = 15;
+
+	/**
+	 * The feature id for the '<em><b>Card identifier</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_CARD__CARD_IDENTIFIER = 0;
+
+	/**
+	 * The feature id for the '<em><b>Tax office</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_CARD__TAX_OFFICE = 1;
+
+	/**
+	 * The feature id for the '<em><b>Percentage of witholding</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_CARD__PERCENTAGE_OF_WITHOLDING = 2;
+
+	/**
+	 * The feature id for the '<em><b>Tax payers name surname</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_CARD__TAX_PAYERS_NAME_SURNAME = 3;
+
+	/**
+	 * The feature id for the '<em><b>Tax payers partner name surname</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_CARD__TAX_PAYERS_PARTNER_NAME_SURNAME = 4;
+
+	/**
+	 * The feature id for the '<em><b>Tax payers address</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_CARD__TAX_PAYERS_ADDRESS = 5;
+
+	/**
+	 * The feature id for the '<em><b>Jobs Employer SS No</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_CARD__JOBS_EMPLOYER_SS_NO = 6;
+
+	/**
+	 * The feature id for the '<em><b>Jobs employers name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_CARD__JOBS_EMPLOYERS_NAME = 7;
+
+	/**
+	 * The feature id for the '<em><b>Jobs activity type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_CARD__JOBS_ACTIVITY_TYPE = 8;
+
+	/**
+	 * The feature id for the '<em><b>Jobs place of work</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_CARD__JOBS_PLACE_OF_WORK = 9;
+
+	/**
+	 * The feature id for the '<em><b>Deduction FD daily</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_CARD__DEDUCTION_FD_DAILY = 10;
+
+	/**
+	 * The feature id for the '<em><b>Deduction FD monthly</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_CARD__DEDUCTION_FD_MONTHLY = 11;
+
+	/**
+	 * The feature id for the '<em><b>Deduction AC daily</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_CARD__DEDUCTION_AC_DAILY = 12;
+
+	/**
+	 * The feature id for the '<em><b>Deduction AC monthly</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_CARD__DEDUCTION_AC_MONTHLY = 13;
+
+	/**
+	 * The feature id for the '<em><b>Deduction AC yearly</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_CARD__DEDUCTION_AC_YEARLY = 14;
+
+	/**
+	 * The feature id for the '<em><b>Deduction CE daily</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_CARD__DEDUCTION_CE_DAILY = 15;
+
+	/**
+	 * The feature id for the '<em><b>Deduction CE monthly</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_CARD__DEDUCTION_CE_MONTHLY = 16;
+
+	/**
+	 * The feature id for the '<em><b>Deduction CE yearly</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_CARD__DEDUCTION_CE_YEARLY = 17;
+
+	/**
+	 * The feature id for the '<em><b>Deduction DS daily</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_CARD__DEDUCTION_DS_DAILY = 18;
+
+	/**
+	 * The feature id for the '<em><b>Deduction DS monthly</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_CARD__DEDUCTION_DS_MONTHLY = 19;
+
+	/**
+	 * The feature id for the '<em><b>Deduction FO daily</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_CARD__DEDUCTION_FO_DAILY = 20;
+
+	/**
+	 * The feature id for the '<em><b>Deduction FO monthly</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_CARD__DEDUCTION_FO_MONTHLY = 21;
+
+	/**
+	 * The feature id for the '<em><b>Deduction FO yearly</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_CARD__DEDUCTION_FO_YEARLY = 22;
+
+	/**
+	 * The feature id for the '<em><b>Credit CIS daily</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_CARD__CREDIT_CIS_DAILY = 23;
+
+	/**
+	 * The feature id for the '<em><b>Credit CIS monthly</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_CARD__CREDIT_CIS_MONTHLY = 24;
+
+	/**
+	 * The feature id for the '<em><b>Credit CIM daily</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_CARD__CREDIT_CIM_DAILY = 25;
+
+	/**
+	 * The feature id for the '<em><b>Validity</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_CARD__VALIDITY = 26;
+
+	/**
+	 * The feature id for the '<em><b>Income Tax Credit</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_CARD__INCOME_TAX_CREDIT = 27;
+
+	/**
+	 * The feature id for the '<em><b>Previous</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_CARD__PREVIOUS = 28;
+
+	/**
+	 * The feature id for the '<em><b>Current tax card</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_CARD__CURRENT_TAX_CARD = 29;
+
+	/**
+	 * The feature id for the '<em><b>Credit CIM yearly</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_CARD__CREDIT_CIM_YEARLY = 30;
+
+	/**
+	 * The feature id for the '<em><b>Deduction DS Alimony yearly</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_CARD__DEDUCTION_DS_ALIMONY_YEARLY = 31;
+
+	/**
+	 * The feature id for the '<em><b>Deduction DS Debt yearly</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_CARD__DEDUCTION_DS_DEBT_YEARLY = 32;
+
+	/**
+	 * The feature id for the '<em><b>Income</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_CARD__INCOME = 33;
+
+	/**
+	 * The number of structural features of the '<em>Tax Card</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_CARD_FEATURE_COUNT = 34;
+
+	/**
+	 * The number of operations of the '<em>Tax Card</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAX_CARD_OPERATION_COUNT = 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.Income_Tax_CreditImpl <em>Income Tax Credit</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.Income_Tax_CreditImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getIncome_Tax_Credit()
+	 * @generated
+	 */
+	int INCOME_TAX_CREDIT = 16;
+
+	/**
+	 * The feature id for the '<em><b>Granted By</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCOME_TAX_CREDIT__GRANTED_BY = 0;
+
+	/**
+	 * The feature id for the '<em><b>Tax Payer</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCOME_TAX_CREDIT__TAX_PAYER = 1;
+
+	/**
+	 * The feature id for the '<em><b>Tax year</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCOME_TAX_CREDIT__TAX_YEAR = 2;
+
+	/**
+	 * The feature id for the '<em><b>Yearly</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCOME_TAX_CREDIT__YEARLY = 3;
+
+	/**
+	 * The feature id for the '<em><b>Monthly</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCOME_TAX_CREDIT__MONTHLY = 4;
+
+	/**
+	 * The feature id for the '<em><b>Daily</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCOME_TAX_CREDIT__DAILY = 5;
+
+	/**
+	 * The feature id for the '<em><b>Id7</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCOME_TAX_CREDIT__ID7 = 6;
+
+	/**
+	 * The feature id for the '<em><b>Taxation Frame</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCOME_TAX_CREDIT__TAXATION_FRAME = 7;
+
+	/**
+	 * The number of structural features of the '<em>Income Tax Credit</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCOME_TAX_CREDIT_FEATURE_COUNT = 8;
+
+	/**
+	 * The number of operations of the '<em>Income Tax Credit</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCOME_TAX_CREDIT_OPERATION_COUNT = 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.Income_DetailImpl <em>Income Detail</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.Income_DetailImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getIncome_Detail()
+	 * @generated
+	 */
+	int INCOME_DETAIL = 17;
+
+	/**
+	 * The feature id for the '<em><b>Amount</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCOME_DETAIL__AMOUNT = 0;
+
+	/**
+	 * The feature id for the '<em><b>Is worked</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCOME_DETAIL__IS_WORKED = 1;
+
+	/**
+	 * The feature id for the '<em><b>Distance</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCOME_DETAIL__DISTANCE = 2;
+
+	/**
+	 * The feature id for the '<em><b>Worked days</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCOME_DETAIL__WORKED_DAYS = 3;
+
+	/**
+	 * The feature id for the '<em><b>Is contributing CNS</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCOME_DETAIL__IS_CONTRIBUTING_CNS = 4;
+
+	/**
+	 * The feature id for the '<em><b>Id5</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCOME_DETAIL__ID5 = 5;
+
+	/**
+	 * The feature id for the '<em><b>Income</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCOME_DETAIL__INCOME = 6;
+
+	/**
+	 * The number of structural features of the '<em>Income Detail</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCOME_DETAIL_FEATURE_COUNT = 7;
+
+	/**
+	 * The number of operations of the '<em>Income Detail</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCOME_DETAIL_OPERATION_COUNT = 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.FromLawImpl <em>From Law</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.FromLawImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getFromLaw()
+	 * @generated
+	 */
+	int FROM_LAW = 18;
+
+	/**
+	 * The feature id for the '<em><b>Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FROM_LAW__ID = 0;
+
+	/**
+	 * The feature id for the '<em><b>Tax Payer</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FROM_LAW__TAX_PAYER = 1;
+
+	/**
+	 * The number of structural features of the '<em>From Law</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FROM_LAW_FEATURE_COUNT = 2;
+
+	/**
+	 * The number of operations of the '<em>From Law</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FROM_LAW_OPERATION_COUNT = 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.Fiscal_AddressImpl <em>Fiscal Address</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.Fiscal_AddressImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getFiscal_Address()
+	 * @generated
+	 */
+	int FISCAL_ADDRESS = 19;
+
+	/**
+	 * The feature id for the '<em><b>Country</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FISCAL_ADDRESS__COUNTRY = ADDRESS__COUNTRY;
+
+	/**
+	 * The feature id for the '<em><b>Street</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FISCAL_ADDRESS__STREET = ADDRESS__STREET;
+
+	/**
+	 * The feature id for the '<em><b>Zip Code</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FISCAL_ADDRESS__ZIP_CODE = ADDRESS__ZIP_CODE;
+
+	/**
+	 * The feature id for the '<em><b>City</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FISCAL_ADDRESS__CITY = ADDRESS__CITY;
+
+	/**
+	 * The feature id for the '<em><b>Id2</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FISCAL_ADDRESS__ID2 = ADDRESS__ID2;
+
+	/**
+	 * The feature id for the '<em><b>Tax Payer</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FISCAL_ADDRESS__TAX_PAYER = ADDRESS__TAX_PAYER;
+
+	/**
+	 * The number of structural features of the '<em>Fiscal Address</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FISCAL_ADDRESS_FEATURE_COUNT = ADDRESS_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Fiscal Address</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FISCAL_ADDRESS_OPERATION_COUNT = ADDRESS_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.Habitual_AddressImpl <em>Habitual Address</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.Habitual_AddressImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getHabitual_Address()
+	 * @generated
+	 */
+	int HABITUAL_ADDRESS = 20;
+
+	/**
+	 * The feature id for the '<em><b>Country</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int HABITUAL_ADDRESS__COUNTRY = ADDRESS__COUNTRY;
+
+	/**
+	 * The feature id for the '<em><b>Street</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int HABITUAL_ADDRESS__STREET = ADDRESS__STREET;
+
+	/**
+	 * The feature id for the '<em><b>Zip Code</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int HABITUAL_ADDRESS__ZIP_CODE = ADDRESS__ZIP_CODE;
+
+	/**
+	 * The feature id for the '<em><b>City</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int HABITUAL_ADDRESS__CITY = ADDRESS__CITY;
+
+	/**
+	 * The feature id for the '<em><b>Id2</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int HABITUAL_ADDRESS__ID2 = ADDRESS__ID2;
+
+	/**
+	 * The feature id for the '<em><b>Tax Payer</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int HABITUAL_ADDRESS__TAX_PAYER = ADDRESS__TAX_PAYER;
+
+	/**
+	 * The number of structural features of the '<em>Habitual Address</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int HABITUAL_ADDRESS_FEATURE_COUNT = ADDRESS_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Habitual Address</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int HABITUAL_ADDRESS_OPERATION_COUNT = ADDRESS_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.Marriage_RecordImpl <em>Marriage Record</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.Marriage_RecordImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getMarriage_Record()
+	 * @generated
+	 */
+	int MARRIAGE_RECORD = 21;
+
+	/**
+	 * The feature id for the '<em><b>Start year</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MARRIAGE_RECORD__START_YEAR = LEGAL_UNION_RECORD__START_YEAR;
+
+	/**
+	 * The feature id for the '<em><b>End year</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MARRIAGE_RECORD__END_YEAR = LEGAL_UNION_RECORD__END_YEAR;
+
+	/**
+	 * The feature id for the '<em><b>Separation cause</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MARRIAGE_RECORD__SEPARATION_CAUSE = LEGAL_UNION_RECORD__SEPARATION_CAUSE;
+
+	/**
+	 * The feature id for the '<em><b>Individual A</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MARRIAGE_RECORD__INDIVIDUAL_A = LEGAL_UNION_RECORD__INDIVIDUAL_A;
+
+	/**
+	 * The feature id for the '<em><b>Individual B</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MARRIAGE_RECORD__INDIVIDUAL_B = LEGAL_UNION_RECORD__INDIVIDUAL_B;
+
+	/**
+	 * The feature id for the '<em><b>Properties</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MARRIAGE_RECORD__PROPERTIES = LEGAL_UNION_RECORD__PROPERTIES;
+
+	/**
+	 * The feature id for the '<em><b>Mutual agreement</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MARRIAGE_RECORD__MUTUAL_AGREEMENT = LEGAL_UNION_RECORD__MUTUAL_AGREEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Id9</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MARRIAGE_RECORD__ID9 = LEGAL_UNION_RECORD__ID9;
+
+	/**
+	 * The feature id for the '<em><b>Household</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MARRIAGE_RECORD__HOUSEHOLD = LEGAL_UNION_RECORD__HOUSEHOLD;
+
+	/**
+	 * The number of structural features of the '<em>Marriage Record</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MARRIAGE_RECORD_FEATURE_COUNT = LEGAL_UNION_RECORD_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Marriage Record</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MARRIAGE_RECORD_OPERATION_COUNT = LEGAL_UNION_RECORD_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.Non_Resident_Tax_PayerImpl <em>Non Resident Tax Payer</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.Non_Resident_Tax_PayerImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getNon_Resident_Tax_Payer()
+	 * @generated
+	 */
+	int NON_RESIDENT_TAX_PAYER = 22;
+
+	/**
+	 * The feature id for the '<em><b>SS No</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NON_RESIDENT_TAX_PAYER__SS_NO = TAX_PAYER__SS_NO;
+
+	/**
+	 * The feature id for the '<em><b>Addresses</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NON_RESIDENT_TAX_PAYER__ADDRESSES = TAX_PAYER__ADDRESSES;
+
+	/**
+	 * The feature id for the '<em><b>Birth year</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NON_RESIDENT_TAX_PAYER__BIRTH_YEAR = TAX_PAYER__BIRTH_YEAR;
+
+	/**
+	 * The feature id for the '<em><b>Disability percentage</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NON_RESIDENT_TAX_PAYER__DISABILITY_PERCENTAGE = TAX_PAYER__DISABILITY_PERCENTAGE;
+
+	/**
+	 * The feature id for the '<em><b>Disability type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NON_RESIDENT_TAX_PAYER__DISABILITY_TYPE = TAX_PAYER__DISABILITY_TYPE;
+
+	/**
+	 * The feature id for the '<em><b>Birth month</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NON_RESIDENT_TAX_PAYER__BIRTH_MONTH = TAX_PAYER__BIRTH_MONTH;
+
+	/**
+	 * The feature id for the '<em><b>Birth day</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NON_RESIDENT_TAX_PAYER__BIRTH_DAY = TAX_PAYER__BIRTH_DAY;
+
+	/**
+	 * The feature id for the '<em><b>Expenses</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NON_RESIDENT_TAX_PAYER__EXPENSES = TAX_PAYER__EXPENSES;
+
+	/**
+	 * The feature id for the '<em><b>Is widower</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NON_RESIDENT_TAX_PAYER__IS_WIDOWER = TAX_PAYER__IS_WIDOWER;
+
+	/**
+	 * The feature id for the '<em><b>Dependents</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NON_RESIDENT_TAX_PAYER__DEPENDENTS = TAX_PAYER__DEPENDENTS;
+
+	/**
+	 * The feature id for the '<em><b>From agent</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NON_RESIDENT_TAX_PAYER__FROM_AGENT = TAX_PAYER__FROM_AGENT;
+
+	/**
+	 * The feature id for the '<em><b>Incomes</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NON_RESIDENT_TAX_PAYER__INCOMES = TAX_PAYER__INCOMES;
+
+	/**
+	 * The feature id for the '<em><b>From law</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NON_RESIDENT_TAX_PAYER__FROM_LAW = TAX_PAYER__FROM_LAW;
+
+	/**
+	 * The feature id for the '<em><b>Is assimilated to resident</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NON_RESIDENT_TAX_PAYER__IS_ASSIMILATED_TO_RESIDENT = TAX_PAYER_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Non Resident Tax Payer</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NON_RESIDENT_TAX_PAYER_FEATURE_COUNT = TAX_PAYER_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of operations of the '<em>Non Resident Tax Payer</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NON_RESIDENT_TAX_PAYER_OPERATION_COUNT = TAX_PAYER_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.Partnership_RecordImpl <em>Partnership Record</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.Partnership_RecordImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getPartnership_Record()
+	 * @generated
+	 */
+	int PARTNERSHIP_RECORD = 23;
+
+	/**
+	 * The feature id for the '<em><b>Start year</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PARTNERSHIP_RECORD__START_YEAR = LEGAL_UNION_RECORD__START_YEAR;
+
+	/**
+	 * The feature id for the '<em><b>End year</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PARTNERSHIP_RECORD__END_YEAR = LEGAL_UNION_RECORD__END_YEAR;
+
+	/**
+	 * The feature id for the '<em><b>Separation cause</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PARTNERSHIP_RECORD__SEPARATION_CAUSE = LEGAL_UNION_RECORD__SEPARATION_CAUSE;
+
+	/**
+	 * The feature id for the '<em><b>Individual A</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PARTNERSHIP_RECORD__INDIVIDUAL_A = LEGAL_UNION_RECORD__INDIVIDUAL_A;
+
+	/**
+	 * The feature id for the '<em><b>Individual B</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PARTNERSHIP_RECORD__INDIVIDUAL_B = LEGAL_UNION_RECORD__INDIVIDUAL_B;
+
+	/**
+	 * The feature id for the '<em><b>Properties</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PARTNERSHIP_RECORD__PROPERTIES = LEGAL_UNION_RECORD__PROPERTIES;
+
+	/**
+	 * The feature id for the '<em><b>Mutual agreement</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PARTNERSHIP_RECORD__MUTUAL_AGREEMENT = LEGAL_UNION_RECORD__MUTUAL_AGREEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Id9</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PARTNERSHIP_RECORD__ID9 = LEGAL_UNION_RECORD__ID9;
+
+	/**
+	 * The feature id for the '<em><b>Household</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PARTNERSHIP_RECORD__HOUSEHOLD = LEGAL_UNION_RECORD__HOUSEHOLD;
+
+	/**
+	 * The number of structural features of the '<em>Partnership Record</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PARTNERSHIP_RECORD_FEATURE_COUNT = LEGAL_UNION_RECORD_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Partnership Record</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PARTNERSHIP_RECORD_OPERATION_COUNT = LEGAL_UNION_RECORD_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.Resident_Tax_PayerImpl <em>Resident Tax Payer</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.Resident_Tax_PayerImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getResident_Tax_Payer()
+	 * @generated
+	 */
+	int RESIDENT_TAX_PAYER = 24;
+
+	/**
+	 * The feature id for the '<em><b>SS No</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RESIDENT_TAX_PAYER__SS_NO = TAX_PAYER__SS_NO;
+
+	/**
+	 * The feature id for the '<em><b>Addresses</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RESIDENT_TAX_PAYER__ADDRESSES = TAX_PAYER__ADDRESSES;
+
+	/**
+	 * The feature id for the '<em><b>Birth year</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RESIDENT_TAX_PAYER__BIRTH_YEAR = TAX_PAYER__BIRTH_YEAR;
+
+	/**
+	 * The feature id for the '<em><b>Disability percentage</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RESIDENT_TAX_PAYER__DISABILITY_PERCENTAGE = TAX_PAYER__DISABILITY_PERCENTAGE;
+
+	/**
+	 * The feature id for the '<em><b>Disability type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RESIDENT_TAX_PAYER__DISABILITY_TYPE = TAX_PAYER__DISABILITY_TYPE;
+
+	/**
+	 * The feature id for the '<em><b>Birth month</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RESIDENT_TAX_PAYER__BIRTH_MONTH = TAX_PAYER__BIRTH_MONTH;
+
+	/**
+	 * The feature id for the '<em><b>Birth day</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RESIDENT_TAX_PAYER__BIRTH_DAY = TAX_PAYER__BIRTH_DAY;
+
+	/**
+	 * The feature id for the '<em><b>Expenses</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RESIDENT_TAX_PAYER__EXPENSES = TAX_PAYER__EXPENSES;
+
+	/**
+	 * The feature id for the '<em><b>Is widower</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RESIDENT_TAX_PAYER__IS_WIDOWER = TAX_PAYER__IS_WIDOWER;
+
+	/**
+	 * The feature id for the '<em><b>Dependents</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RESIDENT_TAX_PAYER__DEPENDENTS = TAX_PAYER__DEPENDENTS;
+
+	/**
+	 * The feature id for the '<em><b>From agent</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RESIDENT_TAX_PAYER__FROM_AGENT = TAX_PAYER__FROM_AGENT;
+
+	/**
+	 * The feature id for the '<em><b>Incomes</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RESIDENT_TAX_PAYER__INCOMES = TAX_PAYER__INCOMES;
+
+	/**
+	 * The feature id for the '<em><b>From law</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RESIDENT_TAX_PAYER__FROM_LAW = TAX_PAYER__FROM_LAW;
+
+	/**
+	 * The number of structural features of the '<em>Resident Tax Payer</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RESIDENT_TAX_PAYER_FEATURE_COUNT = TAX_PAYER_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Resident Tax Payer</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RESIDENT_TAX_PAYER_OPERATION_COUNT = TAX_PAYER_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.Trade_and_Business_IncomeImpl <em>Trade and Business Income</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.Trade_and_Business_IncomeImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getTrade_and_Business_Income()
+	 * @generated
+	 */
+	int TRADE_AND_BUSINESS_INCOME = 25;
+
+	/**
+	 * The feature id for the '<em><b>Id8</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TRADE_AND_BUSINESS_INCOME__ID8 = INCOME_TYPE__ID8;
+
+	/**
+	 * The feature id for the '<em><b>Income</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TRADE_AND_BUSINESS_INCOME__INCOME = INCOME_TYPE__INCOME;
+
+	/**
+	 * The number of structural features of the '<em>Trade and Business Income</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TRADE_AND_BUSINESS_INCOME_FEATURE_COUNT = INCOME_TYPE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Trade and Business Income</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TRADE_AND_BUSINESS_INCOME_OPERATION_COUNT = INCOME_TYPE_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.Agriculture_and_Forestry_IncomeImpl <em>Agriculture and Forestry Income</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.Agriculture_and_Forestry_IncomeImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getAgriculture_and_Forestry_Income()
+	 * @generated
+	 */
+	int AGRICULTURE_AND_FORESTRY_INCOME = 26;
+
+	/**
+	 * The feature id for the '<em><b>Id8</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AGRICULTURE_AND_FORESTRY_INCOME__ID8 = INCOME_TYPE__ID8;
+
+	/**
+	 * The feature id for the '<em><b>Income</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AGRICULTURE_AND_FORESTRY_INCOME__INCOME = INCOME_TYPE__INCOME;
+
+	/**
+	 * The number of structural features of the '<em>Agriculture and Forestry Income</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AGRICULTURE_AND_FORESTRY_INCOME_FEATURE_COUNT = INCOME_TYPE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Agriculture and Forestry Income</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AGRICULTURE_AND_FORESTRY_INCOME_OPERATION_COUNT = INCOME_TYPE_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.Pensions_and_Annuities_IncomeImpl <em>Pensions and Annuities Income</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.Pensions_and_Annuities_IncomeImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getPensions_and_Annuities_Income()
+	 * @generated
+	 */
+	int PENSIONS_AND_ANNUITIES_INCOME = 27;
+
+	/**
+	 * The feature id for the '<em><b>Id8</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PENSIONS_AND_ANNUITIES_INCOME__ID8 = INCOME_TYPE__ID8;
+
+	/**
+	 * The feature id for the '<em><b>Income</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PENSIONS_AND_ANNUITIES_INCOME__INCOME = INCOME_TYPE__INCOME;
+
+	/**
+	 * The feature id for the '<em><b>Occasional payement</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PENSIONS_AND_ANNUITIES_INCOME__OCCASIONAL_PAYEMENT = INCOME_TYPE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Pensions and Annuities Income</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PENSIONS_AND_ANNUITIES_INCOME_FEATURE_COUNT = INCOME_TYPE_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of operations of the '<em>Pensions and Annuities Income</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PENSIONS_AND_ANNUITIES_INCOME_OPERATION_COUNT = INCOME_TYPE_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.Capital_and_Investments_IncomeImpl <em>Capital and Investments Income</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.Capital_and_Investments_IncomeImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getCapital_and_Investments_Income()
+	 * @generated
+	 */
+	int CAPITAL_AND_INVESTMENTS_INCOME = 28;
+
+	/**
+	 * The feature id for the '<em><b>Id8</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CAPITAL_AND_INVESTMENTS_INCOME__ID8 = INCOME_TYPE__ID8;
+
+	/**
+	 * The feature id for the '<em><b>Income</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CAPITAL_AND_INVESTMENTS_INCOME__INCOME = INCOME_TYPE__INCOME;
+
+	/**
+	 * The number of structural features of the '<em>Capital and Investments Income</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CAPITAL_AND_INVESTMENTS_INCOME_FEATURE_COUNT = INCOME_TYPE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Capital and Investments Income</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CAPITAL_AND_INVESTMENTS_INCOME_OPERATION_COUNT = INCOME_TYPE_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.Employment_IncomeImpl <em>Employment Income</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.Employment_IncomeImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getEmployment_Income()
+	 * @generated
+	 */
+	int EMPLOYMENT_INCOME = 29;
+
+	/**
+	 * The feature id for the '<em><b>Id8</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EMPLOYMENT_INCOME__ID8 = INCOME_TYPE__ID8;
+
+	/**
+	 * The feature id for the '<em><b>Income</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EMPLOYMENT_INCOME__INCOME = INCOME_TYPE__INCOME;
+
+	/**
+	 * The number of structural features of the '<em>Employment Income</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EMPLOYMENT_INCOME_FEATURE_COUNT = INCOME_TYPE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Employment Income</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EMPLOYMENT_INCOME_OPERATION_COUNT = INCOME_TYPE_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.Rentals_and_Leases_IncomeImpl <em>Rentals and Leases Income</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.Rentals_and_Leases_IncomeImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getRentals_and_Leases_Income()
+	 * @generated
+	 */
+	int RENTALS_AND_LEASES_INCOME = 30;
+
+	/**
+	 * The feature id for the '<em><b>Id8</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RENTALS_AND_LEASES_INCOME__ID8 = INCOME_TYPE__ID8;
+
+	/**
+	 * The feature id for the '<em><b>Income</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RENTALS_AND_LEASES_INCOME__INCOME = INCOME_TYPE__INCOME;
+
+	/**
+	 * The feature id for the '<em><b>Is periodic</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RENTALS_AND_LEASES_INCOME__IS_PERIODIC = INCOME_TYPE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Rentals and Leases Income</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RENTALS_AND_LEASES_INCOME_FEATURE_COUNT = INCOME_TYPE_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of operations of the '<em>Rentals and Leases Income</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RENTALS_AND_LEASES_INCOME_OPERATION_COUNT = INCOME_TYPE_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.Foreign_IncomeImpl <em>Foreign Income</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.Foreign_IncomeImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getForeign_Income()
+	 * @generated
+	 */
+	int FOREIGN_INCOME = 31;
+
+	/**
+	 * The feature id for the '<em><b>Income amount</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FOREIGN_INCOME__INCOME_AMOUNT = INCOME__INCOME_AMOUNT;
+
+	/**
+	 * The feature id for the '<em><b>Income type</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FOREIGN_INCOME__INCOME_TYPE = INCOME__INCOME_TYPE;
+
+	/**
+	 * The feature id for the '<em><b>Tax card</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FOREIGN_INCOME__TAX_CARD = INCOME__TAX_CARD;
+
+	/**
+	 * The feature id for the '<em><b>Tax liability</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FOREIGN_INCOME__TAX_LIABILITY = INCOME__TAX_LIABILITY;
+
+	/**
+	 * The feature id for the '<em><b>Tax Payer</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FOREIGN_INCOME__TAX_PAYER = INCOME__TAX_PAYER;
+
+	/**
+	 * The feature id for the '<em><b>Details</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FOREIGN_INCOME__DETAILS = INCOME__DETAILS;
+
+	/**
+	 * The feature id for the '<em><b>Num</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FOREIGN_INCOME__NUM = INCOME__NUM;
+
+	/**
+	 * The feature id for the '<em><b>Expenses</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FOREIGN_INCOME__EXPENSES = INCOME__EXPENSES;
+
+	/**
+	 * The number of structural features of the '<em>Foreign Income</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FOREIGN_INCOME_FEATURE_COUNT = INCOME_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Foreign Income</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FOREIGN_INCOME_OPERATION_COUNT = INCOME_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.Local_IncomeImpl <em>Local Income</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.Local_IncomeImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getLocal_Income()
+	 * @generated
+	 */
+	int LOCAL_INCOME = 32;
+
+	/**
+	 * The feature id for the '<em><b>Income amount</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOCAL_INCOME__INCOME_AMOUNT = INCOME__INCOME_AMOUNT;
+
+	/**
+	 * The feature id for the '<em><b>Income type</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOCAL_INCOME__INCOME_TYPE = INCOME__INCOME_TYPE;
+
+	/**
+	 * The feature id for the '<em><b>Tax card</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOCAL_INCOME__TAX_CARD = INCOME__TAX_CARD;
+
+	/**
+	 * The feature id for the '<em><b>Tax liability</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOCAL_INCOME__TAX_LIABILITY = INCOME__TAX_LIABILITY;
+
+	/**
+	 * The feature id for the '<em><b>Tax Payer</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOCAL_INCOME__TAX_PAYER = INCOME__TAX_PAYER;
+
+	/**
+	 * The feature id for the '<em><b>Details</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOCAL_INCOME__DETAILS = INCOME__DETAILS;
+
+	/**
+	 * The feature id for the '<em><b>Num</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOCAL_INCOME__NUM = INCOME__NUM;
+
+	/**
+	 * The feature id for the '<em><b>Expenses</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOCAL_INCOME__EXPENSES = INCOME__EXPENSES;
+
+	/**
+	 * The number of structural features of the '<em>Local Income</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOCAL_INCOME_FEATURE_COUNT = INCOME_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Local Income</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOCAL_INCOME_OPERATION_COUNT = INCOME_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.CIMImpl <em>CIM</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.CIMImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getCIM()
+	 * @generated
+	 */
+	int CIM = 33;
+
+	/**
+	 * The feature id for the '<em><b>Granted By</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CIM__GRANTED_BY = INCOME_TAX_CREDIT__GRANTED_BY;
+
+	/**
+	 * The feature id for the '<em><b>Tax Payer</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CIM__TAX_PAYER = INCOME_TAX_CREDIT__TAX_PAYER;
+
+	/**
+	 * The feature id for the '<em><b>Tax year</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CIM__TAX_YEAR = INCOME_TAX_CREDIT__TAX_YEAR;
+
+	/**
+	 * The feature id for the '<em><b>Yearly</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CIM__YEARLY = INCOME_TAX_CREDIT__YEARLY;
+
+	/**
+	 * The feature id for the '<em><b>Monthly</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CIM__MONTHLY = INCOME_TAX_CREDIT__MONTHLY;
+
+	/**
+	 * The feature id for the '<em><b>Daily</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CIM__DAILY = INCOME_TAX_CREDIT__DAILY;
+
+	/**
+	 * The feature id for the '<em><b>Id7</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CIM__ID7 = INCOME_TAX_CREDIT__ID7;
+
+	/**
+	 * The feature id for the '<em><b>Taxation Frame</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CIM__TAXATION_FRAME = INCOME_TAX_CREDIT__TAXATION_FRAME;
+
+	/**
+	 * The number of structural features of the '<em>CIM</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CIM_FEATURE_COUNT = INCOME_TAX_CREDIT_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>CIM</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CIM_OPERATION_COUNT = INCOME_TAX_CREDIT_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.CIPImpl <em>CIP</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.CIPImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getCIP()
+	 * @generated
+	 */
+	int CIP = 34;
+
+	/**
+	 * The feature id for the '<em><b>Granted By</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CIP__GRANTED_BY = INCOME_TAX_CREDIT__GRANTED_BY;
+
+	/**
+	 * The feature id for the '<em><b>Tax Payer</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CIP__TAX_PAYER = INCOME_TAX_CREDIT__TAX_PAYER;
+
+	/**
+	 * The feature id for the '<em><b>Tax year</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CIP__TAX_YEAR = INCOME_TAX_CREDIT__TAX_YEAR;
+
+	/**
+	 * The feature id for the '<em><b>Yearly</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CIP__YEARLY = INCOME_TAX_CREDIT__YEARLY;
+
+	/**
+	 * The feature id for the '<em><b>Monthly</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CIP__MONTHLY = INCOME_TAX_CREDIT__MONTHLY;
+
+	/**
+	 * The feature id for the '<em><b>Daily</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CIP__DAILY = INCOME_TAX_CREDIT__DAILY;
+
+	/**
+	 * The feature id for the '<em><b>Id7</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CIP__ID7 = INCOME_TAX_CREDIT__ID7;
+
+	/**
+	 * The feature id for the '<em><b>Taxation Frame</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CIP__TAXATION_FRAME = INCOME_TAX_CREDIT__TAXATION_FRAME;
+
+	/**
+	 * The number of structural features of the '<em>CIP</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CIP_FEATURE_COUNT = INCOME_TAX_CREDIT_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>CIP</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CIP_OPERATION_COUNT = INCOME_TAX_CREDIT_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.CISImpl <em>CIS</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.CISImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getCIS()
+	 * @generated
+	 */
+	int CIS = 35;
+
+	/**
+	 * The feature id for the '<em><b>Granted By</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CIS__GRANTED_BY = INCOME_TAX_CREDIT__GRANTED_BY;
+
+	/**
+	 * The feature id for the '<em><b>Tax Payer</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CIS__TAX_PAYER = INCOME_TAX_CREDIT__TAX_PAYER;
+
+	/**
+	 * The feature id for the '<em><b>Tax year</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CIS__TAX_YEAR = INCOME_TAX_CREDIT__TAX_YEAR;
+
+	/**
+	 * The feature id for the '<em><b>Yearly</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CIS__YEARLY = INCOME_TAX_CREDIT__YEARLY;
+
+	/**
+	 * The feature id for the '<em><b>Monthly</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CIS__MONTHLY = INCOME_TAX_CREDIT__MONTHLY;
+
+	/**
+	 * The feature id for the '<em><b>Daily</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CIS__DAILY = INCOME_TAX_CREDIT__DAILY;
+
+	/**
+	 * The feature id for the '<em><b>Id7</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CIS__ID7 = INCOME_TAX_CREDIT__ID7;
+
+	/**
+	 * The feature id for the '<em><b>Taxation Frame</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CIS__TAXATION_FRAME = INCOME_TAX_CREDIT__TAXATION_FRAME;
+
+	/**
+	 * The number of structural features of the '<em>CIS</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CIS_FEATURE_COUNT = INCOME_TAX_CREDIT_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>CIS</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CIS_OPERATION_COUNT = INCOME_TAX_CREDIT_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.Special_Expense_DSImpl <em>Special Expense DS</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.Special_Expense_DSImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getSpecial_Expense_DS()
+	 * @generated
+	 */
+	int SPECIAL_EXPENSE_DS = 37;
+
+	/**
+	 * The feature id for the '<em><b>Declared amount</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SPECIAL_EXPENSE_DS__DECLARED_AMOUNT = EXPENSE__DECLARED_AMOUNT;
+
+	/**
+	 * The feature id for the '<em><b>Expense purpose</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SPECIAL_EXPENSE_DS__EXPENSE_PURPOSE = EXPENSE__EXPENSE_PURPOSE;
+
+	/**
+	 * The feature id for the '<em><b>Dependent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SPECIAL_EXPENSE_DS__DEPENDENT = EXPENSE__DEPENDENT;
+
+	/**
+	 * The feature id for the '<em><b>From agent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SPECIAL_EXPENSE_DS__FROM_AGENT = EXPENSE__FROM_AGENT;
+
+	/**
+	 * The feature id for the '<em><b>Income</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SPECIAL_EXPENSE_DS__INCOME = EXPENSE__INCOME;
+
+	/**
+	 * The feature id for the '<em><b>Id4</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SPECIAL_EXPENSE_DS__ID4 = EXPENSE__ID4;
+
+	/**
+	 * The feature id for the '<em><b>Beneficiary</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SPECIAL_EXPENSE_DS__BENEFICIARY = EXPENSE__BENEFICIARY;
+
+	/**
+	 * The number of structural features of the '<em>Special Expense DS</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SPECIAL_EXPENSE_DS_FEATURE_COUNT = EXPENSE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Special Expense DS</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SPECIAL_EXPENSE_DS_OPERATION_COUNT = EXPENSE_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.Permanent_ExpenseImpl <em>Permanent Expense</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.Permanent_ExpenseImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getPermanent_Expense()
+	 * @generated
+	 */
+	int PERMANENT_EXPENSE = 36;
+
+	/**
+	 * The feature id for the '<em><b>Declared amount</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PERMANENT_EXPENSE__DECLARED_AMOUNT = SPECIAL_EXPENSE_DS__DECLARED_AMOUNT;
+
+	/**
+	 * The feature id for the '<em><b>Expense purpose</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PERMANENT_EXPENSE__EXPENSE_PURPOSE = SPECIAL_EXPENSE_DS__EXPENSE_PURPOSE;
+
+	/**
+	 * The feature id for the '<em><b>Dependent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PERMANENT_EXPENSE__DEPENDENT = SPECIAL_EXPENSE_DS__DEPENDENT;
+
+	/**
+	 * The feature id for the '<em><b>From agent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PERMANENT_EXPENSE__FROM_AGENT = SPECIAL_EXPENSE_DS__FROM_AGENT;
+
+	/**
+	 * The feature id for the '<em><b>Income</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PERMANENT_EXPENSE__INCOME = SPECIAL_EXPENSE_DS__INCOME;
+
+	/**
+	 * The feature id for the '<em><b>Id4</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PERMANENT_EXPENSE__ID4 = SPECIAL_EXPENSE_DS__ID4;
+
+	/**
+	 * The feature id for the '<em><b>Beneficiary</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PERMANENT_EXPENSE__BENEFICIARY = SPECIAL_EXPENSE_DS__BENEFICIARY;
+
+	/**
+	 * The feature id for the '<em><b>Category</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PERMANENT_EXPENSE__CATEGORY = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Permanent Expense</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PERMANENT_EXPENSE_FEATURE_COUNT = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of operations of the '<em>Permanent Expense</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PERMANENT_EXPENSE_OPERATION_COUNT = SPECIAL_EXPENSE_DS_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.Interest_ExpenseImpl <em>Interest Expense</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.Interest_ExpenseImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getInterest_Expense()
+	 * @generated
+	 */
+	int INTEREST_EXPENSE = 38;
+
+	/**
+	 * The feature id for the '<em><b>Declared amount</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTEREST_EXPENSE__DECLARED_AMOUNT = SPECIAL_EXPENSE_DS__DECLARED_AMOUNT;
+
+	/**
+	 * The feature id for the '<em><b>Expense purpose</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTEREST_EXPENSE__EXPENSE_PURPOSE = SPECIAL_EXPENSE_DS__EXPENSE_PURPOSE;
+
+	/**
+	 * The feature id for the '<em><b>Dependent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTEREST_EXPENSE__DEPENDENT = SPECIAL_EXPENSE_DS__DEPENDENT;
+
+	/**
+	 * The feature id for the '<em><b>From agent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTEREST_EXPENSE__FROM_AGENT = SPECIAL_EXPENSE_DS__FROM_AGENT;
+
+	/**
+	 * The feature id for the '<em><b>Income</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTEREST_EXPENSE__INCOME = SPECIAL_EXPENSE_DS__INCOME;
+
+	/**
+	 * The feature id for the '<em><b>Id4</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTEREST_EXPENSE__ID4 = SPECIAL_EXPENSE_DS__ID4;
+
+	/**
+	 * The feature id for the '<em><b>Beneficiary</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTEREST_EXPENSE__BENEFICIARY = SPECIAL_EXPENSE_DS__BENEFICIARY;
+
+	/**
+	 * The number of structural features of the '<em>Interest Expense</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTEREST_EXPENSE_FEATURE_COUNT = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Interest Expense</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTEREST_EXPENSE_OPERATION_COUNT = SPECIAL_EXPENSE_DS_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.Private_Insurance_and_PlanImpl <em>Private Insurance and Plan</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.Private_Insurance_and_PlanImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getPrivate_Insurance_and_Plan()
+	 * @generated
+	 */
+	int PRIVATE_INSURANCE_AND_PLAN = 39;
+
+	/**
+	 * The feature id for the '<em><b>Declared amount</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PRIVATE_INSURANCE_AND_PLAN__DECLARED_AMOUNT = SPECIAL_EXPENSE_DS__DECLARED_AMOUNT;
+
+	/**
+	 * The feature id for the '<em><b>Expense purpose</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PRIVATE_INSURANCE_AND_PLAN__EXPENSE_PURPOSE = SPECIAL_EXPENSE_DS__EXPENSE_PURPOSE;
+
+	/**
+	 * The feature id for the '<em><b>Dependent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PRIVATE_INSURANCE_AND_PLAN__DEPENDENT = SPECIAL_EXPENSE_DS__DEPENDENT;
+
+	/**
+	 * The feature id for the '<em><b>From agent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PRIVATE_INSURANCE_AND_PLAN__FROM_AGENT = SPECIAL_EXPENSE_DS__FROM_AGENT;
+
+	/**
+	 * The feature id for the '<em><b>Income</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PRIVATE_INSURANCE_AND_PLAN__INCOME = SPECIAL_EXPENSE_DS__INCOME;
+
+	/**
+	 * The feature id for the '<em><b>Id4</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PRIVATE_INSURANCE_AND_PLAN__ID4 = SPECIAL_EXPENSE_DS__ID4;
+
+	/**
+	 * The feature id for the '<em><b>Beneficiary</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PRIVATE_INSURANCE_AND_PLAN__BENEFICIARY = SPECIAL_EXPENSE_DS__BENEFICIARY;
+
+	/**
+	 * The feature id for the '<em><b>Category</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PRIVATE_INSURANCE_AND_PLAN__CATEGORY = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Duration of contract</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PRIVATE_INSURANCE_AND_PLAN__DURATION_OF_CONTRACT = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Private Insurance and Plan</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PRIVATE_INSURANCE_AND_PLAN_FEATURE_COUNT = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of operations of the '<em>Private Insurance and Plan</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PRIVATE_INSURANCE_AND_PLAN_OPERATION_COUNT = SPECIAL_EXPENSE_DS_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.Health_and_Pension_InsuranceImpl <em>Health and Pension Insurance</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.Health_and_Pension_InsuranceImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getHealth_and_Pension_Insurance()
+	 * @generated
+	 */
+	int HEALTH_AND_PENSION_INSURANCE = 40;
+
+	/**
+	 * The feature id for the '<em><b>Declared amount</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int HEALTH_AND_PENSION_INSURANCE__DECLARED_AMOUNT = SPECIAL_EXPENSE_DS__DECLARED_AMOUNT;
+
+	/**
+	 * The feature id for the '<em><b>Expense purpose</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int HEALTH_AND_PENSION_INSURANCE__EXPENSE_PURPOSE = SPECIAL_EXPENSE_DS__EXPENSE_PURPOSE;
+
+	/**
+	 * The feature id for the '<em><b>Dependent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int HEALTH_AND_PENSION_INSURANCE__DEPENDENT = SPECIAL_EXPENSE_DS__DEPENDENT;
+
+	/**
+	 * The feature id for the '<em><b>From agent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int HEALTH_AND_PENSION_INSURANCE__FROM_AGENT = SPECIAL_EXPENSE_DS__FROM_AGENT;
+
+	/**
+	 * The feature id for the '<em><b>Income</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int HEALTH_AND_PENSION_INSURANCE__INCOME = SPECIAL_EXPENSE_DS__INCOME;
+
+	/**
+	 * The feature id for the '<em><b>Id4</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int HEALTH_AND_PENSION_INSURANCE__ID4 = SPECIAL_EXPENSE_DS__ID4;
+
+	/**
+	 * The feature id for the '<em><b>Beneficiary</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int HEALTH_AND_PENSION_INSURANCE__BENEFICIARY = SPECIAL_EXPENSE_DS__BENEFICIARY;
+
+	/**
+	 * The feature id for the '<em><b>Category</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int HEALTH_AND_PENSION_INSURANCE__CATEGORY = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Is related to additional salary</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int HEALTH_AND_PENSION_INSURANCE__IS_RELATED_TO_ADDITIONAL_SALARY = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Health and Pension Insurance</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int HEALTH_AND_PENSION_INSURANCE_FEATURE_COUNT = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of operations of the '<em>Health and Pension Insurance</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int HEALTH_AND_PENSION_INSURANCE_OPERATION_COUNT = SPECIAL_EXPENSE_DS_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.DonationImpl <em>Donation</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.DonationImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getDonation()
+	 * @generated
+	 */
+	int DONATION = 41;
+
+	/**
+	 * The feature id for the '<em><b>Declared amount</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DONATION__DECLARED_AMOUNT = SPECIAL_EXPENSE_DS__DECLARED_AMOUNT;
+
+	/**
+	 * The feature id for the '<em><b>Expense purpose</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DONATION__EXPENSE_PURPOSE = SPECIAL_EXPENSE_DS__EXPENSE_PURPOSE;
+
+	/**
+	 * The feature id for the '<em><b>Dependent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DONATION__DEPENDENT = SPECIAL_EXPENSE_DS__DEPENDENT;
+
+	/**
+	 * The feature id for the '<em><b>From agent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DONATION__FROM_AGENT = SPECIAL_EXPENSE_DS__FROM_AGENT;
+
+	/**
+	 * The feature id for the '<em><b>Income</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DONATION__INCOME = SPECIAL_EXPENSE_DS__INCOME;
+
+	/**
+	 * The feature id for the '<em><b>Id4</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DONATION__ID4 = SPECIAL_EXPENSE_DS__ID4;
+
+	/**
+	 * The feature id for the '<em><b>Beneficiary</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DONATION__BENEFICIARY = SPECIAL_EXPENSE_DS__BENEFICIARY;
+
+	/**
+	 * The feature id for the '<em><b>Beneficiary1</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DONATION__BENEFICIARY1 = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Is donation reported</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DONATION__IS_DONATION_REPORTED = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Donation</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DONATION_FEATURE_COUNT = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of operations of the '<em>Donation</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DONATION_OPERATION_COUNT = SPECIAL_EXPENSE_DS_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.Loss_CarryforwardImpl <em>Loss Carryforward</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.Loss_CarryforwardImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getLoss_Carryforward()
+	 * @generated
+	 */
+	int LOSS_CARRYFORWARD = 42;
+
+	/**
+	 * The feature id for the '<em><b>Declared amount</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOSS_CARRYFORWARD__DECLARED_AMOUNT = SPECIAL_EXPENSE_DS__DECLARED_AMOUNT;
+
+	/**
+	 * The feature id for the '<em><b>Expense purpose</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOSS_CARRYFORWARD__EXPENSE_PURPOSE = SPECIAL_EXPENSE_DS__EXPENSE_PURPOSE;
+
+	/**
+	 * The feature id for the '<em><b>Dependent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOSS_CARRYFORWARD__DEPENDENT = SPECIAL_EXPENSE_DS__DEPENDENT;
+
+	/**
+	 * The feature id for the '<em><b>From agent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOSS_CARRYFORWARD__FROM_AGENT = SPECIAL_EXPENSE_DS__FROM_AGENT;
+
+	/**
+	 * The feature id for the '<em><b>Income</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOSS_CARRYFORWARD__INCOME = SPECIAL_EXPENSE_DS__INCOME;
+
+	/**
+	 * The feature id for the '<em><b>Id4</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOSS_CARRYFORWARD__ID4 = SPECIAL_EXPENSE_DS__ID4;
+
+	/**
+	 * The feature id for the '<em><b>Beneficiary</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOSS_CARRYFORWARD__BENEFICIARY = SPECIAL_EXPENSE_DS__BENEFICIARY;
+
+	/**
+	 * The number of structural features of the '<em>Loss Carryforward</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOSS_CARRYFORWARD_FEATURE_COUNT = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Loss Carryforward</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOSS_CARRYFORWARD_OPERATION_COUNT = SPECIAL_EXPENSE_DS_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.Spousal_Expense_ACImpl <em>Spousal Expense AC</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.Spousal_Expense_ACImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getSpousal_Expense_AC()
+	 * @generated
+	 */
+	int SPOUSAL_EXPENSE_AC = 43;
+
+	/**
+	 * The feature id for the '<em><b>Declared amount</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SPOUSAL_EXPENSE_AC__DECLARED_AMOUNT = EXPENSE__DECLARED_AMOUNT;
+
+	/**
+	 * The feature id for the '<em><b>Expense purpose</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SPOUSAL_EXPENSE_AC__EXPENSE_PURPOSE = EXPENSE__EXPENSE_PURPOSE;
+
+	/**
+	 * The feature id for the '<em><b>Dependent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SPOUSAL_EXPENSE_AC__DEPENDENT = EXPENSE__DEPENDENT;
+
+	/**
+	 * The feature id for the '<em><b>From agent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SPOUSAL_EXPENSE_AC__FROM_AGENT = EXPENSE__FROM_AGENT;
+
+	/**
+	 * The feature id for the '<em><b>Income</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SPOUSAL_EXPENSE_AC__INCOME = EXPENSE__INCOME;
+
+	/**
+	 * The feature id for the '<em><b>Id4</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SPOUSAL_EXPENSE_AC__ID4 = EXPENSE__ID4;
+
+	/**
+	 * The feature id for the '<em><b>Beneficiary</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SPOUSAL_EXPENSE_AC__BENEFICIARY = EXPENSE__BENEFICIARY;
+
+	/**
+	 * The number of structural features of the '<em>Spousal Expense AC</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SPOUSAL_EXPENSE_AC_FEATURE_COUNT = EXPENSE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Spousal Expense AC</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SPOUSAL_EXPENSE_AC_OPERATION_COUNT = EXPENSE_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.Extraordinary_Expense_CEImpl <em>Extraordinary Expense CE</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.Extraordinary_Expense_CEImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getExtraordinary_Expense_CE()
+	 * @generated
+	 */
+	int EXTRAORDINARY_EXPENSE_CE = 44;
+
+	/**
+	 * The feature id for the '<em><b>Declared amount</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTRAORDINARY_EXPENSE_CE__DECLARED_AMOUNT = EXPENSE__DECLARED_AMOUNT;
+
+	/**
+	 * The feature id for the '<em><b>Expense purpose</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTRAORDINARY_EXPENSE_CE__EXPENSE_PURPOSE = EXPENSE__EXPENSE_PURPOSE;
+
+	/**
+	 * The feature id for the '<em><b>Dependent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTRAORDINARY_EXPENSE_CE__DEPENDENT = EXPENSE__DEPENDENT;
+
+	/**
+	 * The feature id for the '<em><b>From agent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTRAORDINARY_EXPENSE_CE__FROM_AGENT = EXPENSE__FROM_AGENT;
+
+	/**
+	 * The feature id for the '<em><b>Income</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTRAORDINARY_EXPENSE_CE__INCOME = EXPENSE__INCOME;
+
+	/**
+	 * The feature id for the '<em><b>Id4</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTRAORDINARY_EXPENSE_CE__ID4 = EXPENSE__ID4;
+
+	/**
+	 * The feature id for the '<em><b>Beneficiary</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTRAORDINARY_EXPENSE_CE__BENEFICIARY = EXPENSE__BENEFICIARY;
+
+	/**
+	 * The feature id for the '<em><b>Thresholded deduction percentage</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTRAORDINARY_EXPENSE_CE__THRESHOLDED_DEDUCTION_PERCENTAGE = EXPENSE_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Ce type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTRAORDINARY_EXPENSE_CE__CE_TYPE = EXPENSE_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Extraordinary Expense CE</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTRAORDINARY_EXPENSE_CE_FEATURE_COUNT = EXPENSE_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of operations of the '<em>Extraordinary Expense CE</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTRAORDINARY_EXPENSE_CE_OPERATION_COUNT = EXPENSE_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.Professional_ExpenseImpl <em>Professional Expense</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.Professional_ExpenseImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getProfessional_Expense()
+	 * @generated
+	 */
+	int PROFESSIONAL_EXPENSE = 46;
+
+	/**
+	 * The feature id for the '<em><b>Declared amount</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROFESSIONAL_EXPENSE__DECLARED_AMOUNT = EXPENSE__DECLARED_AMOUNT;
+
+	/**
+	 * The feature id for the '<em><b>Expense purpose</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROFESSIONAL_EXPENSE__EXPENSE_PURPOSE = EXPENSE__EXPENSE_PURPOSE;
+
+	/**
+	 * The feature id for the '<em><b>Dependent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROFESSIONAL_EXPENSE__DEPENDENT = EXPENSE__DEPENDENT;
+
+	/**
+	 * The feature id for the '<em><b>From agent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROFESSIONAL_EXPENSE__FROM_AGENT = EXPENSE__FROM_AGENT;
+
+	/**
+	 * The feature id for the '<em><b>Income</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROFESSIONAL_EXPENSE__INCOME = EXPENSE__INCOME;
+
+	/**
+	 * The feature id for the '<em><b>Id4</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROFESSIONAL_EXPENSE__ID4 = EXPENSE__ID4;
+
+	/**
+	 * The feature id for the '<em><b>Beneficiary</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROFESSIONAL_EXPENSE__BENEFICIARY = EXPENSE__BENEFICIARY;
+
+	/**
+	 * The number of structural features of the '<em>Professional Expense</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROFESSIONAL_EXPENSE_FEATURE_COUNT = EXPENSE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Professional Expense</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROFESSIONAL_EXPENSE_OPERATION_COUNT = EXPENSE_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.Travel_Expense_FDImpl <em>Travel Expense FD</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.Travel_Expense_FDImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getTravel_Expense_FD()
+	 * @generated
+	 */
+	int TRAVEL_EXPENSE_FD = 45;
+
+	/**
+	 * The feature id for the '<em><b>Declared amount</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TRAVEL_EXPENSE_FD__DECLARED_AMOUNT = PROFESSIONAL_EXPENSE__DECLARED_AMOUNT;
+
+	/**
+	 * The feature id for the '<em><b>Expense purpose</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TRAVEL_EXPENSE_FD__EXPENSE_PURPOSE = PROFESSIONAL_EXPENSE__EXPENSE_PURPOSE;
+
+	/**
+	 * The feature id for the '<em><b>Dependent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TRAVEL_EXPENSE_FD__DEPENDENT = PROFESSIONAL_EXPENSE__DEPENDENT;
+
+	/**
+	 * The feature id for the '<em><b>From agent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TRAVEL_EXPENSE_FD__FROM_AGENT = PROFESSIONAL_EXPENSE__FROM_AGENT;
+
+	/**
+	 * The feature id for the '<em><b>Income</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TRAVEL_EXPENSE_FD__INCOME = PROFESSIONAL_EXPENSE__INCOME;
+
+	/**
+	 * The feature id for the '<em><b>Id4</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TRAVEL_EXPENSE_FD__ID4 = PROFESSIONAL_EXPENSE__ID4;
+
+	/**
+	 * The feature id for the '<em><b>Beneficiary</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TRAVEL_EXPENSE_FD__BENEFICIARY = PROFESSIONAL_EXPENSE__BENEFICIARY;
+
+	/**
+	 * The number of structural features of the '<em>Travel Expense FD</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TRAVEL_EXPENSE_FD_FEATURE_COUNT = PROFESSIONAL_EXPENSE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Travel Expense FD</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TRAVEL_EXPENSE_FD_OPERATION_COUNT = PROFESSIONAL_EXPENSE_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.Miscellaneous_Expense_FOImpl <em>Miscellaneous Expense FO</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.Miscellaneous_Expense_FOImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getMiscellaneous_Expense_FO()
+	 * @generated
+	 */
+	int MISCELLANEOUS_EXPENSE_FO = 47;
+
+	/**
+	 * The feature id for the '<em><b>Declared amount</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MISCELLANEOUS_EXPENSE_FO__DECLARED_AMOUNT = PROFESSIONAL_EXPENSE__DECLARED_AMOUNT;
+
+	/**
+	 * The feature id for the '<em><b>Expense purpose</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MISCELLANEOUS_EXPENSE_FO__EXPENSE_PURPOSE = PROFESSIONAL_EXPENSE__EXPENSE_PURPOSE;
+
+	/**
+	 * The feature id for the '<em><b>Dependent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MISCELLANEOUS_EXPENSE_FO__DEPENDENT = PROFESSIONAL_EXPENSE__DEPENDENT;
+
+	/**
+	 * The feature id for the '<em><b>From agent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MISCELLANEOUS_EXPENSE_FO__FROM_AGENT = PROFESSIONAL_EXPENSE__FROM_AGENT;
+
+	/**
+	 * The feature id for the '<em><b>Income</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MISCELLANEOUS_EXPENSE_FO__INCOME = PROFESSIONAL_EXPENSE__INCOME;
+
+	/**
+	 * The feature id for the '<em><b>Id4</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MISCELLANEOUS_EXPENSE_FO__ID4 = PROFESSIONAL_EXPENSE__ID4;
+
+	/**
+	 * The feature id for the '<em><b>Beneficiary</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MISCELLANEOUS_EXPENSE_FO__BENEFICIARY = PROFESSIONAL_EXPENSE__BENEFICIARY;
+
+	/**
+	 * The number of structural features of the '<em>Miscellaneous Expense FO</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MISCELLANEOUS_EXPENSE_FO_FEATURE_COUNT = PROFESSIONAL_EXPENSE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Miscellaneous Expense FO</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MISCELLANEOUS_EXPENSE_FO_OPERATION_COUNT = PROFESSIONAL_EXPENSE_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.impl.ResourceImpl <em>Resource</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.impl.ResourceImpl
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getResource()
+	 * @generated
+	 */
+	int RESOURCE = 48;
+
+	/**
+	 * The feature id for the '<em><b>Contains</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RESOURCE__CONTAINS = 0;
+
+	/**
+	 * The number of structural features of the '<em>Resource</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RESOURCE_FEATURE_COUNT = 1;
+
+	/**
+	 * The number of operations of the '<em>Resource</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RESOURCE_OPERATION_COUNT = 0;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.Grantor <em>Grantor</em>}' enum.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.Grantor
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getGrantor()
+	 * @generated
+	 */
+	int GRANTOR = 49;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.Disability_Types <em>Disability Types</em>}' enum.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.Disability_Types
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getDisability_Types()
+	 * @generated
+	 */
+	int DISABILITY_TYPES = 50;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.Country <em>Country</em>}' enum.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.Country
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getCountry()
+	 * @generated
+	 */
+	int COUNTRY = 51;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.Tax_Office <em>Tax Office</em>}' enum.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.Tax_Office
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getTax_Office()
+	 * @generated
+	 */
+	int TAX_OFFICE = 52;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.Tax_Class_Category <em>Tax Class Category</em>}' enum.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.Tax_Class_Category
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getTax_Class_Category()
+	 * @generated
+	 */
+	int TAX_CLASS_CATEGORY = 53;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.Job_Activity <em>Job Activity</em>}' enum.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.Job_Activity
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getJob_Activity()
+	 * @generated
+	 */
+	int JOB_ACTIVITY = 54;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.Town <em>Town</em>}' enum.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.Town
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getTown()
+	 * @generated
+	 */
+	int TOWN = 55;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.CE_Type <em>CE Type</em>}' enum.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.CE_Type
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getCE_Type()
+	 * @generated
+	 */
+	int CE_TYPE = 56;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.Expense_Purpose <em>Expense Purpose</em>}' enum.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.Expense_Purpose
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getExpense_Purpose()
+	 * @generated
+	 */
+	int EXPENSE_PURPOSE = 57;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.Dependent_Type <em>Dependent Type</em>}' enum.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.Dependent_Type
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getDependent_Type()
+	 * @generated
+	 */
+	int DEPENDENT_TYPE = 58;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.Separation_Causes <em>Separation Causes</em>}' enum.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.Separation_Causes
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getSeparation_Causes()
+	 * @generated
+	 */
+	int SEPARATION_CAUSES = 59;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.Category_of_Permanent_Expense <em>Category of Permanent Expense</em>}' enum.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.Category_of_Permanent_Expense
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getCategory_of_Permanent_Expense()
+	 * @generated
+	 */
+	int CATEGORY_OF_PERMANENT_EXPENSE = 60;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.Category_of_Health_and_Pension_Insurances <em>Category of Health and Pension Insurances</em>}' enum.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.Category_of_Health_and_Pension_Insurances
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getCategory_of_Health_and_Pension_Insurances()
+	 * @generated
+	 */
+	int CATEGORY_OF_HEALTH_AND_PENSION_INSURANCES = 61;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.Category_of_Private_Insurance_and_Plan <em>Category of Private Insurance and Plan</em>}' enum.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.Category_of_Private_Insurance_and_Plan
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getCategory_of_Private_Insurance_and_Plan()
+	 * @generated
+	 */
+	int CATEGORY_OF_PRIVATE_INSURANCE_AND_PLAN = 62;
+
+	/**
+	 * The meta object id for the '{@link TaxationWithRoot.Legal_Union_Types <em>Legal Union Types</em>}' enum.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see TaxationWithRoot.Legal_Union_Types
+	 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getLegal_Union_Types()
+	 * @generated
+	 */
+	int LEGAL_UNION_TYPES = 63;
+
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.Constants <em>Constants</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Constants</em>'.
+	 * @see TaxationWithRoot.Constants
+	 * @generated
+	 */
+	EClass getConstants();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Constants#getMAXIMUM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD <em>MAXIMUM CE RATE FOR CHILD NOT BEING PART OF HOUSEHOLD</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>MAXIMUM CE RATE FOR CHILD NOT BEING PART OF HOUSEHOLD</em>'.
+	 * @see TaxationWithRoot.Constants#getMAXIMUM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD()
+	 * @see #getConstants()
+	 * @generated
+	 */
+	EAttribute getConstants_MAXIMUM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Constants#getMAXIMUM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE <em>MAXIMUM CE RATE FOR HOUSE CARE AND CHILD PART OF THE HOUSEHOLD CARE</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>MAXIMUM CE RATE FOR HOUSE CARE AND CHILD PART OF THE HOUSEHOLD CARE</em>'.
+	 * @see TaxationWithRoot.Constants#getMAXIMUM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE()
+	 * @see #getConstants()
+	 * @generated
+	 */
+	EAttribute getConstants_MAXIMUM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Constants#getMINIMUM_SALARY <em>MINIMUM SALARY</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>MINIMUM SALARY</em>'.
+	 * @see TaxationWithRoot.Constants#getMINIMUM_SALARY()
+	 * @see #getConstants()
+	 * @generated
+	 */
+	EAttribute getConstants_MINIMUM_SALARY();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Constants#getFLAT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION <em>FLAT RATE FOR EXTRA PROFESSIONAL DEDUCTION</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>FLAT RATE FOR EXTRA PROFESSIONAL DEDUCTION</em>'.
+	 * @see TaxationWithRoot.Constants#getFLAT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION()
+	 * @see #getConstants()
+	 * @generated
+	 */
+	EAttribute getConstants_FLAT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Constants#getMAXIMUM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS <em>MAXIMUM DEDUCTIBLE PERCENTAGE FOR DONATIONS</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>MAXIMUM DEDUCTIBLE PERCENTAGE FOR DONATIONS</em>'.
+	 * @see TaxationWithRoot.Constants#getMAXIMUM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS()
+	 * @see #getConstants()
+	 * @generated
+	 */
+	EAttribute getConstants_MAXIMUM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Constants#getMINIMUM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS <em>MINIMUM DEDUCTIBLE AMOUNT FOR DONATIONS</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>MINIMUM DEDUCTIBLE AMOUNT FOR DONATIONS</em>'.
+	 * @see TaxationWithRoot.Constants#getMINIMUM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS()
+	 * @see #getConstants()
+	 * @generated
+	 */
+	EAttribute getConstants_MINIMUM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Constants#getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC <em>MAXIMUM DEDUCTIBLE AMOUNT FOR ADDITIONAL PENSION AND INSURANC</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>MAXIMUM DEDUCTIBLE AMOUNT FOR ADDITIONAL PENSION AND INSURANC</em>'.
+	 * @see TaxationWithRoot.Constants#getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC()
+	 * @see #getConstants()
+	 * @generated
+	 */
+	EAttribute getConstants_MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Constants#getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE <em>MAXIMUM DEDUCTIBLE AMOUNT FOR ALIMONY EXPENSE</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>MAXIMUM DEDUCTIBLE AMOUNT FOR ALIMONY EXPENSE</em>'.
+	 * @see TaxationWithRoot.Constants#getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE()
+	 * @see #getConstants()
+	 * @generated
+	 */
+	EAttribute getConstants_MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Constants#getMAXIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION <em>MAXIMAL DISTANCE FOR TRAVEL EXPENSE DEDUCTION</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>MAXIMAL DISTANCE FOR TRAVEL EXPENSE DEDUCTION</em>'.
+	 * @see TaxationWithRoot.Constants#getMAXIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION()
+	 * @see #getConstants()
+	 * @generated
+	 */
+	EAttribute getConstants_MAXIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Constants#getMAXIMAL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION <em>MAXIMAL FLAT DISTANCE FOR TRAVEL EXPENSE DEDUCTION</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>MAXIMAL FLAT DISTANCE FOR TRAVEL EXPENSE DEDUCTION</em>'.
+	 * @see TaxationWithRoot.Constants#getMAXIMAL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION()
+	 * @see #getConstants()
+	 * @generated
+	 */
+	EAttribute getConstants_MAXIMAL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Constants#getMINIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION <em>MINIMAL DISTANCE FOR TRAVEL EXPENSE DEDUCTION</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>MINIMAL DISTANCE FOR TRAVEL EXPENSE DEDUCTION</em>'.
+	 * @see TaxationWithRoot.Constants#getMINIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION()
+	 * @see #getConstants()
+	 * @generated
+	 */
+	EAttribute getConstants_MINIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Constants#getFLAT_RATE_CIM_DAILY <em>FLAT RATE CIM DAILY</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>FLAT RATE CIM DAILY</em>'.
+	 * @see TaxationWithRoot.Constants#getFLAT_RATE_CIM_DAILY()
+	 * @see #getConstants()
+	 * @generated
+	 */
+	EAttribute getConstants_FLAT_RATE_CIM_DAILY();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Constants#getFLAT_RATE_CIM_MONTHLY <em>FLAT RATE CIM MONTHLY</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>FLAT RATE CIM MONTHLY</em>'.
+	 * @see TaxationWithRoot.Constants#getFLAT_RATE_CIM_MONTHLY()
+	 * @see #getConstants()
+	 * @generated
+	 */
+	EAttribute getConstants_FLAT_RATE_CIM_MONTHLY();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Constants#getFLAT_RATE_CIM_YEARLY <em>FLAT RATE CIM YEARLY</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>FLAT RATE CIM YEARLY</em>'.
+	 * @see TaxationWithRoot.Constants#getFLAT_RATE_CIM_YEARLY()
+	 * @see #getConstants()
+	 * @generated
+	 */
+	EAttribute getConstants_FLAT_RATE_CIM_YEARLY();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Constants#getFLAT_RATE_CIP_DAILY <em>FLAT RATE CIP DAILY</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>FLAT RATE CIP DAILY</em>'.
+	 * @see TaxationWithRoot.Constants#getFLAT_RATE_CIP_DAILY()
+	 * @see #getConstants()
+	 * @generated
+	 */
+	EAttribute getConstants_FLAT_RATE_CIP_DAILY();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Constants#getFLAT_RATE_CIP_MONTHLY <em>FLAT RATE CIP MONTHLY</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>FLAT RATE CIP MONTHLY</em>'.
+	 * @see TaxationWithRoot.Constants#getFLAT_RATE_CIP_MONTHLY()
+	 * @see #getConstants()
+	 * @generated
+	 */
+	EAttribute getConstants_FLAT_RATE_CIP_MONTHLY();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Constants#getFLAT_RATE_CIP_YEARLY <em>FLAT RATE CIP YEARLY</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>FLAT RATE CIP YEARLY</em>'.
+	 * @see TaxationWithRoot.Constants#getFLAT_RATE_CIP_YEARLY()
+	 * @see #getConstants()
+	 * @generated
+	 */
+	EAttribute getConstants_FLAT_RATE_CIP_YEARLY();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Constants#getFLAT_RATE_CIS_DAILY <em>FLAT RATE CIS DAILY</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>FLAT RATE CIS DAILY</em>'.
+	 * @see TaxationWithRoot.Constants#getFLAT_RATE_CIS_DAILY()
+	 * @see #getConstants()
+	 * @generated
+	 */
+	EAttribute getConstants_FLAT_RATE_CIS_DAILY();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Constants#getFLAT_RATE_CIS_MONTHLY <em>FLAT RATE CIS MONTHLY</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>FLAT RATE CIS MONTHLY</em>'.
+	 * @see TaxationWithRoot.Constants#getFLAT_RATE_CIS_MONTHLY()
+	 * @see #getConstants()
+	 * @generated
+	 */
+	EAttribute getConstants_FLAT_RATE_CIS_MONTHLY();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Constants#getFLAT_RATE_CIS_YEARLY <em>FLAT RATE CIS YEARLY</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>FLAT RATE CIS YEARLY</em>'.
+	 * @see TaxationWithRoot.Constants#getFLAT_RATE_CIS_YEARLY()
+	 * @see #getConstants()
+	 * @generated
+	 */
+	EAttribute getConstants_FLAT_RATE_CIS_YEARLY();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Constants#getFLAT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT <em>FLAT RATE FOR TRAVEL EXPENSE PER UNIT</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>FLAT RATE FOR TRAVEL EXPENSE PER UNIT</em>'.
+	 * @see TaxationWithRoot.Constants#getFLAT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT()
+	 * @see #getConstants()
+	 * @generated
+	 */
+	EAttribute getConstants_FLAT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Constants#getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_DS <em>MAXIMUM DEDUCTIBLE AMOUNT FOR DS</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>MAXIMUM DEDUCTIBLE AMOUNT FOR DS</em>'.
+	 * @see TaxationWithRoot.Constants#getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_DS()
+	 * @see #getConstants()
+	 * @generated
+	 */
+	EAttribute getConstants_MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_DS();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Constants#getFLAT_RATE_FOR_MISCELLANEOUS_EXPENSE <em>FLAT RATE FOR MISCELLANEOUS EXPENSE</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>FLAT RATE FOR MISCELLANEOUS EXPENSE</em>'.
+	 * @see TaxationWithRoot.Constants#getFLAT_RATE_FOR_MISCELLANEOUS_EXPENSE()
+	 * @see #getConstants()
+	 * @generated
+	 */
+	EAttribute getConstants_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Constants#getDISABILITY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE <em>DISABILITY FLAT RATE FOR MISCELLANEOUS EXPENSE</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>DISABILITY FLAT RATE FOR MISCELLANEOUS EXPENSE</em>'.
+	 * @see TaxationWithRoot.Constants#getDISABILITY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE()
+	 * @see #getConstants()
+	 * @generated
+	 */
+	EAttribute getConstants_DISABILITY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Constants#getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE <em>MAXIMUM DEDUCTIBLE AMOUNT FOR ADDITIONAL PENSION AND INSURANCE</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>MAXIMUM DEDUCTIBLE AMOUNT FOR ADDITIONAL PENSION AND INSURANCE</em>'.
+	 * @see TaxationWithRoot.Constants#getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE()
+	 * @see #getConstants()
+	 * @generated
+	 */
+	EAttribute getConstants_MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.Income_Tax <em>Income Tax</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Income Tax</em>'.
+	 * @see TaxationWithRoot.Income_Tax
+	 * @generated
+	 */
+	EClass getIncome_Tax();
+
+	/**
+	 * Returns the meta object for the reference '{@link TaxationWithRoot.Income_Tax#getTaxPayer <em>Tax Payer</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Tax Payer</em>'.
+	 * @see TaxationWithRoot.Income_Tax#getTaxPayer()
+	 * @see #getIncome_Tax()
+	 * @generated
+	 */
+	EReference getIncome_Tax_TaxPayer();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Income_Tax#getTax_amount <em>Tax amount</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Tax amount</em>'.
+	 * @see TaxationWithRoot.Income_Tax#getTax_amount()
+	 * @see #getIncome_Tax()
+	 * @generated
+	 */
+	EAttribute getIncome_Tax_Tax_amount();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Income_Tax#getTax_year <em>Tax year</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Tax year</em>'.
+	 * @see TaxationWithRoot.Income_Tax#getTax_year()
+	 * @see #getIncome_Tax()
+	 * @generated
+	 */
+	EAttribute getIncome_Tax_Tax_year();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Income_Tax#getId6 <em>Id6</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Id6</em>'.
+	 * @see TaxationWithRoot.Income_Tax#getId6()
+	 * @see #getIncome_Tax()
+	 * @generated
+	 */
+	EAttribute getIncome_Tax_Id6();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.Tax_Payer <em>Tax Payer</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Tax Payer</em>'.
+	 * @see TaxationWithRoot.Tax_Payer
+	 * @generated
+	 */
+	EClass getTax_Payer();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link TaxationWithRoot.Tax_Payer#getDependents <em>Dependents</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Dependents</em>'.
+	 * @see TaxationWithRoot.Tax_Payer#getDependents()
+	 * @see #getTax_Payer()
+	 * @generated
+	 */
+	EReference getTax_Payer_Dependents();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link TaxationWithRoot.Tax_Payer#getFrom_agent <em>From agent</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>From agent</em>'.
+	 * @see TaxationWithRoot.Tax_Payer#getFrom_agent()
+	 * @see #getTax_Payer()
+	 * @generated
+	 */
+	EReference getTax_Payer_From_agent();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link TaxationWithRoot.Tax_Payer#getIncomes <em>Incomes</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Incomes</em>'.
+	 * @see TaxationWithRoot.Tax_Payer#getIncomes()
+	 * @see #getTax_Payer()
+	 * @generated
+	 */
+	EReference getTax_Payer_Incomes();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link TaxationWithRoot.Tax_Payer#getFrom_law <em>From law</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>From law</em>'.
+	 * @see TaxationWithRoot.Tax_Payer#getFrom_law()
+	 * @see #getTax_Payer()
+	 * @generated
+	 */
+	EReference getTax_Payer_From_law();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.Physical_Person <em>Physical Person</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Physical Person</em>'.
+	 * @see TaxationWithRoot.Physical_Person
+	 * @generated
+	 */
+	EClass getPhysical_Person();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Physical_Person#getSSNo <em>SS No</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>SS No</em>'.
+	 * @see TaxationWithRoot.Physical_Person#getSSNo()
+	 * @see #getPhysical_Person()
+	 * @generated
+	 */
+	EAttribute getPhysical_Person_SSNo();
+
+	/**
+	 * Returns the meta object for the reference list '{@link TaxationWithRoot.Physical_Person#getAddresses <em>Addresses</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference list '<em>Addresses</em>'.
+	 * @see TaxationWithRoot.Physical_Person#getAddresses()
+	 * @see #getPhysical_Person()
+	 * @generated
+	 */
+	EReference getPhysical_Person_Addresses();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Physical_Person#getBirth_year <em>Birth year</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Birth year</em>'.
+	 * @see TaxationWithRoot.Physical_Person#getBirth_year()
+	 * @see #getPhysical_Person()
+	 * @generated
+	 */
+	EAttribute getPhysical_Person_Birth_year();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Physical_Person#getDisability_percentage <em>Disability percentage</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Disability percentage</em>'.
+	 * @see TaxationWithRoot.Physical_Person#getDisability_percentage()
+	 * @see #getPhysical_Person()
+	 * @generated
+	 */
+	EAttribute getPhysical_Person_Disability_percentage();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Physical_Person#getDisability_type <em>Disability type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Disability type</em>'.
+	 * @see TaxationWithRoot.Physical_Person#getDisability_type()
+	 * @see #getPhysical_Person()
+	 * @generated
+	 */
+	EAttribute getPhysical_Person_Disability_type();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Physical_Person#getBirth_month <em>Birth month</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Birth month</em>'.
+	 * @see TaxationWithRoot.Physical_Person#getBirth_month()
+	 * @see #getPhysical_Person()
+	 * @generated
+	 */
+	EAttribute getPhysical_Person_Birth_month();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Physical_Person#getBirth_day <em>Birth day</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Birth day</em>'.
+	 * @see TaxationWithRoot.Physical_Person#getBirth_day()
+	 * @see #getPhysical_Person()
+	 * @generated
+	 */
+	EAttribute getPhysical_Person_Birth_day();
+
+	/**
+	 * Returns the meta object for the reference list '{@link TaxationWithRoot.Physical_Person#getExpenses <em>Expenses</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference list '<em>Expenses</em>'.
+	 * @see TaxationWithRoot.Physical_Person#getExpenses()
+	 * @see #getPhysical_Person()
+	 * @generated
+	 */
+	EReference getPhysical_Person_Expenses();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Physical_Person#isIs_widower <em>Is widower</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Is widower</em>'.
+	 * @see TaxationWithRoot.Physical_Person#isIs_widower()
+	 * @see #getPhysical_Person()
+	 * @generated
+	 */
+	EAttribute getPhysical_Person_Is_widower();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.Address <em>Address</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Address</em>'.
+	 * @see TaxationWithRoot.Address
+	 * @generated
+	 */
+	EClass getAddress();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Address#getCountry <em>Country</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Country</em>'.
+	 * @see TaxationWithRoot.Address#getCountry()
+	 * @see #getAddress()
+	 * @generated
+	 */
+	EAttribute getAddress_Country();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Address#getStreet <em>Street</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Street</em>'.
+	 * @see TaxationWithRoot.Address#getStreet()
+	 * @see #getAddress()
+	 * @generated
+	 */
+	EAttribute getAddress_Street();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Address#getZipCode <em>Zip Code</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Zip Code</em>'.
+	 * @see TaxationWithRoot.Address#getZipCode()
+	 * @see #getAddress()
+	 * @generated
+	 */
+	EAttribute getAddress_ZipCode();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Address#getCity <em>City</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>City</em>'.
+	 * @see TaxationWithRoot.Address#getCity()
+	 * @see #getAddress()
+	 * @generated
+	 */
+	EAttribute getAddress_City();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Address#getId2 <em>Id2</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Id2</em>'.
+	 * @see TaxationWithRoot.Address#getId2()
+	 * @see #getAddress()
+	 * @generated
+	 */
+	EAttribute getAddress_Id2();
+
+	/**
+	 * Returns the meta object for the reference list '{@link TaxationWithRoot.Address#getTaxPayer <em>Tax Payer</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference list '<em>Tax Payer</em>'.
+	 * @see TaxationWithRoot.Address#getTaxPayer()
+	 * @see #getAddress()
+	 * @generated
+	 */
+	EReference getAddress_TaxPayer();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.Expense <em>Expense</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Expense</em>'.
+	 * @see TaxationWithRoot.Expense
+	 * @generated
+	 */
+	EClass getExpense();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Expense#getDeclared_amount <em>Declared amount</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Declared amount</em>'.
+	 * @see TaxationWithRoot.Expense#getDeclared_amount()
+	 * @see #getExpense()
+	 * @generated
+	 */
+	EAttribute getExpense_Declared_amount();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Expense#getExpense_purpose <em>Expense purpose</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Expense purpose</em>'.
+	 * @see TaxationWithRoot.Expense#getExpense_purpose()
+	 * @see #getExpense()
+	 * @generated
+	 */
+	EAttribute getExpense_Expense_purpose();
+
+	/**
+	 * Returns the meta object for the reference '{@link TaxationWithRoot.Expense#getDependent <em>Dependent</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Dependent</em>'.
+	 * @see TaxationWithRoot.Expense#getDependent()
+	 * @see #getExpense()
+	 * @generated
+	 */
+	EReference getExpense_Dependent();
+
+	/**
+	 * Returns the meta object for the reference '{@link TaxationWithRoot.Expense#getFrom_agent <em>From agent</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>From agent</em>'.
+	 * @see TaxationWithRoot.Expense#getFrom_agent()
+	 * @see #getExpense()
+	 * @generated
+	 */
+	EReference getExpense_From_agent();
+
+	/**
+	 * Returns the meta object for the container reference '{@link TaxationWithRoot.Expense#getIncome <em>Income</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the container reference '<em>Income</em>'.
+	 * @see TaxationWithRoot.Expense#getIncome()
+	 * @see #getExpense()
+	 * @generated
+	 */
+	EReference getExpense_Income();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Expense#getId4 <em>Id4</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Id4</em>'.
+	 * @see TaxationWithRoot.Expense#getId4()
+	 * @see #getExpense()
+	 * @generated
+	 */
+	EAttribute getExpense_Id4();
+
+	/**
+	 * Returns the meta object for the reference '{@link TaxationWithRoot.Expense#getBeneficiary <em>Beneficiary</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Beneficiary</em>'.
+	 * @see TaxationWithRoot.Expense#getBeneficiary()
+	 * @see #getExpense()
+	 * @generated
+	 */
+	EReference getExpense_Beneficiary();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.Dependent <em>Dependent</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Dependent</em>'.
+	 * @see TaxationWithRoot.Dependent
+	 * @generated
+	 */
+	EClass getDependent();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Dependent#getDependent_type <em>Dependent type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Dependent type</em>'.
+	 * @see TaxationWithRoot.Dependent#getDependent_type()
+	 * @see #getDependent()
+	 * @generated
+	 */
+	EAttribute getDependent_Dependent_type();
+
+	/**
+	 * Returns the meta object for the container reference '{@link TaxationWithRoot.Dependent#getResponsible_person <em>Responsible person</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the container reference '<em>Responsible person</em>'.
+	 * @see TaxationWithRoot.Dependent#getResponsible_person()
+	 * @see #getDependent()
+	 * @generated
+	 */
+	EReference getDependent_Responsible_person();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Dependent#isContinued_studies <em>Continued studies</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Continued studies</em>'.
+	 * @see TaxationWithRoot.Dependent#isContinued_studies()
+	 * @see #getDependent()
+	 * @generated
+	 */
+	EAttribute getDependent_Continued_studies();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link TaxationWithRoot.Dependent#getAllowances <em>Allowances</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Allowances</em>'.
+	 * @see TaxationWithRoot.Dependent#getAllowances()
+	 * @see #getDependent()
+	 * @generated
+	 */
+	EReference getDependent_Allowances();
+
+	/**
+	 * Returns the meta object for the container reference '{@link TaxationWithRoot.Dependent#getHousehold <em>Household</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the container reference '<em>Household</em>'.
+	 * @see TaxationWithRoot.Dependent#getHousehold()
+	 * @see #getDependent()
+	 * @generated
+	 */
+	EReference getDependent_Household();
+
+	/**
+	 * Returns the meta object for the reference '{@link TaxationWithRoot.Dependent#getFrom_agent <em>From agent</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>From agent</em>'.
+	 * @see TaxationWithRoot.Dependent#getFrom_agent()
+	 * @see #getDependent()
+	 * @generated
+	 */
+	EReference getDependent_From_agent();
+
+	/**
+	 * Returns the meta object for the reference list '{@link TaxationWithRoot.Dependent#getExpense <em>Expense</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference list '<em>Expense</em>'.
+	 * @see TaxationWithRoot.Dependent#getExpense()
+	 * @see #getDependent()
+	 * @generated
+	 */
+	EReference getDependent_Expense();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.External_Allowance <em>External Allowance</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>External Allowance</em>'.
+	 * @see TaxationWithRoot.External_Allowance
+	 * @generated
+	 */
+	EClass getExternal_Allowance();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.External_Allowance#getGrantor <em>Grantor</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Grantor</em>'.
+	 * @see TaxationWithRoot.External_Allowance#getGrantor()
+	 * @see #getExternal_Allowance()
+	 * @generated
+	 */
+	EAttribute getExternal_Allowance_Grantor();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.External_Allowance#getStarting_year <em>Starting year</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Starting year</em>'.
+	 * @see TaxationWithRoot.External_Allowance#getStarting_year()
+	 * @see #getExternal_Allowance()
+	 * @generated
+	 */
+	EAttribute getExternal_Allowance_Starting_year();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.External_Allowance#getEnding_year <em>Ending year</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Ending year</em>'.
+	 * @see TaxationWithRoot.External_Allowance#getEnding_year()
+	 * @see #getExternal_Allowance()
+	 * @generated
+	 */
+	EAttribute getExternal_Allowance_Ending_year();
+
+	/**
+	 * Returns the meta object for the reference '{@link TaxationWithRoot.External_Allowance#getReciver <em>Reciver</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Reciver</em>'.
+	 * @see TaxationWithRoot.External_Allowance#getReciver()
+	 * @see #getExternal_Allowance()
+	 * @generated
+	 */
+	EReference getExternal_Allowance_Reciver();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.External_Allowance#getId5 <em>Id5</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Id5</em>'.
+	 * @see TaxationWithRoot.External_Allowance#getId5()
+	 * @see #getExternal_Allowance()
+	 * @generated
+	 */
+	EAttribute getExternal_Allowance_Id5();
+
+	/**
+	 * Returns the meta object for the container reference '{@link TaxationWithRoot.External_Allowance#getPerson <em>Person</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the container reference '<em>Person</em>'.
+	 * @see TaxationWithRoot.External_Allowance#getPerson()
+	 * @see #getExternal_Allowance()
+	 * @generated
+	 */
+	EReference getExternal_Allowance_Person();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.Household <em>Household</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Household</em>'.
+	 * @see TaxationWithRoot.Household
+	 * @generated
+	 */
+	EClass getHousehold();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link TaxationWithRoot.Household#getParents <em>Parents</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Parents</em>'.
+	 * @see TaxationWithRoot.Household#getParents()
+	 * @see #getHousehold()
+	 * @generated
+	 */
+	EReference getHousehold_Parents();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Household#getId1 <em>Id1</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Id1</em>'.
+	 * @see TaxationWithRoot.Household#getId1()
+	 * @see #getHousehold()
+	 * @generated
+	 */
+	EAttribute getHousehold_Id1();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link TaxationWithRoot.Household#getChildren <em>Children</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Children</em>'.
+	 * @see TaxationWithRoot.Household#getChildren()
+	 * @see #getHousehold()
+	 * @generated
+	 */
+	EReference getHousehold_Children();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.Legal_Union_Record <em>Legal Union Record</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Legal Union Record</em>'.
+	 * @see TaxationWithRoot.Legal_Union_Record
+	 * @generated
+	 */
+	EClass getLegal_Union_Record();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Legal_Union_Record#getStart_year <em>Start year</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Start year</em>'.
+	 * @see TaxationWithRoot.Legal_Union_Record#getStart_year()
+	 * @see #getLegal_Union_Record()
+	 * @generated
+	 */
+	EAttribute getLegal_Union_Record_Start_year();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Legal_Union_Record#getEnd_year <em>End year</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>End year</em>'.
+	 * @see TaxationWithRoot.Legal_Union_Record#getEnd_year()
+	 * @see #getLegal_Union_Record()
+	 * @generated
+	 */
+	EAttribute getLegal_Union_Record_End_year();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Legal_Union_Record#getSeparation_cause <em>Separation cause</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Separation cause</em>'.
+	 * @see TaxationWithRoot.Legal_Union_Record#getSeparation_cause()
+	 * @see #getLegal_Union_Record()
+	 * @generated
+	 */
+	EAttribute getLegal_Union_Record_Separation_cause();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link TaxationWithRoot.Legal_Union_Record#getIndividual_A <em>Individual A</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Individual A</em>'.
+	 * @see TaxationWithRoot.Legal_Union_Record#getIndividual_A()
+	 * @see #getLegal_Union_Record()
+	 * @generated
+	 */
+	EReference getLegal_Union_Record_Individual_A();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link TaxationWithRoot.Legal_Union_Record#getIndividual_B <em>Individual B</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Individual B</em>'.
+	 * @see TaxationWithRoot.Legal_Union_Record#getIndividual_B()
+	 * @see #getLegal_Union_Record()
+	 * @generated
+	 */
+	EReference getLegal_Union_Record_Individual_B();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link TaxationWithRoot.Legal_Union_Record#getProperties <em>Properties</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Properties</em>'.
+	 * @see TaxationWithRoot.Legal_Union_Record#getProperties()
+	 * @see #getLegal_Union_Record()
+	 * @generated
+	 */
+	EReference getLegal_Union_Record_Properties();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Legal_Union_Record#isMutual_agreement <em>Mutual agreement</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Mutual agreement</em>'.
+	 * @see TaxationWithRoot.Legal_Union_Record#isMutual_agreement()
+	 * @see #getLegal_Union_Record()
+	 * @generated
+	 */
+	EAttribute getLegal_Union_Record_Mutual_agreement();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Legal_Union_Record#getId9 <em>Id9</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Id9</em>'.
+	 * @see TaxationWithRoot.Legal_Union_Record#getId9()
+	 * @see #getLegal_Union_Record()
+	 * @generated
+	 */
+	EAttribute getLegal_Union_Record_Id9();
+
+	/**
+	 * Returns the meta object for the container reference '{@link TaxationWithRoot.Legal_Union_Record#getHousehold <em>Household</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the container reference '<em>Household</em>'.
+	 * @see TaxationWithRoot.Legal_Union_Record#getHousehold()
+	 * @see #getLegal_Union_Record()
+	 * @generated
+	 */
+	EReference getLegal_Union_Record_Household();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.Tax_Property <em>Tax Property</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Tax Property</em>'.
+	 * @see TaxationWithRoot.Tax_Property
+	 * @generated
+	 */
+	EClass getTax_Property();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Tax_Property#getStarting_year <em>Starting year</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Starting year</em>'.
+	 * @see TaxationWithRoot.Tax_Property#getStarting_year()
+	 * @see #getTax_Property()
+	 * @generated
+	 */
+	EAttribute getTax_Property_Starting_year();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Tax_Property#getId10 <em>Id10</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Id10</em>'.
+	 * @see TaxationWithRoot.Tax_Property#getId10()
+	 * @see #getTax_Property()
+	 * @generated
+	 */
+	EAttribute getTax_Property_Id10();
+
+	/**
+	 * Returns the meta object for the container reference '{@link TaxationWithRoot.Tax_Property#getUnion_record <em>Union record</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the container reference '<em>Union record</em>'.
+	 * @see TaxationWithRoot.Tax_Property#getUnion_record()
+	 * @see #getTax_Property()
+	 * @generated
+	 */
+	EReference getTax_Property_Union_record();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.Tax_Case <em>Tax Case</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Tax Case</em>'.
+	 * @see TaxationWithRoot.Tax_Case
+	 * @generated
+	 */
+	EClass getTax_Case();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.FromAgent <em>From Agent</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>From Agent</em>'.
+	 * @see TaxationWithRoot.FromAgent
+	 * @generated
+	 */
+	EClass getFromAgent();
+
+	/**
+	 * Returns the meta object for the container reference '{@link TaxationWithRoot.FromAgent#getTaxPayer <em>Tax Payer</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the container reference '<em>Tax Payer</em>'.
+	 * @see TaxationWithRoot.FromAgent#getTaxPayer()
+	 * @see #getFromAgent()
+	 * @generated
+	 */
+	EReference getFromAgent_TaxPayer();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.FromAgent#isIs_dependent_eligible_for_CE_Not_In_Houshold_Children_Care <em>Is dependent eligible for CE Not In Houshold Children Care</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Is dependent eligible for CE Not In Houshold Children Care</em>'.
+	 * @see TaxationWithRoot.FromAgent#isIs_dependent_eligible_for_CE_Not_In_Houshold_Children_Care()
+	 * @see #getFromAgent()
+	 * @generated
+	 */
+	EAttribute getFromAgent_Is_dependent_eligible_for_CE_Not_In_Houshold_Children_Care();
+
+	/**
+	 * Returns the meta object for the reference '{@link TaxationWithRoot.FromAgent#getExpense <em>Expense</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Expense</em>'.
+	 * @see TaxationWithRoot.FromAgent#getExpense()
+	 * @see #getFromAgent()
+	 * @generated
+	 */
+	EReference getFromAgent_Expense();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.FromAgent#isIs_eligible_debt <em>Is eligible debt</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Is eligible debt</em>'.
+	 * @see TaxationWithRoot.FromAgent#isIs_eligible_debt()
+	 * @see #getFromAgent()
+	 * @generated
+	 */
+	EAttribute getFromAgent_Is_eligible_debt();
+
+	/**
+	 * Returns the meta object for the reference '{@link TaxationWithRoot.FromAgent#getDependent <em>Dependent</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Dependent</em>'.
+	 * @see TaxationWithRoot.FromAgent#getDependent()
+	 * @see #getFromAgent()
+	 * @generated
+	 */
+	EReference getFromAgent_Dependent();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.Income <em>Income</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Income</em>'.
+	 * @see TaxationWithRoot.Income
+	 * @generated
+	 */
+	EClass getIncome();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Income#getIncome_amount <em>Income amount</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Income amount</em>'.
+	 * @see TaxationWithRoot.Income#getIncome_amount()
+	 * @see #getIncome()
+	 * @generated
+	 */
+	EAttribute getIncome_Income_amount();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link TaxationWithRoot.Income#getIncome_type <em>Income type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Income type</em>'.
+	 * @see TaxationWithRoot.Income#getIncome_type()
+	 * @see #getIncome()
+	 * @generated
+	 */
+	EReference getIncome_Income_type();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link TaxationWithRoot.Income#getTax_card <em>Tax card</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Tax card</em>'.
+	 * @see TaxationWithRoot.Income#getTax_card()
+	 * @see #getIncome()
+	 * @generated
+	 */
+	EReference getIncome_Tax_card();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Income#getTax_liability <em>Tax liability</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Tax liability</em>'.
+	 * @see TaxationWithRoot.Income#getTax_liability()
+	 * @see #getIncome()
+	 * @generated
+	 */
+	EAttribute getIncome_Tax_liability();
+
+	/**
+	 * Returns the meta object for the container reference '{@link TaxationWithRoot.Income#getTaxPayer <em>Tax Payer</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the container reference '<em>Tax Payer</em>'.
+	 * @see TaxationWithRoot.Income#getTaxPayer()
+	 * @see #getIncome()
+	 * @generated
+	 */
+	EReference getIncome_TaxPayer();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link TaxationWithRoot.Income#getDetails <em>Details</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Details</em>'.
+	 * @see TaxationWithRoot.Income#getDetails()
+	 * @see #getIncome()
+	 * @generated
+	 */
+	EReference getIncome_Details();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Income#getNum <em>Num</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Num</em>'.
+	 * @see TaxationWithRoot.Income#getNum()
+	 * @see #getIncome()
+	 * @generated
+	 */
+	EAttribute getIncome_Num();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link TaxationWithRoot.Income#getExpenses <em>Expenses</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Expenses</em>'.
+	 * @see TaxationWithRoot.Income#getExpenses()
+	 * @see #getIncome()
+	 * @generated
+	 */
+	EReference getIncome_Expenses();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.Income_Type <em>Income Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Income Type</em>'.
+	 * @see TaxationWithRoot.Income_Type
+	 * @generated
+	 */
+	EClass getIncome_Type();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Income_Type#getId8 <em>Id8</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Id8</em>'.
+	 * @see TaxationWithRoot.Income_Type#getId8()
+	 * @see #getIncome_Type()
+	 * @generated
+	 */
+	EAttribute getIncome_Type_Id8();
+
+	/**
+	 * Returns the meta object for the container reference '{@link TaxationWithRoot.Income_Type#getIncome <em>Income</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the container reference '<em>Income</em>'.
+	 * @see TaxationWithRoot.Income_Type#getIncome()
+	 * @see #getIncome_Type()
+	 * @generated
+	 */
+	EReference getIncome_Type_Income();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.Tax_Card <em>Tax Card</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Tax Card</em>'.
+	 * @see TaxationWithRoot.Tax_Card
+	 * @generated
+	 */
+	EClass getTax_Card();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Tax_Card#getCard_identifier <em>Card identifier</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Card identifier</em>'.
+	 * @see TaxationWithRoot.Tax_Card#getCard_identifier()
+	 * @see #getTax_Card()
+	 * @generated
+	 */
+	EAttribute getTax_Card_Card_identifier();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Tax_Card#getTax_office <em>Tax office</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Tax office</em>'.
+	 * @see TaxationWithRoot.Tax_Card#getTax_office()
+	 * @see #getTax_Card()
+	 * @generated
+	 */
+	EAttribute getTax_Card_Tax_office();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Tax_Card#getPercentage_of_witholding <em>Percentage of witholding</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Percentage of witholding</em>'.
+	 * @see TaxationWithRoot.Tax_Card#getPercentage_of_witholding()
+	 * @see #getTax_Card()
+	 * @generated
+	 */
+	EAttribute getTax_Card_Percentage_of_witholding();
+
+	/**
+	 * Returns the meta object for the attribute list '{@link TaxationWithRoot.Tax_Card#getTax_payers_name_surname <em>Tax payers name surname</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute list '<em>Tax payers name surname</em>'.
+	 * @see TaxationWithRoot.Tax_Card#getTax_payers_name_surname()
+	 * @see #getTax_Card()
+	 * @generated
+	 */
+	EAttribute getTax_Card_Tax_payers_name_surname();
+
+	/**
+	 * Returns the meta object for the attribute list '{@link TaxationWithRoot.Tax_Card#getTax_payers_partner_name_surname <em>Tax payers partner name surname</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute list '<em>Tax payers partner name surname</em>'.
+	 * @see TaxationWithRoot.Tax_Card#getTax_payers_partner_name_surname()
+	 * @see #getTax_Card()
+	 * @generated
+	 */
+	EAttribute getTax_Card_Tax_payers_partner_name_surname();
+
+	/**
+	 * Returns the meta object for the reference '{@link TaxationWithRoot.Tax_Card#getTax_payers_address <em>Tax payers address</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Tax payers address</em>'.
+	 * @see TaxationWithRoot.Tax_Card#getTax_payers_address()
+	 * @see #getTax_Card()
+	 * @generated
+	 */
+	EReference getTax_Card_Tax_payers_address();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Tax_Card#getJobs_Employer_SSNo <em>Jobs Employer SS No</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Jobs Employer SS No</em>'.
+	 * @see TaxationWithRoot.Tax_Card#getJobs_Employer_SSNo()
+	 * @see #getTax_Card()
+	 * @generated
+	 */
+	EAttribute getTax_Card_Jobs_Employer_SSNo();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Tax_Card#getJobs_employers_name <em>Jobs employers name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Jobs employers name</em>'.
+	 * @see TaxationWithRoot.Tax_Card#getJobs_employers_name()
+	 * @see #getTax_Card()
+	 * @generated
+	 */
+	EAttribute getTax_Card_Jobs_employers_name();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Tax_Card#getJobs_activity_type <em>Jobs activity type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Jobs activity type</em>'.
+	 * @see TaxationWithRoot.Tax_Card#getJobs_activity_type()
+	 * @see #getTax_Card()
+	 * @generated
+	 */
+	EAttribute getTax_Card_Jobs_activity_type();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Tax_Card#getJobs_place_of_work <em>Jobs place of work</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Jobs place of work</em>'.
+	 * @see TaxationWithRoot.Tax_Card#getJobs_place_of_work()
+	 * @see #getTax_Card()
+	 * @generated
+	 */
+	EAttribute getTax_Card_Jobs_place_of_work();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Tax_Card#getDeduction_FD_daily <em>Deduction FD daily</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Deduction FD daily</em>'.
+	 * @see TaxationWithRoot.Tax_Card#getDeduction_FD_daily()
+	 * @see #getTax_Card()
+	 * @generated
+	 */
+	EAttribute getTax_Card_Deduction_FD_daily();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Tax_Card#getDeduction_FD_monthly <em>Deduction FD monthly</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Deduction FD monthly</em>'.
+	 * @see TaxationWithRoot.Tax_Card#getDeduction_FD_monthly()
+	 * @see #getTax_Card()
+	 * @generated
+	 */
+	EAttribute getTax_Card_Deduction_FD_monthly();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Tax_Card#getDeduction_AC_daily <em>Deduction AC daily</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Deduction AC daily</em>'.
+	 * @see TaxationWithRoot.Tax_Card#getDeduction_AC_daily()
+	 * @see #getTax_Card()
+	 * @generated
+	 */
+	EAttribute getTax_Card_Deduction_AC_daily();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Tax_Card#getDeduction_AC_monthly <em>Deduction AC monthly</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Deduction AC monthly</em>'.
+	 * @see TaxationWithRoot.Tax_Card#getDeduction_AC_monthly()
+	 * @see #getTax_Card()
+	 * @generated
+	 */
+	EAttribute getTax_Card_Deduction_AC_monthly();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Tax_Card#getDeduction_AC_yearly <em>Deduction AC yearly</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Deduction AC yearly</em>'.
+	 * @see TaxationWithRoot.Tax_Card#getDeduction_AC_yearly()
+	 * @see #getTax_Card()
+	 * @generated
+	 */
+	EAttribute getTax_Card_Deduction_AC_yearly();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Tax_Card#getDeduction_CE_daily <em>Deduction CE daily</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Deduction CE daily</em>'.
+	 * @see TaxationWithRoot.Tax_Card#getDeduction_CE_daily()
+	 * @see #getTax_Card()
+	 * @generated
+	 */
+	EAttribute getTax_Card_Deduction_CE_daily();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Tax_Card#getDeduction_CE_monthly <em>Deduction CE monthly</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Deduction CE monthly</em>'.
+	 * @see TaxationWithRoot.Tax_Card#getDeduction_CE_monthly()
+	 * @see #getTax_Card()
+	 * @generated
+	 */
+	EAttribute getTax_Card_Deduction_CE_monthly();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Tax_Card#getDeduction_CE_yearly <em>Deduction CE yearly</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Deduction CE yearly</em>'.
+	 * @see TaxationWithRoot.Tax_Card#getDeduction_CE_yearly()
+	 * @see #getTax_Card()
+	 * @generated
+	 */
+	EAttribute getTax_Card_Deduction_CE_yearly();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Tax_Card#getDeduction_DS_daily <em>Deduction DS daily</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Deduction DS daily</em>'.
+	 * @see TaxationWithRoot.Tax_Card#getDeduction_DS_daily()
+	 * @see #getTax_Card()
+	 * @generated
+	 */
+	EAttribute getTax_Card_Deduction_DS_daily();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Tax_Card#getDeduction_DS_monthly <em>Deduction DS monthly</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Deduction DS monthly</em>'.
+	 * @see TaxationWithRoot.Tax_Card#getDeduction_DS_monthly()
+	 * @see #getTax_Card()
+	 * @generated
+	 */
+	EAttribute getTax_Card_Deduction_DS_monthly();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Tax_Card#getDeduction_FO_daily <em>Deduction FO daily</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Deduction FO daily</em>'.
+	 * @see TaxationWithRoot.Tax_Card#getDeduction_FO_daily()
+	 * @see #getTax_Card()
+	 * @generated
+	 */
+	EAttribute getTax_Card_Deduction_FO_daily();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Tax_Card#getDeduction_FO_monthly <em>Deduction FO monthly</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Deduction FO monthly</em>'.
+	 * @see TaxationWithRoot.Tax_Card#getDeduction_FO_monthly()
+	 * @see #getTax_Card()
+	 * @generated
+	 */
+	EAttribute getTax_Card_Deduction_FO_monthly();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Tax_Card#getDeduction_FO_yearly <em>Deduction FO yearly</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Deduction FO yearly</em>'.
+	 * @see TaxationWithRoot.Tax_Card#getDeduction_FO_yearly()
+	 * @see #getTax_Card()
+	 * @generated
+	 */
+	EAttribute getTax_Card_Deduction_FO_yearly();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Tax_Card#getCredit_CIS_daily <em>Credit CIS daily</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Credit CIS daily</em>'.
+	 * @see TaxationWithRoot.Tax_Card#getCredit_CIS_daily()
+	 * @see #getTax_Card()
+	 * @generated
+	 */
+	EAttribute getTax_Card_Credit_CIS_daily();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Tax_Card#getCredit_CIS_monthly <em>Credit CIS monthly</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Credit CIS monthly</em>'.
+	 * @see TaxationWithRoot.Tax_Card#getCredit_CIS_monthly()
+	 * @see #getTax_Card()
+	 * @generated
+	 */
+	EAttribute getTax_Card_Credit_CIS_monthly();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Tax_Card#getCredit_CIM_daily <em>Credit CIM daily</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Credit CIM daily</em>'.
+	 * @see TaxationWithRoot.Tax_Card#getCredit_CIM_daily()
+	 * @see #getTax_Card()
+	 * @generated
+	 */
+	EAttribute getTax_Card_Credit_CIM_daily();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Tax_Card#isValidity <em>Validity</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Validity</em>'.
+	 * @see TaxationWithRoot.Tax_Card#isValidity()
+	 * @see #getTax_Card()
+	 * @generated
+	 */
+	EAttribute getTax_Card_Validity();
+
+	/**
+	 * Returns the meta object for the reference list '{@link TaxationWithRoot.Tax_Card#getIncome_Tax_Credit <em>Income Tax Credit</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference list '<em>Income Tax Credit</em>'.
+	 * @see TaxationWithRoot.Tax_Card#getIncome_Tax_Credit()
+	 * @see #getTax_Card()
+	 * @generated
+	 */
+	EReference getTax_Card_Income_Tax_Credit();
+
+	/**
+	 * Returns the meta object for the reference '{@link TaxationWithRoot.Tax_Card#getPrevious <em>Previous</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Previous</em>'.
+	 * @see TaxationWithRoot.Tax_Card#getPrevious()
+	 * @see #getTax_Card()
+	 * @generated
+	 */
+	EReference getTax_Card_Previous();
+
+	/**
+	 * Returns the meta object for the reference '{@link TaxationWithRoot.Tax_Card#getCurrent_tax_card <em>Current tax card</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Current tax card</em>'.
+	 * @see TaxationWithRoot.Tax_Card#getCurrent_tax_card()
+	 * @see #getTax_Card()
+	 * @generated
+	 */
+	EReference getTax_Card_Current_tax_card();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Tax_Card#getCredit_CIM_yearly <em>Credit CIM yearly</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Credit CIM yearly</em>'.
+	 * @see TaxationWithRoot.Tax_Card#getCredit_CIM_yearly()
+	 * @see #getTax_Card()
+	 * @generated
+	 */
+	EAttribute getTax_Card_Credit_CIM_yearly();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Tax_Card#getDeduction_DS_Alimony_yearly <em>Deduction DS Alimony yearly</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Deduction DS Alimony yearly</em>'.
+	 * @see TaxationWithRoot.Tax_Card#getDeduction_DS_Alimony_yearly()
+	 * @see #getTax_Card()
+	 * @generated
+	 */
+	EAttribute getTax_Card_Deduction_DS_Alimony_yearly();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Tax_Card#getDeduction_DS_Debt_yearly <em>Deduction DS Debt yearly</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Deduction DS Debt yearly</em>'.
+	 * @see TaxationWithRoot.Tax_Card#getDeduction_DS_Debt_yearly()
+	 * @see #getTax_Card()
+	 * @generated
+	 */
+	EAttribute getTax_Card_Deduction_DS_Debt_yearly();
+
+	/**
+	 * Returns the meta object for the container reference '{@link TaxationWithRoot.Tax_Card#getIncome <em>Income</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the container reference '<em>Income</em>'.
+	 * @see TaxationWithRoot.Tax_Card#getIncome()
+	 * @see #getTax_Card()
+	 * @generated
+	 */
+	EReference getTax_Card_Income();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.Income_Tax_Credit <em>Income Tax Credit</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Income Tax Credit</em>'.
+	 * @see TaxationWithRoot.Income_Tax_Credit
+	 * @generated
+	 */
+	EClass getIncome_Tax_Credit();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Income_Tax_Credit#getGrantedBy <em>Granted By</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Granted By</em>'.
+	 * @see TaxationWithRoot.Income_Tax_Credit#getGrantedBy()
+	 * @see #getIncome_Tax_Credit()
+	 * @generated
+	 */
+	EAttribute getIncome_Tax_Credit_GrantedBy();
+
+	/**
+	 * Returns the meta object for the reference '{@link TaxationWithRoot.Income_Tax_Credit#getTaxPayer <em>Tax Payer</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Tax Payer</em>'.
+	 * @see TaxationWithRoot.Income_Tax_Credit#getTaxPayer()
+	 * @see #getIncome_Tax_Credit()
+	 * @generated
+	 */
+	EReference getIncome_Tax_Credit_TaxPayer();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Income_Tax_Credit#getTax_year <em>Tax year</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Tax year</em>'.
+	 * @see TaxationWithRoot.Income_Tax_Credit#getTax_year()
+	 * @see #getIncome_Tax_Credit()
+	 * @generated
+	 */
+	EAttribute getIncome_Tax_Credit_Tax_year();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Income_Tax_Credit#getYearly <em>Yearly</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Yearly</em>'.
+	 * @see TaxationWithRoot.Income_Tax_Credit#getYearly()
+	 * @see #getIncome_Tax_Credit()
+	 * @generated
+	 */
+	EAttribute getIncome_Tax_Credit_Yearly();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Income_Tax_Credit#getMonthly <em>Monthly</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Monthly</em>'.
+	 * @see TaxationWithRoot.Income_Tax_Credit#getMonthly()
+	 * @see #getIncome_Tax_Credit()
+	 * @generated
+	 */
+	EAttribute getIncome_Tax_Credit_Monthly();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Income_Tax_Credit#getDaily <em>Daily</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Daily</em>'.
+	 * @see TaxationWithRoot.Income_Tax_Credit#getDaily()
+	 * @see #getIncome_Tax_Credit()
+	 * @generated
+	 */
+	EAttribute getIncome_Tax_Credit_Daily();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Income_Tax_Credit#getId7 <em>Id7</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Id7</em>'.
+	 * @see TaxationWithRoot.Income_Tax_Credit#getId7()
+	 * @see #getIncome_Tax_Credit()
+	 * @generated
+	 */
+	EAttribute getIncome_Tax_Credit_Id7();
+
+	/**
+	 * Returns the meta object for the reference '{@link TaxationWithRoot.Income_Tax_Credit#getTaxation_Frame <em>Taxation Frame</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Taxation Frame</em>'.
+	 * @see TaxationWithRoot.Income_Tax_Credit#getTaxation_Frame()
+	 * @see #getIncome_Tax_Credit()
+	 * @generated
+	 */
+	EReference getIncome_Tax_Credit_Taxation_Frame();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.Income_Detail <em>Income Detail</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Income Detail</em>'.
+	 * @see TaxationWithRoot.Income_Detail
+	 * @generated
+	 */
+	EClass getIncome_Detail();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Income_Detail#getAmount <em>Amount</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Amount</em>'.
+	 * @see TaxationWithRoot.Income_Detail#getAmount()
+	 * @see #getIncome_Detail()
+	 * @generated
+	 */
+	EAttribute getIncome_Detail_Amount();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Income_Detail#isIs_worked <em>Is worked</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Is worked</em>'.
+	 * @see TaxationWithRoot.Income_Detail#isIs_worked()
+	 * @see #getIncome_Detail()
+	 * @generated
+	 */
+	EAttribute getIncome_Detail_Is_worked();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Income_Detail#getDistance <em>Distance</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Distance</em>'.
+	 * @see TaxationWithRoot.Income_Detail#getDistance()
+	 * @see #getIncome_Detail()
+	 * @generated
+	 */
+	EAttribute getIncome_Detail_Distance();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Income_Detail#getWorked_days <em>Worked days</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Worked days</em>'.
+	 * @see TaxationWithRoot.Income_Detail#getWorked_days()
+	 * @see #getIncome_Detail()
+	 * @generated
+	 */
+	EAttribute getIncome_Detail_Worked_days();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Income_Detail#isIs_contributing_CNS <em>Is contributing CNS</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Is contributing CNS</em>'.
+	 * @see TaxationWithRoot.Income_Detail#isIs_contributing_CNS()
+	 * @see #getIncome_Detail()
+	 * @generated
+	 */
+	EAttribute getIncome_Detail_Is_contributing_CNS();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Income_Detail#getId5 <em>Id5</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Id5</em>'.
+	 * @see TaxationWithRoot.Income_Detail#getId5()
+	 * @see #getIncome_Detail()
+	 * @generated
+	 */
+	EAttribute getIncome_Detail_Id5();
+
+	/**
+	 * Returns the meta object for the container reference '{@link TaxationWithRoot.Income_Detail#getIncome <em>Income</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the container reference '<em>Income</em>'.
+	 * @see TaxationWithRoot.Income_Detail#getIncome()
+	 * @see #getIncome_Detail()
+	 * @generated
+	 */
+	EReference getIncome_Detail_Income();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.FromLaw <em>From Law</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>From Law</em>'.
+	 * @see TaxationWithRoot.FromLaw
+	 * @generated
+	 */
+	EClass getFromLaw();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.FromLaw#getId <em>Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Id</em>'.
+	 * @see TaxationWithRoot.FromLaw#getId()
+	 * @see #getFromLaw()
+	 * @generated
+	 */
+	EAttribute getFromLaw_Id();
+
+	/**
+	 * Returns the meta object for the container reference '{@link TaxationWithRoot.FromLaw#getTaxPayer <em>Tax Payer</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the container reference '<em>Tax Payer</em>'.
+	 * @see TaxationWithRoot.FromLaw#getTaxPayer()
+	 * @see #getFromLaw()
+	 * @generated
+	 */
+	EReference getFromLaw_TaxPayer();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.Fiscal_Address <em>Fiscal Address</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Fiscal Address</em>'.
+	 * @see TaxationWithRoot.Fiscal_Address
+	 * @generated
+	 */
+	EClass getFiscal_Address();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.Habitual_Address <em>Habitual Address</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Habitual Address</em>'.
+	 * @see TaxationWithRoot.Habitual_Address
+	 * @generated
+	 */
+	EClass getHabitual_Address();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.Marriage_Record <em>Marriage Record</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Marriage Record</em>'.
+	 * @see TaxationWithRoot.Marriage_Record
+	 * @generated
+	 */
+	EClass getMarriage_Record();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.Non_Resident_Tax_Payer <em>Non Resident Tax Payer</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Non Resident Tax Payer</em>'.
+	 * @see TaxationWithRoot.Non_Resident_Tax_Payer
+	 * @generated
+	 */
+	EClass getNon_Resident_Tax_Payer();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Non_Resident_Tax_Payer#isIs_assimilated_to_resident <em>Is assimilated to resident</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Is assimilated to resident</em>'.
+	 * @see TaxationWithRoot.Non_Resident_Tax_Payer#isIs_assimilated_to_resident()
+	 * @see #getNon_Resident_Tax_Payer()
+	 * @generated
+	 */
+	EAttribute getNon_Resident_Tax_Payer_Is_assimilated_to_resident();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.Partnership_Record <em>Partnership Record</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Partnership Record</em>'.
+	 * @see TaxationWithRoot.Partnership_Record
+	 * @generated
+	 */
+	EClass getPartnership_Record();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.Resident_Tax_Payer <em>Resident Tax Payer</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Resident Tax Payer</em>'.
+	 * @see TaxationWithRoot.Resident_Tax_Payer
+	 * @generated
+	 */
+	EClass getResident_Tax_Payer();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.Trade_and_Business_Income <em>Trade and Business Income</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Trade and Business Income</em>'.
+	 * @see TaxationWithRoot.Trade_and_Business_Income
+	 * @generated
+	 */
+	EClass getTrade_and_Business_Income();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.Agriculture_and_Forestry_Income <em>Agriculture and Forestry Income</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Agriculture and Forestry Income</em>'.
+	 * @see TaxationWithRoot.Agriculture_and_Forestry_Income
+	 * @generated
+	 */
+	EClass getAgriculture_and_Forestry_Income();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.Pensions_and_Annuities_Income <em>Pensions and Annuities Income</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Pensions and Annuities Income</em>'.
+	 * @see TaxationWithRoot.Pensions_and_Annuities_Income
+	 * @generated
+	 */
+	EClass getPensions_and_Annuities_Income();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Pensions_and_Annuities_Income#isOccasional_payement <em>Occasional payement</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Occasional payement</em>'.
+	 * @see TaxationWithRoot.Pensions_and_Annuities_Income#isOccasional_payement()
+	 * @see #getPensions_and_Annuities_Income()
+	 * @generated
+	 */
+	EAttribute getPensions_and_Annuities_Income_Occasional_payement();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.Capital_and_Investments_Income <em>Capital and Investments Income</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Capital and Investments Income</em>'.
+	 * @see TaxationWithRoot.Capital_and_Investments_Income
+	 * @generated
+	 */
+	EClass getCapital_and_Investments_Income();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.Employment_Income <em>Employment Income</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Employment Income</em>'.
+	 * @see TaxationWithRoot.Employment_Income
+	 * @generated
+	 */
+	EClass getEmployment_Income();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.Rentals_and_Leases_Income <em>Rentals and Leases Income</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Rentals and Leases Income</em>'.
+	 * @see TaxationWithRoot.Rentals_and_Leases_Income
+	 * @generated
+	 */
+	EClass getRentals_and_Leases_Income();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Rentals_and_Leases_Income#isIs_periodic <em>Is periodic</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Is periodic</em>'.
+	 * @see TaxationWithRoot.Rentals_and_Leases_Income#isIs_periodic()
+	 * @see #getRentals_and_Leases_Income()
+	 * @generated
+	 */
+	EAttribute getRentals_and_Leases_Income_Is_periodic();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.Foreign_Income <em>Foreign Income</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Foreign Income</em>'.
+	 * @see TaxationWithRoot.Foreign_Income
+	 * @generated
+	 */
+	EClass getForeign_Income();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.Local_Income <em>Local Income</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Local Income</em>'.
+	 * @see TaxationWithRoot.Local_Income
+	 * @generated
+	 */
+	EClass getLocal_Income();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.CIM <em>CIM</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>CIM</em>'.
+	 * @see TaxationWithRoot.CIM
+	 * @generated
+	 */
+	EClass getCIM();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.CIP <em>CIP</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>CIP</em>'.
+	 * @see TaxationWithRoot.CIP
+	 * @generated
+	 */
+	EClass getCIP();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.CIS <em>CIS</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>CIS</em>'.
+	 * @see TaxationWithRoot.CIS
+	 * @generated
+	 */
+	EClass getCIS();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.Permanent_Expense <em>Permanent Expense</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Permanent Expense</em>'.
+	 * @see TaxationWithRoot.Permanent_Expense
+	 * @generated
+	 */
+	EClass getPermanent_Expense();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Permanent_Expense#getCategory <em>Category</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Category</em>'.
+	 * @see TaxationWithRoot.Permanent_Expense#getCategory()
+	 * @see #getPermanent_Expense()
+	 * @generated
+	 */
+	EAttribute getPermanent_Expense_Category();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.Special_Expense_DS <em>Special Expense DS</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Special Expense DS</em>'.
+	 * @see TaxationWithRoot.Special_Expense_DS
+	 * @generated
+	 */
+	EClass getSpecial_Expense_DS();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.Interest_Expense <em>Interest Expense</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Interest Expense</em>'.
+	 * @see TaxationWithRoot.Interest_Expense
+	 * @generated
+	 */
+	EClass getInterest_Expense();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.Private_Insurance_and_Plan <em>Private Insurance and Plan</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Private Insurance and Plan</em>'.
+	 * @see TaxationWithRoot.Private_Insurance_and_Plan
+	 * @generated
+	 */
+	EClass getPrivate_Insurance_and_Plan();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Private_Insurance_and_Plan#getCategory <em>Category</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Category</em>'.
+	 * @see TaxationWithRoot.Private_Insurance_and_Plan#getCategory()
+	 * @see #getPrivate_Insurance_and_Plan()
+	 * @generated
+	 */
+	EAttribute getPrivate_Insurance_and_Plan_Category();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Private_Insurance_and_Plan#getDuration_of_contract <em>Duration of contract</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Duration of contract</em>'.
+	 * @see TaxationWithRoot.Private_Insurance_and_Plan#getDuration_of_contract()
+	 * @see #getPrivate_Insurance_and_Plan()
+	 * @generated
+	 */
+	EAttribute getPrivate_Insurance_and_Plan_Duration_of_contract();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.Health_and_Pension_Insurance <em>Health and Pension Insurance</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Health and Pension Insurance</em>'.
+	 * @see TaxationWithRoot.Health_and_Pension_Insurance
+	 * @generated
+	 */
+	EClass getHealth_and_Pension_Insurance();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Health_and_Pension_Insurance#getCategory <em>Category</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Category</em>'.
+	 * @see TaxationWithRoot.Health_and_Pension_Insurance#getCategory()
+	 * @see #getHealth_and_Pension_Insurance()
+	 * @generated
+	 */
+	EAttribute getHealth_and_Pension_Insurance_Category();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Health_and_Pension_Insurance#isIs_related_to_additional_salary <em>Is related to additional salary</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Is related to additional salary</em>'.
+	 * @see TaxationWithRoot.Health_and_Pension_Insurance#isIs_related_to_additional_salary()
+	 * @see #getHealth_and_Pension_Insurance()
+	 * @generated
+	 */
+	EAttribute getHealth_and_Pension_Insurance_Is_related_to_additional_salary();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.Donation <em>Donation</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Donation</em>'.
+	 * @see TaxationWithRoot.Donation
+	 * @generated
+	 */
+	EClass getDonation();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Donation#getBeneficiary1 <em>Beneficiary1</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Beneficiary1</em>'.
+	 * @see TaxationWithRoot.Donation#getBeneficiary1()
+	 * @see #getDonation()
+	 * @generated
+	 */
+	EAttribute getDonation_Beneficiary1();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Donation#isIs_donation_reported <em>Is donation reported</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Is donation reported</em>'.
+	 * @see TaxationWithRoot.Donation#isIs_donation_reported()
+	 * @see #getDonation()
+	 * @generated
+	 */
+	EAttribute getDonation_Is_donation_reported();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.Loss_Carryforward <em>Loss Carryforward</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Loss Carryforward</em>'.
+	 * @see TaxationWithRoot.Loss_Carryforward
+	 * @generated
+	 */
+	EClass getLoss_Carryforward();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.Spousal_Expense_AC <em>Spousal Expense AC</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Spousal Expense AC</em>'.
+	 * @see TaxationWithRoot.Spousal_Expense_AC
+	 * @generated
+	 */
+	EClass getSpousal_Expense_AC();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.Extraordinary_Expense_CE <em>Extraordinary Expense CE</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Extraordinary Expense CE</em>'.
+	 * @see TaxationWithRoot.Extraordinary_Expense_CE
+	 * @generated
+	 */
+	EClass getExtraordinary_Expense_CE();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Extraordinary_Expense_CE#getThresholded_deduction_percentage <em>Thresholded deduction percentage</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Thresholded deduction percentage</em>'.
+	 * @see TaxationWithRoot.Extraordinary_Expense_CE#getThresholded_deduction_percentage()
+	 * @see #getExtraordinary_Expense_CE()
+	 * @generated
+	 */
+	EAttribute getExtraordinary_Expense_CE_Thresholded_deduction_percentage();
+
+	/**
+	 * Returns the meta object for the attribute '{@link TaxationWithRoot.Extraordinary_Expense_CE#getCe_type <em>Ce type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Ce type</em>'.
+	 * @see TaxationWithRoot.Extraordinary_Expense_CE#getCe_type()
+	 * @see #getExtraordinary_Expense_CE()
+	 * @generated
+	 */
+	EAttribute getExtraordinary_Expense_CE_Ce_type();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.Travel_Expense_FD <em>Travel Expense FD</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Travel Expense FD</em>'.
+	 * @see TaxationWithRoot.Travel_Expense_FD
+	 * @generated
+	 */
+	EClass getTravel_Expense_FD();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.Professional_Expense <em>Professional Expense</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Professional Expense</em>'.
+	 * @see TaxationWithRoot.Professional_Expense
+	 * @generated
+	 */
+	EClass getProfessional_Expense();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.Miscellaneous_Expense_FO <em>Miscellaneous Expense FO</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Miscellaneous Expense FO</em>'.
+	 * @see TaxationWithRoot.Miscellaneous_Expense_FO
+	 * @generated
+	 */
+	EClass getMiscellaneous_Expense_FO();
+
+	/**
+	 * Returns the meta object for class '{@link TaxationWithRoot.Resource <em>Resource</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Resource</em>'.
+	 * @see TaxationWithRoot.Resource
+	 * @generated
+	 */
+	EClass getResource();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link TaxationWithRoot.Resource#getContains <em>Contains</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Contains</em>'.
+	 * @see TaxationWithRoot.Resource#getContains()
+	 * @see #getResource()
+	 * @generated
+	 */
+	EReference getResource_Contains();
+
+	/**
+	 * Returns the meta object for enum '{@link TaxationWithRoot.Grantor <em>Grantor</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for enum '<em>Grantor</em>'.
+	 * @see TaxationWithRoot.Grantor
+	 * @generated
+	 */
+	EEnum getGrantor();
+
+	/**
+	 * Returns the meta object for enum '{@link TaxationWithRoot.Disability_Types <em>Disability Types</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for enum '<em>Disability Types</em>'.
+	 * @see TaxationWithRoot.Disability_Types
+	 * @generated
+	 */
+	EEnum getDisability_Types();
+
+	/**
+	 * Returns the meta object for enum '{@link TaxationWithRoot.Country <em>Country</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for enum '<em>Country</em>'.
+	 * @see TaxationWithRoot.Country
+	 * @generated
+	 */
+	EEnum getCountry();
+
+	/**
+	 * Returns the meta object for enum '{@link TaxationWithRoot.Tax_Office <em>Tax Office</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for enum '<em>Tax Office</em>'.
+	 * @see TaxationWithRoot.Tax_Office
+	 * @generated
+	 */
+	EEnum getTax_Office();
+
+	/**
+	 * Returns the meta object for enum '{@link TaxationWithRoot.Tax_Class_Category <em>Tax Class Category</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for enum '<em>Tax Class Category</em>'.
+	 * @see TaxationWithRoot.Tax_Class_Category
+	 * @generated
+	 */
+	EEnum getTax_Class_Category();
+
+	/**
+	 * Returns the meta object for enum '{@link TaxationWithRoot.Job_Activity <em>Job Activity</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for enum '<em>Job Activity</em>'.
+	 * @see TaxationWithRoot.Job_Activity
+	 * @generated
+	 */
+	EEnum getJob_Activity();
+
+	/**
+	 * Returns the meta object for enum '{@link TaxationWithRoot.Town <em>Town</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for enum '<em>Town</em>'.
+	 * @see TaxationWithRoot.Town
+	 * @generated
+	 */
+	EEnum getTown();
+
+	/**
+	 * Returns the meta object for enum '{@link TaxationWithRoot.CE_Type <em>CE Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for enum '<em>CE Type</em>'.
+	 * @see TaxationWithRoot.CE_Type
+	 * @generated
+	 */
+	EEnum getCE_Type();
+
+	/**
+	 * Returns the meta object for enum '{@link TaxationWithRoot.Expense_Purpose <em>Expense Purpose</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for enum '<em>Expense Purpose</em>'.
+	 * @see TaxationWithRoot.Expense_Purpose
+	 * @generated
+	 */
+	EEnum getExpense_Purpose();
+
+	/**
+	 * Returns the meta object for enum '{@link TaxationWithRoot.Dependent_Type <em>Dependent Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for enum '<em>Dependent Type</em>'.
+	 * @see TaxationWithRoot.Dependent_Type
+	 * @generated
+	 */
+	EEnum getDependent_Type();
+
+	/**
+	 * Returns the meta object for enum '{@link TaxationWithRoot.Separation_Causes <em>Separation Causes</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for enum '<em>Separation Causes</em>'.
+	 * @see TaxationWithRoot.Separation_Causes
+	 * @generated
+	 */
+	EEnum getSeparation_Causes();
+
+	/**
+	 * Returns the meta object for enum '{@link TaxationWithRoot.Category_of_Permanent_Expense <em>Category of Permanent Expense</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for enum '<em>Category of Permanent Expense</em>'.
+	 * @see TaxationWithRoot.Category_of_Permanent_Expense
+	 * @generated
+	 */
+	EEnum getCategory_of_Permanent_Expense();
+
+	/**
+	 * Returns the meta object for enum '{@link TaxationWithRoot.Category_of_Health_and_Pension_Insurances <em>Category of Health and Pension Insurances</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for enum '<em>Category of Health and Pension Insurances</em>'.
+	 * @see TaxationWithRoot.Category_of_Health_and_Pension_Insurances
+	 * @generated
+	 */
+	EEnum getCategory_of_Health_and_Pension_Insurances();
+
+	/**
+	 * Returns the meta object for enum '{@link TaxationWithRoot.Category_of_Private_Insurance_and_Plan <em>Category of Private Insurance and Plan</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for enum '<em>Category of Private Insurance and Plan</em>'.
+	 * @see TaxationWithRoot.Category_of_Private_Insurance_and_Plan
+	 * @generated
+	 */
+	EEnum getCategory_of_Private_Insurance_and_Plan();
+
+	/**
+	 * Returns the meta object for enum '{@link TaxationWithRoot.Legal_Union_Types <em>Legal Union Types</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for enum '<em>Legal Union Types</em>'.
+	 * @see TaxationWithRoot.Legal_Union_Types
+	 * @generated
+	 */
+	EEnum getLegal_Union_Types();
+
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+	TaxationWithRootFactory getTaxationWithRootFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 *   <li>each class,</li>
+	 *   <li>each feature of each class,</li>
+	 *   <li>each operation of each class,</li>
+	 *   <li>each enum,</li>
+	 *   <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals {
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.ConstantsImpl <em>Constants</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.ConstantsImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getConstants()
+		 * @generated
+		 */
+		EClass CONSTANTS = eINSTANCE.getConstants();
+
+		/**
+		 * The meta object literal for the '<em><b>MAXIMUM CE RATE FOR CHILD NOT BEING PART OF HOUSEHOLD</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONSTANTS__MAXIMUM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD = eINSTANCE.getConstants_MAXIMUM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD();
+
+		/**
+		 * The meta object literal for the '<em><b>MAXIMUM CE RATE FOR HOUSE CARE AND CHILD PART OF THE HOUSEHOLD CARE</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONSTANTS__MAXIMUM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE = eINSTANCE.getConstants_MAXIMUM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE();
+
+		/**
+		 * The meta object literal for the '<em><b>MINIMUM SALARY</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONSTANTS__MINIMUM_SALARY = eINSTANCE.getConstants_MINIMUM_SALARY();
+
+		/**
+		 * The meta object literal for the '<em><b>FLAT RATE FOR EXTRA PROFESSIONAL DEDUCTION</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONSTANTS__FLAT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION = eINSTANCE.getConstants_FLAT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION();
+
+		/**
+		 * The meta object literal for the '<em><b>MAXIMUM DEDUCTIBLE PERCENTAGE FOR DONATIONS</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONSTANTS__MAXIMUM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS = eINSTANCE.getConstants_MAXIMUM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS();
+
+		/**
+		 * The meta object literal for the '<em><b>MINIMUM DEDUCTIBLE AMOUNT FOR DONATIONS</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONSTANTS__MINIMUM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS = eINSTANCE.getConstants_MINIMUM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS();
+
+		/**
+		 * The meta object literal for the '<em><b>MAXIMUM DEDUCTIBLE AMOUNT FOR ADDITIONAL PENSION AND INSURANC</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONSTANTS__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC = eINSTANCE.getConstants_MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC();
+
+		/**
+		 * The meta object literal for the '<em><b>MAXIMUM DEDUCTIBLE AMOUNT FOR ALIMONY EXPENSE</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONSTANTS__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE = eINSTANCE.getConstants_MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE();
+
+		/**
+		 * The meta object literal for the '<em><b>MAXIMAL DISTANCE FOR TRAVEL EXPENSE DEDUCTION</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONSTANTS__MAXIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION = eINSTANCE.getConstants_MAXIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION();
+
+		/**
+		 * The meta object literal for the '<em><b>MAXIMAL FLAT DISTANCE FOR TRAVEL EXPENSE DEDUCTION</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONSTANTS__MAXIMAL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION = eINSTANCE.getConstants_MAXIMAL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION();
+
+		/**
+		 * The meta object literal for the '<em><b>MINIMAL DISTANCE FOR TRAVEL EXPENSE DEDUCTION</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONSTANTS__MINIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION = eINSTANCE.getConstants_MINIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION();
+
+		/**
+		 * The meta object literal for the '<em><b>FLAT RATE CIM DAILY</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONSTANTS__FLAT_RATE_CIM_DAILY = eINSTANCE.getConstants_FLAT_RATE_CIM_DAILY();
+
+		/**
+		 * The meta object literal for the '<em><b>FLAT RATE CIM MONTHLY</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONSTANTS__FLAT_RATE_CIM_MONTHLY = eINSTANCE.getConstants_FLAT_RATE_CIM_MONTHLY();
+
+		/**
+		 * The meta object literal for the '<em><b>FLAT RATE CIM YEARLY</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONSTANTS__FLAT_RATE_CIM_YEARLY = eINSTANCE.getConstants_FLAT_RATE_CIM_YEARLY();
+
+		/**
+		 * The meta object literal for the '<em><b>FLAT RATE CIP DAILY</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONSTANTS__FLAT_RATE_CIP_DAILY = eINSTANCE.getConstants_FLAT_RATE_CIP_DAILY();
+
+		/**
+		 * The meta object literal for the '<em><b>FLAT RATE CIP MONTHLY</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONSTANTS__FLAT_RATE_CIP_MONTHLY = eINSTANCE.getConstants_FLAT_RATE_CIP_MONTHLY();
+
+		/**
+		 * The meta object literal for the '<em><b>FLAT RATE CIP YEARLY</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONSTANTS__FLAT_RATE_CIP_YEARLY = eINSTANCE.getConstants_FLAT_RATE_CIP_YEARLY();
+
+		/**
+		 * The meta object literal for the '<em><b>FLAT RATE CIS DAILY</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONSTANTS__FLAT_RATE_CIS_DAILY = eINSTANCE.getConstants_FLAT_RATE_CIS_DAILY();
+
+		/**
+		 * The meta object literal for the '<em><b>FLAT RATE CIS MONTHLY</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONSTANTS__FLAT_RATE_CIS_MONTHLY = eINSTANCE.getConstants_FLAT_RATE_CIS_MONTHLY();
+
+		/**
+		 * The meta object literal for the '<em><b>FLAT RATE CIS YEARLY</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONSTANTS__FLAT_RATE_CIS_YEARLY = eINSTANCE.getConstants_FLAT_RATE_CIS_YEARLY();
+
+		/**
+		 * The meta object literal for the '<em><b>FLAT RATE FOR TRAVEL EXPENSE PER UNIT</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONSTANTS__FLAT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT = eINSTANCE.getConstants_FLAT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT();
+
+		/**
+		 * The meta object literal for the '<em><b>MAXIMUM DEDUCTIBLE AMOUNT FOR DS</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONSTANTS__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_DS = eINSTANCE.getConstants_MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_DS();
+
+		/**
+		 * The meta object literal for the '<em><b>FLAT RATE FOR MISCELLANEOUS EXPENSE</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONSTANTS__FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE = eINSTANCE.getConstants_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE();
+
+		/**
+		 * The meta object literal for the '<em><b>DISABILITY FLAT RATE FOR MISCELLANEOUS EXPENSE</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONSTANTS__DISABILITY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE = eINSTANCE.getConstants_DISABILITY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE();
+
+		/**
+		 * The meta object literal for the '<em><b>MAXIMUM DEDUCTIBLE AMOUNT FOR ADDITIONAL PENSION AND INSURANCE</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONSTANTS__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE = eINSTANCE.getConstants_MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.Income_TaxImpl <em>Income Tax</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.Income_TaxImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getIncome_Tax()
+		 * @generated
+		 */
+		EClass INCOME_TAX = eINSTANCE.getIncome_Tax();
+
+		/**
+		 * The meta object literal for the '<em><b>Tax Payer</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference INCOME_TAX__TAX_PAYER = eINSTANCE.getIncome_Tax_TaxPayer();
+
+		/**
+		 * The meta object literal for the '<em><b>Tax amount</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute INCOME_TAX__TAX_AMOUNT = eINSTANCE.getIncome_Tax_Tax_amount();
+
+		/**
+		 * The meta object literal for the '<em><b>Tax year</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute INCOME_TAX__TAX_YEAR = eINSTANCE.getIncome_Tax_Tax_year();
+
+		/**
+		 * The meta object literal for the '<em><b>Id6</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute INCOME_TAX__ID6 = eINSTANCE.getIncome_Tax_Id6();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.Tax_PayerImpl <em>Tax Payer</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.Tax_PayerImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getTax_Payer()
+		 * @generated
+		 */
+		EClass TAX_PAYER = eINSTANCE.getTax_Payer();
+
+		/**
+		 * The meta object literal for the '<em><b>Dependents</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TAX_PAYER__DEPENDENTS = eINSTANCE.getTax_Payer_Dependents();
+
+		/**
+		 * The meta object literal for the '<em><b>From agent</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TAX_PAYER__FROM_AGENT = eINSTANCE.getTax_Payer_From_agent();
+
+		/**
+		 * The meta object literal for the '<em><b>Incomes</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TAX_PAYER__INCOMES = eINSTANCE.getTax_Payer_Incomes();
+
+		/**
+		 * The meta object literal for the '<em><b>From law</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TAX_PAYER__FROM_LAW = eINSTANCE.getTax_Payer_From_law();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.Physical_PersonImpl <em>Physical Person</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.Physical_PersonImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getPhysical_Person()
+		 * @generated
+		 */
+		EClass PHYSICAL_PERSON = eINSTANCE.getPhysical_Person();
+
+		/**
+		 * The meta object literal for the '<em><b>SS No</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PHYSICAL_PERSON__SS_NO = eINSTANCE.getPhysical_Person_SSNo();
+
+		/**
+		 * The meta object literal for the '<em><b>Addresses</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PHYSICAL_PERSON__ADDRESSES = eINSTANCE.getPhysical_Person_Addresses();
+
+		/**
+		 * The meta object literal for the '<em><b>Birth year</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PHYSICAL_PERSON__BIRTH_YEAR = eINSTANCE.getPhysical_Person_Birth_year();
+
+		/**
+		 * The meta object literal for the '<em><b>Disability percentage</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PHYSICAL_PERSON__DISABILITY_PERCENTAGE = eINSTANCE.getPhysical_Person_Disability_percentage();
+
+		/**
+		 * The meta object literal for the '<em><b>Disability type</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PHYSICAL_PERSON__DISABILITY_TYPE = eINSTANCE.getPhysical_Person_Disability_type();
+
+		/**
+		 * The meta object literal for the '<em><b>Birth month</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PHYSICAL_PERSON__BIRTH_MONTH = eINSTANCE.getPhysical_Person_Birth_month();
+
+		/**
+		 * The meta object literal for the '<em><b>Birth day</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PHYSICAL_PERSON__BIRTH_DAY = eINSTANCE.getPhysical_Person_Birth_day();
+
+		/**
+		 * The meta object literal for the '<em><b>Expenses</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PHYSICAL_PERSON__EXPENSES = eINSTANCE.getPhysical_Person_Expenses();
+
+		/**
+		 * The meta object literal for the '<em><b>Is widower</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PHYSICAL_PERSON__IS_WIDOWER = eINSTANCE.getPhysical_Person_Is_widower();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.AddressImpl <em>Address</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.AddressImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getAddress()
+		 * @generated
+		 */
+		EClass ADDRESS = eINSTANCE.getAddress();
+
+		/**
+		 * The meta object literal for the '<em><b>Country</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute ADDRESS__COUNTRY = eINSTANCE.getAddress_Country();
+
+		/**
+		 * The meta object literal for the '<em><b>Street</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute ADDRESS__STREET = eINSTANCE.getAddress_Street();
+
+		/**
+		 * The meta object literal for the '<em><b>Zip Code</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute ADDRESS__ZIP_CODE = eINSTANCE.getAddress_ZipCode();
+
+		/**
+		 * The meta object literal for the '<em><b>City</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute ADDRESS__CITY = eINSTANCE.getAddress_City();
+
+		/**
+		 * The meta object literal for the '<em><b>Id2</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute ADDRESS__ID2 = eINSTANCE.getAddress_Id2();
+
+		/**
+		 * The meta object literal for the '<em><b>Tax Payer</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ADDRESS__TAX_PAYER = eINSTANCE.getAddress_TaxPayer();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.ExpenseImpl <em>Expense</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.ExpenseImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getExpense()
+		 * @generated
+		 */
+		EClass EXPENSE = eINSTANCE.getExpense();
+
+		/**
+		 * The meta object literal for the '<em><b>Declared amount</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute EXPENSE__DECLARED_AMOUNT = eINSTANCE.getExpense_Declared_amount();
+
+		/**
+		 * The meta object literal for the '<em><b>Expense purpose</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute EXPENSE__EXPENSE_PURPOSE = eINSTANCE.getExpense_Expense_purpose();
+
+		/**
+		 * The meta object literal for the '<em><b>Dependent</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference EXPENSE__DEPENDENT = eINSTANCE.getExpense_Dependent();
+
+		/**
+		 * The meta object literal for the '<em><b>From agent</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference EXPENSE__FROM_AGENT = eINSTANCE.getExpense_From_agent();
+
+		/**
+		 * The meta object literal for the '<em><b>Income</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference EXPENSE__INCOME = eINSTANCE.getExpense_Income();
+
+		/**
+		 * The meta object literal for the '<em><b>Id4</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute EXPENSE__ID4 = eINSTANCE.getExpense_Id4();
+
+		/**
+		 * The meta object literal for the '<em><b>Beneficiary</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference EXPENSE__BENEFICIARY = eINSTANCE.getExpense_Beneficiary();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.DependentImpl <em>Dependent</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.DependentImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getDependent()
+		 * @generated
+		 */
+		EClass DEPENDENT = eINSTANCE.getDependent();
+
+		/**
+		 * The meta object literal for the '<em><b>Dependent type</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DEPENDENT__DEPENDENT_TYPE = eINSTANCE.getDependent_Dependent_type();
+
+		/**
+		 * The meta object literal for the '<em><b>Responsible person</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DEPENDENT__RESPONSIBLE_PERSON = eINSTANCE.getDependent_Responsible_person();
+
+		/**
+		 * The meta object literal for the '<em><b>Continued studies</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DEPENDENT__CONTINUED_STUDIES = eINSTANCE.getDependent_Continued_studies();
+
+		/**
+		 * The meta object literal for the '<em><b>Allowances</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DEPENDENT__ALLOWANCES = eINSTANCE.getDependent_Allowances();
+
+		/**
+		 * The meta object literal for the '<em><b>Household</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DEPENDENT__HOUSEHOLD = eINSTANCE.getDependent_Household();
+
+		/**
+		 * The meta object literal for the '<em><b>From agent</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DEPENDENT__FROM_AGENT = eINSTANCE.getDependent_From_agent();
+
+		/**
+		 * The meta object literal for the '<em><b>Expense</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DEPENDENT__EXPENSE = eINSTANCE.getDependent_Expense();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.External_AllowanceImpl <em>External Allowance</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.External_AllowanceImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getExternal_Allowance()
+		 * @generated
+		 */
+		EClass EXTERNAL_ALLOWANCE = eINSTANCE.getExternal_Allowance();
+
+		/**
+		 * The meta object literal for the '<em><b>Grantor</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute EXTERNAL_ALLOWANCE__GRANTOR = eINSTANCE.getExternal_Allowance_Grantor();
+
+		/**
+		 * The meta object literal for the '<em><b>Starting year</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute EXTERNAL_ALLOWANCE__STARTING_YEAR = eINSTANCE.getExternal_Allowance_Starting_year();
+
+		/**
+		 * The meta object literal for the '<em><b>Ending year</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute EXTERNAL_ALLOWANCE__ENDING_YEAR = eINSTANCE.getExternal_Allowance_Ending_year();
+
+		/**
+		 * The meta object literal for the '<em><b>Reciver</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference EXTERNAL_ALLOWANCE__RECIVER = eINSTANCE.getExternal_Allowance_Reciver();
+
+		/**
+		 * The meta object literal for the '<em><b>Id5</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute EXTERNAL_ALLOWANCE__ID5 = eINSTANCE.getExternal_Allowance_Id5();
+
+		/**
+		 * The meta object literal for the '<em><b>Person</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference EXTERNAL_ALLOWANCE__PERSON = eINSTANCE.getExternal_Allowance_Person();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.HouseholdImpl <em>Household</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.HouseholdImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getHousehold()
+		 * @generated
+		 */
+		EClass HOUSEHOLD = eINSTANCE.getHousehold();
+
+		/**
+		 * The meta object literal for the '<em><b>Parents</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference HOUSEHOLD__PARENTS = eINSTANCE.getHousehold_Parents();
+
+		/**
+		 * The meta object literal for the '<em><b>Id1</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute HOUSEHOLD__ID1 = eINSTANCE.getHousehold_Id1();
+
+		/**
+		 * The meta object literal for the '<em><b>Children</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference HOUSEHOLD__CHILDREN = eINSTANCE.getHousehold_Children();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.Legal_Union_RecordImpl <em>Legal Union Record</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.Legal_Union_RecordImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getLegal_Union_Record()
+		 * @generated
+		 */
+		EClass LEGAL_UNION_RECORD = eINSTANCE.getLegal_Union_Record();
+
+		/**
+		 * The meta object literal for the '<em><b>Start year</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute LEGAL_UNION_RECORD__START_YEAR = eINSTANCE.getLegal_Union_Record_Start_year();
+
+		/**
+		 * The meta object literal for the '<em><b>End year</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute LEGAL_UNION_RECORD__END_YEAR = eINSTANCE.getLegal_Union_Record_End_year();
+
+		/**
+		 * The meta object literal for the '<em><b>Separation cause</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute LEGAL_UNION_RECORD__SEPARATION_CAUSE = eINSTANCE.getLegal_Union_Record_Separation_cause();
+
+		/**
+		 * The meta object literal for the '<em><b>Individual A</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference LEGAL_UNION_RECORD__INDIVIDUAL_A = eINSTANCE.getLegal_Union_Record_Individual_A();
+
+		/**
+		 * The meta object literal for the '<em><b>Individual B</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference LEGAL_UNION_RECORD__INDIVIDUAL_B = eINSTANCE.getLegal_Union_Record_Individual_B();
+
+		/**
+		 * The meta object literal for the '<em><b>Properties</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference LEGAL_UNION_RECORD__PROPERTIES = eINSTANCE.getLegal_Union_Record_Properties();
+
+		/**
+		 * The meta object literal for the '<em><b>Mutual agreement</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute LEGAL_UNION_RECORD__MUTUAL_AGREEMENT = eINSTANCE.getLegal_Union_Record_Mutual_agreement();
+
+		/**
+		 * The meta object literal for the '<em><b>Id9</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute LEGAL_UNION_RECORD__ID9 = eINSTANCE.getLegal_Union_Record_Id9();
+
+		/**
+		 * The meta object literal for the '<em><b>Household</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference LEGAL_UNION_RECORD__HOUSEHOLD = eINSTANCE.getLegal_Union_Record_Household();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.Tax_PropertyImpl <em>Tax Property</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.Tax_PropertyImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getTax_Property()
+		 * @generated
+		 */
+		EClass TAX_PROPERTY = eINSTANCE.getTax_Property();
+
+		/**
+		 * The meta object literal for the '<em><b>Starting year</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TAX_PROPERTY__STARTING_YEAR = eINSTANCE.getTax_Property_Starting_year();
+
+		/**
+		 * The meta object literal for the '<em><b>Id10</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TAX_PROPERTY__ID10 = eINSTANCE.getTax_Property_Id10();
+
+		/**
+		 * The meta object literal for the '<em><b>Union record</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TAX_PROPERTY__UNION_RECORD = eINSTANCE.getTax_Property_Union_record();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.Tax_Case <em>Tax Case</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.Tax_Case
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getTax_Case()
+		 * @generated
+		 */
+		EClass TAX_CASE = eINSTANCE.getTax_Case();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.FromAgentImpl <em>From Agent</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.FromAgentImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getFromAgent()
+		 * @generated
+		 */
+		EClass FROM_AGENT = eINSTANCE.getFromAgent();
+
+		/**
+		 * The meta object literal for the '<em><b>Tax Payer</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference FROM_AGENT__TAX_PAYER = eINSTANCE.getFromAgent_TaxPayer();
+
+		/**
+		 * The meta object literal for the '<em><b>Is dependent eligible for CE Not In Houshold Children Care</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute FROM_AGENT__IS_DEPENDENT_ELIGIBLE_FOR_CE_NOT_IN_HOUSHOLD_CHILDREN_CARE = eINSTANCE.getFromAgent_Is_dependent_eligible_for_CE_Not_In_Houshold_Children_Care();
+
+		/**
+		 * The meta object literal for the '<em><b>Expense</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference FROM_AGENT__EXPENSE = eINSTANCE.getFromAgent_Expense();
+
+		/**
+		 * The meta object literal for the '<em><b>Is eligible debt</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute FROM_AGENT__IS_ELIGIBLE_DEBT = eINSTANCE.getFromAgent_Is_eligible_debt();
+
+		/**
+		 * The meta object literal for the '<em><b>Dependent</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference FROM_AGENT__DEPENDENT = eINSTANCE.getFromAgent_Dependent();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.IncomeImpl <em>Income</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.IncomeImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getIncome()
+		 * @generated
+		 */
+		EClass INCOME = eINSTANCE.getIncome();
+
+		/**
+		 * The meta object literal for the '<em><b>Income amount</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute INCOME__INCOME_AMOUNT = eINSTANCE.getIncome_Income_amount();
+
+		/**
+		 * The meta object literal for the '<em><b>Income type</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference INCOME__INCOME_TYPE = eINSTANCE.getIncome_Income_type();
+
+		/**
+		 * The meta object literal for the '<em><b>Tax card</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference INCOME__TAX_CARD = eINSTANCE.getIncome_Tax_card();
+
+		/**
+		 * The meta object literal for the '<em><b>Tax liability</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute INCOME__TAX_LIABILITY = eINSTANCE.getIncome_Tax_liability();
+
+		/**
+		 * The meta object literal for the '<em><b>Tax Payer</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference INCOME__TAX_PAYER = eINSTANCE.getIncome_TaxPayer();
+
+		/**
+		 * The meta object literal for the '<em><b>Details</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference INCOME__DETAILS = eINSTANCE.getIncome_Details();
+
+		/**
+		 * The meta object literal for the '<em><b>Num</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute INCOME__NUM = eINSTANCE.getIncome_Num();
+
+		/**
+		 * The meta object literal for the '<em><b>Expenses</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference INCOME__EXPENSES = eINSTANCE.getIncome_Expenses();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.Income_TypeImpl <em>Income Type</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.Income_TypeImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getIncome_Type()
+		 * @generated
+		 */
+		EClass INCOME_TYPE = eINSTANCE.getIncome_Type();
+
+		/**
+		 * The meta object literal for the '<em><b>Id8</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute INCOME_TYPE__ID8 = eINSTANCE.getIncome_Type_Id8();
+
+		/**
+		 * The meta object literal for the '<em><b>Income</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference INCOME_TYPE__INCOME = eINSTANCE.getIncome_Type_Income();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.Tax_CardImpl <em>Tax Card</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.Tax_CardImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getTax_Card()
+		 * @generated
+		 */
+		EClass TAX_CARD = eINSTANCE.getTax_Card();
+
+		/**
+		 * The meta object literal for the '<em><b>Card identifier</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TAX_CARD__CARD_IDENTIFIER = eINSTANCE.getTax_Card_Card_identifier();
+
+		/**
+		 * The meta object literal for the '<em><b>Tax office</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TAX_CARD__TAX_OFFICE = eINSTANCE.getTax_Card_Tax_office();
+
+		/**
+		 * The meta object literal for the '<em><b>Percentage of witholding</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TAX_CARD__PERCENTAGE_OF_WITHOLDING = eINSTANCE.getTax_Card_Percentage_of_witholding();
+
+		/**
+		 * The meta object literal for the '<em><b>Tax payers name surname</b></em>' attribute list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TAX_CARD__TAX_PAYERS_NAME_SURNAME = eINSTANCE.getTax_Card_Tax_payers_name_surname();
+
+		/**
+		 * The meta object literal for the '<em><b>Tax payers partner name surname</b></em>' attribute list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TAX_CARD__TAX_PAYERS_PARTNER_NAME_SURNAME = eINSTANCE.getTax_Card_Tax_payers_partner_name_surname();
+
+		/**
+		 * The meta object literal for the '<em><b>Tax payers address</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TAX_CARD__TAX_PAYERS_ADDRESS = eINSTANCE.getTax_Card_Tax_payers_address();
+
+		/**
+		 * The meta object literal for the '<em><b>Jobs Employer SS No</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TAX_CARD__JOBS_EMPLOYER_SS_NO = eINSTANCE.getTax_Card_Jobs_Employer_SSNo();
+
+		/**
+		 * The meta object literal for the '<em><b>Jobs employers name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TAX_CARD__JOBS_EMPLOYERS_NAME = eINSTANCE.getTax_Card_Jobs_employers_name();
+
+		/**
+		 * The meta object literal for the '<em><b>Jobs activity type</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TAX_CARD__JOBS_ACTIVITY_TYPE = eINSTANCE.getTax_Card_Jobs_activity_type();
+
+		/**
+		 * The meta object literal for the '<em><b>Jobs place of work</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TAX_CARD__JOBS_PLACE_OF_WORK = eINSTANCE.getTax_Card_Jobs_place_of_work();
+
+		/**
+		 * The meta object literal for the '<em><b>Deduction FD daily</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TAX_CARD__DEDUCTION_FD_DAILY = eINSTANCE.getTax_Card_Deduction_FD_daily();
+
+		/**
+		 * The meta object literal for the '<em><b>Deduction FD monthly</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TAX_CARD__DEDUCTION_FD_MONTHLY = eINSTANCE.getTax_Card_Deduction_FD_monthly();
+
+		/**
+		 * The meta object literal for the '<em><b>Deduction AC daily</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TAX_CARD__DEDUCTION_AC_DAILY = eINSTANCE.getTax_Card_Deduction_AC_daily();
+
+		/**
+		 * The meta object literal for the '<em><b>Deduction AC monthly</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TAX_CARD__DEDUCTION_AC_MONTHLY = eINSTANCE.getTax_Card_Deduction_AC_monthly();
+
+		/**
+		 * The meta object literal for the '<em><b>Deduction AC yearly</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TAX_CARD__DEDUCTION_AC_YEARLY = eINSTANCE.getTax_Card_Deduction_AC_yearly();
+
+		/**
+		 * The meta object literal for the '<em><b>Deduction CE daily</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TAX_CARD__DEDUCTION_CE_DAILY = eINSTANCE.getTax_Card_Deduction_CE_daily();
+
+		/**
+		 * The meta object literal for the '<em><b>Deduction CE monthly</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TAX_CARD__DEDUCTION_CE_MONTHLY = eINSTANCE.getTax_Card_Deduction_CE_monthly();
+
+		/**
+		 * The meta object literal for the '<em><b>Deduction CE yearly</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TAX_CARD__DEDUCTION_CE_YEARLY = eINSTANCE.getTax_Card_Deduction_CE_yearly();
+
+		/**
+		 * The meta object literal for the '<em><b>Deduction DS daily</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TAX_CARD__DEDUCTION_DS_DAILY = eINSTANCE.getTax_Card_Deduction_DS_daily();
+
+		/**
+		 * The meta object literal for the '<em><b>Deduction DS monthly</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TAX_CARD__DEDUCTION_DS_MONTHLY = eINSTANCE.getTax_Card_Deduction_DS_monthly();
+
+		/**
+		 * The meta object literal for the '<em><b>Deduction FO daily</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TAX_CARD__DEDUCTION_FO_DAILY = eINSTANCE.getTax_Card_Deduction_FO_daily();
+
+		/**
+		 * The meta object literal for the '<em><b>Deduction FO monthly</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TAX_CARD__DEDUCTION_FO_MONTHLY = eINSTANCE.getTax_Card_Deduction_FO_monthly();
+
+		/**
+		 * The meta object literal for the '<em><b>Deduction FO yearly</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TAX_CARD__DEDUCTION_FO_YEARLY = eINSTANCE.getTax_Card_Deduction_FO_yearly();
+
+		/**
+		 * The meta object literal for the '<em><b>Credit CIS daily</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TAX_CARD__CREDIT_CIS_DAILY = eINSTANCE.getTax_Card_Credit_CIS_daily();
+
+		/**
+		 * The meta object literal for the '<em><b>Credit CIS monthly</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TAX_CARD__CREDIT_CIS_MONTHLY = eINSTANCE.getTax_Card_Credit_CIS_monthly();
+
+		/**
+		 * The meta object literal for the '<em><b>Credit CIM daily</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TAX_CARD__CREDIT_CIM_DAILY = eINSTANCE.getTax_Card_Credit_CIM_daily();
+
+		/**
+		 * The meta object literal for the '<em><b>Validity</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TAX_CARD__VALIDITY = eINSTANCE.getTax_Card_Validity();
+
+		/**
+		 * The meta object literal for the '<em><b>Income Tax Credit</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TAX_CARD__INCOME_TAX_CREDIT = eINSTANCE.getTax_Card_Income_Tax_Credit();
+
+		/**
+		 * The meta object literal for the '<em><b>Previous</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TAX_CARD__PREVIOUS = eINSTANCE.getTax_Card_Previous();
+
+		/**
+		 * The meta object literal for the '<em><b>Current tax card</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TAX_CARD__CURRENT_TAX_CARD = eINSTANCE.getTax_Card_Current_tax_card();
+
+		/**
+		 * The meta object literal for the '<em><b>Credit CIM yearly</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TAX_CARD__CREDIT_CIM_YEARLY = eINSTANCE.getTax_Card_Credit_CIM_yearly();
+
+		/**
+		 * The meta object literal for the '<em><b>Deduction DS Alimony yearly</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TAX_CARD__DEDUCTION_DS_ALIMONY_YEARLY = eINSTANCE.getTax_Card_Deduction_DS_Alimony_yearly();
+
+		/**
+		 * The meta object literal for the '<em><b>Deduction DS Debt yearly</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TAX_CARD__DEDUCTION_DS_DEBT_YEARLY = eINSTANCE.getTax_Card_Deduction_DS_Debt_yearly();
+
+		/**
+		 * The meta object literal for the '<em><b>Income</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TAX_CARD__INCOME = eINSTANCE.getTax_Card_Income();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.Income_Tax_CreditImpl <em>Income Tax Credit</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.Income_Tax_CreditImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getIncome_Tax_Credit()
+		 * @generated
+		 */
+		EClass INCOME_TAX_CREDIT = eINSTANCE.getIncome_Tax_Credit();
+
+		/**
+		 * The meta object literal for the '<em><b>Granted By</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute INCOME_TAX_CREDIT__GRANTED_BY = eINSTANCE.getIncome_Tax_Credit_GrantedBy();
+
+		/**
+		 * The meta object literal for the '<em><b>Tax Payer</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference INCOME_TAX_CREDIT__TAX_PAYER = eINSTANCE.getIncome_Tax_Credit_TaxPayer();
+
+		/**
+		 * The meta object literal for the '<em><b>Tax year</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute INCOME_TAX_CREDIT__TAX_YEAR = eINSTANCE.getIncome_Tax_Credit_Tax_year();
+
+		/**
+		 * The meta object literal for the '<em><b>Yearly</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute INCOME_TAX_CREDIT__YEARLY = eINSTANCE.getIncome_Tax_Credit_Yearly();
+
+		/**
+		 * The meta object literal for the '<em><b>Monthly</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute INCOME_TAX_CREDIT__MONTHLY = eINSTANCE.getIncome_Tax_Credit_Monthly();
+
+		/**
+		 * The meta object literal for the '<em><b>Daily</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute INCOME_TAX_CREDIT__DAILY = eINSTANCE.getIncome_Tax_Credit_Daily();
+
+		/**
+		 * The meta object literal for the '<em><b>Id7</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute INCOME_TAX_CREDIT__ID7 = eINSTANCE.getIncome_Tax_Credit_Id7();
+
+		/**
+		 * The meta object literal for the '<em><b>Taxation Frame</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference INCOME_TAX_CREDIT__TAXATION_FRAME = eINSTANCE.getIncome_Tax_Credit_Taxation_Frame();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.Income_DetailImpl <em>Income Detail</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.Income_DetailImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getIncome_Detail()
+		 * @generated
+		 */
+		EClass INCOME_DETAIL = eINSTANCE.getIncome_Detail();
+
+		/**
+		 * The meta object literal for the '<em><b>Amount</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute INCOME_DETAIL__AMOUNT = eINSTANCE.getIncome_Detail_Amount();
+
+		/**
+		 * The meta object literal for the '<em><b>Is worked</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute INCOME_DETAIL__IS_WORKED = eINSTANCE.getIncome_Detail_Is_worked();
+
+		/**
+		 * The meta object literal for the '<em><b>Distance</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute INCOME_DETAIL__DISTANCE = eINSTANCE.getIncome_Detail_Distance();
+
+		/**
+		 * The meta object literal for the '<em><b>Worked days</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute INCOME_DETAIL__WORKED_DAYS = eINSTANCE.getIncome_Detail_Worked_days();
+
+		/**
+		 * The meta object literal for the '<em><b>Is contributing CNS</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute INCOME_DETAIL__IS_CONTRIBUTING_CNS = eINSTANCE.getIncome_Detail_Is_contributing_CNS();
+
+		/**
+		 * The meta object literal for the '<em><b>Id5</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute INCOME_DETAIL__ID5 = eINSTANCE.getIncome_Detail_Id5();
+
+		/**
+		 * The meta object literal for the '<em><b>Income</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference INCOME_DETAIL__INCOME = eINSTANCE.getIncome_Detail_Income();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.FromLawImpl <em>From Law</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.FromLawImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getFromLaw()
+		 * @generated
+		 */
+		EClass FROM_LAW = eINSTANCE.getFromLaw();
+
+		/**
+		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute FROM_LAW__ID = eINSTANCE.getFromLaw_Id();
+
+		/**
+		 * The meta object literal for the '<em><b>Tax Payer</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference FROM_LAW__TAX_PAYER = eINSTANCE.getFromLaw_TaxPayer();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.Fiscal_AddressImpl <em>Fiscal Address</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.Fiscal_AddressImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getFiscal_Address()
+		 * @generated
+		 */
+		EClass FISCAL_ADDRESS = eINSTANCE.getFiscal_Address();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.Habitual_AddressImpl <em>Habitual Address</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.Habitual_AddressImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getHabitual_Address()
+		 * @generated
+		 */
+		EClass HABITUAL_ADDRESS = eINSTANCE.getHabitual_Address();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.Marriage_RecordImpl <em>Marriage Record</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.Marriage_RecordImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getMarriage_Record()
+		 * @generated
+		 */
+		EClass MARRIAGE_RECORD = eINSTANCE.getMarriage_Record();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.Non_Resident_Tax_PayerImpl <em>Non Resident Tax Payer</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.Non_Resident_Tax_PayerImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getNon_Resident_Tax_Payer()
+		 * @generated
+		 */
+		EClass NON_RESIDENT_TAX_PAYER = eINSTANCE.getNon_Resident_Tax_Payer();
+
+		/**
+		 * The meta object literal for the '<em><b>Is assimilated to resident</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute NON_RESIDENT_TAX_PAYER__IS_ASSIMILATED_TO_RESIDENT = eINSTANCE.getNon_Resident_Tax_Payer_Is_assimilated_to_resident();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.Partnership_RecordImpl <em>Partnership Record</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.Partnership_RecordImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getPartnership_Record()
+		 * @generated
+		 */
+		EClass PARTNERSHIP_RECORD = eINSTANCE.getPartnership_Record();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.Resident_Tax_PayerImpl <em>Resident Tax Payer</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.Resident_Tax_PayerImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getResident_Tax_Payer()
+		 * @generated
+		 */
+		EClass RESIDENT_TAX_PAYER = eINSTANCE.getResident_Tax_Payer();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.Trade_and_Business_IncomeImpl <em>Trade and Business Income</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.Trade_and_Business_IncomeImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getTrade_and_Business_Income()
+		 * @generated
+		 */
+		EClass TRADE_AND_BUSINESS_INCOME = eINSTANCE.getTrade_and_Business_Income();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.Agriculture_and_Forestry_IncomeImpl <em>Agriculture and Forestry Income</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.Agriculture_and_Forestry_IncomeImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getAgriculture_and_Forestry_Income()
+		 * @generated
+		 */
+		EClass AGRICULTURE_AND_FORESTRY_INCOME = eINSTANCE.getAgriculture_and_Forestry_Income();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.Pensions_and_Annuities_IncomeImpl <em>Pensions and Annuities Income</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.Pensions_and_Annuities_IncomeImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getPensions_and_Annuities_Income()
+		 * @generated
+		 */
+		EClass PENSIONS_AND_ANNUITIES_INCOME = eINSTANCE.getPensions_and_Annuities_Income();
+
+		/**
+		 * The meta object literal for the '<em><b>Occasional payement</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PENSIONS_AND_ANNUITIES_INCOME__OCCASIONAL_PAYEMENT = eINSTANCE.getPensions_and_Annuities_Income_Occasional_payement();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.Capital_and_Investments_IncomeImpl <em>Capital and Investments Income</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.Capital_and_Investments_IncomeImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getCapital_and_Investments_Income()
+		 * @generated
+		 */
+		EClass CAPITAL_AND_INVESTMENTS_INCOME = eINSTANCE.getCapital_and_Investments_Income();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.Employment_IncomeImpl <em>Employment Income</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.Employment_IncomeImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getEmployment_Income()
+		 * @generated
+		 */
+		EClass EMPLOYMENT_INCOME = eINSTANCE.getEmployment_Income();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.Rentals_and_Leases_IncomeImpl <em>Rentals and Leases Income</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.Rentals_and_Leases_IncomeImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getRentals_and_Leases_Income()
+		 * @generated
+		 */
+		EClass RENTALS_AND_LEASES_INCOME = eINSTANCE.getRentals_and_Leases_Income();
+
+		/**
+		 * The meta object literal for the '<em><b>Is periodic</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute RENTALS_AND_LEASES_INCOME__IS_PERIODIC = eINSTANCE.getRentals_and_Leases_Income_Is_periodic();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.Foreign_IncomeImpl <em>Foreign Income</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.Foreign_IncomeImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getForeign_Income()
+		 * @generated
+		 */
+		EClass FOREIGN_INCOME = eINSTANCE.getForeign_Income();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.Local_IncomeImpl <em>Local Income</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.Local_IncomeImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getLocal_Income()
+		 * @generated
+		 */
+		EClass LOCAL_INCOME = eINSTANCE.getLocal_Income();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.CIMImpl <em>CIM</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.CIMImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getCIM()
+		 * @generated
+		 */
+		EClass CIM = eINSTANCE.getCIM();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.CIPImpl <em>CIP</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.CIPImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getCIP()
+		 * @generated
+		 */
+		EClass CIP = eINSTANCE.getCIP();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.CISImpl <em>CIS</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.CISImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getCIS()
+		 * @generated
+		 */
+		EClass CIS = eINSTANCE.getCIS();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.Permanent_ExpenseImpl <em>Permanent Expense</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.Permanent_ExpenseImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getPermanent_Expense()
+		 * @generated
+		 */
+		EClass PERMANENT_EXPENSE = eINSTANCE.getPermanent_Expense();
+
+		/**
+		 * The meta object literal for the '<em><b>Category</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PERMANENT_EXPENSE__CATEGORY = eINSTANCE.getPermanent_Expense_Category();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.Special_Expense_DSImpl <em>Special Expense DS</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.Special_Expense_DSImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getSpecial_Expense_DS()
+		 * @generated
+		 */
+		EClass SPECIAL_EXPENSE_DS = eINSTANCE.getSpecial_Expense_DS();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.Interest_ExpenseImpl <em>Interest Expense</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.Interest_ExpenseImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getInterest_Expense()
+		 * @generated
+		 */
+		EClass INTEREST_EXPENSE = eINSTANCE.getInterest_Expense();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.Private_Insurance_and_PlanImpl <em>Private Insurance and Plan</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.Private_Insurance_and_PlanImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getPrivate_Insurance_and_Plan()
+		 * @generated
+		 */
+		EClass PRIVATE_INSURANCE_AND_PLAN = eINSTANCE.getPrivate_Insurance_and_Plan();
+
+		/**
+		 * The meta object literal for the '<em><b>Category</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PRIVATE_INSURANCE_AND_PLAN__CATEGORY = eINSTANCE.getPrivate_Insurance_and_Plan_Category();
+
+		/**
+		 * The meta object literal for the '<em><b>Duration of contract</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PRIVATE_INSURANCE_AND_PLAN__DURATION_OF_CONTRACT = eINSTANCE.getPrivate_Insurance_and_Plan_Duration_of_contract();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.Health_and_Pension_InsuranceImpl <em>Health and Pension Insurance</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.Health_and_Pension_InsuranceImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getHealth_and_Pension_Insurance()
+		 * @generated
+		 */
+		EClass HEALTH_AND_PENSION_INSURANCE = eINSTANCE.getHealth_and_Pension_Insurance();
+
+		/**
+		 * The meta object literal for the '<em><b>Category</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute HEALTH_AND_PENSION_INSURANCE__CATEGORY = eINSTANCE.getHealth_and_Pension_Insurance_Category();
+
+		/**
+		 * The meta object literal for the '<em><b>Is related to additional salary</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute HEALTH_AND_PENSION_INSURANCE__IS_RELATED_TO_ADDITIONAL_SALARY = eINSTANCE.getHealth_and_Pension_Insurance_Is_related_to_additional_salary();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.DonationImpl <em>Donation</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.DonationImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getDonation()
+		 * @generated
+		 */
+		EClass DONATION = eINSTANCE.getDonation();
+
+		/**
+		 * The meta object literal for the '<em><b>Beneficiary1</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DONATION__BENEFICIARY1 = eINSTANCE.getDonation_Beneficiary1();
+
+		/**
+		 * The meta object literal for the '<em><b>Is donation reported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DONATION__IS_DONATION_REPORTED = eINSTANCE.getDonation_Is_donation_reported();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.Loss_CarryforwardImpl <em>Loss Carryforward</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.Loss_CarryforwardImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getLoss_Carryforward()
+		 * @generated
+		 */
+		EClass LOSS_CARRYFORWARD = eINSTANCE.getLoss_Carryforward();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.Spousal_Expense_ACImpl <em>Spousal Expense AC</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.Spousal_Expense_ACImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getSpousal_Expense_AC()
+		 * @generated
+		 */
+		EClass SPOUSAL_EXPENSE_AC = eINSTANCE.getSpousal_Expense_AC();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.Extraordinary_Expense_CEImpl <em>Extraordinary Expense CE</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.Extraordinary_Expense_CEImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getExtraordinary_Expense_CE()
+		 * @generated
+		 */
+		EClass EXTRAORDINARY_EXPENSE_CE = eINSTANCE.getExtraordinary_Expense_CE();
+
+		/**
+		 * The meta object literal for the '<em><b>Thresholded deduction percentage</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute EXTRAORDINARY_EXPENSE_CE__THRESHOLDED_DEDUCTION_PERCENTAGE = eINSTANCE.getExtraordinary_Expense_CE_Thresholded_deduction_percentage();
+
+		/**
+		 * The meta object literal for the '<em><b>Ce type</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute EXTRAORDINARY_EXPENSE_CE__CE_TYPE = eINSTANCE.getExtraordinary_Expense_CE_Ce_type();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.Travel_Expense_FDImpl <em>Travel Expense FD</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.Travel_Expense_FDImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getTravel_Expense_FD()
+		 * @generated
+		 */
+		EClass TRAVEL_EXPENSE_FD = eINSTANCE.getTravel_Expense_FD();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.Professional_ExpenseImpl <em>Professional Expense</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.Professional_ExpenseImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getProfessional_Expense()
+		 * @generated
+		 */
+		EClass PROFESSIONAL_EXPENSE = eINSTANCE.getProfessional_Expense();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.Miscellaneous_Expense_FOImpl <em>Miscellaneous Expense FO</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.Miscellaneous_Expense_FOImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getMiscellaneous_Expense_FO()
+		 * @generated
+		 */
+		EClass MISCELLANEOUS_EXPENSE_FO = eINSTANCE.getMiscellaneous_Expense_FO();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.impl.ResourceImpl <em>Resource</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.impl.ResourceImpl
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getResource()
+		 * @generated
+		 */
+		EClass RESOURCE = eINSTANCE.getResource();
+
+		/**
+		 * The meta object literal for the '<em><b>Contains</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference RESOURCE__CONTAINS = eINSTANCE.getResource_Contains();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.Grantor <em>Grantor</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.Grantor
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getGrantor()
+		 * @generated
+		 */
+		EEnum GRANTOR = eINSTANCE.getGrantor();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.Disability_Types <em>Disability Types</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.Disability_Types
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getDisability_Types()
+		 * @generated
+		 */
+		EEnum DISABILITY_TYPES = eINSTANCE.getDisability_Types();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.Country <em>Country</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.Country
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getCountry()
+		 * @generated
+		 */
+		EEnum COUNTRY = eINSTANCE.getCountry();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.Tax_Office <em>Tax Office</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.Tax_Office
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getTax_Office()
+		 * @generated
+		 */
+		EEnum TAX_OFFICE = eINSTANCE.getTax_Office();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.Tax_Class_Category <em>Tax Class Category</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.Tax_Class_Category
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getTax_Class_Category()
+		 * @generated
+		 */
+		EEnum TAX_CLASS_CATEGORY = eINSTANCE.getTax_Class_Category();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.Job_Activity <em>Job Activity</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.Job_Activity
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getJob_Activity()
+		 * @generated
+		 */
+		EEnum JOB_ACTIVITY = eINSTANCE.getJob_Activity();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.Town <em>Town</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.Town
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getTown()
+		 * @generated
+		 */
+		EEnum TOWN = eINSTANCE.getTown();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.CE_Type <em>CE Type</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.CE_Type
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getCE_Type()
+		 * @generated
+		 */
+		EEnum CE_TYPE = eINSTANCE.getCE_Type();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.Expense_Purpose <em>Expense Purpose</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.Expense_Purpose
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getExpense_Purpose()
+		 * @generated
+		 */
+		EEnum EXPENSE_PURPOSE = eINSTANCE.getExpense_Purpose();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.Dependent_Type <em>Dependent Type</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.Dependent_Type
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getDependent_Type()
+		 * @generated
+		 */
+		EEnum DEPENDENT_TYPE = eINSTANCE.getDependent_Type();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.Separation_Causes <em>Separation Causes</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.Separation_Causes
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getSeparation_Causes()
+		 * @generated
+		 */
+		EEnum SEPARATION_CAUSES = eINSTANCE.getSeparation_Causes();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.Category_of_Permanent_Expense <em>Category of Permanent Expense</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.Category_of_Permanent_Expense
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getCategory_of_Permanent_Expense()
+		 * @generated
+		 */
+		EEnum CATEGORY_OF_PERMANENT_EXPENSE = eINSTANCE.getCategory_of_Permanent_Expense();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.Category_of_Health_and_Pension_Insurances <em>Category of Health and Pension Insurances</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.Category_of_Health_and_Pension_Insurances
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getCategory_of_Health_and_Pension_Insurances()
+		 * @generated
+		 */
+		EEnum CATEGORY_OF_HEALTH_AND_PENSION_INSURANCES = eINSTANCE.getCategory_of_Health_and_Pension_Insurances();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.Category_of_Private_Insurance_and_Plan <em>Category of Private Insurance and Plan</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.Category_of_Private_Insurance_and_Plan
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getCategory_of_Private_Insurance_and_Plan()
+		 * @generated
+		 */
+		EEnum CATEGORY_OF_PRIVATE_INSURANCE_AND_PLAN = eINSTANCE.getCategory_of_Private_Insurance_and_Plan();
+
+		/**
+		 * The meta object literal for the '{@link TaxationWithRoot.Legal_Union_Types <em>Legal Union Types</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see TaxationWithRoot.Legal_Union_Types
+		 * @see TaxationWithRoot.impl.TaxationWithRootPackageImpl#getLegal_Union_Types()
+		 * @generated
+		 */
+		EEnum LEGAL_UNION_TYPES = eINSTANCE.getLegal_Union_Types();
+
+	}
+
+} //TaxationWithRootPackage
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Town.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Town.java
new file mode 100644
index 00000000..f61dd7c6
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Town.java
@@ -0,0 +1,278 @@
+/**
+ */
+package TaxationWithRoot;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.Enumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Town</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * @see TaxationWithRoot.TaxationWithRootPackage#getTown()
+ * @model
+ * @generated
+ */
+public enum Town implements Enumerator {
+	/**
+	 * The '<em><b>LL</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #LL_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	LL(0, "LL", "LL"),
+
+	/**
+	 * The '<em><b>BB</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #BB_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	BB(1, "BB", "BB"),
+
+	/**
+	 * The '<em><b>SS</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #SS_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	SS(2, "SS", "SS"),
+
+	/**
+	 * The '<em><b>TT</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #TT_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	TT(3, "TT", "TT"),
+
+	/**
+	 * The '<em><b>Other</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #OTHER_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	OTHER(4, "Other", "Other");
+
+	/**
+	 * The '<em><b>LL</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #LL
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int LL_VALUE = 0;
+
+	/**
+	 * The '<em><b>BB</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #BB
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int BB_VALUE = 1;
+
+	/**
+	 * The '<em><b>SS</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #SS
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int SS_VALUE = 2;
+
+	/**
+	 * The '<em><b>TT</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #TT
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int TT_VALUE = 3;
+
+	/**
+	 * The '<em><b>Other</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #OTHER
+	 * @model name="Other"
+	 * @generated
+	 * @ordered
+	 */
+	public static final int OTHER_VALUE = 4;
+
+	/**
+	 * An array of all the '<em><b>Town</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static final Town[] VALUES_ARRAY =
+		new Town[] {
+			LL,
+			BB,
+			SS,
+			TT,
+			OTHER,
+		};
+
+	/**
+	 * A public read-only list of all the '<em><b>Town</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<Town> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+	/**
+	 * Returns the '<em><b>Town</b></em>' literal with the specified literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Town get(String literal) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			Town result = VALUES_ARRAY[i];
+			if (result.toString().equals(literal)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Town</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Town getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			Town result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Town</b></em>' literal with the specified integer value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Town get(int value) {
+		switch (value) {
+			case LL_VALUE: return LL;
+			case BB_VALUE: return BB;
+			case SS_VALUE: return SS;
+			case TT_VALUE: return TT;
+			case OTHER_VALUE: return OTHER;
+		}
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final int value;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String name;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String literal;
+
+	/**
+	 * Only this class can construct instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private Town(int value, String name, String literal) {
+		this.value = value;
+		this.name = name;
+		this.literal = literal;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getValue() {
+	  return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getName() {
+	  return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getLiteral() {
+	  return literal;
+	}
+
+	/**
+	 * Returns the literal value of the enumerator, which is its string representation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		return literal;
+	}
+	
+} //Town
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Trade_and_Business_Income.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Trade_and_Business_Income.java
new file mode 100644
index 00000000..9b07a1b9
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Trade_and_Business_Income.java
@@ -0,0 +1,17 @@
+/**
+ */
+package TaxationWithRoot;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Trade and Business Income</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getTrade_and_Business_Income()
+ * @model
+ * @generated
+ */
+public interface Trade_and_Business_Income extends Income_Type {
+} // Trade_and_Business_Income
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Travel_Expense_FD.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Travel_Expense_FD.java
new file mode 100644
index 00000000..85f84991
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/Travel_Expense_FD.java
@@ -0,0 +1,17 @@
+/**
+ */
+package TaxationWithRoot;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Travel Expense FD</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see TaxationWithRoot.TaxationWithRootPackage#getTravel_Expense_FD()
+ * @model
+ * @generated
+ */
+public interface Travel_Expense_FD extends Professional_Expense {
+} // Travel_Expense_FD
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/AddressImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/AddressImpl.java
new file mode 100644
index 00000000..8c97c7bf
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/AddressImpl.java
@@ -0,0 +1,465 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.Address;
+import TaxationWithRoot.Country;
+import TaxationWithRoot.Physical_Person;
+import TaxationWithRoot.TaxationWithRootPackage;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Address</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.impl.AddressImpl#getCountry <em>Country</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.AddressImpl#getStreet <em>Street</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.AddressImpl#getZipCode <em>Zip Code</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.AddressImpl#getCity <em>City</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.AddressImpl#getId2 <em>Id2</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.AddressImpl#getTaxPayer <em>Tax Payer</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class AddressImpl extends MinimalEObjectImpl.Container implements Address {
+	/**
+	 * The default value of the '{@link #getCountry() <em>Country</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCountry()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final Country COUNTRY_EDEFAULT = Country.ZZ;
+
+	/**
+	 * The cached value of the '{@link #getCountry() <em>Country</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCountry()
+	 * @generated
+	 * @ordered
+	 */
+	protected Country country = COUNTRY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getStreet() <em>Street</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStreet()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String STREET_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getStreet() <em>Street</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStreet()
+	 * @generated
+	 * @ordered
+	 */
+	protected String street = STREET_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getZipCode() <em>Zip Code</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getZipCode()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ZIP_CODE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getZipCode() <em>Zip Code</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getZipCode()
+	 * @generated
+	 * @ordered
+	 */
+	protected String zipCode = ZIP_CODE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getCity() <em>City</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCity()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String CITY_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getCity() <em>City</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCity()
+	 * @generated
+	 * @ordered
+	 */
+	protected String city = CITY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getId2() <em>Id2</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getId2()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ID2_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getId2() <em>Id2</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getId2()
+	 * @generated
+	 * @ordered
+	 */
+	protected String id2 = ID2_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getTaxPayer() <em>Tax Payer</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTaxPayer()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Physical_Person> taxPayer;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AddressImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.ADDRESS;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Country getCountry() {
+		return country;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setCountry(Country newCountry) {
+		Country oldCountry = country;
+		country = newCountry == null ? COUNTRY_EDEFAULT : newCountry;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.ADDRESS__COUNTRY, oldCountry, country));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getStreet() {
+		return street;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setStreet(String newStreet) {
+		String oldStreet = street;
+		street = newStreet;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.ADDRESS__STREET, oldStreet, street));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getZipCode() {
+		return zipCode;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setZipCode(String newZipCode) {
+		String oldZipCode = zipCode;
+		zipCode = newZipCode;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.ADDRESS__ZIP_CODE, oldZipCode, zipCode));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getCity() {
+		return city;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setCity(String newCity) {
+		String oldCity = city;
+		city = newCity;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.ADDRESS__CITY, oldCity, city));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getId2() {
+		return id2;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setId2(String newId2) {
+		String oldId2 = id2;
+		id2 = newId2;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.ADDRESS__ID2, oldId2, id2));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<Physical_Person> getTaxPayer() {
+		if (taxPayer == null) {
+			taxPayer = new EObjectWithInverseResolvingEList.ManyInverse<Physical_Person>(Physical_Person.class, this, TaxationWithRootPackage.ADDRESS__TAX_PAYER, TaxationWithRootPackage.PHYSICAL_PERSON__ADDRESSES);
+		}
+		return taxPayer;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case TaxationWithRootPackage.ADDRESS__TAX_PAYER:
+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getTaxPayer()).basicAdd(otherEnd, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case TaxationWithRootPackage.ADDRESS__TAX_PAYER:
+				return ((InternalEList<?>)getTaxPayer()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case TaxationWithRootPackage.ADDRESS__COUNTRY:
+				return getCountry();
+			case TaxationWithRootPackage.ADDRESS__STREET:
+				return getStreet();
+			case TaxationWithRootPackage.ADDRESS__ZIP_CODE:
+				return getZipCode();
+			case TaxationWithRootPackage.ADDRESS__CITY:
+				return getCity();
+			case TaxationWithRootPackage.ADDRESS__ID2:
+				return getId2();
+			case TaxationWithRootPackage.ADDRESS__TAX_PAYER:
+				return getTaxPayer();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case TaxationWithRootPackage.ADDRESS__COUNTRY:
+				setCountry((Country)newValue);
+				return;
+			case TaxationWithRootPackage.ADDRESS__STREET:
+				setStreet((String)newValue);
+				return;
+			case TaxationWithRootPackage.ADDRESS__ZIP_CODE:
+				setZipCode((String)newValue);
+				return;
+			case TaxationWithRootPackage.ADDRESS__CITY:
+				setCity((String)newValue);
+				return;
+			case TaxationWithRootPackage.ADDRESS__ID2:
+				setId2((String)newValue);
+				return;
+			case TaxationWithRootPackage.ADDRESS__TAX_PAYER:
+				getTaxPayer().clear();
+				getTaxPayer().addAll((Collection<? extends Physical_Person>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.ADDRESS__COUNTRY:
+				setCountry(COUNTRY_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.ADDRESS__STREET:
+				setStreet(STREET_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.ADDRESS__ZIP_CODE:
+				setZipCode(ZIP_CODE_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.ADDRESS__CITY:
+				setCity(CITY_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.ADDRESS__ID2:
+				setId2(ID2_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.ADDRESS__TAX_PAYER:
+				getTaxPayer().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.ADDRESS__COUNTRY:
+				return country != COUNTRY_EDEFAULT;
+			case TaxationWithRootPackage.ADDRESS__STREET:
+				return STREET_EDEFAULT == null ? street != null : !STREET_EDEFAULT.equals(street);
+			case TaxationWithRootPackage.ADDRESS__ZIP_CODE:
+				return ZIP_CODE_EDEFAULT == null ? zipCode != null : !ZIP_CODE_EDEFAULT.equals(zipCode);
+			case TaxationWithRootPackage.ADDRESS__CITY:
+				return CITY_EDEFAULT == null ? city != null : !CITY_EDEFAULT.equals(city);
+			case TaxationWithRootPackage.ADDRESS__ID2:
+				return ID2_EDEFAULT == null ? id2 != null : !ID2_EDEFAULT.equals(id2);
+			case TaxationWithRootPackage.ADDRESS__TAX_PAYER:
+				return taxPayer != null && !taxPayer.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuilder result = new StringBuilder(super.toString());
+		result.append(" (country: ");
+		result.append(country);
+		result.append(", street: ");
+		result.append(street);
+		result.append(", zipCode: ");
+		result.append(zipCode);
+		result.append(", city: ");
+		result.append(city);
+		result.append(", id2: ");
+		result.append(id2);
+		result.append(')');
+		return result.toString();
+	}
+
+} //AddressImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Agriculture_and_Forestry_IncomeImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Agriculture_and_Forestry_IncomeImpl.java
new file mode 100644
index 00000000..4a953a0b
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Agriculture_and_Forestry_IncomeImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.Agriculture_and_Forestry_Income;
+import TaxationWithRoot.TaxationWithRootPackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Agriculture and Forestry Income</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class Agriculture_and_Forestry_IncomeImpl extends Income_TypeImpl implements Agriculture_and_Forestry_Income {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Agriculture_and_Forestry_IncomeImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.AGRICULTURE_AND_FORESTRY_INCOME;
+	}
+
+} //Agriculture_and_Forestry_IncomeImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/CIMImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/CIMImpl.java
new file mode 100644
index 00000000..c511cece
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/CIMImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.CIM;
+import TaxationWithRoot.TaxationWithRootPackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>CIM</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class CIMImpl extends Income_Tax_CreditImpl implements CIM {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CIMImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.CIM;
+	}
+
+} //CIMImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/CIPImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/CIPImpl.java
new file mode 100644
index 00000000..41f43e75
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/CIPImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.CIP;
+import TaxationWithRoot.TaxationWithRootPackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>CIP</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class CIPImpl extends Income_Tax_CreditImpl implements CIP {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CIPImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.CIP;
+	}
+
+} //CIPImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/CISImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/CISImpl.java
new file mode 100644
index 00000000..1aa54828
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/CISImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.CIS;
+import TaxationWithRoot.TaxationWithRootPackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>CIS</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class CISImpl extends Income_Tax_CreditImpl implements CIS {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CISImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.CIS;
+	}
+
+} //CISImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Capital_and_Investments_IncomeImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Capital_and_Investments_IncomeImpl.java
new file mode 100644
index 00000000..7d1f8a04
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Capital_and_Investments_IncomeImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.Capital_and_Investments_Income;
+import TaxationWithRoot.TaxationWithRootPackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Capital and Investments Income</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class Capital_and_Investments_IncomeImpl extends Income_TypeImpl implements Capital_and_Investments_Income {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Capital_and_Investments_IncomeImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.CAPITAL_AND_INVESTMENTS_INCOME;
+	}
+
+} //Capital_and_Investments_IncomeImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/ConstantsImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/ConstantsImpl.java
new file mode 100644
index 00000000..dcf5b13a
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/ConstantsImpl.java
@@ -0,0 +1,1509 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.Constants;
+import TaxationWithRoot.TaxationWithRootPackage;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Constants</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.impl.ConstantsImpl#getMAXIMUM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD <em>MAXIMUM CE RATE FOR CHILD NOT BEING PART OF HOUSEHOLD</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.ConstantsImpl#getMAXIMUM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE <em>MAXIMUM CE RATE FOR HOUSE CARE AND CHILD PART OF THE HOUSEHOLD CARE</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.ConstantsImpl#getMINIMUM_SALARY <em>MINIMUM SALARY</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.ConstantsImpl#getFLAT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION <em>FLAT RATE FOR EXTRA PROFESSIONAL DEDUCTION</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.ConstantsImpl#getMAXIMUM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS <em>MAXIMUM DEDUCTIBLE PERCENTAGE FOR DONATIONS</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.ConstantsImpl#getMINIMUM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS <em>MINIMUM DEDUCTIBLE AMOUNT FOR DONATIONS</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.ConstantsImpl#getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC <em>MAXIMUM DEDUCTIBLE AMOUNT FOR ADDITIONAL PENSION AND INSURANC</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.ConstantsImpl#getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE <em>MAXIMUM DEDUCTIBLE AMOUNT FOR ALIMONY EXPENSE</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.ConstantsImpl#getMAXIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION <em>MAXIMAL DISTANCE FOR TRAVEL EXPENSE DEDUCTION</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.ConstantsImpl#getMAXIMAL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION <em>MAXIMAL FLAT DISTANCE FOR TRAVEL EXPENSE DEDUCTION</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.ConstantsImpl#getMINIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION <em>MINIMAL DISTANCE FOR TRAVEL EXPENSE DEDUCTION</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.ConstantsImpl#getFLAT_RATE_CIM_DAILY <em>FLAT RATE CIM DAILY</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.ConstantsImpl#getFLAT_RATE_CIM_MONTHLY <em>FLAT RATE CIM MONTHLY</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.ConstantsImpl#getFLAT_RATE_CIM_YEARLY <em>FLAT RATE CIM YEARLY</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.ConstantsImpl#getFLAT_RATE_CIP_DAILY <em>FLAT RATE CIP DAILY</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.ConstantsImpl#getFLAT_RATE_CIP_MONTHLY <em>FLAT RATE CIP MONTHLY</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.ConstantsImpl#getFLAT_RATE_CIP_YEARLY <em>FLAT RATE CIP YEARLY</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.ConstantsImpl#getFLAT_RATE_CIS_DAILY <em>FLAT RATE CIS DAILY</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.ConstantsImpl#getFLAT_RATE_CIS_MONTHLY <em>FLAT RATE CIS MONTHLY</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.ConstantsImpl#getFLAT_RATE_CIS_YEARLY <em>FLAT RATE CIS YEARLY</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.ConstantsImpl#getFLAT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT <em>FLAT RATE FOR TRAVEL EXPENSE PER UNIT</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.ConstantsImpl#getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_DS <em>MAXIMUM DEDUCTIBLE AMOUNT FOR DS</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.ConstantsImpl#getFLAT_RATE_FOR_MISCELLANEOUS_EXPENSE <em>FLAT RATE FOR MISCELLANEOUS EXPENSE</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.ConstantsImpl#getDISABILITY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE <em>DISABILITY FLAT RATE FOR MISCELLANEOUS EXPENSE</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.ConstantsImpl#getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE <em>MAXIMUM DEDUCTIBLE AMOUNT FOR ADDITIONAL PENSION AND INSURANCE</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class ConstantsImpl extends MinimalEObjectImpl.Container implements Constants {
+	/**
+	 * The default value of the '{@link #getMAXIMUM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD() <em>MAXIMUM CE RATE FOR CHILD NOT BEING PART OF HOUSEHOLD</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMAXIMUM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double MAXIMUM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD_EDEFAULT = 3480.0;
+
+	/**
+	 * The cached value of the '{@link #getMAXIMUM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD() <em>MAXIMUM CE RATE FOR CHILD NOT BEING PART OF HOUSEHOLD</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMAXIMUM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD()
+	 * @generated
+	 * @ordered
+	 */
+	protected double maximuM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD = MAXIMUM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getMAXIMUM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE() <em>MAXIMUM CE RATE FOR HOUSE CARE AND CHILD PART OF THE HOUSEHOLD CARE</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMAXIMUM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double MAXIMUM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE_EDEFAULT = 3600.0;
+
+	/**
+	 * The cached value of the '{@link #getMAXIMUM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE() <em>MAXIMUM CE RATE FOR HOUSE CARE AND CHILD PART OF THE HOUSEHOLD CARE</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMAXIMUM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE()
+	 * @generated
+	 * @ordered
+	 */
+	protected double maximuM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE = MAXIMUM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getMINIMUM_SALARY() <em>MINIMUM SALARY</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMINIMUM_SALARY()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double MINIMUM_SALARY_EDEFAULT = 1500.0;
+
+	/**
+	 * The cached value of the '{@link #getMINIMUM_SALARY() <em>MINIMUM SALARY</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMINIMUM_SALARY()
+	 * @generated
+	 * @ordered
+	 */
+	protected double minimuM_SALARY = MINIMUM_SALARY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getFLAT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION() <em>FLAT RATE FOR EXTRA PROFESSIONAL DEDUCTION</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFLAT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double FLAT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION_EDEFAULT = 4500.0;
+
+	/**
+	 * The cached value of the '{@link #getFLAT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION() <em>FLAT RATE FOR EXTRA PROFESSIONAL DEDUCTION</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFLAT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION()
+	 * @generated
+	 * @ordered
+	 */
+	protected double flaT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION = FLAT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getMAXIMUM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS() <em>MAXIMUM DEDUCTIBLE PERCENTAGE FOR DONATIONS</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMAXIMUM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double MAXIMUM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS_EDEFAULT = 20.0;
+
+	/**
+	 * The cached value of the '{@link #getMAXIMUM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS() <em>MAXIMUM DEDUCTIBLE PERCENTAGE FOR DONATIONS</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMAXIMUM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS()
+	 * @generated
+	 * @ordered
+	 */
+	protected double maximuM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS = MAXIMUM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getMINIMUM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS() <em>MINIMUM DEDUCTIBLE AMOUNT FOR DONATIONS</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMINIMUM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double MINIMUM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS_EDEFAULT = 120.0;
+
+	/**
+	 * The cached value of the '{@link #getMINIMUM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS() <em>MINIMUM DEDUCTIBLE AMOUNT FOR DONATIONS</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMINIMUM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS()
+	 * @generated
+	 * @ordered
+	 */
+	protected double minimuM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS = MINIMUM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC() <em>MAXIMUM DEDUCTIBLE AMOUNT FOR ADDITIONAL PENSION AND INSURANC</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC_EDEFAULT = 0.0;
+
+	/**
+	 * The cached value of the '{@link #getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC() <em>MAXIMUM DEDUCTIBLE AMOUNT FOR ADDITIONAL PENSION AND INSURANC</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC()
+	 * @generated
+	 * @ordered
+	 */
+	protected double maximuM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC = MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE() <em>MAXIMUM DEDUCTIBLE AMOUNT FOR ALIMONY EXPENSE</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE_EDEFAULT = 24000.0;
+
+	/**
+	 * The cached value of the '{@link #getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE() <em>MAXIMUM DEDUCTIBLE AMOUNT FOR ALIMONY EXPENSE</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE()
+	 * @generated
+	 * @ordered
+	 */
+	protected double maximuM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE = MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getMAXIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION() <em>MAXIMAL DISTANCE FOR TRAVEL EXPENSE DEDUCTION</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMAXIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double MAXIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION_EDEFAULT = 99.0;
+
+	/**
+	 * The cached value of the '{@link #getMAXIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION() <em>MAXIMAL DISTANCE FOR TRAVEL EXPENSE DEDUCTION</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMAXIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION()
+	 * @generated
+	 * @ordered
+	 */
+	protected double maximaL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION = MAXIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getMAXIMAL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION() <em>MAXIMAL FLAT DISTANCE FOR TRAVEL EXPENSE DEDUCTION</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMAXIMAL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double MAXIMAL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION_EDEFAULT = 30.0;
+
+	/**
+	 * The cached value of the '{@link #getMAXIMAL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION() <em>MAXIMAL FLAT DISTANCE FOR TRAVEL EXPENSE DEDUCTION</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMAXIMAL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION()
+	 * @generated
+	 * @ordered
+	 */
+	protected double maximaL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION = MAXIMAL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getMINIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION() <em>MINIMAL DISTANCE FOR TRAVEL EXPENSE DEDUCTION</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMINIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double MINIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION_EDEFAULT = 4.0;
+
+	/**
+	 * The cached value of the '{@link #getMINIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION() <em>MINIMAL DISTANCE FOR TRAVEL EXPENSE DEDUCTION</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMINIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION()
+	 * @generated
+	 * @ordered
+	 */
+	protected double minimaL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION = MINIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getFLAT_RATE_CIM_DAILY() <em>FLAT RATE CIM DAILY</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFLAT_RATE_CIM_DAILY()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double FLAT_RATE_CIM_DAILY_EDEFAULT = 2.0;
+
+	/**
+	 * The cached value of the '{@link #getFLAT_RATE_CIM_DAILY() <em>FLAT RATE CIM DAILY</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFLAT_RATE_CIM_DAILY()
+	 * @generated
+	 * @ordered
+	 */
+	protected double flaT_RATE_CIM_DAILY = FLAT_RATE_CIM_DAILY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getFLAT_RATE_CIM_MONTHLY() <em>FLAT RATE CIM MONTHLY</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFLAT_RATE_CIM_MONTHLY()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double FLAT_RATE_CIM_MONTHLY_EDEFAULT = 62.0;
+
+	/**
+	 * The cached value of the '{@link #getFLAT_RATE_CIM_MONTHLY() <em>FLAT RATE CIM MONTHLY</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFLAT_RATE_CIM_MONTHLY()
+	 * @generated
+	 * @ordered
+	 */
+	protected double flaT_RATE_CIM_MONTHLY = FLAT_RATE_CIM_MONTHLY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getFLAT_RATE_CIM_YEARLY() <em>FLAT RATE CIM YEARLY</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFLAT_RATE_CIM_YEARLY()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double FLAT_RATE_CIM_YEARLY_EDEFAULT = 750.0;
+
+	/**
+	 * The cached value of the '{@link #getFLAT_RATE_CIM_YEARLY() <em>FLAT RATE CIM YEARLY</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFLAT_RATE_CIM_YEARLY()
+	 * @generated
+	 * @ordered
+	 */
+	protected double flaT_RATE_CIM_YEARLY = FLAT_RATE_CIM_YEARLY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getFLAT_RATE_CIP_DAILY() <em>FLAT RATE CIP DAILY</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFLAT_RATE_CIP_DAILY()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double FLAT_RATE_CIP_DAILY_EDEFAULT = 1.0;
+
+	/**
+	 * The cached value of the '{@link #getFLAT_RATE_CIP_DAILY() <em>FLAT RATE CIP DAILY</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFLAT_RATE_CIP_DAILY()
+	 * @generated
+	 * @ordered
+	 */
+	protected double flaT_RATE_CIP_DAILY = FLAT_RATE_CIP_DAILY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getFLAT_RATE_CIP_MONTHLY() <em>FLAT RATE CIP MONTHLY</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFLAT_RATE_CIP_MONTHLY()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double FLAT_RATE_CIP_MONTHLY_EDEFAULT = 25.0;
+
+	/**
+	 * The cached value of the '{@link #getFLAT_RATE_CIP_MONTHLY() <em>FLAT RATE CIP MONTHLY</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFLAT_RATE_CIP_MONTHLY()
+	 * @generated
+	 * @ordered
+	 */
+	protected double flaT_RATE_CIP_MONTHLY = FLAT_RATE_CIP_MONTHLY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getFLAT_RATE_CIP_YEARLY() <em>FLAT RATE CIP YEARLY</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFLAT_RATE_CIP_YEARLY()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double FLAT_RATE_CIP_YEARLY_EDEFAULT = 30.0;
+
+	/**
+	 * The cached value of the '{@link #getFLAT_RATE_CIP_YEARLY() <em>FLAT RATE CIP YEARLY</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFLAT_RATE_CIP_YEARLY()
+	 * @generated
+	 * @ordered
+	 */
+	protected double flaT_RATE_CIP_YEARLY = FLAT_RATE_CIP_YEARLY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getFLAT_RATE_CIS_DAILY() <em>FLAT RATE CIS DAILY</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFLAT_RATE_CIS_DAILY()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double FLAT_RATE_CIS_DAILY_EDEFAULT = 1.0;
+
+	/**
+	 * The cached value of the '{@link #getFLAT_RATE_CIS_DAILY() <em>FLAT RATE CIS DAILY</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFLAT_RATE_CIS_DAILY()
+	 * @generated
+	 * @ordered
+	 */
+	protected double flaT_RATE_CIS_DAILY = FLAT_RATE_CIS_DAILY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getFLAT_RATE_CIS_MONTHLY() <em>FLAT RATE CIS MONTHLY</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFLAT_RATE_CIS_MONTHLY()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double FLAT_RATE_CIS_MONTHLY_EDEFAULT = 25.0;
+
+	/**
+	 * The cached value of the '{@link #getFLAT_RATE_CIS_MONTHLY() <em>FLAT RATE CIS MONTHLY</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFLAT_RATE_CIS_MONTHLY()
+	 * @generated
+	 * @ordered
+	 */
+	protected double flaT_RATE_CIS_MONTHLY = FLAT_RATE_CIS_MONTHLY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getFLAT_RATE_CIS_YEARLY() <em>FLAT RATE CIS YEARLY</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFLAT_RATE_CIS_YEARLY()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double FLAT_RATE_CIS_YEARLY_EDEFAULT = 300.0;
+
+	/**
+	 * The cached value of the '{@link #getFLAT_RATE_CIS_YEARLY() <em>FLAT RATE CIS YEARLY</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFLAT_RATE_CIS_YEARLY()
+	 * @generated
+	 * @ordered
+	 */
+	protected double flaT_RATE_CIS_YEARLY = FLAT_RATE_CIS_YEARLY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getFLAT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT() <em>FLAT RATE FOR TRAVEL EXPENSE PER UNIT</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFLAT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double FLAT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT_EDEFAULT = 99.0;
+
+	/**
+	 * The cached value of the '{@link #getFLAT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT() <em>FLAT RATE FOR TRAVEL EXPENSE PER UNIT</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFLAT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT()
+	 * @generated
+	 * @ordered
+	 */
+	protected double flaT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT = FLAT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_DS() <em>MAXIMUM DEDUCTIBLE AMOUNT FOR DS</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_DS()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_DS_EDEFAULT = 0.0;
+
+	/**
+	 * The cached value of the '{@link #getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_DS() <em>MAXIMUM DEDUCTIBLE AMOUNT FOR DS</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_DS()
+	 * @generated
+	 * @ordered
+	 */
+	protected double maximuM_DEDUCTIBLE_AMOUNT_FOR_DS = MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_DS_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getFLAT_RATE_FOR_MISCELLANEOUS_EXPENSE() <em>FLAT RATE FOR MISCELLANEOUS EXPENSE</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFLAT_RATE_FOR_MISCELLANEOUS_EXPENSE()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE_EDEFAULT = 0.0;
+
+	/**
+	 * The cached value of the '{@link #getFLAT_RATE_FOR_MISCELLANEOUS_EXPENSE() <em>FLAT RATE FOR MISCELLANEOUS EXPENSE</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFLAT_RATE_FOR_MISCELLANEOUS_EXPENSE()
+	 * @generated
+	 * @ordered
+	 */
+	protected double flaT_RATE_FOR_MISCELLANEOUS_EXPENSE = FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDISABILITY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE() <em>DISABILITY FLAT RATE FOR MISCELLANEOUS EXPENSE</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDISABILITY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double DISABILITY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE_EDEFAULT = 0.0;
+
+	/**
+	 * The cached value of the '{@link #getDISABILITY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE() <em>DISABILITY FLAT RATE FOR MISCELLANEOUS EXPENSE</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDISABILITY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE()
+	 * @generated
+	 * @ordered
+	 */
+	protected double disabilitY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE = DISABILITY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE() <em>MAXIMUM DEDUCTIBLE AMOUNT FOR ADDITIONAL PENSION AND INSURANCE</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE_EDEFAULT = 0.0;
+
+	/**
+	 * The cached value of the '{@link #getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE() <em>MAXIMUM DEDUCTIBLE AMOUNT FOR ADDITIONAL PENSION AND INSURANCE</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE()
+	 * @generated
+	 * @ordered
+	 */
+	protected double maximuM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE = MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ConstantsImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.CONSTANTS;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getMAXIMUM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD() {
+		return maximuM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setMAXIMUM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD(double newMAXIMUM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD) {
+		double oldMAXIMUM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD = maximuM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD;
+		maximuM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD = newMAXIMUM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.CONSTANTS__MAXIMUM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD, oldMAXIMUM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD, maximuM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getMAXIMUM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE() {
+		return maximuM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setMAXIMUM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE(double newMAXIMUM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE) {
+		double oldMAXIMUM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE = maximuM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE;
+		maximuM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE = newMAXIMUM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.CONSTANTS__MAXIMUM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE, oldMAXIMUM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE, maximuM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getMINIMUM_SALARY() {
+		return minimuM_SALARY;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setMINIMUM_SALARY(double newMINIMUM_SALARY) {
+		double oldMINIMUM_SALARY = minimuM_SALARY;
+		minimuM_SALARY = newMINIMUM_SALARY;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.CONSTANTS__MINIMUM_SALARY, oldMINIMUM_SALARY, minimuM_SALARY));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getFLAT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION() {
+		return flaT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setFLAT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION(double newFLAT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION) {
+		double oldFLAT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION = flaT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION;
+		flaT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION = newFLAT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.CONSTANTS__FLAT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION, oldFLAT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION, flaT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getMAXIMUM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS() {
+		return maximuM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setMAXIMUM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS(double newMAXIMUM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS) {
+		double oldMAXIMUM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS = maximuM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS;
+		maximuM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS = newMAXIMUM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.CONSTANTS__MAXIMUM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS, oldMAXIMUM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS, maximuM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getMINIMUM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS() {
+		return minimuM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setMINIMUM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS(double newMINIMUM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS) {
+		double oldMINIMUM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS = minimuM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS;
+		minimuM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS = newMINIMUM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.CONSTANTS__MINIMUM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS, oldMINIMUM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS, minimuM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC() {
+		return maximuM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC(double newMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC) {
+		double oldMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC = maximuM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC;
+		maximuM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC = newMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.CONSTANTS__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC, oldMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC, maximuM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE() {
+		return maximuM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE(double newMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE) {
+		double oldMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE = maximuM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE;
+		maximuM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE = newMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.CONSTANTS__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE, oldMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE, maximuM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getMAXIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION() {
+		return maximaL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setMAXIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION(double newMAXIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION) {
+		double oldMAXIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION = maximaL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION;
+		maximaL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION = newMAXIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.CONSTANTS__MAXIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION, oldMAXIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION, maximaL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getMAXIMAL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION() {
+		return maximaL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setMAXIMAL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION(double newMAXIMAL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION) {
+		double oldMAXIMAL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION = maximaL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION;
+		maximaL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION = newMAXIMAL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.CONSTANTS__MAXIMAL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION, oldMAXIMAL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION, maximaL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getMINIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION() {
+		return minimaL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setMINIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION(double newMINIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION) {
+		double oldMINIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION = minimaL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION;
+		minimaL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION = newMINIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.CONSTANTS__MINIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION, oldMINIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION, minimaL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getFLAT_RATE_CIM_DAILY() {
+		return flaT_RATE_CIM_DAILY;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setFLAT_RATE_CIM_DAILY(double newFLAT_RATE_CIM_DAILY) {
+		double oldFLAT_RATE_CIM_DAILY = flaT_RATE_CIM_DAILY;
+		flaT_RATE_CIM_DAILY = newFLAT_RATE_CIM_DAILY;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.CONSTANTS__FLAT_RATE_CIM_DAILY, oldFLAT_RATE_CIM_DAILY, flaT_RATE_CIM_DAILY));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getFLAT_RATE_CIM_MONTHLY() {
+		return flaT_RATE_CIM_MONTHLY;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setFLAT_RATE_CIM_MONTHLY(double newFLAT_RATE_CIM_MONTHLY) {
+		double oldFLAT_RATE_CIM_MONTHLY = flaT_RATE_CIM_MONTHLY;
+		flaT_RATE_CIM_MONTHLY = newFLAT_RATE_CIM_MONTHLY;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.CONSTANTS__FLAT_RATE_CIM_MONTHLY, oldFLAT_RATE_CIM_MONTHLY, flaT_RATE_CIM_MONTHLY));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getFLAT_RATE_CIM_YEARLY() {
+		return flaT_RATE_CIM_YEARLY;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setFLAT_RATE_CIM_YEARLY(double newFLAT_RATE_CIM_YEARLY) {
+		double oldFLAT_RATE_CIM_YEARLY = flaT_RATE_CIM_YEARLY;
+		flaT_RATE_CIM_YEARLY = newFLAT_RATE_CIM_YEARLY;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.CONSTANTS__FLAT_RATE_CIM_YEARLY, oldFLAT_RATE_CIM_YEARLY, flaT_RATE_CIM_YEARLY));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getFLAT_RATE_CIP_DAILY() {
+		return flaT_RATE_CIP_DAILY;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setFLAT_RATE_CIP_DAILY(double newFLAT_RATE_CIP_DAILY) {
+		double oldFLAT_RATE_CIP_DAILY = flaT_RATE_CIP_DAILY;
+		flaT_RATE_CIP_DAILY = newFLAT_RATE_CIP_DAILY;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.CONSTANTS__FLAT_RATE_CIP_DAILY, oldFLAT_RATE_CIP_DAILY, flaT_RATE_CIP_DAILY));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getFLAT_RATE_CIP_MONTHLY() {
+		return flaT_RATE_CIP_MONTHLY;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setFLAT_RATE_CIP_MONTHLY(double newFLAT_RATE_CIP_MONTHLY) {
+		double oldFLAT_RATE_CIP_MONTHLY = flaT_RATE_CIP_MONTHLY;
+		flaT_RATE_CIP_MONTHLY = newFLAT_RATE_CIP_MONTHLY;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.CONSTANTS__FLAT_RATE_CIP_MONTHLY, oldFLAT_RATE_CIP_MONTHLY, flaT_RATE_CIP_MONTHLY));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getFLAT_RATE_CIP_YEARLY() {
+		return flaT_RATE_CIP_YEARLY;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setFLAT_RATE_CIP_YEARLY(double newFLAT_RATE_CIP_YEARLY) {
+		double oldFLAT_RATE_CIP_YEARLY = flaT_RATE_CIP_YEARLY;
+		flaT_RATE_CIP_YEARLY = newFLAT_RATE_CIP_YEARLY;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.CONSTANTS__FLAT_RATE_CIP_YEARLY, oldFLAT_RATE_CIP_YEARLY, flaT_RATE_CIP_YEARLY));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getFLAT_RATE_CIS_DAILY() {
+		return flaT_RATE_CIS_DAILY;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setFLAT_RATE_CIS_DAILY(double newFLAT_RATE_CIS_DAILY) {
+		double oldFLAT_RATE_CIS_DAILY = flaT_RATE_CIS_DAILY;
+		flaT_RATE_CIS_DAILY = newFLAT_RATE_CIS_DAILY;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.CONSTANTS__FLAT_RATE_CIS_DAILY, oldFLAT_RATE_CIS_DAILY, flaT_RATE_CIS_DAILY));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getFLAT_RATE_CIS_MONTHLY() {
+		return flaT_RATE_CIS_MONTHLY;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setFLAT_RATE_CIS_MONTHLY(double newFLAT_RATE_CIS_MONTHLY) {
+		double oldFLAT_RATE_CIS_MONTHLY = flaT_RATE_CIS_MONTHLY;
+		flaT_RATE_CIS_MONTHLY = newFLAT_RATE_CIS_MONTHLY;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.CONSTANTS__FLAT_RATE_CIS_MONTHLY, oldFLAT_RATE_CIS_MONTHLY, flaT_RATE_CIS_MONTHLY));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getFLAT_RATE_CIS_YEARLY() {
+		return flaT_RATE_CIS_YEARLY;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setFLAT_RATE_CIS_YEARLY(double newFLAT_RATE_CIS_YEARLY) {
+		double oldFLAT_RATE_CIS_YEARLY = flaT_RATE_CIS_YEARLY;
+		flaT_RATE_CIS_YEARLY = newFLAT_RATE_CIS_YEARLY;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.CONSTANTS__FLAT_RATE_CIS_YEARLY, oldFLAT_RATE_CIS_YEARLY, flaT_RATE_CIS_YEARLY));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getFLAT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT() {
+		return flaT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setFLAT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT(double newFLAT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT) {
+		double oldFLAT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT = flaT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT;
+		flaT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT = newFLAT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.CONSTANTS__FLAT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT, oldFLAT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT, flaT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_DS() {
+		return maximuM_DEDUCTIBLE_AMOUNT_FOR_DS;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_DS(double newMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_DS) {
+		double oldMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_DS = maximuM_DEDUCTIBLE_AMOUNT_FOR_DS;
+		maximuM_DEDUCTIBLE_AMOUNT_FOR_DS = newMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_DS;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.CONSTANTS__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_DS, oldMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_DS, maximuM_DEDUCTIBLE_AMOUNT_FOR_DS));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getFLAT_RATE_FOR_MISCELLANEOUS_EXPENSE() {
+		return flaT_RATE_FOR_MISCELLANEOUS_EXPENSE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setFLAT_RATE_FOR_MISCELLANEOUS_EXPENSE(double newFLAT_RATE_FOR_MISCELLANEOUS_EXPENSE) {
+		double oldFLAT_RATE_FOR_MISCELLANEOUS_EXPENSE = flaT_RATE_FOR_MISCELLANEOUS_EXPENSE;
+		flaT_RATE_FOR_MISCELLANEOUS_EXPENSE = newFLAT_RATE_FOR_MISCELLANEOUS_EXPENSE;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.CONSTANTS__FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE, oldFLAT_RATE_FOR_MISCELLANEOUS_EXPENSE, flaT_RATE_FOR_MISCELLANEOUS_EXPENSE));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getDISABILITY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE() {
+		return disabilitY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDISABILITY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE(double newDISABILITY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE) {
+		double oldDISABILITY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE = disabilitY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE;
+		disabilitY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE = newDISABILITY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.CONSTANTS__DISABILITY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE, oldDISABILITY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE, disabilitY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE() {
+		return maximuM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE(double newMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE) {
+		double oldMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE = maximuM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE;
+		maximuM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE = newMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.CONSTANTS__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE, oldMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE, maximuM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case TaxationWithRootPackage.CONSTANTS__MAXIMUM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD:
+				return getMAXIMUM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD();
+			case TaxationWithRootPackage.CONSTANTS__MAXIMUM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE:
+				return getMAXIMUM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE();
+			case TaxationWithRootPackage.CONSTANTS__MINIMUM_SALARY:
+				return getMINIMUM_SALARY();
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION:
+				return getFLAT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION();
+			case TaxationWithRootPackage.CONSTANTS__MAXIMUM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS:
+				return getMAXIMUM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS();
+			case TaxationWithRootPackage.CONSTANTS__MINIMUM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS:
+				return getMINIMUM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS();
+			case TaxationWithRootPackage.CONSTANTS__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC:
+				return getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC();
+			case TaxationWithRootPackage.CONSTANTS__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE:
+				return getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE();
+			case TaxationWithRootPackage.CONSTANTS__MAXIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION:
+				return getMAXIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION();
+			case TaxationWithRootPackage.CONSTANTS__MAXIMAL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION:
+				return getMAXIMAL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION();
+			case TaxationWithRootPackage.CONSTANTS__MINIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION:
+				return getMINIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION();
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_CIM_DAILY:
+				return getFLAT_RATE_CIM_DAILY();
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_CIM_MONTHLY:
+				return getFLAT_RATE_CIM_MONTHLY();
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_CIM_YEARLY:
+				return getFLAT_RATE_CIM_YEARLY();
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_CIP_DAILY:
+				return getFLAT_RATE_CIP_DAILY();
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_CIP_MONTHLY:
+				return getFLAT_RATE_CIP_MONTHLY();
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_CIP_YEARLY:
+				return getFLAT_RATE_CIP_YEARLY();
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_CIS_DAILY:
+				return getFLAT_RATE_CIS_DAILY();
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_CIS_MONTHLY:
+				return getFLAT_RATE_CIS_MONTHLY();
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_CIS_YEARLY:
+				return getFLAT_RATE_CIS_YEARLY();
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT:
+				return getFLAT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT();
+			case TaxationWithRootPackage.CONSTANTS__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_DS:
+				return getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_DS();
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE:
+				return getFLAT_RATE_FOR_MISCELLANEOUS_EXPENSE();
+			case TaxationWithRootPackage.CONSTANTS__DISABILITY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE:
+				return getDISABILITY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE();
+			case TaxationWithRootPackage.CONSTANTS__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE:
+				return getMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case TaxationWithRootPackage.CONSTANTS__MAXIMUM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD:
+				setMAXIMUM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD((Double)newValue);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__MAXIMUM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE:
+				setMAXIMUM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE((Double)newValue);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__MINIMUM_SALARY:
+				setMINIMUM_SALARY((Double)newValue);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION:
+				setFLAT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION((Double)newValue);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__MAXIMUM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS:
+				setMAXIMUM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS((Double)newValue);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__MINIMUM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS:
+				setMINIMUM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS((Double)newValue);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC:
+				setMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC((Double)newValue);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE:
+				setMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE((Double)newValue);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__MAXIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION:
+				setMAXIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION((Double)newValue);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__MAXIMAL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION:
+				setMAXIMAL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION((Double)newValue);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__MINIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION:
+				setMINIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION((Double)newValue);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_CIM_DAILY:
+				setFLAT_RATE_CIM_DAILY((Double)newValue);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_CIM_MONTHLY:
+				setFLAT_RATE_CIM_MONTHLY((Double)newValue);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_CIM_YEARLY:
+				setFLAT_RATE_CIM_YEARLY((Double)newValue);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_CIP_DAILY:
+				setFLAT_RATE_CIP_DAILY((Double)newValue);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_CIP_MONTHLY:
+				setFLAT_RATE_CIP_MONTHLY((Double)newValue);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_CIP_YEARLY:
+				setFLAT_RATE_CIP_YEARLY((Double)newValue);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_CIS_DAILY:
+				setFLAT_RATE_CIS_DAILY((Double)newValue);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_CIS_MONTHLY:
+				setFLAT_RATE_CIS_MONTHLY((Double)newValue);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_CIS_YEARLY:
+				setFLAT_RATE_CIS_YEARLY((Double)newValue);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT:
+				setFLAT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT((Double)newValue);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_DS:
+				setMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_DS((Double)newValue);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE:
+				setFLAT_RATE_FOR_MISCELLANEOUS_EXPENSE((Double)newValue);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__DISABILITY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE:
+				setDISABILITY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE((Double)newValue);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE:
+				setMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE((Double)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.CONSTANTS__MAXIMUM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD:
+				setMAXIMUM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD(MAXIMUM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__MAXIMUM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE:
+				setMAXIMUM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE(MAXIMUM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__MINIMUM_SALARY:
+				setMINIMUM_SALARY(MINIMUM_SALARY_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION:
+				setFLAT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION(FLAT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__MAXIMUM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS:
+				setMAXIMUM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS(MAXIMUM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__MINIMUM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS:
+				setMINIMUM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS(MINIMUM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC:
+				setMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC(MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE:
+				setMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE(MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__MAXIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION:
+				setMAXIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION(MAXIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__MAXIMAL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION:
+				setMAXIMAL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION(MAXIMAL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__MINIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION:
+				setMINIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION(MINIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_CIM_DAILY:
+				setFLAT_RATE_CIM_DAILY(FLAT_RATE_CIM_DAILY_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_CIM_MONTHLY:
+				setFLAT_RATE_CIM_MONTHLY(FLAT_RATE_CIM_MONTHLY_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_CIM_YEARLY:
+				setFLAT_RATE_CIM_YEARLY(FLAT_RATE_CIM_YEARLY_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_CIP_DAILY:
+				setFLAT_RATE_CIP_DAILY(FLAT_RATE_CIP_DAILY_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_CIP_MONTHLY:
+				setFLAT_RATE_CIP_MONTHLY(FLAT_RATE_CIP_MONTHLY_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_CIP_YEARLY:
+				setFLAT_RATE_CIP_YEARLY(FLAT_RATE_CIP_YEARLY_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_CIS_DAILY:
+				setFLAT_RATE_CIS_DAILY(FLAT_RATE_CIS_DAILY_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_CIS_MONTHLY:
+				setFLAT_RATE_CIS_MONTHLY(FLAT_RATE_CIS_MONTHLY_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_CIS_YEARLY:
+				setFLAT_RATE_CIS_YEARLY(FLAT_RATE_CIS_YEARLY_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT:
+				setFLAT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT(FLAT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_DS:
+				setMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_DS(MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_DS_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE:
+				setFLAT_RATE_FOR_MISCELLANEOUS_EXPENSE(FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__DISABILITY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE:
+				setDISABILITY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE(DISABILITY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.CONSTANTS__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE:
+				setMAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE(MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.CONSTANTS__MAXIMUM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD:
+				return maximuM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD != MAXIMUM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD_EDEFAULT;
+			case TaxationWithRootPackage.CONSTANTS__MAXIMUM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE:
+				return maximuM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE != MAXIMUM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE_EDEFAULT;
+			case TaxationWithRootPackage.CONSTANTS__MINIMUM_SALARY:
+				return minimuM_SALARY != MINIMUM_SALARY_EDEFAULT;
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION:
+				return flaT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION != FLAT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION_EDEFAULT;
+			case TaxationWithRootPackage.CONSTANTS__MAXIMUM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS:
+				return maximuM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS != MAXIMUM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS_EDEFAULT;
+			case TaxationWithRootPackage.CONSTANTS__MINIMUM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS:
+				return minimuM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS != MINIMUM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS_EDEFAULT;
+			case TaxationWithRootPackage.CONSTANTS__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC:
+				return maximuM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC != MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC_EDEFAULT;
+			case TaxationWithRootPackage.CONSTANTS__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE:
+				return maximuM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE != MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE_EDEFAULT;
+			case TaxationWithRootPackage.CONSTANTS__MAXIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION:
+				return maximaL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION != MAXIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION_EDEFAULT;
+			case TaxationWithRootPackage.CONSTANTS__MAXIMAL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION:
+				return maximaL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION != MAXIMAL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION_EDEFAULT;
+			case TaxationWithRootPackage.CONSTANTS__MINIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION:
+				return minimaL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION != MINIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION_EDEFAULT;
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_CIM_DAILY:
+				return flaT_RATE_CIM_DAILY != FLAT_RATE_CIM_DAILY_EDEFAULT;
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_CIM_MONTHLY:
+				return flaT_RATE_CIM_MONTHLY != FLAT_RATE_CIM_MONTHLY_EDEFAULT;
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_CIM_YEARLY:
+				return flaT_RATE_CIM_YEARLY != FLAT_RATE_CIM_YEARLY_EDEFAULT;
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_CIP_DAILY:
+				return flaT_RATE_CIP_DAILY != FLAT_RATE_CIP_DAILY_EDEFAULT;
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_CIP_MONTHLY:
+				return flaT_RATE_CIP_MONTHLY != FLAT_RATE_CIP_MONTHLY_EDEFAULT;
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_CIP_YEARLY:
+				return flaT_RATE_CIP_YEARLY != FLAT_RATE_CIP_YEARLY_EDEFAULT;
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_CIS_DAILY:
+				return flaT_RATE_CIS_DAILY != FLAT_RATE_CIS_DAILY_EDEFAULT;
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_CIS_MONTHLY:
+				return flaT_RATE_CIS_MONTHLY != FLAT_RATE_CIS_MONTHLY_EDEFAULT;
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_CIS_YEARLY:
+				return flaT_RATE_CIS_YEARLY != FLAT_RATE_CIS_YEARLY_EDEFAULT;
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT:
+				return flaT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT != FLAT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT_EDEFAULT;
+			case TaxationWithRootPackage.CONSTANTS__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_DS:
+				return maximuM_DEDUCTIBLE_AMOUNT_FOR_DS != MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_DS_EDEFAULT;
+			case TaxationWithRootPackage.CONSTANTS__FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE:
+				return flaT_RATE_FOR_MISCELLANEOUS_EXPENSE != FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE_EDEFAULT;
+			case TaxationWithRootPackage.CONSTANTS__DISABILITY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE:
+				return disabilitY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE != DISABILITY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE_EDEFAULT;
+			case TaxationWithRootPackage.CONSTANTS__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE:
+				return maximuM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE != MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE_EDEFAULT;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuilder result = new StringBuilder(super.toString());
+		result.append(" (MAXIMUM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD: ");
+		result.append(maximuM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD);
+		result.append(", MAXIMUM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE: ");
+		result.append(maximuM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE);
+		result.append(", MINIMUM_SALARY: ");
+		result.append(minimuM_SALARY);
+		result.append(", FLAT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION: ");
+		result.append(flaT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION);
+		result.append(", MAXIMUM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS: ");
+		result.append(maximuM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS);
+		result.append(", MINIMUM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS: ");
+		result.append(minimuM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS);
+		result.append(", MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC: ");
+		result.append(maximuM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC);
+		result.append(", MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE: ");
+		result.append(maximuM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE);
+		result.append(", MAXIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION: ");
+		result.append(maximaL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION);
+		result.append(", MAXIMAL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION: ");
+		result.append(maximaL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION);
+		result.append(", MINIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION: ");
+		result.append(minimaL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION);
+		result.append(", FLAT_RATE_CIM_DAILY: ");
+		result.append(flaT_RATE_CIM_DAILY);
+		result.append(", FLAT_RATE_CIM_MONTHLY: ");
+		result.append(flaT_RATE_CIM_MONTHLY);
+		result.append(", FLAT_RATE_CIM_YEARLY: ");
+		result.append(flaT_RATE_CIM_YEARLY);
+		result.append(", FLAT_RATE_CIP_DAILY: ");
+		result.append(flaT_RATE_CIP_DAILY);
+		result.append(", FLAT_RATE_CIP_MONTHLY: ");
+		result.append(flaT_RATE_CIP_MONTHLY);
+		result.append(", FLAT_RATE_CIP_YEARLY: ");
+		result.append(flaT_RATE_CIP_YEARLY);
+		result.append(", FLAT_RATE_CIS_DAILY: ");
+		result.append(flaT_RATE_CIS_DAILY);
+		result.append(", FLAT_RATE_CIS_MONTHLY: ");
+		result.append(flaT_RATE_CIS_MONTHLY);
+		result.append(", FLAT_RATE_CIS_YEARLY: ");
+		result.append(flaT_RATE_CIS_YEARLY);
+		result.append(", FLAT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT: ");
+		result.append(flaT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT);
+		result.append(", MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_DS: ");
+		result.append(maximuM_DEDUCTIBLE_AMOUNT_FOR_DS);
+		result.append(", FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE: ");
+		result.append(flaT_RATE_FOR_MISCELLANEOUS_EXPENSE);
+		result.append(", DISABILITY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE: ");
+		result.append(disabilitY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE);
+		result.append(", MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE: ");
+		result.append(maximuM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE);
+		result.append(')');
+		return result.toString();
+	}
+
+} //ConstantsImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/DependentImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/DependentImpl.java
new file mode 100644
index 00000000..f6111014
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/DependentImpl.java
@@ -0,0 +1,599 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.Dependent;
+import TaxationWithRoot.Dependent_Type;
+import TaxationWithRoot.Expense;
+import TaxationWithRoot.External_Allowance;
+import TaxationWithRoot.FromAgent;
+import TaxationWithRoot.Household;
+import TaxationWithRoot.Tax_Payer;
+import TaxationWithRoot.TaxationWithRootPackage;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Dependent</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.impl.DependentImpl#getDependent_type <em>Dependent type</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.DependentImpl#getResponsible_person <em>Responsible person</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.DependentImpl#isContinued_studies <em>Continued studies</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.DependentImpl#getAllowances <em>Allowances</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.DependentImpl#getHousehold <em>Household</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.DependentImpl#getFrom_agent <em>From agent</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.DependentImpl#getExpense <em>Expense</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class DependentImpl extends Physical_PersonImpl implements Dependent {
+	/**
+	 * The default value of the '{@link #getDependent_type() <em>Dependent type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDependent_type()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final Dependent_Type DEPENDENT_TYPE_EDEFAULT = Dependent_Type.CHILD;
+
+	/**
+	 * The cached value of the '{@link #getDependent_type() <em>Dependent type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDependent_type()
+	 * @generated
+	 * @ordered
+	 */
+	protected Dependent_Type dependent_type = DEPENDENT_TYPE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isContinued_studies() <em>Continued studies</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isContinued_studies()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean CONTINUED_STUDIES_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isContinued_studies() <em>Continued studies</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isContinued_studies()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean continued_studies = CONTINUED_STUDIES_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getAllowances() <em>Allowances</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAllowances()
+	 * @generated
+	 * @ordered
+	 */
+	protected External_Allowance allowances;
+
+	/**
+	 * The cached value of the '{@link #getFrom_agent() <em>From agent</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFrom_agent()
+	 * @generated
+	 * @ordered
+	 */
+	protected FromAgent from_agent;
+
+	/**
+	 * The cached value of the '{@link #getExpense() <em>Expense</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getExpense()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Expense> expense;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DependentImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.DEPENDENT;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Dependent_Type getDependent_type() {
+		return dependent_type;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDependent_type(Dependent_Type newDependent_type) {
+		Dependent_Type oldDependent_type = dependent_type;
+		dependent_type = newDependent_type == null ? DEPENDENT_TYPE_EDEFAULT : newDependent_type;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.DEPENDENT__DEPENDENT_TYPE, oldDependent_type, dependent_type));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Tax_Payer getResponsible_person() {
+		if (eContainerFeatureID() != TaxationWithRootPackage.DEPENDENT__RESPONSIBLE_PERSON) return null;
+		return (Tax_Payer)eInternalContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetResponsible_person(Tax_Payer newResponsible_person, NotificationChain msgs) {
+		msgs = eBasicSetContainer((InternalEObject)newResponsible_person, TaxationWithRootPackage.DEPENDENT__RESPONSIBLE_PERSON, msgs);
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setResponsible_person(Tax_Payer newResponsible_person) {
+		if (newResponsible_person != eInternalContainer() || (eContainerFeatureID() != TaxationWithRootPackage.DEPENDENT__RESPONSIBLE_PERSON && newResponsible_person != null)) {
+			if (EcoreUtil.isAncestor(this, newResponsible_person))
+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+			NotificationChain msgs = null;
+			if (eInternalContainer() != null)
+				msgs = eBasicRemoveFromContainer(msgs);
+			if (newResponsible_person != null)
+				msgs = ((InternalEObject)newResponsible_person).eInverseAdd(this, TaxationWithRootPackage.TAX_PAYER__DEPENDENTS, Tax_Payer.class, msgs);
+			msgs = basicSetResponsible_person(newResponsible_person, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.DEPENDENT__RESPONSIBLE_PERSON, newResponsible_person, newResponsible_person));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isContinued_studies() {
+		return continued_studies;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setContinued_studies(boolean newContinued_studies) {
+		boolean oldContinued_studies = continued_studies;
+		continued_studies = newContinued_studies;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.DEPENDENT__CONTINUED_STUDIES, oldContinued_studies, continued_studies));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public External_Allowance getAllowances() {
+		return allowances;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetAllowances(External_Allowance newAllowances, NotificationChain msgs) {
+		External_Allowance oldAllowances = allowances;
+		allowances = newAllowances;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.DEPENDENT__ALLOWANCES, oldAllowances, newAllowances);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setAllowances(External_Allowance newAllowances) {
+		if (newAllowances != allowances) {
+			NotificationChain msgs = null;
+			if (allowances != null)
+				msgs = ((InternalEObject)allowances).eInverseRemove(this, TaxationWithRootPackage.EXTERNAL_ALLOWANCE__PERSON, External_Allowance.class, msgs);
+			if (newAllowances != null)
+				msgs = ((InternalEObject)newAllowances).eInverseAdd(this, TaxationWithRootPackage.EXTERNAL_ALLOWANCE__PERSON, External_Allowance.class, msgs);
+			msgs = basicSetAllowances(newAllowances, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.DEPENDENT__ALLOWANCES, newAllowances, newAllowances));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Household getHousehold() {
+		if (eContainerFeatureID() != TaxationWithRootPackage.DEPENDENT__HOUSEHOLD) return null;
+		return (Household)eInternalContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetHousehold(Household newHousehold, NotificationChain msgs) {
+		msgs = eBasicSetContainer((InternalEObject)newHousehold, TaxationWithRootPackage.DEPENDENT__HOUSEHOLD, msgs);
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setHousehold(Household newHousehold) {
+		if (newHousehold != eInternalContainer() || (eContainerFeatureID() != TaxationWithRootPackage.DEPENDENT__HOUSEHOLD && newHousehold != null)) {
+			if (EcoreUtil.isAncestor(this, newHousehold))
+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+			NotificationChain msgs = null;
+			if (eInternalContainer() != null)
+				msgs = eBasicRemoveFromContainer(msgs);
+			if (newHousehold != null)
+				msgs = ((InternalEObject)newHousehold).eInverseAdd(this, TaxationWithRootPackage.HOUSEHOLD__CHILDREN, Household.class, msgs);
+			msgs = basicSetHousehold(newHousehold, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.DEPENDENT__HOUSEHOLD, newHousehold, newHousehold));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public FromAgent getFrom_agent() {
+		if (from_agent != null && from_agent.eIsProxy()) {
+			InternalEObject oldFrom_agent = (InternalEObject)from_agent;
+			from_agent = (FromAgent)eResolveProxy(oldFrom_agent);
+			if (from_agent != oldFrom_agent) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TaxationWithRootPackage.DEPENDENT__FROM_AGENT, oldFrom_agent, from_agent));
+			}
+		}
+		return from_agent;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public FromAgent basicGetFrom_agent() {
+		return from_agent;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetFrom_agent(FromAgent newFrom_agent, NotificationChain msgs) {
+		FromAgent oldFrom_agent = from_agent;
+		from_agent = newFrom_agent;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.DEPENDENT__FROM_AGENT, oldFrom_agent, newFrom_agent);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setFrom_agent(FromAgent newFrom_agent) {
+		if (newFrom_agent != from_agent) {
+			NotificationChain msgs = null;
+			if (from_agent != null)
+				msgs = ((InternalEObject)from_agent).eInverseRemove(this, TaxationWithRootPackage.FROM_AGENT__DEPENDENT, FromAgent.class, msgs);
+			if (newFrom_agent != null)
+				msgs = ((InternalEObject)newFrom_agent).eInverseAdd(this, TaxationWithRootPackage.FROM_AGENT__DEPENDENT, FromAgent.class, msgs);
+			msgs = basicSetFrom_agent(newFrom_agent, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.DEPENDENT__FROM_AGENT, newFrom_agent, newFrom_agent));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<Expense> getExpense() {
+		if (expense == null) {
+			expense = new EObjectWithInverseResolvingEList<Expense>(Expense.class, this, TaxationWithRootPackage.DEPENDENT__EXPENSE, TaxationWithRootPackage.EXPENSE__DEPENDENT);
+		}
+		return expense;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case TaxationWithRootPackage.DEPENDENT__RESPONSIBLE_PERSON:
+				if (eInternalContainer() != null)
+					msgs = eBasicRemoveFromContainer(msgs);
+				return basicSetResponsible_person((Tax_Payer)otherEnd, msgs);
+			case TaxationWithRootPackage.DEPENDENT__ALLOWANCES:
+				if (allowances != null)
+					msgs = ((InternalEObject)allowances).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - TaxationWithRootPackage.DEPENDENT__ALLOWANCES, null, msgs);
+				return basicSetAllowances((External_Allowance)otherEnd, msgs);
+			case TaxationWithRootPackage.DEPENDENT__HOUSEHOLD:
+				if (eInternalContainer() != null)
+					msgs = eBasicRemoveFromContainer(msgs);
+				return basicSetHousehold((Household)otherEnd, msgs);
+			case TaxationWithRootPackage.DEPENDENT__FROM_AGENT:
+				if (from_agent != null)
+					msgs = ((InternalEObject)from_agent).eInverseRemove(this, TaxationWithRootPackage.FROM_AGENT__DEPENDENT, FromAgent.class, msgs);
+				return basicSetFrom_agent((FromAgent)otherEnd, msgs);
+			case TaxationWithRootPackage.DEPENDENT__EXPENSE:
+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getExpense()).basicAdd(otherEnd, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case TaxationWithRootPackage.DEPENDENT__RESPONSIBLE_PERSON:
+				return basicSetResponsible_person(null, msgs);
+			case TaxationWithRootPackage.DEPENDENT__ALLOWANCES:
+				return basicSetAllowances(null, msgs);
+			case TaxationWithRootPackage.DEPENDENT__HOUSEHOLD:
+				return basicSetHousehold(null, msgs);
+			case TaxationWithRootPackage.DEPENDENT__FROM_AGENT:
+				return basicSetFrom_agent(null, msgs);
+			case TaxationWithRootPackage.DEPENDENT__EXPENSE:
+				return ((InternalEList<?>)getExpense()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+		switch (eContainerFeatureID()) {
+			case TaxationWithRootPackage.DEPENDENT__RESPONSIBLE_PERSON:
+				return eInternalContainer().eInverseRemove(this, TaxationWithRootPackage.TAX_PAYER__DEPENDENTS, Tax_Payer.class, msgs);
+			case TaxationWithRootPackage.DEPENDENT__HOUSEHOLD:
+				return eInternalContainer().eInverseRemove(this, TaxationWithRootPackage.HOUSEHOLD__CHILDREN, Household.class, msgs);
+		}
+		return super.eBasicRemoveFromContainerFeature(msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case TaxationWithRootPackage.DEPENDENT__DEPENDENT_TYPE:
+				return getDependent_type();
+			case TaxationWithRootPackage.DEPENDENT__RESPONSIBLE_PERSON:
+				return getResponsible_person();
+			case TaxationWithRootPackage.DEPENDENT__CONTINUED_STUDIES:
+				return isContinued_studies();
+			case TaxationWithRootPackage.DEPENDENT__ALLOWANCES:
+				return getAllowances();
+			case TaxationWithRootPackage.DEPENDENT__HOUSEHOLD:
+				return getHousehold();
+			case TaxationWithRootPackage.DEPENDENT__FROM_AGENT:
+				if (resolve) return getFrom_agent();
+				return basicGetFrom_agent();
+			case TaxationWithRootPackage.DEPENDENT__EXPENSE:
+				return getExpense();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case TaxationWithRootPackage.DEPENDENT__DEPENDENT_TYPE:
+				setDependent_type((Dependent_Type)newValue);
+				return;
+			case TaxationWithRootPackage.DEPENDENT__RESPONSIBLE_PERSON:
+				setResponsible_person((Tax_Payer)newValue);
+				return;
+			case TaxationWithRootPackage.DEPENDENT__CONTINUED_STUDIES:
+				setContinued_studies((Boolean)newValue);
+				return;
+			case TaxationWithRootPackage.DEPENDENT__ALLOWANCES:
+				setAllowances((External_Allowance)newValue);
+				return;
+			case TaxationWithRootPackage.DEPENDENT__HOUSEHOLD:
+				setHousehold((Household)newValue);
+				return;
+			case TaxationWithRootPackage.DEPENDENT__FROM_AGENT:
+				setFrom_agent((FromAgent)newValue);
+				return;
+			case TaxationWithRootPackage.DEPENDENT__EXPENSE:
+				getExpense().clear();
+				getExpense().addAll((Collection<? extends Expense>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.DEPENDENT__DEPENDENT_TYPE:
+				setDependent_type(DEPENDENT_TYPE_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.DEPENDENT__RESPONSIBLE_PERSON:
+				setResponsible_person((Tax_Payer)null);
+				return;
+			case TaxationWithRootPackage.DEPENDENT__CONTINUED_STUDIES:
+				setContinued_studies(CONTINUED_STUDIES_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.DEPENDENT__ALLOWANCES:
+				setAllowances((External_Allowance)null);
+				return;
+			case TaxationWithRootPackage.DEPENDENT__HOUSEHOLD:
+				setHousehold((Household)null);
+				return;
+			case TaxationWithRootPackage.DEPENDENT__FROM_AGENT:
+				setFrom_agent((FromAgent)null);
+				return;
+			case TaxationWithRootPackage.DEPENDENT__EXPENSE:
+				getExpense().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.DEPENDENT__DEPENDENT_TYPE:
+				return dependent_type != DEPENDENT_TYPE_EDEFAULT;
+			case TaxationWithRootPackage.DEPENDENT__RESPONSIBLE_PERSON:
+				return getResponsible_person() != null;
+			case TaxationWithRootPackage.DEPENDENT__CONTINUED_STUDIES:
+				return continued_studies != CONTINUED_STUDIES_EDEFAULT;
+			case TaxationWithRootPackage.DEPENDENT__ALLOWANCES:
+				return allowances != null;
+			case TaxationWithRootPackage.DEPENDENT__HOUSEHOLD:
+				return getHousehold() != null;
+			case TaxationWithRootPackage.DEPENDENT__FROM_AGENT:
+				return from_agent != null;
+			case TaxationWithRootPackage.DEPENDENT__EXPENSE:
+				return expense != null && !expense.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuilder result = new StringBuilder(super.toString());
+		result.append(" (dependent_type: ");
+		result.append(dependent_type);
+		result.append(", continued_studies: ");
+		result.append(continued_studies);
+		result.append(')');
+		return result.toString();
+	}
+
+} //DependentImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/DonationImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/DonationImpl.java
new file mode 100644
index 00000000..50e05d9f
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/DonationImpl.java
@@ -0,0 +1,220 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.Donation;
+import TaxationWithRoot.TaxationWithRootPackage;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Donation</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.impl.DonationImpl#getBeneficiary1 <em>Beneficiary1</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.DonationImpl#isIs_donation_reported <em>Is donation reported</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class DonationImpl extends Special_Expense_DSImpl implements Donation {
+	/**
+	 * The default value of the '{@link #getBeneficiary1() <em>Beneficiary1</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getBeneficiary1()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String BENEFICIARY1_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getBeneficiary1() <em>Beneficiary1</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getBeneficiary1()
+	 * @generated
+	 * @ordered
+	 */
+	protected String beneficiary1 = BENEFICIARY1_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isIs_donation_reported() <em>Is donation reported</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isIs_donation_reported()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean IS_DONATION_REPORTED_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isIs_donation_reported() <em>Is donation reported</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isIs_donation_reported()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean is_donation_reported = IS_DONATION_REPORTED_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DonationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.DONATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getBeneficiary1() {
+		return beneficiary1;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setBeneficiary1(String newBeneficiary1) {
+		String oldBeneficiary1 = beneficiary1;
+		beneficiary1 = newBeneficiary1;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.DONATION__BENEFICIARY1, oldBeneficiary1, beneficiary1));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isIs_donation_reported() {
+		return is_donation_reported;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setIs_donation_reported(boolean newIs_donation_reported) {
+		boolean oldIs_donation_reported = is_donation_reported;
+		is_donation_reported = newIs_donation_reported;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.DONATION__IS_DONATION_REPORTED, oldIs_donation_reported, is_donation_reported));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case TaxationWithRootPackage.DONATION__BENEFICIARY1:
+				return getBeneficiary1();
+			case TaxationWithRootPackage.DONATION__IS_DONATION_REPORTED:
+				return isIs_donation_reported();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case TaxationWithRootPackage.DONATION__BENEFICIARY1:
+				setBeneficiary1((String)newValue);
+				return;
+			case TaxationWithRootPackage.DONATION__IS_DONATION_REPORTED:
+				setIs_donation_reported((Boolean)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.DONATION__BENEFICIARY1:
+				setBeneficiary1(BENEFICIARY1_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.DONATION__IS_DONATION_REPORTED:
+				setIs_donation_reported(IS_DONATION_REPORTED_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.DONATION__BENEFICIARY1:
+				return BENEFICIARY1_EDEFAULT == null ? beneficiary1 != null : !BENEFICIARY1_EDEFAULT.equals(beneficiary1);
+			case TaxationWithRootPackage.DONATION__IS_DONATION_REPORTED:
+				return is_donation_reported != IS_DONATION_REPORTED_EDEFAULT;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuilder result = new StringBuilder(super.toString());
+		result.append(" (beneficiary1: ");
+		result.append(beneficiary1);
+		result.append(", is_donation_reported: ");
+		result.append(is_donation_reported);
+		result.append(')');
+		return result.toString();
+	}
+
+} //DonationImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Employment_IncomeImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Employment_IncomeImpl.java
new file mode 100644
index 00000000..32ea4f65
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Employment_IncomeImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.Employment_Income;
+import TaxationWithRoot.TaxationWithRootPackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Employment Income</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class Employment_IncomeImpl extends Income_TypeImpl implements Employment_Income {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Employment_IncomeImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.EMPLOYMENT_INCOME;
+	}
+
+} //Employment_IncomeImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/ExpenseImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/ExpenseImpl.java
new file mode 100644
index 00000000..bab7796d
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/ExpenseImpl.java
@@ -0,0 +1,654 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.Dependent;
+import TaxationWithRoot.Expense;
+import TaxationWithRoot.Expense_Purpose;
+import TaxationWithRoot.FromAgent;
+import TaxationWithRoot.Income;
+import TaxationWithRoot.Physical_Person;
+import TaxationWithRoot.TaxationWithRootPackage;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EcoreUtil;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Expense</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.impl.ExpenseImpl#getDeclared_amount <em>Declared amount</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.ExpenseImpl#getExpense_purpose <em>Expense purpose</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.ExpenseImpl#getDependent <em>Dependent</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.ExpenseImpl#getFrom_agent <em>From agent</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.ExpenseImpl#getIncome <em>Income</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.ExpenseImpl#getId4 <em>Id4</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.ExpenseImpl#getBeneficiary <em>Beneficiary</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ExpenseImpl extends MinimalEObjectImpl.Container implements Expense {
+	/**
+	 * The default value of the '{@link #getDeclared_amount() <em>Declared amount</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDeclared_amount()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double DECLARED_AMOUNT_EDEFAULT = 0.0;
+
+	/**
+	 * The cached value of the '{@link #getDeclared_amount() <em>Declared amount</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDeclared_amount()
+	 * @generated
+	 * @ordered
+	 */
+	protected double declared_amount = DECLARED_AMOUNT_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getExpense_purpose() <em>Expense purpose</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getExpense_purpose()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final Expense_Purpose EXPENSE_PURPOSE_EDEFAULT = Expense_Purpose.OTHER;
+
+	/**
+	 * The cached value of the '{@link #getExpense_purpose() <em>Expense purpose</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getExpense_purpose()
+	 * @generated
+	 * @ordered
+	 */
+	protected Expense_Purpose expense_purpose = EXPENSE_PURPOSE_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getDependent() <em>Dependent</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDependent()
+	 * @generated
+	 * @ordered
+	 */
+	protected Dependent dependent;
+
+	/**
+	 * The cached value of the '{@link #getFrom_agent() <em>From agent</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFrom_agent()
+	 * @generated
+	 * @ordered
+	 */
+	protected FromAgent from_agent;
+
+	/**
+	 * The default value of the '{@link #getId4() <em>Id4</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getId4()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ID4_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getId4() <em>Id4</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getId4()
+	 * @generated
+	 * @ordered
+	 */
+	protected String id4 = ID4_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getBeneficiary() <em>Beneficiary</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getBeneficiary()
+	 * @generated
+	 * @ordered
+	 */
+	protected Physical_Person beneficiary;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ExpenseImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.EXPENSE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getDeclared_amount() {
+		return declared_amount;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDeclared_amount(double newDeclared_amount) {
+		double oldDeclared_amount = declared_amount;
+		declared_amount = newDeclared_amount;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.EXPENSE__DECLARED_AMOUNT, oldDeclared_amount, declared_amount));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Expense_Purpose getExpense_purpose() {
+		return expense_purpose;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setExpense_purpose(Expense_Purpose newExpense_purpose) {
+		Expense_Purpose oldExpense_purpose = expense_purpose;
+		expense_purpose = newExpense_purpose == null ? EXPENSE_PURPOSE_EDEFAULT : newExpense_purpose;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.EXPENSE__EXPENSE_PURPOSE, oldExpense_purpose, expense_purpose));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Dependent getDependent() {
+		if (dependent != null && dependent.eIsProxy()) {
+			InternalEObject oldDependent = (InternalEObject)dependent;
+			dependent = (Dependent)eResolveProxy(oldDependent);
+			if (dependent != oldDependent) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TaxationWithRootPackage.EXPENSE__DEPENDENT, oldDependent, dependent));
+			}
+		}
+		return dependent;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Dependent basicGetDependent() {
+		return dependent;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetDependent(Dependent newDependent, NotificationChain msgs) {
+		Dependent oldDependent = dependent;
+		dependent = newDependent;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.EXPENSE__DEPENDENT, oldDependent, newDependent);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDependent(Dependent newDependent) {
+		if (newDependent != dependent) {
+			NotificationChain msgs = null;
+			if (dependent != null)
+				msgs = ((InternalEObject)dependent).eInverseRemove(this, TaxationWithRootPackage.DEPENDENT__EXPENSE, Dependent.class, msgs);
+			if (newDependent != null)
+				msgs = ((InternalEObject)newDependent).eInverseAdd(this, TaxationWithRootPackage.DEPENDENT__EXPENSE, Dependent.class, msgs);
+			msgs = basicSetDependent(newDependent, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.EXPENSE__DEPENDENT, newDependent, newDependent));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public FromAgent getFrom_agent() {
+		if (from_agent != null && from_agent.eIsProxy()) {
+			InternalEObject oldFrom_agent = (InternalEObject)from_agent;
+			from_agent = (FromAgent)eResolveProxy(oldFrom_agent);
+			if (from_agent != oldFrom_agent) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TaxationWithRootPackage.EXPENSE__FROM_AGENT, oldFrom_agent, from_agent));
+			}
+		}
+		return from_agent;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public FromAgent basicGetFrom_agent() {
+		return from_agent;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetFrom_agent(FromAgent newFrom_agent, NotificationChain msgs) {
+		FromAgent oldFrom_agent = from_agent;
+		from_agent = newFrom_agent;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.EXPENSE__FROM_AGENT, oldFrom_agent, newFrom_agent);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setFrom_agent(FromAgent newFrom_agent) {
+		if (newFrom_agent != from_agent) {
+			NotificationChain msgs = null;
+			if (from_agent != null)
+				msgs = ((InternalEObject)from_agent).eInverseRemove(this, TaxationWithRootPackage.FROM_AGENT__EXPENSE, FromAgent.class, msgs);
+			if (newFrom_agent != null)
+				msgs = ((InternalEObject)newFrom_agent).eInverseAdd(this, TaxationWithRootPackage.FROM_AGENT__EXPENSE, FromAgent.class, msgs);
+			msgs = basicSetFrom_agent(newFrom_agent, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.EXPENSE__FROM_AGENT, newFrom_agent, newFrom_agent));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Income getIncome() {
+		if (eContainerFeatureID() != TaxationWithRootPackage.EXPENSE__INCOME) return null;
+		return (Income)eInternalContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetIncome(Income newIncome, NotificationChain msgs) {
+		msgs = eBasicSetContainer((InternalEObject)newIncome, TaxationWithRootPackage.EXPENSE__INCOME, msgs);
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setIncome(Income newIncome) {
+		if (newIncome != eInternalContainer() || (eContainerFeatureID() != TaxationWithRootPackage.EXPENSE__INCOME && newIncome != null)) {
+			if (EcoreUtil.isAncestor(this, newIncome))
+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+			NotificationChain msgs = null;
+			if (eInternalContainer() != null)
+				msgs = eBasicRemoveFromContainer(msgs);
+			if (newIncome != null)
+				msgs = ((InternalEObject)newIncome).eInverseAdd(this, TaxationWithRootPackage.INCOME__EXPENSES, Income.class, msgs);
+			msgs = basicSetIncome(newIncome, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.EXPENSE__INCOME, newIncome, newIncome));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getId4() {
+		return id4;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setId4(String newId4) {
+		String oldId4 = id4;
+		id4 = newId4;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.EXPENSE__ID4, oldId4, id4));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Physical_Person getBeneficiary() {
+		if (beneficiary != null && beneficiary.eIsProxy()) {
+			InternalEObject oldBeneficiary = (InternalEObject)beneficiary;
+			beneficiary = (Physical_Person)eResolveProxy(oldBeneficiary);
+			if (beneficiary != oldBeneficiary) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TaxationWithRootPackage.EXPENSE__BENEFICIARY, oldBeneficiary, beneficiary));
+			}
+		}
+		return beneficiary;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Physical_Person basicGetBeneficiary() {
+		return beneficiary;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetBeneficiary(Physical_Person newBeneficiary, NotificationChain msgs) {
+		Physical_Person oldBeneficiary = beneficiary;
+		beneficiary = newBeneficiary;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.EXPENSE__BENEFICIARY, oldBeneficiary, newBeneficiary);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setBeneficiary(Physical_Person newBeneficiary) {
+		if (newBeneficiary != beneficiary) {
+			NotificationChain msgs = null;
+			if (beneficiary != null)
+				msgs = ((InternalEObject)beneficiary).eInverseRemove(this, TaxationWithRootPackage.PHYSICAL_PERSON__EXPENSES, Physical_Person.class, msgs);
+			if (newBeneficiary != null)
+				msgs = ((InternalEObject)newBeneficiary).eInverseAdd(this, TaxationWithRootPackage.PHYSICAL_PERSON__EXPENSES, Physical_Person.class, msgs);
+			msgs = basicSetBeneficiary(newBeneficiary, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.EXPENSE__BENEFICIARY, newBeneficiary, newBeneficiary));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case TaxationWithRootPackage.EXPENSE__DEPENDENT:
+				if (dependent != null)
+					msgs = ((InternalEObject)dependent).eInverseRemove(this, TaxationWithRootPackage.DEPENDENT__EXPENSE, Dependent.class, msgs);
+				return basicSetDependent((Dependent)otherEnd, msgs);
+			case TaxationWithRootPackage.EXPENSE__FROM_AGENT:
+				if (from_agent != null)
+					msgs = ((InternalEObject)from_agent).eInverseRemove(this, TaxationWithRootPackage.FROM_AGENT__EXPENSE, FromAgent.class, msgs);
+				return basicSetFrom_agent((FromAgent)otherEnd, msgs);
+			case TaxationWithRootPackage.EXPENSE__INCOME:
+				if (eInternalContainer() != null)
+					msgs = eBasicRemoveFromContainer(msgs);
+				return basicSetIncome((Income)otherEnd, msgs);
+			case TaxationWithRootPackage.EXPENSE__BENEFICIARY:
+				if (beneficiary != null)
+					msgs = ((InternalEObject)beneficiary).eInverseRemove(this, TaxationWithRootPackage.PHYSICAL_PERSON__EXPENSES, Physical_Person.class, msgs);
+				return basicSetBeneficiary((Physical_Person)otherEnd, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case TaxationWithRootPackage.EXPENSE__DEPENDENT:
+				return basicSetDependent(null, msgs);
+			case TaxationWithRootPackage.EXPENSE__FROM_AGENT:
+				return basicSetFrom_agent(null, msgs);
+			case TaxationWithRootPackage.EXPENSE__INCOME:
+				return basicSetIncome(null, msgs);
+			case TaxationWithRootPackage.EXPENSE__BENEFICIARY:
+				return basicSetBeneficiary(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+		switch (eContainerFeatureID()) {
+			case TaxationWithRootPackage.EXPENSE__INCOME:
+				return eInternalContainer().eInverseRemove(this, TaxationWithRootPackage.INCOME__EXPENSES, Income.class, msgs);
+		}
+		return super.eBasicRemoveFromContainerFeature(msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case TaxationWithRootPackage.EXPENSE__DECLARED_AMOUNT:
+				return getDeclared_amount();
+			case TaxationWithRootPackage.EXPENSE__EXPENSE_PURPOSE:
+				return getExpense_purpose();
+			case TaxationWithRootPackage.EXPENSE__DEPENDENT:
+				if (resolve) return getDependent();
+				return basicGetDependent();
+			case TaxationWithRootPackage.EXPENSE__FROM_AGENT:
+				if (resolve) return getFrom_agent();
+				return basicGetFrom_agent();
+			case TaxationWithRootPackage.EXPENSE__INCOME:
+				return getIncome();
+			case TaxationWithRootPackage.EXPENSE__ID4:
+				return getId4();
+			case TaxationWithRootPackage.EXPENSE__BENEFICIARY:
+				if (resolve) return getBeneficiary();
+				return basicGetBeneficiary();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case TaxationWithRootPackage.EXPENSE__DECLARED_AMOUNT:
+				setDeclared_amount((Double)newValue);
+				return;
+			case TaxationWithRootPackage.EXPENSE__EXPENSE_PURPOSE:
+				setExpense_purpose((Expense_Purpose)newValue);
+				return;
+			case TaxationWithRootPackage.EXPENSE__DEPENDENT:
+				setDependent((Dependent)newValue);
+				return;
+			case TaxationWithRootPackage.EXPENSE__FROM_AGENT:
+				setFrom_agent((FromAgent)newValue);
+				return;
+			case TaxationWithRootPackage.EXPENSE__INCOME:
+				setIncome((Income)newValue);
+				return;
+			case TaxationWithRootPackage.EXPENSE__ID4:
+				setId4((String)newValue);
+				return;
+			case TaxationWithRootPackage.EXPENSE__BENEFICIARY:
+				setBeneficiary((Physical_Person)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.EXPENSE__DECLARED_AMOUNT:
+				setDeclared_amount(DECLARED_AMOUNT_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.EXPENSE__EXPENSE_PURPOSE:
+				setExpense_purpose(EXPENSE_PURPOSE_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.EXPENSE__DEPENDENT:
+				setDependent((Dependent)null);
+				return;
+			case TaxationWithRootPackage.EXPENSE__FROM_AGENT:
+				setFrom_agent((FromAgent)null);
+				return;
+			case TaxationWithRootPackage.EXPENSE__INCOME:
+				setIncome((Income)null);
+				return;
+			case TaxationWithRootPackage.EXPENSE__ID4:
+				setId4(ID4_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.EXPENSE__BENEFICIARY:
+				setBeneficiary((Physical_Person)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.EXPENSE__DECLARED_AMOUNT:
+				return declared_amount != DECLARED_AMOUNT_EDEFAULT;
+			case TaxationWithRootPackage.EXPENSE__EXPENSE_PURPOSE:
+				return expense_purpose != EXPENSE_PURPOSE_EDEFAULT;
+			case TaxationWithRootPackage.EXPENSE__DEPENDENT:
+				return dependent != null;
+			case TaxationWithRootPackage.EXPENSE__FROM_AGENT:
+				return from_agent != null;
+			case TaxationWithRootPackage.EXPENSE__INCOME:
+				return getIncome() != null;
+			case TaxationWithRootPackage.EXPENSE__ID4:
+				return ID4_EDEFAULT == null ? id4 != null : !ID4_EDEFAULT.equals(id4);
+			case TaxationWithRootPackage.EXPENSE__BENEFICIARY:
+				return beneficiary != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuilder result = new StringBuilder(super.toString());
+		result.append(" (declared_amount: ");
+		result.append(declared_amount);
+		result.append(", expense_purpose: ");
+		result.append(expense_purpose);
+		result.append(", id4: ");
+		result.append(id4);
+		result.append(')');
+		return result.toString();
+	}
+
+} //ExpenseImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/External_AllowanceImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/External_AllowanceImpl.java
new file mode 100644
index 00000000..88f96468
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/External_AllowanceImpl.java
@@ -0,0 +1,500 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.Dependent;
+import TaxationWithRoot.External_Allowance;
+import TaxationWithRoot.Grantor;
+import TaxationWithRoot.Physical_Person;
+import TaxationWithRoot.TaxationWithRootPackage;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EcoreUtil;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>External Allowance</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.impl.External_AllowanceImpl#getGrantor <em>Grantor</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.External_AllowanceImpl#getStarting_year <em>Starting year</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.External_AllowanceImpl#getEnding_year <em>Ending year</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.External_AllowanceImpl#getReciver <em>Reciver</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.External_AllowanceImpl#getId5 <em>Id5</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.External_AllowanceImpl#getPerson <em>Person</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class External_AllowanceImpl extends MinimalEObjectImpl.Container implements External_Allowance {
+	/**
+	 * The default value of the '{@link #getGrantor() <em>Grantor</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getGrantor()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final Grantor GRANTOR_EDEFAULT = Grantor.WWW;
+
+	/**
+	 * The cached value of the '{@link #getGrantor() <em>Grantor</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getGrantor()
+	 * @generated
+	 * @ordered
+	 */
+	protected Grantor grantor = GRANTOR_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getStarting_year() <em>Starting year</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStarting_year()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int STARTING_YEAR_EDEFAULT = 0;
+
+	/**
+	 * The cached value of the '{@link #getStarting_year() <em>Starting year</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStarting_year()
+	 * @generated
+	 * @ordered
+	 */
+	protected int starting_year = STARTING_YEAR_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getEnding_year() <em>Ending year</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getEnding_year()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int ENDING_YEAR_EDEFAULT = 0;
+
+	/**
+	 * The cached value of the '{@link #getEnding_year() <em>Ending year</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getEnding_year()
+	 * @generated
+	 * @ordered
+	 */
+	protected int ending_year = ENDING_YEAR_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getReciver() <em>Reciver</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getReciver()
+	 * @generated
+	 * @ordered
+	 */
+	protected Physical_Person reciver;
+
+	/**
+	 * The default value of the '{@link #getId5() <em>Id5</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getId5()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ID5_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getId5() <em>Id5</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getId5()
+	 * @generated
+	 * @ordered
+	 */
+	protected String id5 = ID5_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected External_AllowanceImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.EXTERNAL_ALLOWANCE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Grantor getGrantor() {
+		return grantor;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setGrantor(Grantor newGrantor) {
+		Grantor oldGrantor = grantor;
+		grantor = newGrantor == null ? GRANTOR_EDEFAULT : newGrantor;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.EXTERNAL_ALLOWANCE__GRANTOR, oldGrantor, grantor));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getStarting_year() {
+		return starting_year;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setStarting_year(int newStarting_year) {
+		int oldStarting_year = starting_year;
+		starting_year = newStarting_year;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.EXTERNAL_ALLOWANCE__STARTING_YEAR, oldStarting_year, starting_year));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getEnding_year() {
+		return ending_year;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setEnding_year(int newEnding_year) {
+		int oldEnding_year = ending_year;
+		ending_year = newEnding_year;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.EXTERNAL_ALLOWANCE__ENDING_YEAR, oldEnding_year, ending_year));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Physical_Person getReciver() {
+		if (reciver != null && reciver.eIsProxy()) {
+			InternalEObject oldReciver = (InternalEObject)reciver;
+			reciver = (Physical_Person)eResolveProxy(oldReciver);
+			if (reciver != oldReciver) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TaxationWithRootPackage.EXTERNAL_ALLOWANCE__RECIVER, oldReciver, reciver));
+			}
+		}
+		return reciver;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Physical_Person basicGetReciver() {
+		return reciver;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setReciver(Physical_Person newReciver) {
+		Physical_Person oldReciver = reciver;
+		reciver = newReciver;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.EXTERNAL_ALLOWANCE__RECIVER, oldReciver, reciver));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getId5() {
+		return id5;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setId5(String newId5) {
+		String oldId5 = id5;
+		id5 = newId5;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.EXTERNAL_ALLOWANCE__ID5, oldId5, id5));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Dependent getPerson() {
+		if (eContainerFeatureID() != TaxationWithRootPackage.EXTERNAL_ALLOWANCE__PERSON) return null;
+		return (Dependent)eInternalContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetPerson(Dependent newPerson, NotificationChain msgs) {
+		msgs = eBasicSetContainer((InternalEObject)newPerson, TaxationWithRootPackage.EXTERNAL_ALLOWANCE__PERSON, msgs);
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setPerson(Dependent newPerson) {
+		if (newPerson != eInternalContainer() || (eContainerFeatureID() != TaxationWithRootPackage.EXTERNAL_ALLOWANCE__PERSON && newPerson != null)) {
+			if (EcoreUtil.isAncestor(this, newPerson))
+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+			NotificationChain msgs = null;
+			if (eInternalContainer() != null)
+				msgs = eBasicRemoveFromContainer(msgs);
+			if (newPerson != null)
+				msgs = ((InternalEObject)newPerson).eInverseAdd(this, TaxationWithRootPackage.DEPENDENT__ALLOWANCES, Dependent.class, msgs);
+			msgs = basicSetPerson(newPerson, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.EXTERNAL_ALLOWANCE__PERSON, newPerson, newPerson));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case TaxationWithRootPackage.EXTERNAL_ALLOWANCE__PERSON:
+				if (eInternalContainer() != null)
+					msgs = eBasicRemoveFromContainer(msgs);
+				return basicSetPerson((Dependent)otherEnd, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case TaxationWithRootPackage.EXTERNAL_ALLOWANCE__PERSON:
+				return basicSetPerson(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+		switch (eContainerFeatureID()) {
+			case TaxationWithRootPackage.EXTERNAL_ALLOWANCE__PERSON:
+				return eInternalContainer().eInverseRemove(this, TaxationWithRootPackage.DEPENDENT__ALLOWANCES, Dependent.class, msgs);
+		}
+		return super.eBasicRemoveFromContainerFeature(msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case TaxationWithRootPackage.EXTERNAL_ALLOWANCE__GRANTOR:
+				return getGrantor();
+			case TaxationWithRootPackage.EXTERNAL_ALLOWANCE__STARTING_YEAR:
+				return getStarting_year();
+			case TaxationWithRootPackage.EXTERNAL_ALLOWANCE__ENDING_YEAR:
+				return getEnding_year();
+			case TaxationWithRootPackage.EXTERNAL_ALLOWANCE__RECIVER:
+				if (resolve) return getReciver();
+				return basicGetReciver();
+			case TaxationWithRootPackage.EXTERNAL_ALLOWANCE__ID5:
+				return getId5();
+			case TaxationWithRootPackage.EXTERNAL_ALLOWANCE__PERSON:
+				return getPerson();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case TaxationWithRootPackage.EXTERNAL_ALLOWANCE__GRANTOR:
+				setGrantor((Grantor)newValue);
+				return;
+			case TaxationWithRootPackage.EXTERNAL_ALLOWANCE__STARTING_YEAR:
+				setStarting_year((Integer)newValue);
+				return;
+			case TaxationWithRootPackage.EXTERNAL_ALLOWANCE__ENDING_YEAR:
+				setEnding_year((Integer)newValue);
+				return;
+			case TaxationWithRootPackage.EXTERNAL_ALLOWANCE__RECIVER:
+				setReciver((Physical_Person)newValue);
+				return;
+			case TaxationWithRootPackage.EXTERNAL_ALLOWANCE__ID5:
+				setId5((String)newValue);
+				return;
+			case TaxationWithRootPackage.EXTERNAL_ALLOWANCE__PERSON:
+				setPerson((Dependent)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.EXTERNAL_ALLOWANCE__GRANTOR:
+				setGrantor(GRANTOR_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.EXTERNAL_ALLOWANCE__STARTING_YEAR:
+				setStarting_year(STARTING_YEAR_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.EXTERNAL_ALLOWANCE__ENDING_YEAR:
+				setEnding_year(ENDING_YEAR_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.EXTERNAL_ALLOWANCE__RECIVER:
+				setReciver((Physical_Person)null);
+				return;
+			case TaxationWithRootPackage.EXTERNAL_ALLOWANCE__ID5:
+				setId5(ID5_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.EXTERNAL_ALLOWANCE__PERSON:
+				setPerson((Dependent)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.EXTERNAL_ALLOWANCE__GRANTOR:
+				return grantor != GRANTOR_EDEFAULT;
+			case TaxationWithRootPackage.EXTERNAL_ALLOWANCE__STARTING_YEAR:
+				return starting_year != STARTING_YEAR_EDEFAULT;
+			case TaxationWithRootPackage.EXTERNAL_ALLOWANCE__ENDING_YEAR:
+				return ending_year != ENDING_YEAR_EDEFAULT;
+			case TaxationWithRootPackage.EXTERNAL_ALLOWANCE__RECIVER:
+				return reciver != null;
+			case TaxationWithRootPackage.EXTERNAL_ALLOWANCE__ID5:
+				return ID5_EDEFAULT == null ? id5 != null : !ID5_EDEFAULT.equals(id5);
+			case TaxationWithRootPackage.EXTERNAL_ALLOWANCE__PERSON:
+				return getPerson() != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuilder result = new StringBuilder(super.toString());
+		result.append(" (grantor: ");
+		result.append(grantor);
+		result.append(", starting_year: ");
+		result.append(starting_year);
+		result.append(", ending_year: ");
+		result.append(ending_year);
+		result.append(", id5: ");
+		result.append(id5);
+		result.append(')');
+		return result.toString();
+	}
+
+} //External_AllowanceImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Extraordinary_Expense_CEImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Extraordinary_Expense_CEImpl.java
new file mode 100644
index 00000000..74920a1d
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Extraordinary_Expense_CEImpl.java
@@ -0,0 +1,221 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.CE_Type;
+import TaxationWithRoot.Extraordinary_Expense_CE;
+import TaxationWithRoot.TaxationWithRootPackage;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Extraordinary Expense CE</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.impl.Extraordinary_Expense_CEImpl#getThresholded_deduction_percentage <em>Thresholded deduction percentage</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Extraordinary_Expense_CEImpl#getCe_type <em>Ce type</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class Extraordinary_Expense_CEImpl extends ExpenseImpl implements Extraordinary_Expense_CE {
+	/**
+	 * The default value of the '{@link #getThresholded_deduction_percentage() <em>Thresholded deduction percentage</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getThresholded_deduction_percentage()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double THRESHOLDED_DEDUCTION_PERCENTAGE_EDEFAULT = 0.0;
+
+	/**
+	 * The cached value of the '{@link #getThresholded_deduction_percentage() <em>Thresholded deduction percentage</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getThresholded_deduction_percentage()
+	 * @generated
+	 * @ordered
+	 */
+	protected double thresholded_deduction_percentage = THRESHOLDED_DEDUCTION_PERCENTAGE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getCe_type() <em>Ce type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCe_type()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final CE_Type CE_TYPE_EDEFAULT = CE_Type.INALIDITY_AND_INFIRMITY;
+
+	/**
+	 * The cached value of the '{@link #getCe_type() <em>Ce type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCe_type()
+	 * @generated
+	 * @ordered
+	 */
+	protected CE_Type ce_type = CE_TYPE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Extraordinary_Expense_CEImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.EXTRAORDINARY_EXPENSE_CE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getThresholded_deduction_percentage() {
+		return thresholded_deduction_percentage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setThresholded_deduction_percentage(double newThresholded_deduction_percentage) {
+		double oldThresholded_deduction_percentage = thresholded_deduction_percentage;
+		thresholded_deduction_percentage = newThresholded_deduction_percentage;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.EXTRAORDINARY_EXPENSE_CE__THRESHOLDED_DEDUCTION_PERCENTAGE, oldThresholded_deduction_percentage, thresholded_deduction_percentage));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public CE_Type getCe_type() {
+		return ce_type;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setCe_type(CE_Type newCe_type) {
+		CE_Type oldCe_type = ce_type;
+		ce_type = newCe_type == null ? CE_TYPE_EDEFAULT : newCe_type;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.EXTRAORDINARY_EXPENSE_CE__CE_TYPE, oldCe_type, ce_type));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case TaxationWithRootPackage.EXTRAORDINARY_EXPENSE_CE__THRESHOLDED_DEDUCTION_PERCENTAGE:
+				return getThresholded_deduction_percentage();
+			case TaxationWithRootPackage.EXTRAORDINARY_EXPENSE_CE__CE_TYPE:
+				return getCe_type();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case TaxationWithRootPackage.EXTRAORDINARY_EXPENSE_CE__THRESHOLDED_DEDUCTION_PERCENTAGE:
+				setThresholded_deduction_percentage((Double)newValue);
+				return;
+			case TaxationWithRootPackage.EXTRAORDINARY_EXPENSE_CE__CE_TYPE:
+				setCe_type((CE_Type)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.EXTRAORDINARY_EXPENSE_CE__THRESHOLDED_DEDUCTION_PERCENTAGE:
+				setThresholded_deduction_percentage(THRESHOLDED_DEDUCTION_PERCENTAGE_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.EXTRAORDINARY_EXPENSE_CE__CE_TYPE:
+				setCe_type(CE_TYPE_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.EXTRAORDINARY_EXPENSE_CE__THRESHOLDED_DEDUCTION_PERCENTAGE:
+				return thresholded_deduction_percentage != THRESHOLDED_DEDUCTION_PERCENTAGE_EDEFAULT;
+			case TaxationWithRootPackage.EXTRAORDINARY_EXPENSE_CE__CE_TYPE:
+				return ce_type != CE_TYPE_EDEFAULT;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuilder result = new StringBuilder(super.toString());
+		result.append(" (thresholded_deduction_percentage: ");
+		result.append(thresholded_deduction_percentage);
+		result.append(", ce_type: ");
+		result.append(ce_type);
+		result.append(')');
+		return result.toString();
+	}
+
+} //Extraordinary_Expense_CEImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Fiscal_AddressImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Fiscal_AddressImpl.java
new file mode 100644
index 00000000..747486de
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Fiscal_AddressImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.Fiscal_Address;
+import TaxationWithRoot.TaxationWithRootPackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Fiscal Address</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class Fiscal_AddressImpl extends AddressImpl implements Fiscal_Address {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Fiscal_AddressImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.FISCAL_ADDRESS;
+	}
+
+} //Fiscal_AddressImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Foreign_IncomeImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Foreign_IncomeImpl.java
new file mode 100644
index 00000000..fd87c33b
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Foreign_IncomeImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.Foreign_Income;
+import TaxationWithRoot.TaxationWithRootPackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Foreign Income</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class Foreign_IncomeImpl extends IncomeImpl implements Foreign_Income {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Foreign_IncomeImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.FOREIGN_INCOME;
+	}
+
+} //Foreign_IncomeImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/FromAgentImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/FromAgentImpl.java
new file mode 100644
index 00000000..7523607e
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/FromAgentImpl.java
@@ -0,0 +1,506 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.Dependent;
+import TaxationWithRoot.Expense;
+import TaxationWithRoot.FromAgent;
+import TaxationWithRoot.Tax_Payer;
+import TaxationWithRoot.TaxationWithRootPackage;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EcoreUtil;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>From Agent</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.impl.FromAgentImpl#getTaxPayer <em>Tax Payer</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.FromAgentImpl#isIs_dependent_eligible_for_CE_Not_In_Houshold_Children_Care <em>Is dependent eligible for CE Not In Houshold Children Care</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.FromAgentImpl#getExpense <em>Expense</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.FromAgentImpl#isIs_eligible_debt <em>Is eligible debt</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.FromAgentImpl#getDependent <em>Dependent</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class FromAgentImpl extends MinimalEObjectImpl.Container implements FromAgent {
+	/**
+	 * The default value of the '{@link #isIs_dependent_eligible_for_CE_Not_In_Houshold_Children_Care() <em>Is dependent eligible for CE Not In Houshold Children Care</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isIs_dependent_eligible_for_CE_Not_In_Houshold_Children_Care()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean IS_DEPENDENT_ELIGIBLE_FOR_CE_NOT_IN_HOUSHOLD_CHILDREN_CARE_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isIs_dependent_eligible_for_CE_Not_In_Houshold_Children_Care() <em>Is dependent eligible for CE Not In Houshold Children Care</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isIs_dependent_eligible_for_CE_Not_In_Houshold_Children_Care()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean is_dependent_eligible_for_CE_Not_In_Houshold_Children_Care = IS_DEPENDENT_ELIGIBLE_FOR_CE_NOT_IN_HOUSHOLD_CHILDREN_CARE_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getExpense() <em>Expense</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getExpense()
+	 * @generated
+	 * @ordered
+	 */
+	protected Expense expense;
+
+	/**
+	 * The default value of the '{@link #isIs_eligible_debt() <em>Is eligible debt</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isIs_eligible_debt()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean IS_ELIGIBLE_DEBT_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isIs_eligible_debt() <em>Is eligible debt</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isIs_eligible_debt()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean is_eligible_debt = IS_ELIGIBLE_DEBT_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getDependent() <em>Dependent</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDependent()
+	 * @generated
+	 * @ordered
+	 */
+	protected Dependent dependent;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected FromAgentImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.FROM_AGENT;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Tax_Payer getTaxPayer() {
+		if (eContainerFeatureID() != TaxationWithRootPackage.FROM_AGENT__TAX_PAYER) return null;
+		return (Tax_Payer)eInternalContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetTaxPayer(Tax_Payer newTaxPayer, NotificationChain msgs) {
+		msgs = eBasicSetContainer((InternalEObject)newTaxPayer, TaxationWithRootPackage.FROM_AGENT__TAX_PAYER, msgs);
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setTaxPayer(Tax_Payer newTaxPayer) {
+		if (newTaxPayer != eInternalContainer() || (eContainerFeatureID() != TaxationWithRootPackage.FROM_AGENT__TAX_PAYER && newTaxPayer != null)) {
+			if (EcoreUtil.isAncestor(this, newTaxPayer))
+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+			NotificationChain msgs = null;
+			if (eInternalContainer() != null)
+				msgs = eBasicRemoveFromContainer(msgs);
+			if (newTaxPayer != null)
+				msgs = ((InternalEObject)newTaxPayer).eInverseAdd(this, TaxationWithRootPackage.TAX_PAYER__FROM_AGENT, Tax_Payer.class, msgs);
+			msgs = basicSetTaxPayer(newTaxPayer, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.FROM_AGENT__TAX_PAYER, newTaxPayer, newTaxPayer));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isIs_dependent_eligible_for_CE_Not_In_Houshold_Children_Care() {
+		return is_dependent_eligible_for_CE_Not_In_Houshold_Children_Care;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setIs_dependent_eligible_for_CE_Not_In_Houshold_Children_Care(boolean newIs_dependent_eligible_for_CE_Not_In_Houshold_Children_Care) {
+		boolean oldIs_dependent_eligible_for_CE_Not_In_Houshold_Children_Care = is_dependent_eligible_for_CE_Not_In_Houshold_Children_Care;
+		is_dependent_eligible_for_CE_Not_In_Houshold_Children_Care = newIs_dependent_eligible_for_CE_Not_In_Houshold_Children_Care;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.FROM_AGENT__IS_DEPENDENT_ELIGIBLE_FOR_CE_NOT_IN_HOUSHOLD_CHILDREN_CARE, oldIs_dependent_eligible_for_CE_Not_In_Houshold_Children_Care, is_dependent_eligible_for_CE_Not_In_Houshold_Children_Care));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Expense getExpense() {
+		if (expense != null && expense.eIsProxy()) {
+			InternalEObject oldExpense = (InternalEObject)expense;
+			expense = (Expense)eResolveProxy(oldExpense);
+			if (expense != oldExpense) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TaxationWithRootPackage.FROM_AGENT__EXPENSE, oldExpense, expense));
+			}
+		}
+		return expense;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Expense basicGetExpense() {
+		return expense;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetExpense(Expense newExpense, NotificationChain msgs) {
+		Expense oldExpense = expense;
+		expense = newExpense;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.FROM_AGENT__EXPENSE, oldExpense, newExpense);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setExpense(Expense newExpense) {
+		if (newExpense != expense) {
+			NotificationChain msgs = null;
+			if (expense != null)
+				msgs = ((InternalEObject)expense).eInverseRemove(this, TaxationWithRootPackage.EXPENSE__FROM_AGENT, Expense.class, msgs);
+			if (newExpense != null)
+				msgs = ((InternalEObject)newExpense).eInverseAdd(this, TaxationWithRootPackage.EXPENSE__FROM_AGENT, Expense.class, msgs);
+			msgs = basicSetExpense(newExpense, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.FROM_AGENT__EXPENSE, newExpense, newExpense));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isIs_eligible_debt() {
+		return is_eligible_debt;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setIs_eligible_debt(boolean newIs_eligible_debt) {
+		boolean oldIs_eligible_debt = is_eligible_debt;
+		is_eligible_debt = newIs_eligible_debt;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.FROM_AGENT__IS_ELIGIBLE_DEBT, oldIs_eligible_debt, is_eligible_debt));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Dependent getDependent() {
+		if (dependent != null && dependent.eIsProxy()) {
+			InternalEObject oldDependent = (InternalEObject)dependent;
+			dependent = (Dependent)eResolveProxy(oldDependent);
+			if (dependent != oldDependent) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TaxationWithRootPackage.FROM_AGENT__DEPENDENT, oldDependent, dependent));
+			}
+		}
+		return dependent;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Dependent basicGetDependent() {
+		return dependent;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetDependent(Dependent newDependent, NotificationChain msgs) {
+		Dependent oldDependent = dependent;
+		dependent = newDependent;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.FROM_AGENT__DEPENDENT, oldDependent, newDependent);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDependent(Dependent newDependent) {
+		if (newDependent != dependent) {
+			NotificationChain msgs = null;
+			if (dependent != null)
+				msgs = ((InternalEObject)dependent).eInverseRemove(this, TaxationWithRootPackage.DEPENDENT__FROM_AGENT, Dependent.class, msgs);
+			if (newDependent != null)
+				msgs = ((InternalEObject)newDependent).eInverseAdd(this, TaxationWithRootPackage.DEPENDENT__FROM_AGENT, Dependent.class, msgs);
+			msgs = basicSetDependent(newDependent, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.FROM_AGENT__DEPENDENT, newDependent, newDependent));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case TaxationWithRootPackage.FROM_AGENT__TAX_PAYER:
+				if (eInternalContainer() != null)
+					msgs = eBasicRemoveFromContainer(msgs);
+				return basicSetTaxPayer((Tax_Payer)otherEnd, msgs);
+			case TaxationWithRootPackage.FROM_AGENT__EXPENSE:
+				if (expense != null)
+					msgs = ((InternalEObject)expense).eInverseRemove(this, TaxationWithRootPackage.EXPENSE__FROM_AGENT, Expense.class, msgs);
+				return basicSetExpense((Expense)otherEnd, msgs);
+			case TaxationWithRootPackage.FROM_AGENT__DEPENDENT:
+				if (dependent != null)
+					msgs = ((InternalEObject)dependent).eInverseRemove(this, TaxationWithRootPackage.DEPENDENT__FROM_AGENT, Dependent.class, msgs);
+				return basicSetDependent((Dependent)otherEnd, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case TaxationWithRootPackage.FROM_AGENT__TAX_PAYER:
+				return basicSetTaxPayer(null, msgs);
+			case TaxationWithRootPackage.FROM_AGENT__EXPENSE:
+				return basicSetExpense(null, msgs);
+			case TaxationWithRootPackage.FROM_AGENT__DEPENDENT:
+				return basicSetDependent(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+		switch (eContainerFeatureID()) {
+			case TaxationWithRootPackage.FROM_AGENT__TAX_PAYER:
+				return eInternalContainer().eInverseRemove(this, TaxationWithRootPackage.TAX_PAYER__FROM_AGENT, Tax_Payer.class, msgs);
+		}
+		return super.eBasicRemoveFromContainerFeature(msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case TaxationWithRootPackage.FROM_AGENT__TAX_PAYER:
+				return getTaxPayer();
+			case TaxationWithRootPackage.FROM_AGENT__IS_DEPENDENT_ELIGIBLE_FOR_CE_NOT_IN_HOUSHOLD_CHILDREN_CARE:
+				return isIs_dependent_eligible_for_CE_Not_In_Houshold_Children_Care();
+			case TaxationWithRootPackage.FROM_AGENT__EXPENSE:
+				if (resolve) return getExpense();
+				return basicGetExpense();
+			case TaxationWithRootPackage.FROM_AGENT__IS_ELIGIBLE_DEBT:
+				return isIs_eligible_debt();
+			case TaxationWithRootPackage.FROM_AGENT__DEPENDENT:
+				if (resolve) return getDependent();
+				return basicGetDependent();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case TaxationWithRootPackage.FROM_AGENT__TAX_PAYER:
+				setTaxPayer((Tax_Payer)newValue);
+				return;
+			case TaxationWithRootPackage.FROM_AGENT__IS_DEPENDENT_ELIGIBLE_FOR_CE_NOT_IN_HOUSHOLD_CHILDREN_CARE:
+				setIs_dependent_eligible_for_CE_Not_In_Houshold_Children_Care((Boolean)newValue);
+				return;
+			case TaxationWithRootPackage.FROM_AGENT__EXPENSE:
+				setExpense((Expense)newValue);
+				return;
+			case TaxationWithRootPackage.FROM_AGENT__IS_ELIGIBLE_DEBT:
+				setIs_eligible_debt((Boolean)newValue);
+				return;
+			case TaxationWithRootPackage.FROM_AGENT__DEPENDENT:
+				setDependent((Dependent)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.FROM_AGENT__TAX_PAYER:
+				setTaxPayer((Tax_Payer)null);
+				return;
+			case TaxationWithRootPackage.FROM_AGENT__IS_DEPENDENT_ELIGIBLE_FOR_CE_NOT_IN_HOUSHOLD_CHILDREN_CARE:
+				setIs_dependent_eligible_for_CE_Not_In_Houshold_Children_Care(IS_DEPENDENT_ELIGIBLE_FOR_CE_NOT_IN_HOUSHOLD_CHILDREN_CARE_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.FROM_AGENT__EXPENSE:
+				setExpense((Expense)null);
+				return;
+			case TaxationWithRootPackage.FROM_AGENT__IS_ELIGIBLE_DEBT:
+				setIs_eligible_debt(IS_ELIGIBLE_DEBT_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.FROM_AGENT__DEPENDENT:
+				setDependent((Dependent)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.FROM_AGENT__TAX_PAYER:
+				return getTaxPayer() != null;
+			case TaxationWithRootPackage.FROM_AGENT__IS_DEPENDENT_ELIGIBLE_FOR_CE_NOT_IN_HOUSHOLD_CHILDREN_CARE:
+				return is_dependent_eligible_for_CE_Not_In_Houshold_Children_Care != IS_DEPENDENT_ELIGIBLE_FOR_CE_NOT_IN_HOUSHOLD_CHILDREN_CARE_EDEFAULT;
+			case TaxationWithRootPackage.FROM_AGENT__EXPENSE:
+				return expense != null;
+			case TaxationWithRootPackage.FROM_AGENT__IS_ELIGIBLE_DEBT:
+				return is_eligible_debt != IS_ELIGIBLE_DEBT_EDEFAULT;
+			case TaxationWithRootPackage.FROM_AGENT__DEPENDENT:
+				return dependent != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuilder result = new StringBuilder(super.toString());
+		result.append(" (is_dependent_eligible_for_CE_Not_In_Houshold_Children_Care: ");
+		result.append(is_dependent_eligible_for_CE_Not_In_Houshold_Children_Care);
+		result.append(", is_eligible_debt: ");
+		result.append(is_eligible_debt);
+		result.append(')');
+		return result.toString();
+	}
+
+} //FromAgentImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/FromLawImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/FromLawImpl.java
new file mode 100644
index 00000000..6244e60f
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/FromLawImpl.java
@@ -0,0 +1,268 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.FromLaw;
+import TaxationWithRoot.Tax_Payer;
+import TaxationWithRoot.TaxationWithRootPackage;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EcoreUtil;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>From Law</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.impl.FromLawImpl#getId <em>Id</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.FromLawImpl#getTaxPayer <em>Tax Payer</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class FromLawImpl extends MinimalEObjectImpl.Container implements FromLaw {
+	/**
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String id = ID_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected FromLawImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.FROM_LAW;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getId() {
+		return id;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setId(String newId) {
+		String oldId = id;
+		id = newId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.FROM_LAW__ID, oldId, id));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Tax_Payer getTaxPayer() {
+		if (eContainerFeatureID() != TaxationWithRootPackage.FROM_LAW__TAX_PAYER) return null;
+		return (Tax_Payer)eInternalContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetTaxPayer(Tax_Payer newTaxPayer, NotificationChain msgs) {
+		msgs = eBasicSetContainer((InternalEObject)newTaxPayer, TaxationWithRootPackage.FROM_LAW__TAX_PAYER, msgs);
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setTaxPayer(Tax_Payer newTaxPayer) {
+		if (newTaxPayer != eInternalContainer() || (eContainerFeatureID() != TaxationWithRootPackage.FROM_LAW__TAX_PAYER && newTaxPayer != null)) {
+			if (EcoreUtil.isAncestor(this, newTaxPayer))
+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+			NotificationChain msgs = null;
+			if (eInternalContainer() != null)
+				msgs = eBasicRemoveFromContainer(msgs);
+			if (newTaxPayer != null)
+				msgs = ((InternalEObject)newTaxPayer).eInverseAdd(this, TaxationWithRootPackage.TAX_PAYER__FROM_LAW, Tax_Payer.class, msgs);
+			msgs = basicSetTaxPayer(newTaxPayer, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.FROM_LAW__TAX_PAYER, newTaxPayer, newTaxPayer));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case TaxationWithRootPackage.FROM_LAW__TAX_PAYER:
+				if (eInternalContainer() != null)
+					msgs = eBasicRemoveFromContainer(msgs);
+				return basicSetTaxPayer((Tax_Payer)otherEnd, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case TaxationWithRootPackage.FROM_LAW__TAX_PAYER:
+				return basicSetTaxPayer(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+		switch (eContainerFeatureID()) {
+			case TaxationWithRootPackage.FROM_LAW__TAX_PAYER:
+				return eInternalContainer().eInverseRemove(this, TaxationWithRootPackage.TAX_PAYER__FROM_LAW, Tax_Payer.class, msgs);
+		}
+		return super.eBasicRemoveFromContainerFeature(msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case TaxationWithRootPackage.FROM_LAW__ID:
+				return getId();
+			case TaxationWithRootPackage.FROM_LAW__TAX_PAYER:
+				return getTaxPayer();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case TaxationWithRootPackage.FROM_LAW__ID:
+				setId((String)newValue);
+				return;
+			case TaxationWithRootPackage.FROM_LAW__TAX_PAYER:
+				setTaxPayer((Tax_Payer)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.FROM_LAW__ID:
+				setId(ID_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.FROM_LAW__TAX_PAYER:
+				setTaxPayer((Tax_Payer)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.FROM_LAW__ID:
+				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+			case TaxationWithRootPackage.FROM_LAW__TAX_PAYER:
+				return getTaxPayer() != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuilder result = new StringBuilder(super.toString());
+		result.append(" (id: ");
+		result.append(id);
+		result.append(')');
+		return result.toString();
+	}
+
+} //FromLawImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Habitual_AddressImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Habitual_AddressImpl.java
new file mode 100644
index 00000000..4fea235c
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Habitual_AddressImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.Habitual_Address;
+import TaxationWithRoot.TaxationWithRootPackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Habitual Address</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class Habitual_AddressImpl extends AddressImpl implements Habitual_Address {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Habitual_AddressImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.HABITUAL_ADDRESS;
+	}
+
+} //Habitual_AddressImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Health_and_Pension_InsuranceImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Health_and_Pension_InsuranceImpl.java
new file mode 100644
index 00000000..2e2346b7
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Health_and_Pension_InsuranceImpl.java
@@ -0,0 +1,221 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.Category_of_Health_and_Pension_Insurances;
+import TaxationWithRoot.Health_and_Pension_Insurance;
+import TaxationWithRoot.TaxationWithRootPackage;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Health and Pension Insurance</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.impl.Health_and_Pension_InsuranceImpl#getCategory <em>Category</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Health_and_Pension_InsuranceImpl#isIs_related_to_additional_salary <em>Is related to additional salary</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class Health_and_Pension_InsuranceImpl extends Special_Expense_DSImpl implements Health_and_Pension_Insurance {
+	/**
+	 * The default value of the '{@link #getCategory() <em>Category</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCategory()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final Category_of_Health_and_Pension_Insurances CATEGORY_EDEFAULT = Category_of_Health_and_Pension_Insurances.MANDATORY_HEALTH_AND_PENSION_INSURANCE;
+
+	/**
+	 * The cached value of the '{@link #getCategory() <em>Category</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCategory()
+	 * @generated
+	 * @ordered
+	 */
+	protected Category_of_Health_and_Pension_Insurances category = CATEGORY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isIs_related_to_additional_salary() <em>Is related to additional salary</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isIs_related_to_additional_salary()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean IS_RELATED_TO_ADDITIONAL_SALARY_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isIs_related_to_additional_salary() <em>Is related to additional salary</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isIs_related_to_additional_salary()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean is_related_to_additional_salary = IS_RELATED_TO_ADDITIONAL_SALARY_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Health_and_Pension_InsuranceImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.HEALTH_AND_PENSION_INSURANCE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Category_of_Health_and_Pension_Insurances getCategory() {
+		return category;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setCategory(Category_of_Health_and_Pension_Insurances newCategory) {
+		Category_of_Health_and_Pension_Insurances oldCategory = category;
+		category = newCategory == null ? CATEGORY_EDEFAULT : newCategory;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.HEALTH_AND_PENSION_INSURANCE__CATEGORY, oldCategory, category));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isIs_related_to_additional_salary() {
+		return is_related_to_additional_salary;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setIs_related_to_additional_salary(boolean newIs_related_to_additional_salary) {
+		boolean oldIs_related_to_additional_salary = is_related_to_additional_salary;
+		is_related_to_additional_salary = newIs_related_to_additional_salary;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.HEALTH_AND_PENSION_INSURANCE__IS_RELATED_TO_ADDITIONAL_SALARY, oldIs_related_to_additional_salary, is_related_to_additional_salary));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case TaxationWithRootPackage.HEALTH_AND_PENSION_INSURANCE__CATEGORY:
+				return getCategory();
+			case TaxationWithRootPackage.HEALTH_AND_PENSION_INSURANCE__IS_RELATED_TO_ADDITIONAL_SALARY:
+				return isIs_related_to_additional_salary();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case TaxationWithRootPackage.HEALTH_AND_PENSION_INSURANCE__CATEGORY:
+				setCategory((Category_of_Health_and_Pension_Insurances)newValue);
+				return;
+			case TaxationWithRootPackage.HEALTH_AND_PENSION_INSURANCE__IS_RELATED_TO_ADDITIONAL_SALARY:
+				setIs_related_to_additional_salary((Boolean)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.HEALTH_AND_PENSION_INSURANCE__CATEGORY:
+				setCategory(CATEGORY_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.HEALTH_AND_PENSION_INSURANCE__IS_RELATED_TO_ADDITIONAL_SALARY:
+				setIs_related_to_additional_salary(IS_RELATED_TO_ADDITIONAL_SALARY_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.HEALTH_AND_PENSION_INSURANCE__CATEGORY:
+				return category != CATEGORY_EDEFAULT;
+			case TaxationWithRootPackage.HEALTH_AND_PENSION_INSURANCE__IS_RELATED_TO_ADDITIONAL_SALARY:
+				return is_related_to_additional_salary != IS_RELATED_TO_ADDITIONAL_SALARY_EDEFAULT;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuilder result = new StringBuilder(super.toString());
+		result.append(" (category: ");
+		result.append(category);
+		result.append(", is_related_to_additional_salary: ");
+		result.append(is_related_to_additional_salary);
+		result.append(')');
+		return result.toString();
+	}
+
+} //Health_and_Pension_InsuranceImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/HouseholdImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/HouseholdImpl.java
new file mode 100644
index 00000000..9cd59977
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/HouseholdImpl.java
@@ -0,0 +1,313 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.Dependent;
+import TaxationWithRoot.Household;
+import TaxationWithRoot.Legal_Union_Record;
+import TaxationWithRoot.TaxationWithRootPackage;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Household</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.impl.HouseholdImpl#getParents <em>Parents</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.HouseholdImpl#getId1 <em>Id1</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.HouseholdImpl#getChildren <em>Children</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class HouseholdImpl extends MinimalEObjectImpl.Container implements Household {
+	/**
+	 * The cached value of the '{@link #getParents() <em>Parents</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getParents()
+	 * @generated
+	 * @ordered
+	 */
+	protected Legal_Union_Record parents;
+
+	/**
+	 * The default value of the '{@link #getId1() <em>Id1</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getId1()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ID1_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getId1() <em>Id1</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getId1()
+	 * @generated
+	 * @ordered
+	 */
+	protected String id1 = ID1_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getChildren() <em>Children</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getChildren()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Dependent> children;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected HouseholdImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.HOUSEHOLD;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Legal_Union_Record getParents() {
+		return parents;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetParents(Legal_Union_Record newParents, NotificationChain msgs) {
+		Legal_Union_Record oldParents = parents;
+		parents = newParents;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.HOUSEHOLD__PARENTS, oldParents, newParents);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setParents(Legal_Union_Record newParents) {
+		if (newParents != parents) {
+			NotificationChain msgs = null;
+			if (parents != null)
+				msgs = ((InternalEObject)parents).eInverseRemove(this, TaxationWithRootPackage.LEGAL_UNION_RECORD__HOUSEHOLD, Legal_Union_Record.class, msgs);
+			if (newParents != null)
+				msgs = ((InternalEObject)newParents).eInverseAdd(this, TaxationWithRootPackage.LEGAL_UNION_RECORD__HOUSEHOLD, Legal_Union_Record.class, msgs);
+			msgs = basicSetParents(newParents, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.HOUSEHOLD__PARENTS, newParents, newParents));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getId1() {
+		return id1;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setId1(String newId1) {
+		String oldId1 = id1;
+		id1 = newId1;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.HOUSEHOLD__ID1, oldId1, id1));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<Dependent> getChildren() {
+		if (children == null) {
+			children = new EObjectContainmentWithInverseEList<Dependent>(Dependent.class, this, TaxationWithRootPackage.HOUSEHOLD__CHILDREN, TaxationWithRootPackage.DEPENDENT__HOUSEHOLD);
+		}
+		return children;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case TaxationWithRootPackage.HOUSEHOLD__PARENTS:
+				if (parents != null)
+					msgs = ((InternalEObject)parents).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - TaxationWithRootPackage.HOUSEHOLD__PARENTS, null, msgs);
+				return basicSetParents((Legal_Union_Record)otherEnd, msgs);
+			case TaxationWithRootPackage.HOUSEHOLD__CHILDREN:
+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case TaxationWithRootPackage.HOUSEHOLD__PARENTS:
+				return basicSetParents(null, msgs);
+			case TaxationWithRootPackage.HOUSEHOLD__CHILDREN:
+				return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case TaxationWithRootPackage.HOUSEHOLD__PARENTS:
+				return getParents();
+			case TaxationWithRootPackage.HOUSEHOLD__ID1:
+				return getId1();
+			case TaxationWithRootPackage.HOUSEHOLD__CHILDREN:
+				return getChildren();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case TaxationWithRootPackage.HOUSEHOLD__PARENTS:
+				setParents((Legal_Union_Record)newValue);
+				return;
+			case TaxationWithRootPackage.HOUSEHOLD__ID1:
+				setId1((String)newValue);
+				return;
+			case TaxationWithRootPackage.HOUSEHOLD__CHILDREN:
+				getChildren().clear();
+				getChildren().addAll((Collection<? extends Dependent>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.HOUSEHOLD__PARENTS:
+				setParents((Legal_Union_Record)null);
+				return;
+			case TaxationWithRootPackage.HOUSEHOLD__ID1:
+				setId1(ID1_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.HOUSEHOLD__CHILDREN:
+				getChildren().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.HOUSEHOLD__PARENTS:
+				return parents != null;
+			case TaxationWithRootPackage.HOUSEHOLD__ID1:
+				return ID1_EDEFAULT == null ? id1 != null : !ID1_EDEFAULT.equals(id1);
+			case TaxationWithRootPackage.HOUSEHOLD__CHILDREN:
+				return children != null && !children.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuilder result = new StringBuilder(super.toString());
+		result.append(" (id1: ");
+		result.append(id1);
+		result.append(')');
+		return result.toString();
+	}
+
+} //HouseholdImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/IncomeImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/IncomeImpl.java
new file mode 100644
index 00000000..83667fd8
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/IncomeImpl.java
@@ -0,0 +1,614 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.Expense;
+import TaxationWithRoot.Income;
+import TaxationWithRoot.Income_Detail;
+import TaxationWithRoot.Income_Type;
+import TaxationWithRoot.Tax_Card;
+import TaxationWithRoot.Tax_Payer;
+import TaxationWithRoot.TaxationWithRootPackage;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Income</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.impl.IncomeImpl#getIncome_amount <em>Income amount</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.IncomeImpl#getIncome_type <em>Income type</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.IncomeImpl#getTax_card <em>Tax card</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.IncomeImpl#getTax_liability <em>Tax liability</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.IncomeImpl#getTaxPayer <em>Tax Payer</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.IncomeImpl#getDetails <em>Details</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.IncomeImpl#getNum <em>Num</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.IncomeImpl#getExpenses <em>Expenses</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class IncomeImpl extends MinimalEObjectImpl.Container implements Income {
+	/**
+	 * The default value of the '{@link #getIncome_amount() <em>Income amount</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getIncome_amount()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double INCOME_AMOUNT_EDEFAULT = 0.0;
+
+	/**
+	 * The cached value of the '{@link #getIncome_amount() <em>Income amount</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getIncome_amount()
+	 * @generated
+	 * @ordered
+	 */
+	protected double income_amount = INCOME_AMOUNT_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getIncome_type() <em>Income type</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getIncome_type()
+	 * @generated
+	 * @ordered
+	 */
+	protected Income_Type income_type;
+
+	/**
+	 * The cached value of the '{@link #getTax_card() <em>Tax card</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTax_card()
+	 * @generated
+	 * @ordered
+	 */
+	protected Tax_Card tax_card;
+
+	/**
+	 * The default value of the '{@link #getTax_liability() <em>Tax liability</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTax_liability()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double TAX_LIABILITY_EDEFAULT = 0.0;
+
+	/**
+	 * The cached value of the '{@link #getTax_liability() <em>Tax liability</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTax_liability()
+	 * @generated
+	 * @ordered
+	 */
+	protected double tax_liability = TAX_LIABILITY_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getDetails() <em>Details</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDetails()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Income_Detail> details;
+
+	/**
+	 * The default value of the '{@link #getNum() <em>Num</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getNum()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int NUM_EDEFAULT = 0;
+
+	/**
+	 * The cached value of the '{@link #getNum() <em>Num</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getNum()
+	 * @generated
+	 * @ordered
+	 */
+	protected int num = NUM_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getExpenses() <em>Expenses</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getExpenses()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Expense> expenses;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IncomeImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.INCOME;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getIncome_amount() {
+		return income_amount;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setIncome_amount(double newIncome_amount) {
+		double oldIncome_amount = income_amount;
+		income_amount = newIncome_amount;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.INCOME__INCOME_AMOUNT, oldIncome_amount, income_amount));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Income_Type getIncome_type() {
+		return income_type;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetIncome_type(Income_Type newIncome_type, NotificationChain msgs) {
+		Income_Type oldIncome_type = income_type;
+		income_type = newIncome_type;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.INCOME__INCOME_TYPE, oldIncome_type, newIncome_type);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setIncome_type(Income_Type newIncome_type) {
+		if (newIncome_type != income_type) {
+			NotificationChain msgs = null;
+			if (income_type != null)
+				msgs = ((InternalEObject)income_type).eInverseRemove(this, TaxationWithRootPackage.INCOME_TYPE__INCOME, Income_Type.class, msgs);
+			if (newIncome_type != null)
+				msgs = ((InternalEObject)newIncome_type).eInverseAdd(this, TaxationWithRootPackage.INCOME_TYPE__INCOME, Income_Type.class, msgs);
+			msgs = basicSetIncome_type(newIncome_type, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.INCOME__INCOME_TYPE, newIncome_type, newIncome_type));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Tax_Card getTax_card() {
+		return tax_card;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetTax_card(Tax_Card newTax_card, NotificationChain msgs) {
+		Tax_Card oldTax_card = tax_card;
+		tax_card = newTax_card;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.INCOME__TAX_CARD, oldTax_card, newTax_card);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setTax_card(Tax_Card newTax_card) {
+		if (newTax_card != tax_card) {
+			NotificationChain msgs = null;
+			if (tax_card != null)
+				msgs = ((InternalEObject)tax_card).eInverseRemove(this, TaxationWithRootPackage.TAX_CARD__INCOME, Tax_Card.class, msgs);
+			if (newTax_card != null)
+				msgs = ((InternalEObject)newTax_card).eInverseAdd(this, TaxationWithRootPackage.TAX_CARD__INCOME, Tax_Card.class, msgs);
+			msgs = basicSetTax_card(newTax_card, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.INCOME__TAX_CARD, newTax_card, newTax_card));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getTax_liability() {
+		return tax_liability;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setTax_liability(double newTax_liability) {
+		double oldTax_liability = tax_liability;
+		tax_liability = newTax_liability;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.INCOME__TAX_LIABILITY, oldTax_liability, tax_liability));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Tax_Payer getTaxPayer() {
+		if (eContainerFeatureID() != TaxationWithRootPackage.INCOME__TAX_PAYER) return null;
+		return (Tax_Payer)eInternalContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetTaxPayer(Tax_Payer newTaxPayer, NotificationChain msgs) {
+		msgs = eBasicSetContainer((InternalEObject)newTaxPayer, TaxationWithRootPackage.INCOME__TAX_PAYER, msgs);
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setTaxPayer(Tax_Payer newTaxPayer) {
+		if (newTaxPayer != eInternalContainer() || (eContainerFeatureID() != TaxationWithRootPackage.INCOME__TAX_PAYER && newTaxPayer != null)) {
+			if (EcoreUtil.isAncestor(this, newTaxPayer))
+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+			NotificationChain msgs = null;
+			if (eInternalContainer() != null)
+				msgs = eBasicRemoveFromContainer(msgs);
+			if (newTaxPayer != null)
+				msgs = ((InternalEObject)newTaxPayer).eInverseAdd(this, TaxationWithRootPackage.TAX_PAYER__INCOMES, Tax_Payer.class, msgs);
+			msgs = basicSetTaxPayer(newTaxPayer, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.INCOME__TAX_PAYER, newTaxPayer, newTaxPayer));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<Income_Detail> getDetails() {
+		if (details == null) {
+			details = new EObjectContainmentWithInverseEList<Income_Detail>(Income_Detail.class, this, TaxationWithRootPackage.INCOME__DETAILS, TaxationWithRootPackage.INCOME_DETAIL__INCOME);
+		}
+		return details;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getNum() {
+		return num;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setNum(int newNum) {
+		int oldNum = num;
+		num = newNum;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.INCOME__NUM, oldNum, num));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<Expense> getExpenses() {
+		if (expenses == null) {
+			expenses = new EObjectContainmentWithInverseEList<Expense>(Expense.class, this, TaxationWithRootPackage.INCOME__EXPENSES, TaxationWithRootPackage.EXPENSE__INCOME);
+		}
+		return expenses;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case TaxationWithRootPackage.INCOME__INCOME_TYPE:
+				if (income_type != null)
+					msgs = ((InternalEObject)income_type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - TaxationWithRootPackage.INCOME__INCOME_TYPE, null, msgs);
+				return basicSetIncome_type((Income_Type)otherEnd, msgs);
+			case TaxationWithRootPackage.INCOME__TAX_CARD:
+				if (tax_card != null)
+					msgs = ((InternalEObject)tax_card).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - TaxationWithRootPackage.INCOME__TAX_CARD, null, msgs);
+				return basicSetTax_card((Tax_Card)otherEnd, msgs);
+			case TaxationWithRootPackage.INCOME__TAX_PAYER:
+				if (eInternalContainer() != null)
+					msgs = eBasicRemoveFromContainer(msgs);
+				return basicSetTaxPayer((Tax_Payer)otherEnd, msgs);
+			case TaxationWithRootPackage.INCOME__DETAILS:
+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getDetails()).basicAdd(otherEnd, msgs);
+			case TaxationWithRootPackage.INCOME__EXPENSES:
+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getExpenses()).basicAdd(otherEnd, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case TaxationWithRootPackage.INCOME__INCOME_TYPE:
+				return basicSetIncome_type(null, msgs);
+			case TaxationWithRootPackage.INCOME__TAX_CARD:
+				return basicSetTax_card(null, msgs);
+			case TaxationWithRootPackage.INCOME__TAX_PAYER:
+				return basicSetTaxPayer(null, msgs);
+			case TaxationWithRootPackage.INCOME__DETAILS:
+				return ((InternalEList<?>)getDetails()).basicRemove(otherEnd, msgs);
+			case TaxationWithRootPackage.INCOME__EXPENSES:
+				return ((InternalEList<?>)getExpenses()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+		switch (eContainerFeatureID()) {
+			case TaxationWithRootPackage.INCOME__TAX_PAYER:
+				return eInternalContainer().eInverseRemove(this, TaxationWithRootPackage.TAX_PAYER__INCOMES, Tax_Payer.class, msgs);
+		}
+		return super.eBasicRemoveFromContainerFeature(msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case TaxationWithRootPackage.INCOME__INCOME_AMOUNT:
+				return getIncome_amount();
+			case TaxationWithRootPackage.INCOME__INCOME_TYPE:
+				return getIncome_type();
+			case TaxationWithRootPackage.INCOME__TAX_CARD:
+				return getTax_card();
+			case TaxationWithRootPackage.INCOME__TAX_LIABILITY:
+				return getTax_liability();
+			case TaxationWithRootPackage.INCOME__TAX_PAYER:
+				return getTaxPayer();
+			case TaxationWithRootPackage.INCOME__DETAILS:
+				return getDetails();
+			case TaxationWithRootPackage.INCOME__NUM:
+				return getNum();
+			case TaxationWithRootPackage.INCOME__EXPENSES:
+				return getExpenses();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case TaxationWithRootPackage.INCOME__INCOME_AMOUNT:
+				setIncome_amount((Double)newValue);
+				return;
+			case TaxationWithRootPackage.INCOME__INCOME_TYPE:
+				setIncome_type((Income_Type)newValue);
+				return;
+			case TaxationWithRootPackage.INCOME__TAX_CARD:
+				setTax_card((Tax_Card)newValue);
+				return;
+			case TaxationWithRootPackage.INCOME__TAX_LIABILITY:
+				setTax_liability((Double)newValue);
+				return;
+			case TaxationWithRootPackage.INCOME__TAX_PAYER:
+				setTaxPayer((Tax_Payer)newValue);
+				return;
+			case TaxationWithRootPackage.INCOME__DETAILS:
+				getDetails().clear();
+				getDetails().addAll((Collection<? extends Income_Detail>)newValue);
+				return;
+			case TaxationWithRootPackage.INCOME__NUM:
+				setNum((Integer)newValue);
+				return;
+			case TaxationWithRootPackage.INCOME__EXPENSES:
+				getExpenses().clear();
+				getExpenses().addAll((Collection<? extends Expense>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.INCOME__INCOME_AMOUNT:
+				setIncome_amount(INCOME_AMOUNT_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.INCOME__INCOME_TYPE:
+				setIncome_type((Income_Type)null);
+				return;
+			case TaxationWithRootPackage.INCOME__TAX_CARD:
+				setTax_card((Tax_Card)null);
+				return;
+			case TaxationWithRootPackage.INCOME__TAX_LIABILITY:
+				setTax_liability(TAX_LIABILITY_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.INCOME__TAX_PAYER:
+				setTaxPayer((Tax_Payer)null);
+				return;
+			case TaxationWithRootPackage.INCOME__DETAILS:
+				getDetails().clear();
+				return;
+			case TaxationWithRootPackage.INCOME__NUM:
+				setNum(NUM_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.INCOME__EXPENSES:
+				getExpenses().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.INCOME__INCOME_AMOUNT:
+				return income_amount != INCOME_AMOUNT_EDEFAULT;
+			case TaxationWithRootPackage.INCOME__INCOME_TYPE:
+				return income_type != null;
+			case TaxationWithRootPackage.INCOME__TAX_CARD:
+				return tax_card != null;
+			case TaxationWithRootPackage.INCOME__TAX_LIABILITY:
+				return tax_liability != TAX_LIABILITY_EDEFAULT;
+			case TaxationWithRootPackage.INCOME__TAX_PAYER:
+				return getTaxPayer() != null;
+			case TaxationWithRootPackage.INCOME__DETAILS:
+				return details != null && !details.isEmpty();
+			case TaxationWithRootPackage.INCOME__NUM:
+				return num != NUM_EDEFAULT;
+			case TaxationWithRootPackage.INCOME__EXPENSES:
+				return expenses != null && !expenses.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuilder result = new StringBuilder(super.toString());
+		result.append(" (income_amount: ");
+		result.append(income_amount);
+		result.append(", tax_liability: ");
+		result.append(tax_liability);
+		result.append(", num: ");
+		result.append(num);
+		result.append(')');
+		return result.toString();
+	}
+
+} //IncomeImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Income_DetailImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Income_DetailImpl.java
new file mode 100644
index 00000000..4820079f
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Income_DetailImpl.java
@@ -0,0 +1,548 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.Income;
+import TaxationWithRoot.Income_Detail;
+import TaxationWithRoot.TaxationWithRootPackage;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EcoreUtil;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Income Detail</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.impl.Income_DetailImpl#getAmount <em>Amount</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Income_DetailImpl#isIs_worked <em>Is worked</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Income_DetailImpl#getDistance <em>Distance</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Income_DetailImpl#getWorked_days <em>Worked days</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Income_DetailImpl#isIs_contributing_CNS <em>Is contributing CNS</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Income_DetailImpl#getId5 <em>Id5</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Income_DetailImpl#getIncome <em>Income</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class Income_DetailImpl extends MinimalEObjectImpl.Container implements Income_Detail {
+	/**
+	 * The default value of the '{@link #getAmount() <em>Amount</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAmount()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double AMOUNT_EDEFAULT = 0.0;
+
+	/**
+	 * The cached value of the '{@link #getAmount() <em>Amount</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAmount()
+	 * @generated
+	 * @ordered
+	 */
+	protected double amount = AMOUNT_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isIs_worked() <em>Is worked</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isIs_worked()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean IS_WORKED_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isIs_worked() <em>Is worked</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isIs_worked()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean is_worked = IS_WORKED_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDistance() <em>Distance</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDistance()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double DISTANCE_EDEFAULT = 0.0;
+
+	/**
+	 * The cached value of the '{@link #getDistance() <em>Distance</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDistance()
+	 * @generated
+	 * @ordered
+	 */
+	protected double distance = DISTANCE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getWorked_days() <em>Worked days</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getWorked_days()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int WORKED_DAYS_EDEFAULT = 0;
+
+	/**
+	 * The cached value of the '{@link #getWorked_days() <em>Worked days</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getWorked_days()
+	 * @generated
+	 * @ordered
+	 */
+	protected int worked_days = WORKED_DAYS_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isIs_contributing_CNS() <em>Is contributing CNS</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isIs_contributing_CNS()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean IS_CONTRIBUTING_CNS_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isIs_contributing_CNS() <em>Is contributing CNS</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isIs_contributing_CNS()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean is_contributing_CNS = IS_CONTRIBUTING_CNS_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getId5() <em>Id5</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getId5()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ID5_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getId5() <em>Id5</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getId5()
+	 * @generated
+	 * @ordered
+	 */
+	protected String id5 = ID5_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Income_DetailImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.INCOME_DETAIL;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getAmount() {
+		return amount;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setAmount(double newAmount) {
+		double oldAmount = amount;
+		amount = newAmount;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.INCOME_DETAIL__AMOUNT, oldAmount, amount));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isIs_worked() {
+		return is_worked;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setIs_worked(boolean newIs_worked) {
+		boolean oldIs_worked = is_worked;
+		is_worked = newIs_worked;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.INCOME_DETAIL__IS_WORKED, oldIs_worked, is_worked));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getDistance() {
+		return distance;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDistance(double newDistance) {
+		double oldDistance = distance;
+		distance = newDistance;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.INCOME_DETAIL__DISTANCE, oldDistance, distance));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getWorked_days() {
+		return worked_days;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setWorked_days(int newWorked_days) {
+		int oldWorked_days = worked_days;
+		worked_days = newWorked_days;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.INCOME_DETAIL__WORKED_DAYS, oldWorked_days, worked_days));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isIs_contributing_CNS() {
+		return is_contributing_CNS;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setIs_contributing_CNS(boolean newIs_contributing_CNS) {
+		boolean oldIs_contributing_CNS = is_contributing_CNS;
+		is_contributing_CNS = newIs_contributing_CNS;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.INCOME_DETAIL__IS_CONTRIBUTING_CNS, oldIs_contributing_CNS, is_contributing_CNS));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getId5() {
+		return id5;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setId5(String newId5) {
+		String oldId5 = id5;
+		id5 = newId5;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.INCOME_DETAIL__ID5, oldId5, id5));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Income getIncome() {
+		if (eContainerFeatureID() != TaxationWithRootPackage.INCOME_DETAIL__INCOME) return null;
+		return (Income)eInternalContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetIncome(Income newIncome, NotificationChain msgs) {
+		msgs = eBasicSetContainer((InternalEObject)newIncome, TaxationWithRootPackage.INCOME_DETAIL__INCOME, msgs);
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setIncome(Income newIncome) {
+		if (newIncome != eInternalContainer() || (eContainerFeatureID() != TaxationWithRootPackage.INCOME_DETAIL__INCOME && newIncome != null)) {
+			if (EcoreUtil.isAncestor(this, newIncome))
+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+			NotificationChain msgs = null;
+			if (eInternalContainer() != null)
+				msgs = eBasicRemoveFromContainer(msgs);
+			if (newIncome != null)
+				msgs = ((InternalEObject)newIncome).eInverseAdd(this, TaxationWithRootPackage.INCOME__DETAILS, Income.class, msgs);
+			msgs = basicSetIncome(newIncome, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.INCOME_DETAIL__INCOME, newIncome, newIncome));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case TaxationWithRootPackage.INCOME_DETAIL__INCOME:
+				if (eInternalContainer() != null)
+					msgs = eBasicRemoveFromContainer(msgs);
+				return basicSetIncome((Income)otherEnd, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case TaxationWithRootPackage.INCOME_DETAIL__INCOME:
+				return basicSetIncome(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+		switch (eContainerFeatureID()) {
+			case TaxationWithRootPackage.INCOME_DETAIL__INCOME:
+				return eInternalContainer().eInverseRemove(this, TaxationWithRootPackage.INCOME__DETAILS, Income.class, msgs);
+		}
+		return super.eBasicRemoveFromContainerFeature(msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case TaxationWithRootPackage.INCOME_DETAIL__AMOUNT:
+				return getAmount();
+			case TaxationWithRootPackage.INCOME_DETAIL__IS_WORKED:
+				return isIs_worked();
+			case TaxationWithRootPackage.INCOME_DETAIL__DISTANCE:
+				return getDistance();
+			case TaxationWithRootPackage.INCOME_DETAIL__WORKED_DAYS:
+				return getWorked_days();
+			case TaxationWithRootPackage.INCOME_DETAIL__IS_CONTRIBUTING_CNS:
+				return isIs_contributing_CNS();
+			case TaxationWithRootPackage.INCOME_DETAIL__ID5:
+				return getId5();
+			case TaxationWithRootPackage.INCOME_DETAIL__INCOME:
+				return getIncome();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case TaxationWithRootPackage.INCOME_DETAIL__AMOUNT:
+				setAmount((Double)newValue);
+				return;
+			case TaxationWithRootPackage.INCOME_DETAIL__IS_WORKED:
+				setIs_worked((Boolean)newValue);
+				return;
+			case TaxationWithRootPackage.INCOME_DETAIL__DISTANCE:
+				setDistance((Double)newValue);
+				return;
+			case TaxationWithRootPackage.INCOME_DETAIL__WORKED_DAYS:
+				setWorked_days((Integer)newValue);
+				return;
+			case TaxationWithRootPackage.INCOME_DETAIL__IS_CONTRIBUTING_CNS:
+				setIs_contributing_CNS((Boolean)newValue);
+				return;
+			case TaxationWithRootPackage.INCOME_DETAIL__ID5:
+				setId5((String)newValue);
+				return;
+			case TaxationWithRootPackage.INCOME_DETAIL__INCOME:
+				setIncome((Income)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.INCOME_DETAIL__AMOUNT:
+				setAmount(AMOUNT_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.INCOME_DETAIL__IS_WORKED:
+				setIs_worked(IS_WORKED_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.INCOME_DETAIL__DISTANCE:
+				setDistance(DISTANCE_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.INCOME_DETAIL__WORKED_DAYS:
+				setWorked_days(WORKED_DAYS_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.INCOME_DETAIL__IS_CONTRIBUTING_CNS:
+				setIs_contributing_CNS(IS_CONTRIBUTING_CNS_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.INCOME_DETAIL__ID5:
+				setId5(ID5_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.INCOME_DETAIL__INCOME:
+				setIncome((Income)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.INCOME_DETAIL__AMOUNT:
+				return amount != AMOUNT_EDEFAULT;
+			case TaxationWithRootPackage.INCOME_DETAIL__IS_WORKED:
+				return is_worked != IS_WORKED_EDEFAULT;
+			case TaxationWithRootPackage.INCOME_DETAIL__DISTANCE:
+				return distance != DISTANCE_EDEFAULT;
+			case TaxationWithRootPackage.INCOME_DETAIL__WORKED_DAYS:
+				return worked_days != WORKED_DAYS_EDEFAULT;
+			case TaxationWithRootPackage.INCOME_DETAIL__IS_CONTRIBUTING_CNS:
+				return is_contributing_CNS != IS_CONTRIBUTING_CNS_EDEFAULT;
+			case TaxationWithRootPackage.INCOME_DETAIL__ID5:
+				return ID5_EDEFAULT == null ? id5 != null : !ID5_EDEFAULT.equals(id5);
+			case TaxationWithRootPackage.INCOME_DETAIL__INCOME:
+				return getIncome() != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuilder result = new StringBuilder(super.toString());
+		result.append(" (amount: ");
+		result.append(amount);
+		result.append(", is_worked: ");
+		result.append(is_worked);
+		result.append(", distance: ");
+		result.append(distance);
+		result.append(", worked_days: ");
+		result.append(worked_days);
+		result.append(", is_contributing_CNS: ");
+		result.append(is_contributing_CNS);
+		result.append(", id5: ");
+		result.append(id5);
+		result.append(')');
+		return result.toString();
+	}
+
+} //Income_DetailImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Income_TaxImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Income_TaxImpl.java
new file mode 100644
index 00000000..58619bc1
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Income_TaxImpl.java
@@ -0,0 +1,341 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.Income_Tax;
+import TaxationWithRoot.Tax_Payer;
+import TaxationWithRoot.TaxationWithRootPackage;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Income Tax</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.impl.Income_TaxImpl#getTaxPayer <em>Tax Payer</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Income_TaxImpl#getTax_amount <em>Tax amount</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Income_TaxImpl#getTax_year <em>Tax year</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Income_TaxImpl#getId6 <em>Id6</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class Income_TaxImpl extends MinimalEObjectImpl.Container implements Income_Tax {
+	/**
+	 * The cached value of the '{@link #getTaxPayer() <em>Tax Payer</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTaxPayer()
+	 * @generated
+	 * @ordered
+	 */
+	protected Tax_Payer taxPayer;
+
+	/**
+	 * The default value of the '{@link #getTax_amount() <em>Tax amount</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTax_amount()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double TAX_AMOUNT_EDEFAULT = 0.0;
+
+	/**
+	 * The cached value of the '{@link #getTax_amount() <em>Tax amount</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTax_amount()
+	 * @generated
+	 * @ordered
+	 */
+	protected double tax_amount = TAX_AMOUNT_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getTax_year() <em>Tax year</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTax_year()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int TAX_YEAR_EDEFAULT = 0;
+
+	/**
+	 * The cached value of the '{@link #getTax_year() <em>Tax year</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTax_year()
+	 * @generated
+	 * @ordered
+	 */
+	protected int tax_year = TAX_YEAR_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getId6() <em>Id6</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getId6()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ID6_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getId6() <em>Id6</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getId6()
+	 * @generated
+	 * @ordered
+	 */
+	protected String id6 = ID6_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Income_TaxImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.INCOME_TAX;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Tax_Payer getTaxPayer() {
+		if (taxPayer != null && taxPayer.eIsProxy()) {
+			InternalEObject oldTaxPayer = (InternalEObject)taxPayer;
+			taxPayer = (Tax_Payer)eResolveProxy(oldTaxPayer);
+			if (taxPayer != oldTaxPayer) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TaxationWithRootPackage.INCOME_TAX__TAX_PAYER, oldTaxPayer, taxPayer));
+			}
+		}
+		return taxPayer;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Tax_Payer basicGetTaxPayer() {
+		return taxPayer;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setTaxPayer(Tax_Payer newTaxPayer) {
+		Tax_Payer oldTaxPayer = taxPayer;
+		taxPayer = newTaxPayer;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.INCOME_TAX__TAX_PAYER, oldTaxPayer, taxPayer));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getTax_amount() {
+		return tax_amount;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setTax_amount(double newTax_amount) {
+		double oldTax_amount = tax_amount;
+		tax_amount = newTax_amount;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.INCOME_TAX__TAX_AMOUNT, oldTax_amount, tax_amount));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getTax_year() {
+		return tax_year;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setTax_year(int newTax_year) {
+		int oldTax_year = tax_year;
+		tax_year = newTax_year;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.INCOME_TAX__TAX_YEAR, oldTax_year, tax_year));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getId6() {
+		return id6;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setId6(String newId6) {
+		String oldId6 = id6;
+		id6 = newId6;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.INCOME_TAX__ID6, oldId6, id6));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case TaxationWithRootPackage.INCOME_TAX__TAX_PAYER:
+				if (resolve) return getTaxPayer();
+				return basicGetTaxPayer();
+			case TaxationWithRootPackage.INCOME_TAX__TAX_AMOUNT:
+				return getTax_amount();
+			case TaxationWithRootPackage.INCOME_TAX__TAX_YEAR:
+				return getTax_year();
+			case TaxationWithRootPackage.INCOME_TAX__ID6:
+				return getId6();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case TaxationWithRootPackage.INCOME_TAX__TAX_PAYER:
+				setTaxPayer((Tax_Payer)newValue);
+				return;
+			case TaxationWithRootPackage.INCOME_TAX__TAX_AMOUNT:
+				setTax_amount((Double)newValue);
+				return;
+			case TaxationWithRootPackage.INCOME_TAX__TAX_YEAR:
+				setTax_year((Integer)newValue);
+				return;
+			case TaxationWithRootPackage.INCOME_TAX__ID6:
+				setId6((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.INCOME_TAX__TAX_PAYER:
+				setTaxPayer((Tax_Payer)null);
+				return;
+			case TaxationWithRootPackage.INCOME_TAX__TAX_AMOUNT:
+				setTax_amount(TAX_AMOUNT_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.INCOME_TAX__TAX_YEAR:
+				setTax_year(TAX_YEAR_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.INCOME_TAX__ID6:
+				setId6(ID6_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.INCOME_TAX__TAX_PAYER:
+				return taxPayer != null;
+			case TaxationWithRootPackage.INCOME_TAX__TAX_AMOUNT:
+				return tax_amount != TAX_AMOUNT_EDEFAULT;
+			case TaxationWithRootPackage.INCOME_TAX__TAX_YEAR:
+				return tax_year != TAX_YEAR_EDEFAULT;
+			case TaxationWithRootPackage.INCOME_TAX__ID6:
+				return ID6_EDEFAULT == null ? id6 != null : !ID6_EDEFAULT.equals(id6);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuilder result = new StringBuilder(super.toString());
+		result.append(" (tax_amount: ");
+		result.append(tax_amount);
+		result.append(", tax_year: ");
+		result.append(tax_year);
+		result.append(", id6: ");
+		result.append(id6);
+		result.append(')');
+		return result.toString();
+	}
+
+} //Income_TaxImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Income_Tax_CreditImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Income_Tax_CreditImpl.java
new file mode 100644
index 00000000..4e7a317a
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Income_Tax_CreditImpl.java
@@ -0,0 +1,626 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.Grantor;
+import TaxationWithRoot.Income_Tax_Credit;
+import TaxationWithRoot.Tax_Card;
+import TaxationWithRoot.Tax_Payer;
+import TaxationWithRoot.TaxationWithRootPackage;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Income Tax Credit</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.impl.Income_Tax_CreditImpl#getGrantedBy <em>Granted By</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Income_Tax_CreditImpl#getTaxPayer <em>Tax Payer</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Income_Tax_CreditImpl#getTax_year <em>Tax year</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Income_Tax_CreditImpl#getYearly <em>Yearly</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Income_Tax_CreditImpl#getMonthly <em>Monthly</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Income_Tax_CreditImpl#getDaily <em>Daily</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Income_Tax_CreditImpl#getId7 <em>Id7</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Income_Tax_CreditImpl#getTaxation_Frame <em>Taxation Frame</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class Income_Tax_CreditImpl extends MinimalEObjectImpl.Container implements Income_Tax_Credit {
+	/**
+	 * The default value of the '{@link #getGrantedBy() <em>Granted By</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getGrantedBy()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final Grantor GRANTED_BY_EDEFAULT = Grantor.WWW;
+
+	/**
+	 * The cached value of the '{@link #getGrantedBy() <em>Granted By</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getGrantedBy()
+	 * @generated
+	 * @ordered
+	 */
+	protected Grantor grantedBy = GRANTED_BY_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getTaxPayer() <em>Tax Payer</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTaxPayer()
+	 * @generated
+	 * @ordered
+	 */
+	protected Tax_Payer taxPayer;
+
+	/**
+	 * The default value of the '{@link #getTax_year() <em>Tax year</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTax_year()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int TAX_YEAR_EDEFAULT = 0;
+
+	/**
+	 * The cached value of the '{@link #getTax_year() <em>Tax year</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTax_year()
+	 * @generated
+	 * @ordered
+	 */
+	protected int tax_year = TAX_YEAR_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getYearly() <em>Yearly</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getYearly()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double YEARLY_EDEFAULT = 300.0;
+
+	/**
+	 * The cached value of the '{@link #getYearly() <em>Yearly</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getYearly()
+	 * @generated
+	 * @ordered
+	 */
+	protected double yearly = YEARLY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getMonthly() <em>Monthly</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMonthly()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double MONTHLY_EDEFAULT = 25.0;
+
+	/**
+	 * The cached value of the '{@link #getMonthly() <em>Monthly</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMonthly()
+	 * @generated
+	 * @ordered
+	 */
+	protected double monthly = MONTHLY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDaily() <em>Daily</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDaily()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double DAILY_EDEFAULT = 1.0;
+
+	/**
+	 * The cached value of the '{@link #getDaily() <em>Daily</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDaily()
+	 * @generated
+	 * @ordered
+	 */
+	protected double daily = DAILY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getId7() <em>Id7</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getId7()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ID7_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getId7() <em>Id7</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getId7()
+	 * @generated
+	 * @ordered
+	 */
+	protected String id7 = ID7_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getTaxation_Frame() <em>Taxation Frame</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTaxation_Frame()
+	 * @generated
+	 * @ordered
+	 */
+	protected Tax_Card taxation_Frame;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Income_Tax_CreditImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.INCOME_TAX_CREDIT;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Grantor getGrantedBy() {
+		return grantedBy;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setGrantedBy(Grantor newGrantedBy) {
+		Grantor oldGrantedBy = grantedBy;
+		grantedBy = newGrantedBy == null ? GRANTED_BY_EDEFAULT : newGrantedBy;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.INCOME_TAX_CREDIT__GRANTED_BY, oldGrantedBy, grantedBy));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Tax_Payer getTaxPayer() {
+		if (taxPayer != null && taxPayer.eIsProxy()) {
+			InternalEObject oldTaxPayer = (InternalEObject)taxPayer;
+			taxPayer = (Tax_Payer)eResolveProxy(oldTaxPayer);
+			if (taxPayer != oldTaxPayer) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TaxationWithRootPackage.INCOME_TAX_CREDIT__TAX_PAYER, oldTaxPayer, taxPayer));
+			}
+		}
+		return taxPayer;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Tax_Payer basicGetTaxPayer() {
+		return taxPayer;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setTaxPayer(Tax_Payer newTaxPayer) {
+		Tax_Payer oldTaxPayer = taxPayer;
+		taxPayer = newTaxPayer;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.INCOME_TAX_CREDIT__TAX_PAYER, oldTaxPayer, taxPayer));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getTax_year() {
+		return tax_year;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setTax_year(int newTax_year) {
+		int oldTax_year = tax_year;
+		tax_year = newTax_year;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.INCOME_TAX_CREDIT__TAX_YEAR, oldTax_year, tax_year));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getYearly() {
+		return yearly;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setYearly(double newYearly) {
+		double oldYearly = yearly;
+		yearly = newYearly;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.INCOME_TAX_CREDIT__YEARLY, oldYearly, yearly));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getMonthly() {
+		return monthly;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setMonthly(double newMonthly) {
+		double oldMonthly = monthly;
+		monthly = newMonthly;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.INCOME_TAX_CREDIT__MONTHLY, oldMonthly, monthly));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getDaily() {
+		return daily;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDaily(double newDaily) {
+		double oldDaily = daily;
+		daily = newDaily;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.INCOME_TAX_CREDIT__DAILY, oldDaily, daily));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getId7() {
+		return id7;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setId7(String newId7) {
+		String oldId7 = id7;
+		id7 = newId7;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.INCOME_TAX_CREDIT__ID7, oldId7, id7));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Tax_Card getTaxation_Frame() {
+		if (taxation_Frame != null && taxation_Frame.eIsProxy()) {
+			InternalEObject oldTaxation_Frame = (InternalEObject)taxation_Frame;
+			taxation_Frame = (Tax_Card)eResolveProxy(oldTaxation_Frame);
+			if (taxation_Frame != oldTaxation_Frame) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TaxationWithRootPackage.INCOME_TAX_CREDIT__TAXATION_FRAME, oldTaxation_Frame, taxation_Frame));
+			}
+		}
+		return taxation_Frame;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Tax_Card basicGetTaxation_Frame() {
+		return taxation_Frame;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetTaxation_Frame(Tax_Card newTaxation_Frame, NotificationChain msgs) {
+		Tax_Card oldTaxation_Frame = taxation_Frame;
+		taxation_Frame = newTaxation_Frame;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.INCOME_TAX_CREDIT__TAXATION_FRAME, oldTaxation_Frame, newTaxation_Frame);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setTaxation_Frame(Tax_Card newTaxation_Frame) {
+		if (newTaxation_Frame != taxation_Frame) {
+			NotificationChain msgs = null;
+			if (taxation_Frame != null)
+				msgs = ((InternalEObject)taxation_Frame).eInverseRemove(this, TaxationWithRootPackage.TAX_CARD__INCOME_TAX_CREDIT, Tax_Card.class, msgs);
+			if (newTaxation_Frame != null)
+				msgs = ((InternalEObject)newTaxation_Frame).eInverseAdd(this, TaxationWithRootPackage.TAX_CARD__INCOME_TAX_CREDIT, Tax_Card.class, msgs);
+			msgs = basicSetTaxation_Frame(newTaxation_Frame, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.INCOME_TAX_CREDIT__TAXATION_FRAME, newTaxation_Frame, newTaxation_Frame));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case TaxationWithRootPackage.INCOME_TAX_CREDIT__TAXATION_FRAME:
+				if (taxation_Frame != null)
+					msgs = ((InternalEObject)taxation_Frame).eInverseRemove(this, TaxationWithRootPackage.TAX_CARD__INCOME_TAX_CREDIT, Tax_Card.class, msgs);
+				return basicSetTaxation_Frame((Tax_Card)otherEnd, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case TaxationWithRootPackage.INCOME_TAX_CREDIT__TAXATION_FRAME:
+				return basicSetTaxation_Frame(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case TaxationWithRootPackage.INCOME_TAX_CREDIT__GRANTED_BY:
+				return getGrantedBy();
+			case TaxationWithRootPackage.INCOME_TAX_CREDIT__TAX_PAYER:
+				if (resolve) return getTaxPayer();
+				return basicGetTaxPayer();
+			case TaxationWithRootPackage.INCOME_TAX_CREDIT__TAX_YEAR:
+				return getTax_year();
+			case TaxationWithRootPackage.INCOME_TAX_CREDIT__YEARLY:
+				return getYearly();
+			case TaxationWithRootPackage.INCOME_TAX_CREDIT__MONTHLY:
+				return getMonthly();
+			case TaxationWithRootPackage.INCOME_TAX_CREDIT__DAILY:
+				return getDaily();
+			case TaxationWithRootPackage.INCOME_TAX_CREDIT__ID7:
+				return getId7();
+			case TaxationWithRootPackage.INCOME_TAX_CREDIT__TAXATION_FRAME:
+				if (resolve) return getTaxation_Frame();
+				return basicGetTaxation_Frame();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case TaxationWithRootPackage.INCOME_TAX_CREDIT__GRANTED_BY:
+				setGrantedBy((Grantor)newValue);
+				return;
+			case TaxationWithRootPackage.INCOME_TAX_CREDIT__TAX_PAYER:
+				setTaxPayer((Tax_Payer)newValue);
+				return;
+			case TaxationWithRootPackage.INCOME_TAX_CREDIT__TAX_YEAR:
+				setTax_year((Integer)newValue);
+				return;
+			case TaxationWithRootPackage.INCOME_TAX_CREDIT__YEARLY:
+				setYearly((Double)newValue);
+				return;
+			case TaxationWithRootPackage.INCOME_TAX_CREDIT__MONTHLY:
+				setMonthly((Double)newValue);
+				return;
+			case TaxationWithRootPackage.INCOME_TAX_CREDIT__DAILY:
+				setDaily((Double)newValue);
+				return;
+			case TaxationWithRootPackage.INCOME_TAX_CREDIT__ID7:
+				setId7((String)newValue);
+				return;
+			case TaxationWithRootPackage.INCOME_TAX_CREDIT__TAXATION_FRAME:
+				setTaxation_Frame((Tax_Card)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.INCOME_TAX_CREDIT__GRANTED_BY:
+				setGrantedBy(GRANTED_BY_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.INCOME_TAX_CREDIT__TAX_PAYER:
+				setTaxPayer((Tax_Payer)null);
+				return;
+			case TaxationWithRootPackage.INCOME_TAX_CREDIT__TAX_YEAR:
+				setTax_year(TAX_YEAR_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.INCOME_TAX_CREDIT__YEARLY:
+				setYearly(YEARLY_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.INCOME_TAX_CREDIT__MONTHLY:
+				setMonthly(MONTHLY_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.INCOME_TAX_CREDIT__DAILY:
+				setDaily(DAILY_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.INCOME_TAX_CREDIT__ID7:
+				setId7(ID7_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.INCOME_TAX_CREDIT__TAXATION_FRAME:
+				setTaxation_Frame((Tax_Card)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.INCOME_TAX_CREDIT__GRANTED_BY:
+				return grantedBy != GRANTED_BY_EDEFAULT;
+			case TaxationWithRootPackage.INCOME_TAX_CREDIT__TAX_PAYER:
+				return taxPayer != null;
+			case TaxationWithRootPackage.INCOME_TAX_CREDIT__TAX_YEAR:
+				return tax_year != TAX_YEAR_EDEFAULT;
+			case TaxationWithRootPackage.INCOME_TAX_CREDIT__YEARLY:
+				return yearly != YEARLY_EDEFAULT;
+			case TaxationWithRootPackage.INCOME_TAX_CREDIT__MONTHLY:
+				return monthly != MONTHLY_EDEFAULT;
+			case TaxationWithRootPackage.INCOME_TAX_CREDIT__DAILY:
+				return daily != DAILY_EDEFAULT;
+			case TaxationWithRootPackage.INCOME_TAX_CREDIT__ID7:
+				return ID7_EDEFAULT == null ? id7 != null : !ID7_EDEFAULT.equals(id7);
+			case TaxationWithRootPackage.INCOME_TAX_CREDIT__TAXATION_FRAME:
+				return taxation_Frame != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuilder result = new StringBuilder(super.toString());
+		result.append(" (grantedBy: ");
+		result.append(grantedBy);
+		result.append(", tax_year: ");
+		result.append(tax_year);
+		result.append(", yearly: ");
+		result.append(yearly);
+		result.append(", monthly: ");
+		result.append(monthly);
+		result.append(", daily: ");
+		result.append(daily);
+		result.append(", id7: ");
+		result.append(id7);
+		result.append(')');
+		return result.toString();
+	}
+
+} //Income_Tax_CreditImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Income_TypeImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Income_TypeImpl.java
new file mode 100644
index 00000000..c3411b34
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Income_TypeImpl.java
@@ -0,0 +1,268 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.Income;
+import TaxationWithRoot.Income_Type;
+import TaxationWithRoot.TaxationWithRootPackage;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EcoreUtil;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Income Type</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.impl.Income_TypeImpl#getId8 <em>Id8</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Income_TypeImpl#getIncome <em>Income</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class Income_TypeImpl extends MinimalEObjectImpl.Container implements Income_Type {
+	/**
+	 * The default value of the '{@link #getId8() <em>Id8</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getId8()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ID8_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getId8() <em>Id8</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getId8()
+	 * @generated
+	 * @ordered
+	 */
+	protected String id8 = ID8_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Income_TypeImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.INCOME_TYPE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getId8() {
+		return id8;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setId8(String newId8) {
+		String oldId8 = id8;
+		id8 = newId8;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.INCOME_TYPE__ID8, oldId8, id8));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Income getIncome() {
+		if (eContainerFeatureID() != TaxationWithRootPackage.INCOME_TYPE__INCOME) return null;
+		return (Income)eInternalContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetIncome(Income newIncome, NotificationChain msgs) {
+		msgs = eBasicSetContainer((InternalEObject)newIncome, TaxationWithRootPackage.INCOME_TYPE__INCOME, msgs);
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setIncome(Income newIncome) {
+		if (newIncome != eInternalContainer() || (eContainerFeatureID() != TaxationWithRootPackage.INCOME_TYPE__INCOME && newIncome != null)) {
+			if (EcoreUtil.isAncestor(this, newIncome))
+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+			NotificationChain msgs = null;
+			if (eInternalContainer() != null)
+				msgs = eBasicRemoveFromContainer(msgs);
+			if (newIncome != null)
+				msgs = ((InternalEObject)newIncome).eInverseAdd(this, TaxationWithRootPackage.INCOME__INCOME_TYPE, Income.class, msgs);
+			msgs = basicSetIncome(newIncome, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.INCOME_TYPE__INCOME, newIncome, newIncome));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case TaxationWithRootPackage.INCOME_TYPE__INCOME:
+				if (eInternalContainer() != null)
+					msgs = eBasicRemoveFromContainer(msgs);
+				return basicSetIncome((Income)otherEnd, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case TaxationWithRootPackage.INCOME_TYPE__INCOME:
+				return basicSetIncome(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+		switch (eContainerFeatureID()) {
+			case TaxationWithRootPackage.INCOME_TYPE__INCOME:
+				return eInternalContainer().eInverseRemove(this, TaxationWithRootPackage.INCOME__INCOME_TYPE, Income.class, msgs);
+		}
+		return super.eBasicRemoveFromContainerFeature(msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case TaxationWithRootPackage.INCOME_TYPE__ID8:
+				return getId8();
+			case TaxationWithRootPackage.INCOME_TYPE__INCOME:
+				return getIncome();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case TaxationWithRootPackage.INCOME_TYPE__ID8:
+				setId8((String)newValue);
+				return;
+			case TaxationWithRootPackage.INCOME_TYPE__INCOME:
+				setIncome((Income)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.INCOME_TYPE__ID8:
+				setId8(ID8_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.INCOME_TYPE__INCOME:
+				setIncome((Income)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.INCOME_TYPE__ID8:
+				return ID8_EDEFAULT == null ? id8 != null : !ID8_EDEFAULT.equals(id8);
+			case TaxationWithRootPackage.INCOME_TYPE__INCOME:
+				return getIncome() != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuilder result = new StringBuilder(super.toString());
+		result.append(" (id8: ");
+		result.append(id8);
+		result.append(')');
+		return result.toString();
+	}
+
+} //Income_TypeImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Interest_ExpenseImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Interest_ExpenseImpl.java
new file mode 100644
index 00000000..cc5df875
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Interest_ExpenseImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.Interest_Expense;
+import TaxationWithRoot.TaxationWithRootPackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Interest Expense</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class Interest_ExpenseImpl extends Special_Expense_DSImpl implements Interest_Expense {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Interest_ExpenseImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.INTEREST_EXPENSE;
+	}
+
+} //Interest_ExpenseImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Legal_Union_RecordImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Legal_Union_RecordImpl.java
new file mode 100644
index 00000000..90d04c90
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Legal_Union_RecordImpl.java
@@ -0,0 +1,648 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.Household;
+import TaxationWithRoot.Legal_Union_Record;
+import TaxationWithRoot.Physical_Person;
+import TaxationWithRoot.Separation_Causes;
+import TaxationWithRoot.Tax_Property;
+import TaxationWithRoot.TaxationWithRootPackage;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Legal Union Record</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.impl.Legal_Union_RecordImpl#getStart_year <em>Start year</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Legal_Union_RecordImpl#getEnd_year <em>End year</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Legal_Union_RecordImpl#getSeparation_cause <em>Separation cause</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Legal_Union_RecordImpl#getIndividual_A <em>Individual A</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Legal_Union_RecordImpl#getIndividual_B <em>Individual B</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Legal_Union_RecordImpl#getProperties <em>Properties</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Legal_Union_RecordImpl#isMutual_agreement <em>Mutual agreement</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Legal_Union_RecordImpl#getId9 <em>Id9</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Legal_Union_RecordImpl#getHousehold <em>Household</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class Legal_Union_RecordImpl extends MinimalEObjectImpl.Container implements Legal_Union_Record {
+	/**
+	 * The default value of the '{@link #getStart_year() <em>Start year</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStart_year()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int START_YEAR_EDEFAULT = 0;
+
+	/**
+	 * The cached value of the '{@link #getStart_year() <em>Start year</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStart_year()
+	 * @generated
+	 * @ordered
+	 */
+	protected int start_year = START_YEAR_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getEnd_year() <em>End year</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getEnd_year()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int END_YEAR_EDEFAULT = 0;
+
+	/**
+	 * The cached value of the '{@link #getEnd_year() <em>End year</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getEnd_year()
+	 * @generated
+	 * @ordered
+	 */
+	protected int end_year = END_YEAR_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getSeparation_cause() <em>Separation cause</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSeparation_cause()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final Separation_Causes SEPARATION_CAUSE_EDEFAULT = Separation_Causes.NONE;
+
+	/**
+	 * The cached value of the '{@link #getSeparation_cause() <em>Separation cause</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSeparation_cause()
+	 * @generated
+	 * @ordered
+	 */
+	protected Separation_Causes separation_cause = SEPARATION_CAUSE_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getIndividual_A() <em>Individual A</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getIndividual_A()
+	 * @generated
+	 * @ordered
+	 */
+	protected Physical_Person individual_A;
+
+	/**
+	 * The cached value of the '{@link #getIndividual_B() <em>Individual B</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getIndividual_B()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Physical_Person> individual_B;
+
+	/**
+	 * The cached value of the '{@link #getProperties() <em>Properties</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getProperties()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Tax_Property> properties;
+
+	/**
+	 * The default value of the '{@link #isMutual_agreement() <em>Mutual agreement</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isMutual_agreement()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean MUTUAL_AGREEMENT_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isMutual_agreement() <em>Mutual agreement</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isMutual_agreement()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean mutual_agreement = MUTUAL_AGREEMENT_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getId9() <em>Id9</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getId9()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ID9_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getId9() <em>Id9</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getId9()
+	 * @generated
+	 * @ordered
+	 */
+	protected String id9 = ID9_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Legal_Union_RecordImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.LEGAL_UNION_RECORD;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getStart_year() {
+		return start_year;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setStart_year(int newStart_year) {
+		int oldStart_year = start_year;
+		start_year = newStart_year;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.LEGAL_UNION_RECORD__START_YEAR, oldStart_year, start_year));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getEnd_year() {
+		return end_year;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setEnd_year(int newEnd_year) {
+		int oldEnd_year = end_year;
+		end_year = newEnd_year;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.LEGAL_UNION_RECORD__END_YEAR, oldEnd_year, end_year));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Separation_Causes getSeparation_cause() {
+		return separation_cause;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setSeparation_cause(Separation_Causes newSeparation_cause) {
+		Separation_Causes oldSeparation_cause = separation_cause;
+		separation_cause = newSeparation_cause == null ? SEPARATION_CAUSE_EDEFAULT : newSeparation_cause;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.LEGAL_UNION_RECORD__SEPARATION_CAUSE, oldSeparation_cause, separation_cause));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Physical_Person getIndividual_A() {
+		return individual_A;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetIndividual_A(Physical_Person newIndividual_A, NotificationChain msgs) {
+		Physical_Person oldIndividual_A = individual_A;
+		individual_A = newIndividual_A;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.LEGAL_UNION_RECORD__INDIVIDUAL_A, oldIndividual_A, newIndividual_A);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setIndividual_A(Physical_Person newIndividual_A) {
+		if (newIndividual_A != individual_A) {
+			NotificationChain msgs = null;
+			if (individual_A != null)
+				msgs = ((InternalEObject)individual_A).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - TaxationWithRootPackage.LEGAL_UNION_RECORD__INDIVIDUAL_A, null, msgs);
+			if (newIndividual_A != null)
+				msgs = ((InternalEObject)newIndividual_A).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - TaxationWithRootPackage.LEGAL_UNION_RECORD__INDIVIDUAL_A, null, msgs);
+			msgs = basicSetIndividual_A(newIndividual_A, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.LEGAL_UNION_RECORD__INDIVIDUAL_A, newIndividual_A, newIndividual_A));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<Physical_Person> getIndividual_B() {
+		if (individual_B == null) {
+			individual_B = new EObjectContainmentEList<Physical_Person>(Physical_Person.class, this, TaxationWithRootPackage.LEGAL_UNION_RECORD__INDIVIDUAL_B);
+		}
+		return individual_B;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<Tax_Property> getProperties() {
+		if (properties == null) {
+			properties = new EObjectContainmentWithInverseEList<Tax_Property>(Tax_Property.class, this, TaxationWithRootPackage.LEGAL_UNION_RECORD__PROPERTIES, TaxationWithRootPackage.TAX_PROPERTY__UNION_RECORD);
+		}
+		return properties;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isMutual_agreement() {
+		return mutual_agreement;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setMutual_agreement(boolean newMutual_agreement) {
+		boolean oldMutual_agreement = mutual_agreement;
+		mutual_agreement = newMutual_agreement;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.LEGAL_UNION_RECORD__MUTUAL_AGREEMENT, oldMutual_agreement, mutual_agreement));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getId9() {
+		return id9;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setId9(String newId9) {
+		String oldId9 = id9;
+		id9 = newId9;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.LEGAL_UNION_RECORD__ID9, oldId9, id9));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Household getHousehold() {
+		if (eContainerFeatureID() != TaxationWithRootPackage.LEGAL_UNION_RECORD__HOUSEHOLD) return null;
+		return (Household)eInternalContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetHousehold(Household newHousehold, NotificationChain msgs) {
+		msgs = eBasicSetContainer((InternalEObject)newHousehold, TaxationWithRootPackage.LEGAL_UNION_RECORD__HOUSEHOLD, msgs);
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setHousehold(Household newHousehold) {
+		if (newHousehold != eInternalContainer() || (eContainerFeatureID() != TaxationWithRootPackage.LEGAL_UNION_RECORD__HOUSEHOLD && newHousehold != null)) {
+			if (EcoreUtil.isAncestor(this, newHousehold))
+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+			NotificationChain msgs = null;
+			if (eInternalContainer() != null)
+				msgs = eBasicRemoveFromContainer(msgs);
+			if (newHousehold != null)
+				msgs = ((InternalEObject)newHousehold).eInverseAdd(this, TaxationWithRootPackage.HOUSEHOLD__PARENTS, Household.class, msgs);
+			msgs = basicSetHousehold(newHousehold, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.LEGAL_UNION_RECORD__HOUSEHOLD, newHousehold, newHousehold));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case TaxationWithRootPackage.LEGAL_UNION_RECORD__PROPERTIES:
+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getProperties()).basicAdd(otherEnd, msgs);
+			case TaxationWithRootPackage.LEGAL_UNION_RECORD__HOUSEHOLD:
+				if (eInternalContainer() != null)
+					msgs = eBasicRemoveFromContainer(msgs);
+				return basicSetHousehold((Household)otherEnd, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case TaxationWithRootPackage.LEGAL_UNION_RECORD__INDIVIDUAL_A:
+				return basicSetIndividual_A(null, msgs);
+			case TaxationWithRootPackage.LEGAL_UNION_RECORD__INDIVIDUAL_B:
+				return ((InternalEList<?>)getIndividual_B()).basicRemove(otherEnd, msgs);
+			case TaxationWithRootPackage.LEGAL_UNION_RECORD__PROPERTIES:
+				return ((InternalEList<?>)getProperties()).basicRemove(otherEnd, msgs);
+			case TaxationWithRootPackage.LEGAL_UNION_RECORD__HOUSEHOLD:
+				return basicSetHousehold(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+		switch (eContainerFeatureID()) {
+			case TaxationWithRootPackage.LEGAL_UNION_RECORD__HOUSEHOLD:
+				return eInternalContainer().eInverseRemove(this, TaxationWithRootPackage.HOUSEHOLD__PARENTS, Household.class, msgs);
+		}
+		return super.eBasicRemoveFromContainerFeature(msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case TaxationWithRootPackage.LEGAL_UNION_RECORD__START_YEAR:
+				return getStart_year();
+			case TaxationWithRootPackage.LEGAL_UNION_RECORD__END_YEAR:
+				return getEnd_year();
+			case TaxationWithRootPackage.LEGAL_UNION_RECORD__SEPARATION_CAUSE:
+				return getSeparation_cause();
+			case TaxationWithRootPackage.LEGAL_UNION_RECORD__INDIVIDUAL_A:
+				return getIndividual_A();
+			case TaxationWithRootPackage.LEGAL_UNION_RECORD__INDIVIDUAL_B:
+				return getIndividual_B();
+			case TaxationWithRootPackage.LEGAL_UNION_RECORD__PROPERTIES:
+				return getProperties();
+			case TaxationWithRootPackage.LEGAL_UNION_RECORD__MUTUAL_AGREEMENT:
+				return isMutual_agreement();
+			case TaxationWithRootPackage.LEGAL_UNION_RECORD__ID9:
+				return getId9();
+			case TaxationWithRootPackage.LEGAL_UNION_RECORD__HOUSEHOLD:
+				return getHousehold();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case TaxationWithRootPackage.LEGAL_UNION_RECORD__START_YEAR:
+				setStart_year((Integer)newValue);
+				return;
+			case TaxationWithRootPackage.LEGAL_UNION_RECORD__END_YEAR:
+				setEnd_year((Integer)newValue);
+				return;
+			case TaxationWithRootPackage.LEGAL_UNION_RECORD__SEPARATION_CAUSE:
+				setSeparation_cause((Separation_Causes)newValue);
+				return;
+			case TaxationWithRootPackage.LEGAL_UNION_RECORD__INDIVIDUAL_A:
+				setIndividual_A((Physical_Person)newValue);
+				return;
+			case TaxationWithRootPackage.LEGAL_UNION_RECORD__INDIVIDUAL_B:
+				getIndividual_B().clear();
+				getIndividual_B().addAll((Collection<? extends Physical_Person>)newValue);
+				return;
+			case TaxationWithRootPackage.LEGAL_UNION_RECORD__PROPERTIES:
+				getProperties().clear();
+				getProperties().addAll((Collection<? extends Tax_Property>)newValue);
+				return;
+			case TaxationWithRootPackage.LEGAL_UNION_RECORD__MUTUAL_AGREEMENT:
+				setMutual_agreement((Boolean)newValue);
+				return;
+			case TaxationWithRootPackage.LEGAL_UNION_RECORD__ID9:
+				setId9((String)newValue);
+				return;
+			case TaxationWithRootPackage.LEGAL_UNION_RECORD__HOUSEHOLD:
+				setHousehold((Household)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.LEGAL_UNION_RECORD__START_YEAR:
+				setStart_year(START_YEAR_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.LEGAL_UNION_RECORD__END_YEAR:
+				setEnd_year(END_YEAR_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.LEGAL_UNION_RECORD__SEPARATION_CAUSE:
+				setSeparation_cause(SEPARATION_CAUSE_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.LEGAL_UNION_RECORD__INDIVIDUAL_A:
+				setIndividual_A((Physical_Person)null);
+				return;
+			case TaxationWithRootPackage.LEGAL_UNION_RECORD__INDIVIDUAL_B:
+				getIndividual_B().clear();
+				return;
+			case TaxationWithRootPackage.LEGAL_UNION_RECORD__PROPERTIES:
+				getProperties().clear();
+				return;
+			case TaxationWithRootPackage.LEGAL_UNION_RECORD__MUTUAL_AGREEMENT:
+				setMutual_agreement(MUTUAL_AGREEMENT_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.LEGAL_UNION_RECORD__ID9:
+				setId9(ID9_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.LEGAL_UNION_RECORD__HOUSEHOLD:
+				setHousehold((Household)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.LEGAL_UNION_RECORD__START_YEAR:
+				return start_year != START_YEAR_EDEFAULT;
+			case TaxationWithRootPackage.LEGAL_UNION_RECORD__END_YEAR:
+				return end_year != END_YEAR_EDEFAULT;
+			case TaxationWithRootPackage.LEGAL_UNION_RECORD__SEPARATION_CAUSE:
+				return separation_cause != SEPARATION_CAUSE_EDEFAULT;
+			case TaxationWithRootPackage.LEGAL_UNION_RECORD__INDIVIDUAL_A:
+				return individual_A != null;
+			case TaxationWithRootPackage.LEGAL_UNION_RECORD__INDIVIDUAL_B:
+				return individual_B != null && !individual_B.isEmpty();
+			case TaxationWithRootPackage.LEGAL_UNION_RECORD__PROPERTIES:
+				return properties != null && !properties.isEmpty();
+			case TaxationWithRootPackage.LEGAL_UNION_RECORD__MUTUAL_AGREEMENT:
+				return mutual_agreement != MUTUAL_AGREEMENT_EDEFAULT;
+			case TaxationWithRootPackage.LEGAL_UNION_RECORD__ID9:
+				return ID9_EDEFAULT == null ? id9 != null : !ID9_EDEFAULT.equals(id9);
+			case TaxationWithRootPackage.LEGAL_UNION_RECORD__HOUSEHOLD:
+				return getHousehold() != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuilder result = new StringBuilder(super.toString());
+		result.append(" (start_year: ");
+		result.append(start_year);
+		result.append(", end_year: ");
+		result.append(end_year);
+		result.append(", separation_cause: ");
+		result.append(separation_cause);
+		result.append(", mutual_agreement: ");
+		result.append(mutual_agreement);
+		result.append(", id9: ");
+		result.append(id9);
+		result.append(')');
+		return result.toString();
+	}
+
+} //Legal_Union_RecordImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Local_IncomeImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Local_IncomeImpl.java
new file mode 100644
index 00000000..1e7bcf81
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Local_IncomeImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.Local_Income;
+import TaxationWithRoot.TaxationWithRootPackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Local Income</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class Local_IncomeImpl extends IncomeImpl implements Local_Income {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Local_IncomeImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.LOCAL_INCOME;
+	}
+
+} //Local_IncomeImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Loss_CarryforwardImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Loss_CarryforwardImpl.java
new file mode 100644
index 00000000..32cb3507
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Loss_CarryforwardImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.Loss_Carryforward;
+import TaxationWithRoot.TaxationWithRootPackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Loss Carryforward</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class Loss_CarryforwardImpl extends Special_Expense_DSImpl implements Loss_Carryforward {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Loss_CarryforwardImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.LOSS_CARRYFORWARD;
+	}
+
+} //Loss_CarryforwardImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Marriage_RecordImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Marriage_RecordImpl.java
new file mode 100644
index 00000000..39f7966a
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Marriage_RecordImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.Marriage_Record;
+import TaxationWithRoot.TaxationWithRootPackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Marriage Record</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class Marriage_RecordImpl extends Legal_Union_RecordImpl implements Marriage_Record {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Marriage_RecordImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.MARRIAGE_RECORD;
+	}
+
+} //Marriage_RecordImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Miscellaneous_Expense_FOImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Miscellaneous_Expense_FOImpl.java
new file mode 100644
index 00000000..f3b824e7
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Miscellaneous_Expense_FOImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.Miscellaneous_Expense_FO;
+import TaxationWithRoot.TaxationWithRootPackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Miscellaneous Expense FO</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class Miscellaneous_Expense_FOImpl extends Professional_ExpenseImpl implements Miscellaneous_Expense_FO {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Miscellaneous_Expense_FOImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.MISCELLANEOUS_EXPENSE_FO;
+	}
+
+} //Miscellaneous_Expense_FOImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Non_Resident_Tax_PayerImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Non_Resident_Tax_PayerImpl.java
new file mode 100644
index 00000000..253c1097
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Non_Resident_Tax_PayerImpl.java
@@ -0,0 +1,164 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.Non_Resident_Tax_Payer;
+import TaxationWithRoot.TaxationWithRootPackage;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Non Resident Tax Payer</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.impl.Non_Resident_Tax_PayerImpl#isIs_assimilated_to_resident <em>Is assimilated to resident</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class Non_Resident_Tax_PayerImpl extends Tax_PayerImpl implements Non_Resident_Tax_Payer {
+	/**
+	 * The default value of the '{@link #isIs_assimilated_to_resident() <em>Is assimilated to resident</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isIs_assimilated_to_resident()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean IS_ASSIMILATED_TO_RESIDENT_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isIs_assimilated_to_resident() <em>Is assimilated to resident</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isIs_assimilated_to_resident()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean is_assimilated_to_resident = IS_ASSIMILATED_TO_RESIDENT_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Non_Resident_Tax_PayerImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.NON_RESIDENT_TAX_PAYER;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isIs_assimilated_to_resident() {
+		return is_assimilated_to_resident;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setIs_assimilated_to_resident(boolean newIs_assimilated_to_resident) {
+		boolean oldIs_assimilated_to_resident = is_assimilated_to_resident;
+		is_assimilated_to_resident = newIs_assimilated_to_resident;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.NON_RESIDENT_TAX_PAYER__IS_ASSIMILATED_TO_RESIDENT, oldIs_assimilated_to_resident, is_assimilated_to_resident));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case TaxationWithRootPackage.NON_RESIDENT_TAX_PAYER__IS_ASSIMILATED_TO_RESIDENT:
+				return isIs_assimilated_to_resident();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case TaxationWithRootPackage.NON_RESIDENT_TAX_PAYER__IS_ASSIMILATED_TO_RESIDENT:
+				setIs_assimilated_to_resident((Boolean)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.NON_RESIDENT_TAX_PAYER__IS_ASSIMILATED_TO_RESIDENT:
+				setIs_assimilated_to_resident(IS_ASSIMILATED_TO_RESIDENT_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.NON_RESIDENT_TAX_PAYER__IS_ASSIMILATED_TO_RESIDENT:
+				return is_assimilated_to_resident != IS_ASSIMILATED_TO_RESIDENT_EDEFAULT;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuilder result = new StringBuilder(super.toString());
+		result.append(" (is_assimilated_to_resident: ");
+		result.append(is_assimilated_to_resident);
+		result.append(')');
+		return result.toString();
+	}
+
+} //Non_Resident_Tax_PayerImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Partnership_RecordImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Partnership_RecordImpl.java
new file mode 100644
index 00000000..fd4dc513
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Partnership_RecordImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.Partnership_Record;
+import TaxationWithRoot.TaxationWithRootPackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Partnership Record</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class Partnership_RecordImpl extends Legal_Union_RecordImpl implements Partnership_Record {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Partnership_RecordImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.PARTNERSHIP_RECORD;
+	}
+
+} //Partnership_RecordImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Pensions_and_Annuities_IncomeImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Pensions_and_Annuities_IncomeImpl.java
new file mode 100644
index 00000000..e58f5005
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Pensions_and_Annuities_IncomeImpl.java
@@ -0,0 +1,164 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.Pensions_and_Annuities_Income;
+import TaxationWithRoot.TaxationWithRootPackage;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Pensions and Annuities Income</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.impl.Pensions_and_Annuities_IncomeImpl#isOccasional_payement <em>Occasional payement</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class Pensions_and_Annuities_IncomeImpl extends Income_TypeImpl implements Pensions_and_Annuities_Income {
+	/**
+	 * The default value of the '{@link #isOccasional_payement() <em>Occasional payement</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isOccasional_payement()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean OCCASIONAL_PAYEMENT_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isOccasional_payement() <em>Occasional payement</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isOccasional_payement()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean occasional_payement = OCCASIONAL_PAYEMENT_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Pensions_and_Annuities_IncomeImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.PENSIONS_AND_ANNUITIES_INCOME;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isOccasional_payement() {
+		return occasional_payement;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setOccasional_payement(boolean newOccasional_payement) {
+		boolean oldOccasional_payement = occasional_payement;
+		occasional_payement = newOccasional_payement;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.PENSIONS_AND_ANNUITIES_INCOME__OCCASIONAL_PAYEMENT, oldOccasional_payement, occasional_payement));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case TaxationWithRootPackage.PENSIONS_AND_ANNUITIES_INCOME__OCCASIONAL_PAYEMENT:
+				return isOccasional_payement();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case TaxationWithRootPackage.PENSIONS_AND_ANNUITIES_INCOME__OCCASIONAL_PAYEMENT:
+				setOccasional_payement((Boolean)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.PENSIONS_AND_ANNUITIES_INCOME__OCCASIONAL_PAYEMENT:
+				setOccasional_payement(OCCASIONAL_PAYEMENT_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.PENSIONS_AND_ANNUITIES_INCOME__OCCASIONAL_PAYEMENT:
+				return occasional_payement != OCCASIONAL_PAYEMENT_EDEFAULT;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuilder result = new StringBuilder(super.toString());
+		result.append(" (occasional_payement: ");
+		result.append(occasional_payement);
+		result.append(')');
+		return result.toString();
+	}
+
+} //Pensions_and_Annuities_IncomeImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Permanent_ExpenseImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Permanent_ExpenseImpl.java
new file mode 100644
index 00000000..c6735595
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Permanent_ExpenseImpl.java
@@ -0,0 +1,165 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.Category_of_Permanent_Expense;
+import TaxationWithRoot.Permanent_Expense;
+import TaxationWithRoot.TaxationWithRootPackage;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Permanent Expense</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.impl.Permanent_ExpenseImpl#getCategory <em>Category</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class Permanent_ExpenseImpl extends Special_Expense_DSImpl implements Permanent_Expense {
+	/**
+	 * The default value of the '{@link #getCategory() <em>Category</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCategory()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final Category_of_Permanent_Expense CATEGORY_EDEFAULT = Category_of_Permanent_Expense.MISCELLANEOUS_DEBT;
+
+	/**
+	 * The cached value of the '{@link #getCategory() <em>Category</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCategory()
+	 * @generated
+	 * @ordered
+	 */
+	protected Category_of_Permanent_Expense category = CATEGORY_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Permanent_ExpenseImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.PERMANENT_EXPENSE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Category_of_Permanent_Expense getCategory() {
+		return category;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setCategory(Category_of_Permanent_Expense newCategory) {
+		Category_of_Permanent_Expense oldCategory = category;
+		category = newCategory == null ? CATEGORY_EDEFAULT : newCategory;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.PERMANENT_EXPENSE__CATEGORY, oldCategory, category));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case TaxationWithRootPackage.PERMANENT_EXPENSE__CATEGORY:
+				return getCategory();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case TaxationWithRootPackage.PERMANENT_EXPENSE__CATEGORY:
+				setCategory((Category_of_Permanent_Expense)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.PERMANENT_EXPENSE__CATEGORY:
+				setCategory(CATEGORY_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.PERMANENT_EXPENSE__CATEGORY:
+				return category != CATEGORY_EDEFAULT;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuilder result = new StringBuilder(super.toString());
+		result.append(" (category: ");
+		result.append(category);
+		result.append(')');
+		return result.toString();
+	}
+
+} //Permanent_ExpenseImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Physical_PersonImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Physical_PersonImpl.java
new file mode 100644
index 00000000..408ee362
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Physical_PersonImpl.java
@@ -0,0 +1,617 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.Address;
+import TaxationWithRoot.Disability_Types;
+import TaxationWithRoot.Expense;
+import TaxationWithRoot.Physical_Person;
+import TaxationWithRoot.TaxationWithRootPackage;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Physical Person</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.impl.Physical_PersonImpl#getSSNo <em>SS No</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Physical_PersonImpl#getAddresses <em>Addresses</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Physical_PersonImpl#getBirth_year <em>Birth year</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Physical_PersonImpl#getDisability_percentage <em>Disability percentage</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Physical_PersonImpl#getDisability_type <em>Disability type</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Physical_PersonImpl#getBirth_month <em>Birth month</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Physical_PersonImpl#getBirth_day <em>Birth day</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Physical_PersonImpl#getExpenses <em>Expenses</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Physical_PersonImpl#isIs_widower <em>Is widower</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements Physical_Person {
+	/**
+	 * The default value of the '{@link #getSSNo() <em>SS No</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSSNo()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SS_NO_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getSSNo() <em>SS No</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSSNo()
+	 * @generated
+	 * @ordered
+	 */
+	protected String ssNo = SS_NO_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getAddresses() <em>Addresses</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAddresses()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Address> addresses;
+
+	/**
+	 * The default value of the '{@link #getBirth_year() <em>Birth year</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getBirth_year()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int BIRTH_YEAR_EDEFAULT = 0;
+
+	/**
+	 * The cached value of the '{@link #getBirth_year() <em>Birth year</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getBirth_year()
+	 * @generated
+	 * @ordered
+	 */
+	protected int birth_year = BIRTH_YEAR_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDisability_percentage() <em>Disability percentage</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDisability_percentage()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double DISABILITY_PERCENTAGE_EDEFAULT = 0.0;
+
+	/**
+	 * The cached value of the '{@link #getDisability_percentage() <em>Disability percentage</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDisability_percentage()
+	 * @generated
+	 * @ordered
+	 */
+	protected double disability_percentage = DISABILITY_PERCENTAGE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDisability_type() <em>Disability type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDisability_type()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final Disability_Types DISABILITY_TYPE_EDEFAULT = Disability_Types.BEUG;
+
+	/**
+	 * The cached value of the '{@link #getDisability_type() <em>Disability type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDisability_type()
+	 * @generated
+	 * @ordered
+	 */
+	protected Disability_Types disability_type = DISABILITY_TYPE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getBirth_month() <em>Birth month</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getBirth_month()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int BIRTH_MONTH_EDEFAULT = 0;
+
+	/**
+	 * The cached value of the '{@link #getBirth_month() <em>Birth month</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getBirth_month()
+	 * @generated
+	 * @ordered
+	 */
+	protected int birth_month = BIRTH_MONTH_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getBirth_day() <em>Birth day</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getBirth_day()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int BIRTH_DAY_EDEFAULT = 0;
+
+	/**
+	 * The cached value of the '{@link #getBirth_day() <em>Birth day</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getBirth_day()
+	 * @generated
+	 * @ordered
+	 */
+	protected int birth_day = BIRTH_DAY_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getExpenses() <em>Expenses</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getExpenses()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Expense> expenses;
+
+	/**
+	 * The default value of the '{@link #isIs_widower() <em>Is widower</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isIs_widower()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean IS_WIDOWER_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isIs_widower() <em>Is widower</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isIs_widower()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean is_widower = IS_WIDOWER_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Physical_PersonImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.PHYSICAL_PERSON;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getSSNo() {
+		return ssNo;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setSSNo(String newSSNo) {
+		String oldSSNo = ssNo;
+		ssNo = newSSNo;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.PHYSICAL_PERSON__SS_NO, oldSSNo, ssNo));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<Address> getAddresses() {
+		if (addresses == null) {
+			addresses = new EObjectWithInverseResolvingEList.ManyInverse<Address>(Address.class, this, TaxationWithRootPackage.PHYSICAL_PERSON__ADDRESSES, TaxationWithRootPackage.ADDRESS__TAX_PAYER);
+		}
+		return addresses;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getBirth_year() {
+		return birth_year;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setBirth_year(int newBirth_year) {
+		int oldBirth_year = birth_year;
+		birth_year = newBirth_year;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.PHYSICAL_PERSON__BIRTH_YEAR, oldBirth_year, birth_year));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getDisability_percentage() {
+		return disability_percentage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDisability_percentage(double newDisability_percentage) {
+		double oldDisability_percentage = disability_percentage;
+		disability_percentage = newDisability_percentage;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.PHYSICAL_PERSON__DISABILITY_PERCENTAGE, oldDisability_percentage, disability_percentage));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Disability_Types getDisability_type() {
+		return disability_type;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDisability_type(Disability_Types newDisability_type) {
+		Disability_Types oldDisability_type = disability_type;
+		disability_type = newDisability_type == null ? DISABILITY_TYPE_EDEFAULT : newDisability_type;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.PHYSICAL_PERSON__DISABILITY_TYPE, oldDisability_type, disability_type));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getBirth_month() {
+		return birth_month;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setBirth_month(int newBirth_month) {
+		int oldBirth_month = birth_month;
+		birth_month = newBirth_month;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.PHYSICAL_PERSON__BIRTH_MONTH, oldBirth_month, birth_month));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getBirth_day() {
+		return birth_day;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setBirth_day(int newBirth_day) {
+		int oldBirth_day = birth_day;
+		birth_day = newBirth_day;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.PHYSICAL_PERSON__BIRTH_DAY, oldBirth_day, birth_day));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<Expense> getExpenses() {
+		if (expenses == null) {
+			expenses = new EObjectWithInverseResolvingEList<Expense>(Expense.class, this, TaxationWithRootPackage.PHYSICAL_PERSON__EXPENSES, TaxationWithRootPackage.EXPENSE__BENEFICIARY);
+		}
+		return expenses;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isIs_widower() {
+		return is_widower;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setIs_widower(boolean newIs_widower) {
+		boolean oldIs_widower = is_widower;
+		is_widower = newIs_widower;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.PHYSICAL_PERSON__IS_WIDOWER, oldIs_widower, is_widower));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case TaxationWithRootPackage.PHYSICAL_PERSON__ADDRESSES:
+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getAddresses()).basicAdd(otherEnd, msgs);
+			case TaxationWithRootPackage.PHYSICAL_PERSON__EXPENSES:
+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getExpenses()).basicAdd(otherEnd, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case TaxationWithRootPackage.PHYSICAL_PERSON__ADDRESSES:
+				return ((InternalEList<?>)getAddresses()).basicRemove(otherEnd, msgs);
+			case TaxationWithRootPackage.PHYSICAL_PERSON__EXPENSES:
+				return ((InternalEList<?>)getExpenses()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case TaxationWithRootPackage.PHYSICAL_PERSON__SS_NO:
+				return getSSNo();
+			case TaxationWithRootPackage.PHYSICAL_PERSON__ADDRESSES:
+				return getAddresses();
+			case TaxationWithRootPackage.PHYSICAL_PERSON__BIRTH_YEAR:
+				return getBirth_year();
+			case TaxationWithRootPackage.PHYSICAL_PERSON__DISABILITY_PERCENTAGE:
+				return getDisability_percentage();
+			case TaxationWithRootPackage.PHYSICAL_PERSON__DISABILITY_TYPE:
+				return getDisability_type();
+			case TaxationWithRootPackage.PHYSICAL_PERSON__BIRTH_MONTH:
+				return getBirth_month();
+			case TaxationWithRootPackage.PHYSICAL_PERSON__BIRTH_DAY:
+				return getBirth_day();
+			case TaxationWithRootPackage.PHYSICAL_PERSON__EXPENSES:
+				return getExpenses();
+			case TaxationWithRootPackage.PHYSICAL_PERSON__IS_WIDOWER:
+				return isIs_widower();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case TaxationWithRootPackage.PHYSICAL_PERSON__SS_NO:
+				setSSNo((String)newValue);
+				return;
+			case TaxationWithRootPackage.PHYSICAL_PERSON__ADDRESSES:
+				getAddresses().clear();
+				getAddresses().addAll((Collection<? extends Address>)newValue);
+				return;
+			case TaxationWithRootPackage.PHYSICAL_PERSON__BIRTH_YEAR:
+				setBirth_year((Integer)newValue);
+				return;
+			case TaxationWithRootPackage.PHYSICAL_PERSON__DISABILITY_PERCENTAGE:
+				setDisability_percentage((Double)newValue);
+				return;
+			case TaxationWithRootPackage.PHYSICAL_PERSON__DISABILITY_TYPE:
+				setDisability_type((Disability_Types)newValue);
+				return;
+			case TaxationWithRootPackage.PHYSICAL_PERSON__BIRTH_MONTH:
+				setBirth_month((Integer)newValue);
+				return;
+			case TaxationWithRootPackage.PHYSICAL_PERSON__BIRTH_DAY:
+				setBirth_day((Integer)newValue);
+				return;
+			case TaxationWithRootPackage.PHYSICAL_PERSON__EXPENSES:
+				getExpenses().clear();
+				getExpenses().addAll((Collection<? extends Expense>)newValue);
+				return;
+			case TaxationWithRootPackage.PHYSICAL_PERSON__IS_WIDOWER:
+				setIs_widower((Boolean)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.PHYSICAL_PERSON__SS_NO:
+				setSSNo(SS_NO_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.PHYSICAL_PERSON__ADDRESSES:
+				getAddresses().clear();
+				return;
+			case TaxationWithRootPackage.PHYSICAL_PERSON__BIRTH_YEAR:
+				setBirth_year(BIRTH_YEAR_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.PHYSICAL_PERSON__DISABILITY_PERCENTAGE:
+				setDisability_percentage(DISABILITY_PERCENTAGE_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.PHYSICAL_PERSON__DISABILITY_TYPE:
+				setDisability_type(DISABILITY_TYPE_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.PHYSICAL_PERSON__BIRTH_MONTH:
+				setBirth_month(BIRTH_MONTH_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.PHYSICAL_PERSON__BIRTH_DAY:
+				setBirth_day(BIRTH_DAY_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.PHYSICAL_PERSON__EXPENSES:
+				getExpenses().clear();
+				return;
+			case TaxationWithRootPackage.PHYSICAL_PERSON__IS_WIDOWER:
+				setIs_widower(IS_WIDOWER_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.PHYSICAL_PERSON__SS_NO:
+				return SS_NO_EDEFAULT == null ? ssNo != null : !SS_NO_EDEFAULT.equals(ssNo);
+			case TaxationWithRootPackage.PHYSICAL_PERSON__ADDRESSES:
+				return addresses != null && !addresses.isEmpty();
+			case TaxationWithRootPackage.PHYSICAL_PERSON__BIRTH_YEAR:
+				return birth_year != BIRTH_YEAR_EDEFAULT;
+			case TaxationWithRootPackage.PHYSICAL_PERSON__DISABILITY_PERCENTAGE:
+				return disability_percentage != DISABILITY_PERCENTAGE_EDEFAULT;
+			case TaxationWithRootPackage.PHYSICAL_PERSON__DISABILITY_TYPE:
+				return disability_type != DISABILITY_TYPE_EDEFAULT;
+			case TaxationWithRootPackage.PHYSICAL_PERSON__BIRTH_MONTH:
+				return birth_month != BIRTH_MONTH_EDEFAULT;
+			case TaxationWithRootPackage.PHYSICAL_PERSON__BIRTH_DAY:
+				return birth_day != BIRTH_DAY_EDEFAULT;
+			case TaxationWithRootPackage.PHYSICAL_PERSON__EXPENSES:
+				return expenses != null && !expenses.isEmpty();
+			case TaxationWithRootPackage.PHYSICAL_PERSON__IS_WIDOWER:
+				return is_widower != IS_WIDOWER_EDEFAULT;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuilder result = new StringBuilder(super.toString());
+		result.append(" (SSNo: ");
+		result.append(ssNo);
+		result.append(", birth_year: ");
+		result.append(birth_year);
+		result.append(", disability_percentage: ");
+		result.append(disability_percentage);
+		result.append(", disability_type: ");
+		result.append(disability_type);
+		result.append(", birth_month: ");
+		result.append(birth_month);
+		result.append(", birth_day: ");
+		result.append(birth_day);
+		result.append(", is_widower: ");
+		result.append(is_widower);
+		result.append(')');
+		return result.toString();
+	}
+
+} //Physical_PersonImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Private_Insurance_and_PlanImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Private_Insurance_and_PlanImpl.java
new file mode 100644
index 00000000..a2881b29
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Private_Insurance_and_PlanImpl.java
@@ -0,0 +1,221 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.Category_of_Private_Insurance_and_Plan;
+import TaxationWithRoot.Private_Insurance_and_Plan;
+import TaxationWithRoot.TaxationWithRootPackage;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Private Insurance and Plan</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.impl.Private_Insurance_and_PlanImpl#getCategory <em>Category</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Private_Insurance_and_PlanImpl#getDuration_of_contract <em>Duration of contract</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class Private_Insurance_and_PlanImpl extends Special_Expense_DSImpl implements Private_Insurance_and_Plan {
+	/**
+	 * The default value of the '{@link #getCategory() <em>Category</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCategory()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final Category_of_Private_Insurance_and_Plan CATEGORY_EDEFAULT = Category_of_Private_Insurance_and_Plan.PRIVATE_INSURANCE;
+
+	/**
+	 * The cached value of the '{@link #getCategory() <em>Category</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCategory()
+	 * @generated
+	 * @ordered
+	 */
+	protected Category_of_Private_Insurance_and_Plan category = CATEGORY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDuration_of_contract() <em>Duration of contract</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDuration_of_contract()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int DURATION_OF_CONTRACT_EDEFAULT = 0;
+
+	/**
+	 * The cached value of the '{@link #getDuration_of_contract() <em>Duration of contract</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDuration_of_contract()
+	 * @generated
+	 * @ordered
+	 */
+	protected int duration_of_contract = DURATION_OF_CONTRACT_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Private_Insurance_and_PlanImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.PRIVATE_INSURANCE_AND_PLAN;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Category_of_Private_Insurance_and_Plan getCategory() {
+		return category;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setCategory(Category_of_Private_Insurance_and_Plan newCategory) {
+		Category_of_Private_Insurance_and_Plan oldCategory = category;
+		category = newCategory == null ? CATEGORY_EDEFAULT : newCategory;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.PRIVATE_INSURANCE_AND_PLAN__CATEGORY, oldCategory, category));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getDuration_of_contract() {
+		return duration_of_contract;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDuration_of_contract(int newDuration_of_contract) {
+		int oldDuration_of_contract = duration_of_contract;
+		duration_of_contract = newDuration_of_contract;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.PRIVATE_INSURANCE_AND_PLAN__DURATION_OF_CONTRACT, oldDuration_of_contract, duration_of_contract));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case TaxationWithRootPackage.PRIVATE_INSURANCE_AND_PLAN__CATEGORY:
+				return getCategory();
+			case TaxationWithRootPackage.PRIVATE_INSURANCE_AND_PLAN__DURATION_OF_CONTRACT:
+				return getDuration_of_contract();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case TaxationWithRootPackage.PRIVATE_INSURANCE_AND_PLAN__CATEGORY:
+				setCategory((Category_of_Private_Insurance_and_Plan)newValue);
+				return;
+			case TaxationWithRootPackage.PRIVATE_INSURANCE_AND_PLAN__DURATION_OF_CONTRACT:
+				setDuration_of_contract((Integer)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.PRIVATE_INSURANCE_AND_PLAN__CATEGORY:
+				setCategory(CATEGORY_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.PRIVATE_INSURANCE_AND_PLAN__DURATION_OF_CONTRACT:
+				setDuration_of_contract(DURATION_OF_CONTRACT_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.PRIVATE_INSURANCE_AND_PLAN__CATEGORY:
+				return category != CATEGORY_EDEFAULT;
+			case TaxationWithRootPackage.PRIVATE_INSURANCE_AND_PLAN__DURATION_OF_CONTRACT:
+				return duration_of_contract != DURATION_OF_CONTRACT_EDEFAULT;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuilder result = new StringBuilder(super.toString());
+		result.append(" (category: ");
+		result.append(category);
+		result.append(", duration_of_contract: ");
+		result.append(duration_of_contract);
+		result.append(')');
+		return result.toString();
+	}
+
+} //Private_Insurance_and_PlanImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Professional_ExpenseImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Professional_ExpenseImpl.java
new file mode 100644
index 00000000..3dc4a3ab
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Professional_ExpenseImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.Professional_Expense;
+import TaxationWithRoot.TaxationWithRootPackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Professional Expense</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class Professional_ExpenseImpl extends ExpenseImpl implements Professional_Expense {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Professional_ExpenseImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.PROFESSIONAL_EXPENSE;
+	}
+
+} //Professional_ExpenseImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Rentals_and_Leases_IncomeImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Rentals_and_Leases_IncomeImpl.java
new file mode 100644
index 00000000..ac9af840
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Rentals_and_Leases_IncomeImpl.java
@@ -0,0 +1,164 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.Rentals_and_Leases_Income;
+import TaxationWithRoot.TaxationWithRootPackage;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Rentals and Leases Income</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.impl.Rentals_and_Leases_IncomeImpl#isIs_periodic <em>Is periodic</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class Rentals_and_Leases_IncomeImpl extends Income_TypeImpl implements Rentals_and_Leases_Income {
+	/**
+	 * The default value of the '{@link #isIs_periodic() <em>Is periodic</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isIs_periodic()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean IS_PERIODIC_EDEFAULT = true;
+
+	/**
+	 * The cached value of the '{@link #isIs_periodic() <em>Is periodic</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isIs_periodic()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean is_periodic = IS_PERIODIC_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Rentals_and_Leases_IncomeImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.RENTALS_AND_LEASES_INCOME;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isIs_periodic() {
+		return is_periodic;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setIs_periodic(boolean newIs_periodic) {
+		boolean oldIs_periodic = is_periodic;
+		is_periodic = newIs_periodic;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.RENTALS_AND_LEASES_INCOME__IS_PERIODIC, oldIs_periodic, is_periodic));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case TaxationWithRootPackage.RENTALS_AND_LEASES_INCOME__IS_PERIODIC:
+				return isIs_periodic();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case TaxationWithRootPackage.RENTALS_AND_LEASES_INCOME__IS_PERIODIC:
+				setIs_periodic((Boolean)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.RENTALS_AND_LEASES_INCOME__IS_PERIODIC:
+				setIs_periodic(IS_PERIODIC_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.RENTALS_AND_LEASES_INCOME__IS_PERIODIC:
+				return is_periodic != IS_PERIODIC_EDEFAULT;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuilder result = new StringBuilder(super.toString());
+		result.append(" (is_periodic: ");
+		result.append(is_periodic);
+		result.append(')');
+		return result.toString();
+	}
+
+} //Rentals_and_Leases_IncomeImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Resident_Tax_PayerImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Resident_Tax_PayerImpl.java
new file mode 100644
index 00000000..e18a3490
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Resident_Tax_PayerImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.Resident_Tax_Payer;
+import TaxationWithRoot.TaxationWithRootPackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Resident Tax Payer</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class Resident_Tax_PayerImpl extends Tax_PayerImpl implements Resident_Tax_Payer {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Resident_Tax_PayerImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.RESIDENT_TAX_PAYER;
+	}
+
+} //Resident_Tax_PayerImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/ResourceImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/ResourceImpl.java
new file mode 100644
index 00000000..27e76c61
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/ResourceImpl.java
@@ -0,0 +1,153 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.Household;
+import TaxationWithRoot.Resource;
+import TaxationWithRoot.TaxationWithRootPackage;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Resource</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.impl.ResourceImpl#getContains <em>Contains</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ResourceImpl extends MinimalEObjectImpl.Container implements Resource {
+	/**
+	 * The cached value of the '{@link #getContains() <em>Contains</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getContains()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Household> contains;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ResourceImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.RESOURCE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<Household> getContains() {
+		if (contains == null) {
+			contains = new EObjectContainmentEList<Household>(Household.class, this, TaxationWithRootPackage.RESOURCE__CONTAINS);
+		}
+		return contains;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case TaxationWithRootPackage.RESOURCE__CONTAINS:
+				return ((InternalEList<?>)getContains()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case TaxationWithRootPackage.RESOURCE__CONTAINS:
+				return getContains();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case TaxationWithRootPackage.RESOURCE__CONTAINS:
+				getContains().clear();
+				getContains().addAll((Collection<? extends Household>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.RESOURCE__CONTAINS:
+				getContains().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.RESOURCE__CONTAINS:
+				return contains != null && !contains.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //ResourceImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Special_Expense_DSImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Special_Expense_DSImpl.java
new file mode 100644
index 00000000..c2dcf8e5
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Special_Expense_DSImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.Special_Expense_DS;
+import TaxationWithRoot.TaxationWithRootPackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Special Expense DS</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class Special_Expense_DSImpl extends ExpenseImpl implements Special_Expense_DS {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Special_Expense_DSImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.SPECIAL_EXPENSE_DS;
+	}
+
+} //Special_Expense_DSImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Spousal_Expense_ACImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Spousal_Expense_ACImpl.java
new file mode 100644
index 00000000..2fc910e3
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Spousal_Expense_ACImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.Spousal_Expense_AC;
+import TaxationWithRoot.TaxationWithRootPackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Spousal Expense AC</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class Spousal_Expense_ACImpl extends ExpenseImpl implements Spousal_Expense_AC {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Spousal_Expense_ACImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.SPOUSAL_EXPENSE_AC;
+	}
+
+} //Spousal_Expense_ACImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Tax_CardImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Tax_CardImpl.java
new file mode 100644
index 00000000..9f457341
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Tax_CardImpl.java
@@ -0,0 +1,2093 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.Address;
+import TaxationWithRoot.Income;
+import TaxationWithRoot.Income_Tax_Credit;
+import TaxationWithRoot.Job_Activity;
+import TaxationWithRoot.Tax_Card;
+import TaxationWithRoot.Tax_Office;
+import TaxationWithRoot.TaxationWithRootPackage;
+import TaxationWithRoot.Town;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
+import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Tax Card</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.impl.Tax_CardImpl#getCard_identifier <em>Card identifier</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Tax_CardImpl#getTax_office <em>Tax office</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Tax_CardImpl#getPercentage_of_witholding <em>Percentage of witholding</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Tax_CardImpl#getTax_payers_name_surname <em>Tax payers name surname</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Tax_CardImpl#getTax_payers_partner_name_surname <em>Tax payers partner name surname</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Tax_CardImpl#getTax_payers_address <em>Tax payers address</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Tax_CardImpl#getJobs_Employer_SSNo <em>Jobs Employer SS No</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Tax_CardImpl#getJobs_employers_name <em>Jobs employers name</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Tax_CardImpl#getJobs_activity_type <em>Jobs activity type</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Tax_CardImpl#getJobs_place_of_work <em>Jobs place of work</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Tax_CardImpl#getDeduction_FD_daily <em>Deduction FD daily</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Tax_CardImpl#getDeduction_FD_monthly <em>Deduction FD monthly</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Tax_CardImpl#getDeduction_AC_daily <em>Deduction AC daily</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Tax_CardImpl#getDeduction_AC_monthly <em>Deduction AC monthly</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Tax_CardImpl#getDeduction_AC_yearly <em>Deduction AC yearly</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Tax_CardImpl#getDeduction_CE_daily <em>Deduction CE daily</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Tax_CardImpl#getDeduction_CE_monthly <em>Deduction CE monthly</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Tax_CardImpl#getDeduction_CE_yearly <em>Deduction CE yearly</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Tax_CardImpl#getDeduction_DS_daily <em>Deduction DS daily</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Tax_CardImpl#getDeduction_DS_monthly <em>Deduction DS monthly</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Tax_CardImpl#getDeduction_FO_daily <em>Deduction FO daily</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Tax_CardImpl#getDeduction_FO_monthly <em>Deduction FO monthly</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Tax_CardImpl#getDeduction_FO_yearly <em>Deduction FO yearly</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Tax_CardImpl#getCredit_CIS_daily <em>Credit CIS daily</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Tax_CardImpl#getCredit_CIS_monthly <em>Credit CIS monthly</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Tax_CardImpl#getCredit_CIM_daily <em>Credit CIM daily</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Tax_CardImpl#isValidity <em>Validity</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Tax_CardImpl#getIncome_Tax_Credit <em>Income Tax Credit</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Tax_CardImpl#getPrevious <em>Previous</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Tax_CardImpl#getCurrent_tax_card <em>Current tax card</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Tax_CardImpl#getCredit_CIM_yearly <em>Credit CIM yearly</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Tax_CardImpl#getDeduction_DS_Alimony_yearly <em>Deduction DS Alimony yearly</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Tax_CardImpl#getDeduction_DS_Debt_yearly <em>Deduction DS Debt yearly</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Tax_CardImpl#getIncome <em>Income</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class Tax_CardImpl extends MinimalEObjectImpl.Container implements Tax_Card {
+	/**
+	 * The default value of the '{@link #getCard_identifier() <em>Card identifier</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCard_identifier()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String CARD_IDENTIFIER_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getCard_identifier() <em>Card identifier</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCard_identifier()
+	 * @generated
+	 * @ordered
+	 */
+	protected String card_identifier = CARD_IDENTIFIER_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getTax_office() <em>Tax office</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTax_office()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final Tax_Office TAX_OFFICE_EDEFAULT = Tax_Office.RTS_2;
+
+	/**
+	 * The cached value of the '{@link #getTax_office() <em>Tax office</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTax_office()
+	 * @generated
+	 * @ordered
+	 */
+	protected Tax_Office tax_office = TAX_OFFICE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getPercentage_of_witholding() <em>Percentage of witholding</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPercentage_of_witholding()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double PERCENTAGE_OF_WITHOLDING_EDEFAULT = 0.0;
+
+	/**
+	 * The cached value of the '{@link #getPercentage_of_witholding() <em>Percentage of witholding</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPercentage_of_witholding()
+	 * @generated
+	 * @ordered
+	 */
+	protected double percentage_of_witholding = PERCENTAGE_OF_WITHOLDING_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getTax_payers_name_surname() <em>Tax payers name surname</em>}' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTax_payers_name_surname()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<String> tax_payers_name_surname;
+
+	/**
+	 * The cached value of the '{@link #getTax_payers_partner_name_surname() <em>Tax payers partner name surname</em>}' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTax_payers_partner_name_surname()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<String> tax_payers_partner_name_surname;
+
+	/**
+	 * The cached value of the '{@link #getTax_payers_address() <em>Tax payers address</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTax_payers_address()
+	 * @generated
+	 * @ordered
+	 */
+	protected Address tax_payers_address;
+
+	/**
+	 * The default value of the '{@link #getJobs_Employer_SSNo() <em>Jobs Employer SS No</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getJobs_Employer_SSNo()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String JOBS_EMPLOYER_SS_NO_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getJobs_Employer_SSNo() <em>Jobs Employer SS No</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getJobs_Employer_SSNo()
+	 * @generated
+	 * @ordered
+	 */
+	protected String jobs_Employer_SSNo = JOBS_EMPLOYER_SS_NO_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getJobs_employers_name() <em>Jobs employers name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getJobs_employers_name()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String JOBS_EMPLOYERS_NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getJobs_employers_name() <em>Jobs employers name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getJobs_employers_name()
+	 * @generated
+	 * @ordered
+	 */
+	protected String jobs_employers_name = JOBS_EMPLOYERS_NAME_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getJobs_activity_type() <em>Jobs activity type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getJobs_activity_type()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final Job_Activity JOBS_ACTIVITY_TYPE_EDEFAULT = Job_Activity.SALARY;
+
+	/**
+	 * The cached value of the '{@link #getJobs_activity_type() <em>Jobs activity type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getJobs_activity_type()
+	 * @generated
+	 * @ordered
+	 */
+	protected Job_Activity jobs_activity_type = JOBS_ACTIVITY_TYPE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getJobs_place_of_work() <em>Jobs place of work</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getJobs_place_of_work()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final Town JOBS_PLACE_OF_WORK_EDEFAULT = Town.LL;
+
+	/**
+	 * The cached value of the '{@link #getJobs_place_of_work() <em>Jobs place of work</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getJobs_place_of_work()
+	 * @generated
+	 * @ordered
+	 */
+	protected Town jobs_place_of_work = JOBS_PLACE_OF_WORK_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDeduction_FD_daily() <em>Deduction FD daily</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDeduction_FD_daily()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double DEDUCTION_FD_DAILY_EDEFAULT = 0.0;
+
+	/**
+	 * The cached value of the '{@link #getDeduction_FD_daily() <em>Deduction FD daily</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDeduction_FD_daily()
+	 * @generated
+	 * @ordered
+	 */
+	protected double deduction_FD_daily = DEDUCTION_FD_DAILY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDeduction_FD_monthly() <em>Deduction FD monthly</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDeduction_FD_monthly()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double DEDUCTION_FD_MONTHLY_EDEFAULT = 0.0;
+
+	/**
+	 * The cached value of the '{@link #getDeduction_FD_monthly() <em>Deduction FD monthly</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDeduction_FD_monthly()
+	 * @generated
+	 * @ordered
+	 */
+	protected double deduction_FD_monthly = DEDUCTION_FD_MONTHLY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDeduction_AC_daily() <em>Deduction AC daily</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDeduction_AC_daily()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double DEDUCTION_AC_DAILY_EDEFAULT = 0.0;
+
+	/**
+	 * The cached value of the '{@link #getDeduction_AC_daily() <em>Deduction AC daily</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDeduction_AC_daily()
+	 * @generated
+	 * @ordered
+	 */
+	protected double deduction_AC_daily = DEDUCTION_AC_DAILY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDeduction_AC_monthly() <em>Deduction AC monthly</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDeduction_AC_monthly()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double DEDUCTION_AC_MONTHLY_EDEFAULT = 0.0;
+
+	/**
+	 * The cached value of the '{@link #getDeduction_AC_monthly() <em>Deduction AC monthly</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDeduction_AC_monthly()
+	 * @generated
+	 * @ordered
+	 */
+	protected double deduction_AC_monthly = DEDUCTION_AC_MONTHLY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDeduction_AC_yearly() <em>Deduction AC yearly</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDeduction_AC_yearly()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double DEDUCTION_AC_YEARLY_EDEFAULT = 0.0;
+
+	/**
+	 * The cached value of the '{@link #getDeduction_AC_yearly() <em>Deduction AC yearly</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDeduction_AC_yearly()
+	 * @generated
+	 * @ordered
+	 */
+	protected double deduction_AC_yearly = DEDUCTION_AC_YEARLY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDeduction_CE_daily() <em>Deduction CE daily</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDeduction_CE_daily()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double DEDUCTION_CE_DAILY_EDEFAULT = 0.0;
+
+	/**
+	 * The cached value of the '{@link #getDeduction_CE_daily() <em>Deduction CE daily</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDeduction_CE_daily()
+	 * @generated
+	 * @ordered
+	 */
+	protected double deduction_CE_daily = DEDUCTION_CE_DAILY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDeduction_CE_monthly() <em>Deduction CE monthly</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDeduction_CE_monthly()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double DEDUCTION_CE_MONTHLY_EDEFAULT = 0.0;
+
+	/**
+	 * The cached value of the '{@link #getDeduction_CE_monthly() <em>Deduction CE monthly</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDeduction_CE_monthly()
+	 * @generated
+	 * @ordered
+	 */
+	protected double deduction_CE_monthly = DEDUCTION_CE_MONTHLY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDeduction_CE_yearly() <em>Deduction CE yearly</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDeduction_CE_yearly()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double DEDUCTION_CE_YEARLY_EDEFAULT = 0.0;
+
+	/**
+	 * The cached value of the '{@link #getDeduction_CE_yearly() <em>Deduction CE yearly</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDeduction_CE_yearly()
+	 * @generated
+	 * @ordered
+	 */
+	protected double deduction_CE_yearly = DEDUCTION_CE_YEARLY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDeduction_DS_daily() <em>Deduction DS daily</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDeduction_DS_daily()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double DEDUCTION_DS_DAILY_EDEFAULT = 0.0;
+
+	/**
+	 * The cached value of the '{@link #getDeduction_DS_daily() <em>Deduction DS daily</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDeduction_DS_daily()
+	 * @generated
+	 * @ordered
+	 */
+	protected double deduction_DS_daily = DEDUCTION_DS_DAILY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDeduction_DS_monthly() <em>Deduction DS monthly</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDeduction_DS_monthly()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double DEDUCTION_DS_MONTHLY_EDEFAULT = 0.0;
+
+	/**
+	 * The cached value of the '{@link #getDeduction_DS_monthly() <em>Deduction DS monthly</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDeduction_DS_monthly()
+	 * @generated
+	 * @ordered
+	 */
+	protected double deduction_DS_monthly = DEDUCTION_DS_MONTHLY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDeduction_FO_daily() <em>Deduction FO daily</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDeduction_FO_daily()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double DEDUCTION_FO_DAILY_EDEFAULT = 0.0;
+
+	/**
+	 * The cached value of the '{@link #getDeduction_FO_daily() <em>Deduction FO daily</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDeduction_FO_daily()
+	 * @generated
+	 * @ordered
+	 */
+	protected double deduction_FO_daily = DEDUCTION_FO_DAILY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDeduction_FO_monthly() <em>Deduction FO monthly</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDeduction_FO_monthly()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double DEDUCTION_FO_MONTHLY_EDEFAULT = 0.0;
+
+	/**
+	 * The cached value of the '{@link #getDeduction_FO_monthly() <em>Deduction FO monthly</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDeduction_FO_monthly()
+	 * @generated
+	 * @ordered
+	 */
+	protected double deduction_FO_monthly = DEDUCTION_FO_MONTHLY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDeduction_FO_yearly() <em>Deduction FO yearly</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDeduction_FO_yearly()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double DEDUCTION_FO_YEARLY_EDEFAULT = 0.0;
+
+	/**
+	 * The cached value of the '{@link #getDeduction_FO_yearly() <em>Deduction FO yearly</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDeduction_FO_yearly()
+	 * @generated
+	 * @ordered
+	 */
+	protected double deduction_FO_yearly = DEDUCTION_FO_YEARLY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getCredit_CIS_daily() <em>Credit CIS daily</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCredit_CIS_daily()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double CREDIT_CIS_DAILY_EDEFAULT = 0.0;
+
+	/**
+	 * The cached value of the '{@link #getCredit_CIS_daily() <em>Credit CIS daily</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCredit_CIS_daily()
+	 * @generated
+	 * @ordered
+	 */
+	protected double credit_CIS_daily = CREDIT_CIS_DAILY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getCredit_CIS_monthly() <em>Credit CIS monthly</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCredit_CIS_monthly()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double CREDIT_CIS_MONTHLY_EDEFAULT = 0.0;
+
+	/**
+	 * The cached value of the '{@link #getCredit_CIS_monthly() <em>Credit CIS monthly</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCredit_CIS_monthly()
+	 * @generated
+	 * @ordered
+	 */
+	protected double credit_CIS_monthly = CREDIT_CIS_MONTHLY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getCredit_CIM_daily() <em>Credit CIM daily</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCredit_CIM_daily()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double CREDIT_CIM_DAILY_EDEFAULT = 0.0;
+
+	/**
+	 * The cached value of the '{@link #getCredit_CIM_daily() <em>Credit CIM daily</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCredit_CIM_daily()
+	 * @generated
+	 * @ordered
+	 */
+	protected double credit_CIM_daily = CREDIT_CIM_DAILY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isValidity() <em>Validity</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isValidity()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean VALIDITY_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isValidity() <em>Validity</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isValidity()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean validity = VALIDITY_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getIncome_Tax_Credit() <em>Income Tax Credit</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getIncome_Tax_Credit()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Income_Tax_Credit> income_Tax_Credit;
+
+	/**
+	 * The cached value of the '{@link #getPrevious() <em>Previous</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPrevious()
+	 * @generated
+	 * @ordered
+	 */
+	protected Tax_Card previous;
+
+	/**
+	 * The cached value of the '{@link #getCurrent_tax_card() <em>Current tax card</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCurrent_tax_card()
+	 * @generated
+	 * @ordered
+	 */
+	protected Tax_Card current_tax_card;
+
+	/**
+	 * The default value of the '{@link #getCredit_CIM_yearly() <em>Credit CIM yearly</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCredit_CIM_yearly()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double CREDIT_CIM_YEARLY_EDEFAULT = 0.0;
+
+	/**
+	 * The cached value of the '{@link #getCredit_CIM_yearly() <em>Credit CIM yearly</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCredit_CIM_yearly()
+	 * @generated
+	 * @ordered
+	 */
+	protected double credit_CIM_yearly = CREDIT_CIM_YEARLY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDeduction_DS_Alimony_yearly() <em>Deduction DS Alimony yearly</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDeduction_DS_Alimony_yearly()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double DEDUCTION_DS_ALIMONY_YEARLY_EDEFAULT = 0.0;
+
+	/**
+	 * The cached value of the '{@link #getDeduction_DS_Alimony_yearly() <em>Deduction DS Alimony yearly</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDeduction_DS_Alimony_yearly()
+	 * @generated
+	 * @ordered
+	 */
+	protected double deduction_DS_Alimony_yearly = DEDUCTION_DS_ALIMONY_YEARLY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDeduction_DS_Debt_yearly() <em>Deduction DS Debt yearly</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDeduction_DS_Debt_yearly()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double DEDUCTION_DS_DEBT_YEARLY_EDEFAULT = 0.0;
+
+	/**
+	 * The cached value of the '{@link #getDeduction_DS_Debt_yearly() <em>Deduction DS Debt yearly</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDeduction_DS_Debt_yearly()
+	 * @generated
+	 * @ordered
+	 */
+	protected double deduction_DS_Debt_yearly = DEDUCTION_DS_DEBT_YEARLY_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Tax_CardImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.TAX_CARD;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getCard_identifier() {
+		return card_identifier;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setCard_identifier(String newCard_identifier) {
+		String oldCard_identifier = card_identifier;
+		card_identifier = newCard_identifier;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.TAX_CARD__CARD_IDENTIFIER, oldCard_identifier, card_identifier));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Tax_Office getTax_office() {
+		return tax_office;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setTax_office(Tax_Office newTax_office) {
+		Tax_Office oldTax_office = tax_office;
+		tax_office = newTax_office == null ? TAX_OFFICE_EDEFAULT : newTax_office;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.TAX_CARD__TAX_OFFICE, oldTax_office, tax_office));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getPercentage_of_witholding() {
+		return percentage_of_witholding;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setPercentage_of_witholding(double newPercentage_of_witholding) {
+		double oldPercentage_of_witholding = percentage_of_witholding;
+		percentage_of_witholding = newPercentage_of_witholding;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.TAX_CARD__PERCENTAGE_OF_WITHOLDING, oldPercentage_of_witholding, percentage_of_witholding));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<String> getTax_payers_name_surname() {
+		if (tax_payers_name_surname == null) {
+			tax_payers_name_surname = new EDataTypeUniqueEList<String>(String.class, this, TaxationWithRootPackage.TAX_CARD__TAX_PAYERS_NAME_SURNAME);
+		}
+		return tax_payers_name_surname;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<String> getTax_payers_partner_name_surname() {
+		if (tax_payers_partner_name_surname == null) {
+			tax_payers_partner_name_surname = new EDataTypeUniqueEList<String>(String.class, this, TaxationWithRootPackage.TAX_CARD__TAX_PAYERS_PARTNER_NAME_SURNAME);
+		}
+		return tax_payers_partner_name_surname;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Address getTax_payers_address() {
+		if (tax_payers_address != null && tax_payers_address.eIsProxy()) {
+			InternalEObject oldTax_payers_address = (InternalEObject)tax_payers_address;
+			tax_payers_address = (Address)eResolveProxy(oldTax_payers_address);
+			if (tax_payers_address != oldTax_payers_address) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TaxationWithRootPackage.TAX_CARD__TAX_PAYERS_ADDRESS, oldTax_payers_address, tax_payers_address));
+			}
+		}
+		return tax_payers_address;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Address basicGetTax_payers_address() {
+		return tax_payers_address;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setTax_payers_address(Address newTax_payers_address) {
+		Address oldTax_payers_address = tax_payers_address;
+		tax_payers_address = newTax_payers_address;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.TAX_CARD__TAX_PAYERS_ADDRESS, oldTax_payers_address, tax_payers_address));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getJobs_Employer_SSNo() {
+		return jobs_Employer_SSNo;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setJobs_Employer_SSNo(String newJobs_Employer_SSNo) {
+		String oldJobs_Employer_SSNo = jobs_Employer_SSNo;
+		jobs_Employer_SSNo = newJobs_Employer_SSNo;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.TAX_CARD__JOBS_EMPLOYER_SS_NO, oldJobs_Employer_SSNo, jobs_Employer_SSNo));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getJobs_employers_name() {
+		return jobs_employers_name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setJobs_employers_name(String newJobs_employers_name) {
+		String oldJobs_employers_name = jobs_employers_name;
+		jobs_employers_name = newJobs_employers_name;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.TAX_CARD__JOBS_EMPLOYERS_NAME, oldJobs_employers_name, jobs_employers_name));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Job_Activity getJobs_activity_type() {
+		return jobs_activity_type;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setJobs_activity_type(Job_Activity newJobs_activity_type) {
+		Job_Activity oldJobs_activity_type = jobs_activity_type;
+		jobs_activity_type = newJobs_activity_type == null ? JOBS_ACTIVITY_TYPE_EDEFAULT : newJobs_activity_type;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.TAX_CARD__JOBS_ACTIVITY_TYPE, oldJobs_activity_type, jobs_activity_type));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Town getJobs_place_of_work() {
+		return jobs_place_of_work;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setJobs_place_of_work(Town newJobs_place_of_work) {
+		Town oldJobs_place_of_work = jobs_place_of_work;
+		jobs_place_of_work = newJobs_place_of_work == null ? JOBS_PLACE_OF_WORK_EDEFAULT : newJobs_place_of_work;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.TAX_CARD__JOBS_PLACE_OF_WORK, oldJobs_place_of_work, jobs_place_of_work));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getDeduction_FD_daily() {
+		return deduction_FD_daily;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDeduction_FD_daily(double newDeduction_FD_daily) {
+		double oldDeduction_FD_daily = deduction_FD_daily;
+		deduction_FD_daily = newDeduction_FD_daily;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.TAX_CARD__DEDUCTION_FD_DAILY, oldDeduction_FD_daily, deduction_FD_daily));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getDeduction_FD_monthly() {
+		return deduction_FD_monthly;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDeduction_FD_monthly(double newDeduction_FD_monthly) {
+		double oldDeduction_FD_monthly = deduction_FD_monthly;
+		deduction_FD_monthly = newDeduction_FD_monthly;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.TAX_CARD__DEDUCTION_FD_MONTHLY, oldDeduction_FD_monthly, deduction_FD_monthly));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getDeduction_AC_daily() {
+		return deduction_AC_daily;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDeduction_AC_daily(double newDeduction_AC_daily) {
+		double oldDeduction_AC_daily = deduction_AC_daily;
+		deduction_AC_daily = newDeduction_AC_daily;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.TAX_CARD__DEDUCTION_AC_DAILY, oldDeduction_AC_daily, deduction_AC_daily));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getDeduction_AC_monthly() {
+		return deduction_AC_monthly;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDeduction_AC_monthly(double newDeduction_AC_monthly) {
+		double oldDeduction_AC_monthly = deduction_AC_monthly;
+		deduction_AC_monthly = newDeduction_AC_monthly;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.TAX_CARD__DEDUCTION_AC_MONTHLY, oldDeduction_AC_monthly, deduction_AC_monthly));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getDeduction_AC_yearly() {
+		return deduction_AC_yearly;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDeduction_AC_yearly(double newDeduction_AC_yearly) {
+		double oldDeduction_AC_yearly = deduction_AC_yearly;
+		deduction_AC_yearly = newDeduction_AC_yearly;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.TAX_CARD__DEDUCTION_AC_YEARLY, oldDeduction_AC_yearly, deduction_AC_yearly));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getDeduction_CE_daily() {
+		return deduction_CE_daily;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDeduction_CE_daily(double newDeduction_CE_daily) {
+		double oldDeduction_CE_daily = deduction_CE_daily;
+		deduction_CE_daily = newDeduction_CE_daily;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.TAX_CARD__DEDUCTION_CE_DAILY, oldDeduction_CE_daily, deduction_CE_daily));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getDeduction_CE_monthly() {
+		return deduction_CE_monthly;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDeduction_CE_monthly(double newDeduction_CE_monthly) {
+		double oldDeduction_CE_monthly = deduction_CE_monthly;
+		deduction_CE_monthly = newDeduction_CE_monthly;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.TAX_CARD__DEDUCTION_CE_MONTHLY, oldDeduction_CE_monthly, deduction_CE_monthly));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getDeduction_CE_yearly() {
+		return deduction_CE_yearly;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDeduction_CE_yearly(double newDeduction_CE_yearly) {
+		double oldDeduction_CE_yearly = deduction_CE_yearly;
+		deduction_CE_yearly = newDeduction_CE_yearly;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.TAX_CARD__DEDUCTION_CE_YEARLY, oldDeduction_CE_yearly, deduction_CE_yearly));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getDeduction_DS_daily() {
+		return deduction_DS_daily;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDeduction_DS_daily(double newDeduction_DS_daily) {
+		double oldDeduction_DS_daily = deduction_DS_daily;
+		deduction_DS_daily = newDeduction_DS_daily;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.TAX_CARD__DEDUCTION_DS_DAILY, oldDeduction_DS_daily, deduction_DS_daily));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getDeduction_DS_monthly() {
+		return deduction_DS_monthly;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDeduction_DS_monthly(double newDeduction_DS_monthly) {
+		double oldDeduction_DS_monthly = deduction_DS_monthly;
+		deduction_DS_monthly = newDeduction_DS_monthly;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.TAX_CARD__DEDUCTION_DS_MONTHLY, oldDeduction_DS_monthly, deduction_DS_monthly));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getDeduction_FO_daily() {
+		return deduction_FO_daily;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDeduction_FO_daily(double newDeduction_FO_daily) {
+		double oldDeduction_FO_daily = deduction_FO_daily;
+		deduction_FO_daily = newDeduction_FO_daily;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.TAX_CARD__DEDUCTION_FO_DAILY, oldDeduction_FO_daily, deduction_FO_daily));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getDeduction_FO_monthly() {
+		return deduction_FO_monthly;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDeduction_FO_monthly(double newDeduction_FO_monthly) {
+		double oldDeduction_FO_monthly = deduction_FO_monthly;
+		deduction_FO_monthly = newDeduction_FO_monthly;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.TAX_CARD__DEDUCTION_FO_MONTHLY, oldDeduction_FO_monthly, deduction_FO_monthly));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getDeduction_FO_yearly() {
+		return deduction_FO_yearly;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDeduction_FO_yearly(double newDeduction_FO_yearly) {
+		double oldDeduction_FO_yearly = deduction_FO_yearly;
+		deduction_FO_yearly = newDeduction_FO_yearly;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.TAX_CARD__DEDUCTION_FO_YEARLY, oldDeduction_FO_yearly, deduction_FO_yearly));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getCredit_CIS_daily() {
+		return credit_CIS_daily;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setCredit_CIS_daily(double newCredit_CIS_daily) {
+		double oldCredit_CIS_daily = credit_CIS_daily;
+		credit_CIS_daily = newCredit_CIS_daily;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.TAX_CARD__CREDIT_CIS_DAILY, oldCredit_CIS_daily, credit_CIS_daily));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getCredit_CIS_monthly() {
+		return credit_CIS_monthly;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setCredit_CIS_monthly(double newCredit_CIS_monthly) {
+		double oldCredit_CIS_monthly = credit_CIS_monthly;
+		credit_CIS_monthly = newCredit_CIS_monthly;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.TAX_CARD__CREDIT_CIS_MONTHLY, oldCredit_CIS_monthly, credit_CIS_monthly));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getCredit_CIM_daily() {
+		return credit_CIM_daily;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setCredit_CIM_daily(double newCredit_CIM_daily) {
+		double oldCredit_CIM_daily = credit_CIM_daily;
+		credit_CIM_daily = newCredit_CIM_daily;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.TAX_CARD__CREDIT_CIM_DAILY, oldCredit_CIM_daily, credit_CIM_daily));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isValidity() {
+		return validity;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setValidity(boolean newValidity) {
+		boolean oldValidity = validity;
+		validity = newValidity;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.TAX_CARD__VALIDITY, oldValidity, validity));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<Income_Tax_Credit> getIncome_Tax_Credit() {
+		if (income_Tax_Credit == null) {
+			income_Tax_Credit = new EObjectWithInverseResolvingEList<Income_Tax_Credit>(Income_Tax_Credit.class, this, TaxationWithRootPackage.TAX_CARD__INCOME_TAX_CREDIT, TaxationWithRootPackage.INCOME_TAX_CREDIT__TAXATION_FRAME);
+		}
+		return income_Tax_Credit;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Tax_Card getPrevious() {
+		if (previous != null && previous.eIsProxy()) {
+			InternalEObject oldPrevious = (InternalEObject)previous;
+			previous = (Tax_Card)eResolveProxy(oldPrevious);
+			if (previous != oldPrevious) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TaxationWithRootPackage.TAX_CARD__PREVIOUS, oldPrevious, previous));
+			}
+		}
+		return previous;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Tax_Card basicGetPrevious() {
+		return previous;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetPrevious(Tax_Card newPrevious, NotificationChain msgs) {
+		Tax_Card oldPrevious = previous;
+		previous = newPrevious;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.TAX_CARD__PREVIOUS, oldPrevious, newPrevious);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setPrevious(Tax_Card newPrevious) {
+		if (newPrevious != previous) {
+			NotificationChain msgs = null;
+			if (previous != null)
+				msgs = ((InternalEObject)previous).eInverseRemove(this, TaxationWithRootPackage.TAX_CARD__CURRENT_TAX_CARD, Tax_Card.class, msgs);
+			if (newPrevious != null)
+				msgs = ((InternalEObject)newPrevious).eInverseAdd(this, TaxationWithRootPackage.TAX_CARD__CURRENT_TAX_CARD, Tax_Card.class, msgs);
+			msgs = basicSetPrevious(newPrevious, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.TAX_CARD__PREVIOUS, newPrevious, newPrevious));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Tax_Card getCurrent_tax_card() {
+		if (current_tax_card != null && current_tax_card.eIsProxy()) {
+			InternalEObject oldCurrent_tax_card = (InternalEObject)current_tax_card;
+			current_tax_card = (Tax_Card)eResolveProxy(oldCurrent_tax_card);
+			if (current_tax_card != oldCurrent_tax_card) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TaxationWithRootPackage.TAX_CARD__CURRENT_TAX_CARD, oldCurrent_tax_card, current_tax_card));
+			}
+		}
+		return current_tax_card;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Tax_Card basicGetCurrent_tax_card() {
+		return current_tax_card;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetCurrent_tax_card(Tax_Card newCurrent_tax_card, NotificationChain msgs) {
+		Tax_Card oldCurrent_tax_card = current_tax_card;
+		current_tax_card = newCurrent_tax_card;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.TAX_CARD__CURRENT_TAX_CARD, oldCurrent_tax_card, newCurrent_tax_card);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setCurrent_tax_card(Tax_Card newCurrent_tax_card) {
+		if (newCurrent_tax_card != current_tax_card) {
+			NotificationChain msgs = null;
+			if (current_tax_card != null)
+				msgs = ((InternalEObject)current_tax_card).eInverseRemove(this, TaxationWithRootPackage.TAX_CARD__PREVIOUS, Tax_Card.class, msgs);
+			if (newCurrent_tax_card != null)
+				msgs = ((InternalEObject)newCurrent_tax_card).eInverseAdd(this, TaxationWithRootPackage.TAX_CARD__PREVIOUS, Tax_Card.class, msgs);
+			msgs = basicSetCurrent_tax_card(newCurrent_tax_card, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.TAX_CARD__CURRENT_TAX_CARD, newCurrent_tax_card, newCurrent_tax_card));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getCredit_CIM_yearly() {
+		return credit_CIM_yearly;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setCredit_CIM_yearly(double newCredit_CIM_yearly) {
+		double oldCredit_CIM_yearly = credit_CIM_yearly;
+		credit_CIM_yearly = newCredit_CIM_yearly;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.TAX_CARD__CREDIT_CIM_YEARLY, oldCredit_CIM_yearly, credit_CIM_yearly));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getDeduction_DS_Alimony_yearly() {
+		return deduction_DS_Alimony_yearly;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDeduction_DS_Alimony_yearly(double newDeduction_DS_Alimony_yearly) {
+		double oldDeduction_DS_Alimony_yearly = deduction_DS_Alimony_yearly;
+		deduction_DS_Alimony_yearly = newDeduction_DS_Alimony_yearly;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.TAX_CARD__DEDUCTION_DS_ALIMONY_YEARLY, oldDeduction_DS_Alimony_yearly, deduction_DS_Alimony_yearly));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public double getDeduction_DS_Debt_yearly() {
+		return deduction_DS_Debt_yearly;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDeduction_DS_Debt_yearly(double newDeduction_DS_Debt_yearly) {
+		double oldDeduction_DS_Debt_yearly = deduction_DS_Debt_yearly;
+		deduction_DS_Debt_yearly = newDeduction_DS_Debt_yearly;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.TAX_CARD__DEDUCTION_DS_DEBT_YEARLY, oldDeduction_DS_Debt_yearly, deduction_DS_Debt_yearly));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Income getIncome() {
+		if (eContainerFeatureID() != TaxationWithRootPackage.TAX_CARD__INCOME) return null;
+		return (Income)eInternalContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetIncome(Income newIncome, NotificationChain msgs) {
+		msgs = eBasicSetContainer((InternalEObject)newIncome, TaxationWithRootPackage.TAX_CARD__INCOME, msgs);
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setIncome(Income newIncome) {
+		if (newIncome != eInternalContainer() || (eContainerFeatureID() != TaxationWithRootPackage.TAX_CARD__INCOME && newIncome != null)) {
+			if (EcoreUtil.isAncestor(this, newIncome))
+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+			NotificationChain msgs = null;
+			if (eInternalContainer() != null)
+				msgs = eBasicRemoveFromContainer(msgs);
+			if (newIncome != null)
+				msgs = ((InternalEObject)newIncome).eInverseAdd(this, TaxationWithRootPackage.INCOME__TAX_CARD, Income.class, msgs);
+			msgs = basicSetIncome(newIncome, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.TAX_CARD__INCOME, newIncome, newIncome));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case TaxationWithRootPackage.TAX_CARD__INCOME_TAX_CREDIT:
+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getIncome_Tax_Credit()).basicAdd(otherEnd, msgs);
+			case TaxationWithRootPackage.TAX_CARD__PREVIOUS:
+				if (previous != null)
+					msgs = ((InternalEObject)previous).eInverseRemove(this, TaxationWithRootPackage.TAX_CARD__CURRENT_TAX_CARD, Tax_Card.class, msgs);
+				return basicSetPrevious((Tax_Card)otherEnd, msgs);
+			case TaxationWithRootPackage.TAX_CARD__CURRENT_TAX_CARD:
+				if (current_tax_card != null)
+					msgs = ((InternalEObject)current_tax_card).eInverseRemove(this, TaxationWithRootPackage.TAX_CARD__PREVIOUS, Tax_Card.class, msgs);
+				return basicSetCurrent_tax_card((Tax_Card)otherEnd, msgs);
+			case TaxationWithRootPackage.TAX_CARD__INCOME:
+				if (eInternalContainer() != null)
+					msgs = eBasicRemoveFromContainer(msgs);
+				return basicSetIncome((Income)otherEnd, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case TaxationWithRootPackage.TAX_CARD__INCOME_TAX_CREDIT:
+				return ((InternalEList<?>)getIncome_Tax_Credit()).basicRemove(otherEnd, msgs);
+			case TaxationWithRootPackage.TAX_CARD__PREVIOUS:
+				return basicSetPrevious(null, msgs);
+			case TaxationWithRootPackage.TAX_CARD__CURRENT_TAX_CARD:
+				return basicSetCurrent_tax_card(null, msgs);
+			case TaxationWithRootPackage.TAX_CARD__INCOME:
+				return basicSetIncome(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+		switch (eContainerFeatureID()) {
+			case TaxationWithRootPackage.TAX_CARD__INCOME:
+				return eInternalContainer().eInverseRemove(this, TaxationWithRootPackage.INCOME__TAX_CARD, Income.class, msgs);
+		}
+		return super.eBasicRemoveFromContainerFeature(msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case TaxationWithRootPackage.TAX_CARD__CARD_IDENTIFIER:
+				return getCard_identifier();
+			case TaxationWithRootPackage.TAX_CARD__TAX_OFFICE:
+				return getTax_office();
+			case TaxationWithRootPackage.TAX_CARD__PERCENTAGE_OF_WITHOLDING:
+				return getPercentage_of_witholding();
+			case TaxationWithRootPackage.TAX_CARD__TAX_PAYERS_NAME_SURNAME:
+				return getTax_payers_name_surname();
+			case TaxationWithRootPackage.TAX_CARD__TAX_PAYERS_PARTNER_NAME_SURNAME:
+				return getTax_payers_partner_name_surname();
+			case TaxationWithRootPackage.TAX_CARD__TAX_PAYERS_ADDRESS:
+				if (resolve) return getTax_payers_address();
+				return basicGetTax_payers_address();
+			case TaxationWithRootPackage.TAX_CARD__JOBS_EMPLOYER_SS_NO:
+				return getJobs_Employer_SSNo();
+			case TaxationWithRootPackage.TAX_CARD__JOBS_EMPLOYERS_NAME:
+				return getJobs_employers_name();
+			case TaxationWithRootPackage.TAX_CARD__JOBS_ACTIVITY_TYPE:
+				return getJobs_activity_type();
+			case TaxationWithRootPackage.TAX_CARD__JOBS_PLACE_OF_WORK:
+				return getJobs_place_of_work();
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_FD_DAILY:
+				return getDeduction_FD_daily();
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_FD_MONTHLY:
+				return getDeduction_FD_monthly();
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_AC_DAILY:
+				return getDeduction_AC_daily();
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_AC_MONTHLY:
+				return getDeduction_AC_monthly();
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_AC_YEARLY:
+				return getDeduction_AC_yearly();
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_CE_DAILY:
+				return getDeduction_CE_daily();
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_CE_MONTHLY:
+				return getDeduction_CE_monthly();
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_CE_YEARLY:
+				return getDeduction_CE_yearly();
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_DS_DAILY:
+				return getDeduction_DS_daily();
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_DS_MONTHLY:
+				return getDeduction_DS_monthly();
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_FO_DAILY:
+				return getDeduction_FO_daily();
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_FO_MONTHLY:
+				return getDeduction_FO_monthly();
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_FO_YEARLY:
+				return getDeduction_FO_yearly();
+			case TaxationWithRootPackage.TAX_CARD__CREDIT_CIS_DAILY:
+				return getCredit_CIS_daily();
+			case TaxationWithRootPackage.TAX_CARD__CREDIT_CIS_MONTHLY:
+				return getCredit_CIS_monthly();
+			case TaxationWithRootPackage.TAX_CARD__CREDIT_CIM_DAILY:
+				return getCredit_CIM_daily();
+			case TaxationWithRootPackage.TAX_CARD__VALIDITY:
+				return isValidity();
+			case TaxationWithRootPackage.TAX_CARD__INCOME_TAX_CREDIT:
+				return getIncome_Tax_Credit();
+			case TaxationWithRootPackage.TAX_CARD__PREVIOUS:
+				if (resolve) return getPrevious();
+				return basicGetPrevious();
+			case TaxationWithRootPackage.TAX_CARD__CURRENT_TAX_CARD:
+				if (resolve) return getCurrent_tax_card();
+				return basicGetCurrent_tax_card();
+			case TaxationWithRootPackage.TAX_CARD__CREDIT_CIM_YEARLY:
+				return getCredit_CIM_yearly();
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_DS_ALIMONY_YEARLY:
+				return getDeduction_DS_Alimony_yearly();
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_DS_DEBT_YEARLY:
+				return getDeduction_DS_Debt_yearly();
+			case TaxationWithRootPackage.TAX_CARD__INCOME:
+				return getIncome();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case TaxationWithRootPackage.TAX_CARD__CARD_IDENTIFIER:
+				setCard_identifier((String)newValue);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__TAX_OFFICE:
+				setTax_office((Tax_Office)newValue);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__PERCENTAGE_OF_WITHOLDING:
+				setPercentage_of_witholding((Double)newValue);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__TAX_PAYERS_NAME_SURNAME:
+				getTax_payers_name_surname().clear();
+				getTax_payers_name_surname().addAll((Collection<? extends String>)newValue);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__TAX_PAYERS_PARTNER_NAME_SURNAME:
+				getTax_payers_partner_name_surname().clear();
+				getTax_payers_partner_name_surname().addAll((Collection<? extends String>)newValue);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__TAX_PAYERS_ADDRESS:
+				setTax_payers_address((Address)newValue);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__JOBS_EMPLOYER_SS_NO:
+				setJobs_Employer_SSNo((String)newValue);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__JOBS_EMPLOYERS_NAME:
+				setJobs_employers_name((String)newValue);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__JOBS_ACTIVITY_TYPE:
+				setJobs_activity_type((Job_Activity)newValue);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__JOBS_PLACE_OF_WORK:
+				setJobs_place_of_work((Town)newValue);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_FD_DAILY:
+				setDeduction_FD_daily((Double)newValue);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_FD_MONTHLY:
+				setDeduction_FD_monthly((Double)newValue);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_AC_DAILY:
+				setDeduction_AC_daily((Double)newValue);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_AC_MONTHLY:
+				setDeduction_AC_monthly((Double)newValue);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_AC_YEARLY:
+				setDeduction_AC_yearly((Double)newValue);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_CE_DAILY:
+				setDeduction_CE_daily((Double)newValue);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_CE_MONTHLY:
+				setDeduction_CE_monthly((Double)newValue);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_CE_YEARLY:
+				setDeduction_CE_yearly((Double)newValue);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_DS_DAILY:
+				setDeduction_DS_daily((Double)newValue);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_DS_MONTHLY:
+				setDeduction_DS_monthly((Double)newValue);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_FO_DAILY:
+				setDeduction_FO_daily((Double)newValue);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_FO_MONTHLY:
+				setDeduction_FO_monthly((Double)newValue);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_FO_YEARLY:
+				setDeduction_FO_yearly((Double)newValue);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__CREDIT_CIS_DAILY:
+				setCredit_CIS_daily((Double)newValue);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__CREDIT_CIS_MONTHLY:
+				setCredit_CIS_monthly((Double)newValue);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__CREDIT_CIM_DAILY:
+				setCredit_CIM_daily((Double)newValue);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__VALIDITY:
+				setValidity((Boolean)newValue);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__INCOME_TAX_CREDIT:
+				getIncome_Tax_Credit().clear();
+				getIncome_Tax_Credit().addAll((Collection<? extends Income_Tax_Credit>)newValue);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__PREVIOUS:
+				setPrevious((Tax_Card)newValue);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__CURRENT_TAX_CARD:
+				setCurrent_tax_card((Tax_Card)newValue);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__CREDIT_CIM_YEARLY:
+				setCredit_CIM_yearly((Double)newValue);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_DS_ALIMONY_YEARLY:
+				setDeduction_DS_Alimony_yearly((Double)newValue);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_DS_DEBT_YEARLY:
+				setDeduction_DS_Debt_yearly((Double)newValue);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__INCOME:
+				setIncome((Income)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.TAX_CARD__CARD_IDENTIFIER:
+				setCard_identifier(CARD_IDENTIFIER_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__TAX_OFFICE:
+				setTax_office(TAX_OFFICE_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__PERCENTAGE_OF_WITHOLDING:
+				setPercentage_of_witholding(PERCENTAGE_OF_WITHOLDING_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__TAX_PAYERS_NAME_SURNAME:
+				getTax_payers_name_surname().clear();
+				return;
+			case TaxationWithRootPackage.TAX_CARD__TAX_PAYERS_PARTNER_NAME_SURNAME:
+				getTax_payers_partner_name_surname().clear();
+				return;
+			case TaxationWithRootPackage.TAX_CARD__TAX_PAYERS_ADDRESS:
+				setTax_payers_address((Address)null);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__JOBS_EMPLOYER_SS_NO:
+				setJobs_Employer_SSNo(JOBS_EMPLOYER_SS_NO_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__JOBS_EMPLOYERS_NAME:
+				setJobs_employers_name(JOBS_EMPLOYERS_NAME_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__JOBS_ACTIVITY_TYPE:
+				setJobs_activity_type(JOBS_ACTIVITY_TYPE_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__JOBS_PLACE_OF_WORK:
+				setJobs_place_of_work(JOBS_PLACE_OF_WORK_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_FD_DAILY:
+				setDeduction_FD_daily(DEDUCTION_FD_DAILY_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_FD_MONTHLY:
+				setDeduction_FD_monthly(DEDUCTION_FD_MONTHLY_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_AC_DAILY:
+				setDeduction_AC_daily(DEDUCTION_AC_DAILY_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_AC_MONTHLY:
+				setDeduction_AC_monthly(DEDUCTION_AC_MONTHLY_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_AC_YEARLY:
+				setDeduction_AC_yearly(DEDUCTION_AC_YEARLY_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_CE_DAILY:
+				setDeduction_CE_daily(DEDUCTION_CE_DAILY_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_CE_MONTHLY:
+				setDeduction_CE_monthly(DEDUCTION_CE_MONTHLY_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_CE_YEARLY:
+				setDeduction_CE_yearly(DEDUCTION_CE_YEARLY_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_DS_DAILY:
+				setDeduction_DS_daily(DEDUCTION_DS_DAILY_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_DS_MONTHLY:
+				setDeduction_DS_monthly(DEDUCTION_DS_MONTHLY_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_FO_DAILY:
+				setDeduction_FO_daily(DEDUCTION_FO_DAILY_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_FO_MONTHLY:
+				setDeduction_FO_monthly(DEDUCTION_FO_MONTHLY_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_FO_YEARLY:
+				setDeduction_FO_yearly(DEDUCTION_FO_YEARLY_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__CREDIT_CIS_DAILY:
+				setCredit_CIS_daily(CREDIT_CIS_DAILY_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__CREDIT_CIS_MONTHLY:
+				setCredit_CIS_monthly(CREDIT_CIS_MONTHLY_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__CREDIT_CIM_DAILY:
+				setCredit_CIM_daily(CREDIT_CIM_DAILY_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__VALIDITY:
+				setValidity(VALIDITY_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__INCOME_TAX_CREDIT:
+				getIncome_Tax_Credit().clear();
+				return;
+			case TaxationWithRootPackage.TAX_CARD__PREVIOUS:
+				setPrevious((Tax_Card)null);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__CURRENT_TAX_CARD:
+				setCurrent_tax_card((Tax_Card)null);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__CREDIT_CIM_YEARLY:
+				setCredit_CIM_yearly(CREDIT_CIM_YEARLY_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_DS_ALIMONY_YEARLY:
+				setDeduction_DS_Alimony_yearly(DEDUCTION_DS_ALIMONY_YEARLY_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_DS_DEBT_YEARLY:
+				setDeduction_DS_Debt_yearly(DEDUCTION_DS_DEBT_YEARLY_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.TAX_CARD__INCOME:
+				setIncome((Income)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.TAX_CARD__CARD_IDENTIFIER:
+				return CARD_IDENTIFIER_EDEFAULT == null ? card_identifier != null : !CARD_IDENTIFIER_EDEFAULT.equals(card_identifier);
+			case TaxationWithRootPackage.TAX_CARD__TAX_OFFICE:
+				return tax_office != TAX_OFFICE_EDEFAULT;
+			case TaxationWithRootPackage.TAX_CARD__PERCENTAGE_OF_WITHOLDING:
+				return percentage_of_witholding != PERCENTAGE_OF_WITHOLDING_EDEFAULT;
+			case TaxationWithRootPackage.TAX_CARD__TAX_PAYERS_NAME_SURNAME:
+				return tax_payers_name_surname != null && !tax_payers_name_surname.isEmpty();
+			case TaxationWithRootPackage.TAX_CARD__TAX_PAYERS_PARTNER_NAME_SURNAME:
+				return tax_payers_partner_name_surname != null && !tax_payers_partner_name_surname.isEmpty();
+			case TaxationWithRootPackage.TAX_CARD__TAX_PAYERS_ADDRESS:
+				return tax_payers_address != null;
+			case TaxationWithRootPackage.TAX_CARD__JOBS_EMPLOYER_SS_NO:
+				return JOBS_EMPLOYER_SS_NO_EDEFAULT == null ? jobs_Employer_SSNo != null : !JOBS_EMPLOYER_SS_NO_EDEFAULT.equals(jobs_Employer_SSNo);
+			case TaxationWithRootPackage.TAX_CARD__JOBS_EMPLOYERS_NAME:
+				return JOBS_EMPLOYERS_NAME_EDEFAULT == null ? jobs_employers_name != null : !JOBS_EMPLOYERS_NAME_EDEFAULT.equals(jobs_employers_name);
+			case TaxationWithRootPackage.TAX_CARD__JOBS_ACTIVITY_TYPE:
+				return jobs_activity_type != JOBS_ACTIVITY_TYPE_EDEFAULT;
+			case TaxationWithRootPackage.TAX_CARD__JOBS_PLACE_OF_WORK:
+				return jobs_place_of_work != JOBS_PLACE_OF_WORK_EDEFAULT;
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_FD_DAILY:
+				return deduction_FD_daily != DEDUCTION_FD_DAILY_EDEFAULT;
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_FD_MONTHLY:
+				return deduction_FD_monthly != DEDUCTION_FD_MONTHLY_EDEFAULT;
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_AC_DAILY:
+				return deduction_AC_daily != DEDUCTION_AC_DAILY_EDEFAULT;
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_AC_MONTHLY:
+				return deduction_AC_monthly != DEDUCTION_AC_MONTHLY_EDEFAULT;
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_AC_YEARLY:
+				return deduction_AC_yearly != DEDUCTION_AC_YEARLY_EDEFAULT;
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_CE_DAILY:
+				return deduction_CE_daily != DEDUCTION_CE_DAILY_EDEFAULT;
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_CE_MONTHLY:
+				return deduction_CE_monthly != DEDUCTION_CE_MONTHLY_EDEFAULT;
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_CE_YEARLY:
+				return deduction_CE_yearly != DEDUCTION_CE_YEARLY_EDEFAULT;
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_DS_DAILY:
+				return deduction_DS_daily != DEDUCTION_DS_DAILY_EDEFAULT;
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_DS_MONTHLY:
+				return deduction_DS_monthly != DEDUCTION_DS_MONTHLY_EDEFAULT;
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_FO_DAILY:
+				return deduction_FO_daily != DEDUCTION_FO_DAILY_EDEFAULT;
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_FO_MONTHLY:
+				return deduction_FO_monthly != DEDUCTION_FO_MONTHLY_EDEFAULT;
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_FO_YEARLY:
+				return deduction_FO_yearly != DEDUCTION_FO_YEARLY_EDEFAULT;
+			case TaxationWithRootPackage.TAX_CARD__CREDIT_CIS_DAILY:
+				return credit_CIS_daily != CREDIT_CIS_DAILY_EDEFAULT;
+			case TaxationWithRootPackage.TAX_CARD__CREDIT_CIS_MONTHLY:
+				return credit_CIS_monthly != CREDIT_CIS_MONTHLY_EDEFAULT;
+			case TaxationWithRootPackage.TAX_CARD__CREDIT_CIM_DAILY:
+				return credit_CIM_daily != CREDIT_CIM_DAILY_EDEFAULT;
+			case TaxationWithRootPackage.TAX_CARD__VALIDITY:
+				return validity != VALIDITY_EDEFAULT;
+			case TaxationWithRootPackage.TAX_CARD__INCOME_TAX_CREDIT:
+				return income_Tax_Credit != null && !income_Tax_Credit.isEmpty();
+			case TaxationWithRootPackage.TAX_CARD__PREVIOUS:
+				return previous != null;
+			case TaxationWithRootPackage.TAX_CARD__CURRENT_TAX_CARD:
+				return current_tax_card != null;
+			case TaxationWithRootPackage.TAX_CARD__CREDIT_CIM_YEARLY:
+				return credit_CIM_yearly != CREDIT_CIM_YEARLY_EDEFAULT;
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_DS_ALIMONY_YEARLY:
+				return deduction_DS_Alimony_yearly != DEDUCTION_DS_ALIMONY_YEARLY_EDEFAULT;
+			case TaxationWithRootPackage.TAX_CARD__DEDUCTION_DS_DEBT_YEARLY:
+				return deduction_DS_Debt_yearly != DEDUCTION_DS_DEBT_YEARLY_EDEFAULT;
+			case TaxationWithRootPackage.TAX_CARD__INCOME:
+				return getIncome() != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuilder result = new StringBuilder(super.toString());
+		result.append(" (card_identifier: ");
+		result.append(card_identifier);
+		result.append(", tax_office: ");
+		result.append(tax_office);
+		result.append(", percentage_of_witholding: ");
+		result.append(percentage_of_witholding);
+		result.append(", tax_payers_name_surname: ");
+		result.append(tax_payers_name_surname);
+		result.append(", tax_payers_partner_name_surname: ");
+		result.append(tax_payers_partner_name_surname);
+		result.append(", jobs_Employer_SSNo: ");
+		result.append(jobs_Employer_SSNo);
+		result.append(", jobs_employers_name: ");
+		result.append(jobs_employers_name);
+		result.append(", jobs_activity_type: ");
+		result.append(jobs_activity_type);
+		result.append(", jobs_place_of_work: ");
+		result.append(jobs_place_of_work);
+		result.append(", deduction_FD_daily: ");
+		result.append(deduction_FD_daily);
+		result.append(", deduction_FD_monthly: ");
+		result.append(deduction_FD_monthly);
+		result.append(", deduction_AC_daily: ");
+		result.append(deduction_AC_daily);
+		result.append(", deduction_AC_monthly: ");
+		result.append(deduction_AC_monthly);
+		result.append(", deduction_AC_yearly: ");
+		result.append(deduction_AC_yearly);
+		result.append(", deduction_CE_daily: ");
+		result.append(deduction_CE_daily);
+		result.append(", deduction_CE_monthly: ");
+		result.append(deduction_CE_monthly);
+		result.append(", deduction_CE_yearly: ");
+		result.append(deduction_CE_yearly);
+		result.append(", deduction_DS_daily: ");
+		result.append(deduction_DS_daily);
+		result.append(", deduction_DS_monthly: ");
+		result.append(deduction_DS_monthly);
+		result.append(", deduction_FO_daily: ");
+		result.append(deduction_FO_daily);
+		result.append(", deduction_FO_monthly: ");
+		result.append(deduction_FO_monthly);
+		result.append(", deduction_FO_yearly: ");
+		result.append(deduction_FO_yearly);
+		result.append(", credit_CIS_daily: ");
+		result.append(credit_CIS_daily);
+		result.append(", credit_CIS_monthly: ");
+		result.append(credit_CIS_monthly);
+		result.append(", credit_CIM_daily: ");
+		result.append(credit_CIM_daily);
+		result.append(", validity: ");
+		result.append(validity);
+		result.append(", credit_CIM_yearly: ");
+		result.append(credit_CIM_yearly);
+		result.append(", deduction_DS_Alimony_yearly: ");
+		result.append(deduction_DS_Alimony_yearly);
+		result.append(", deduction_DS_Debt_yearly: ");
+		result.append(deduction_DS_Debt_yearly);
+		result.append(')');
+		return result.toString();
+	}
+
+} //Tax_CardImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Tax_PayerImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Tax_PayerImpl.java
new file mode 100644
index 00000000..3783701a
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Tax_PayerImpl.java
@@ -0,0 +1,355 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.Dependent;
+import TaxationWithRoot.FromAgent;
+import TaxationWithRoot.FromLaw;
+import TaxationWithRoot.Income;
+import TaxationWithRoot.Tax_Payer;
+import TaxationWithRoot.TaxationWithRootPackage;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Tax Payer</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.impl.Tax_PayerImpl#getDependents <em>Dependents</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Tax_PayerImpl#getFrom_agent <em>From agent</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Tax_PayerImpl#getIncomes <em>Incomes</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Tax_PayerImpl#getFrom_law <em>From law</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class Tax_PayerImpl extends Physical_PersonImpl implements Tax_Payer {
+	/**
+	 * The cached value of the '{@link #getDependents() <em>Dependents</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDependents()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Dependent> dependents;
+
+	/**
+	 * The cached value of the '{@link #getFrom_agent() <em>From agent</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFrom_agent()
+	 * @generated
+	 * @ordered
+	 */
+	protected FromAgent from_agent;
+
+	/**
+	 * The cached value of the '{@link #getIncomes() <em>Incomes</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getIncomes()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Income> incomes;
+
+	/**
+	 * The cached value of the '{@link #getFrom_law() <em>From law</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFrom_law()
+	 * @generated
+	 * @ordered
+	 */
+	protected FromLaw from_law;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Tax_PayerImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.TAX_PAYER;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<Dependent> getDependents() {
+		if (dependents == null) {
+			dependents = new EObjectContainmentWithInverseEList<Dependent>(Dependent.class, this, TaxationWithRootPackage.TAX_PAYER__DEPENDENTS, TaxationWithRootPackage.DEPENDENT__RESPONSIBLE_PERSON);
+		}
+		return dependents;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public FromAgent getFrom_agent() {
+		return from_agent;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetFrom_agent(FromAgent newFrom_agent, NotificationChain msgs) {
+		FromAgent oldFrom_agent = from_agent;
+		from_agent = newFrom_agent;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.TAX_PAYER__FROM_AGENT, oldFrom_agent, newFrom_agent);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setFrom_agent(FromAgent newFrom_agent) {
+		if (newFrom_agent != from_agent) {
+			NotificationChain msgs = null;
+			if (from_agent != null)
+				msgs = ((InternalEObject)from_agent).eInverseRemove(this, TaxationWithRootPackage.FROM_AGENT__TAX_PAYER, FromAgent.class, msgs);
+			if (newFrom_agent != null)
+				msgs = ((InternalEObject)newFrom_agent).eInverseAdd(this, TaxationWithRootPackage.FROM_AGENT__TAX_PAYER, FromAgent.class, msgs);
+			msgs = basicSetFrom_agent(newFrom_agent, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.TAX_PAYER__FROM_AGENT, newFrom_agent, newFrom_agent));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<Income> getIncomes() {
+		if (incomes == null) {
+			incomes = new EObjectContainmentWithInverseEList<Income>(Income.class, this, TaxationWithRootPackage.TAX_PAYER__INCOMES, TaxationWithRootPackage.INCOME__TAX_PAYER);
+		}
+		return incomes;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public FromLaw getFrom_law() {
+		return from_law;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetFrom_law(FromLaw newFrom_law, NotificationChain msgs) {
+		FromLaw oldFrom_law = from_law;
+		from_law = newFrom_law;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.TAX_PAYER__FROM_LAW, oldFrom_law, newFrom_law);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setFrom_law(FromLaw newFrom_law) {
+		if (newFrom_law != from_law) {
+			NotificationChain msgs = null;
+			if (from_law != null)
+				msgs = ((InternalEObject)from_law).eInverseRemove(this, TaxationWithRootPackage.FROM_LAW__TAX_PAYER, FromLaw.class, msgs);
+			if (newFrom_law != null)
+				msgs = ((InternalEObject)newFrom_law).eInverseAdd(this, TaxationWithRootPackage.FROM_LAW__TAX_PAYER, FromLaw.class, msgs);
+			msgs = basicSetFrom_law(newFrom_law, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.TAX_PAYER__FROM_LAW, newFrom_law, newFrom_law));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case TaxationWithRootPackage.TAX_PAYER__DEPENDENTS:
+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getDependents()).basicAdd(otherEnd, msgs);
+			case TaxationWithRootPackage.TAX_PAYER__FROM_AGENT:
+				if (from_agent != null)
+					msgs = ((InternalEObject)from_agent).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - TaxationWithRootPackage.TAX_PAYER__FROM_AGENT, null, msgs);
+				return basicSetFrom_agent((FromAgent)otherEnd, msgs);
+			case TaxationWithRootPackage.TAX_PAYER__INCOMES:
+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getIncomes()).basicAdd(otherEnd, msgs);
+			case TaxationWithRootPackage.TAX_PAYER__FROM_LAW:
+				if (from_law != null)
+					msgs = ((InternalEObject)from_law).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - TaxationWithRootPackage.TAX_PAYER__FROM_LAW, null, msgs);
+				return basicSetFrom_law((FromLaw)otherEnd, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case TaxationWithRootPackage.TAX_PAYER__DEPENDENTS:
+				return ((InternalEList<?>)getDependents()).basicRemove(otherEnd, msgs);
+			case TaxationWithRootPackage.TAX_PAYER__FROM_AGENT:
+				return basicSetFrom_agent(null, msgs);
+			case TaxationWithRootPackage.TAX_PAYER__INCOMES:
+				return ((InternalEList<?>)getIncomes()).basicRemove(otherEnd, msgs);
+			case TaxationWithRootPackage.TAX_PAYER__FROM_LAW:
+				return basicSetFrom_law(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case TaxationWithRootPackage.TAX_PAYER__DEPENDENTS:
+				return getDependents();
+			case TaxationWithRootPackage.TAX_PAYER__FROM_AGENT:
+				return getFrom_agent();
+			case TaxationWithRootPackage.TAX_PAYER__INCOMES:
+				return getIncomes();
+			case TaxationWithRootPackage.TAX_PAYER__FROM_LAW:
+				return getFrom_law();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case TaxationWithRootPackage.TAX_PAYER__DEPENDENTS:
+				getDependents().clear();
+				getDependents().addAll((Collection<? extends Dependent>)newValue);
+				return;
+			case TaxationWithRootPackage.TAX_PAYER__FROM_AGENT:
+				setFrom_agent((FromAgent)newValue);
+				return;
+			case TaxationWithRootPackage.TAX_PAYER__INCOMES:
+				getIncomes().clear();
+				getIncomes().addAll((Collection<? extends Income>)newValue);
+				return;
+			case TaxationWithRootPackage.TAX_PAYER__FROM_LAW:
+				setFrom_law((FromLaw)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.TAX_PAYER__DEPENDENTS:
+				getDependents().clear();
+				return;
+			case TaxationWithRootPackage.TAX_PAYER__FROM_AGENT:
+				setFrom_agent((FromAgent)null);
+				return;
+			case TaxationWithRootPackage.TAX_PAYER__INCOMES:
+				getIncomes().clear();
+				return;
+			case TaxationWithRootPackage.TAX_PAYER__FROM_LAW:
+				setFrom_law((FromLaw)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.TAX_PAYER__DEPENDENTS:
+				return dependents != null && !dependents.isEmpty();
+			case TaxationWithRootPackage.TAX_PAYER__FROM_AGENT:
+				return from_agent != null;
+			case TaxationWithRootPackage.TAX_PAYER__INCOMES:
+				return incomes != null && !incomes.isEmpty();
+			case TaxationWithRootPackage.TAX_PAYER__FROM_LAW:
+				return from_law != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //Tax_PayerImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Tax_PropertyImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Tax_PropertyImpl.java
new file mode 100644
index 00000000..8b5e4683
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Tax_PropertyImpl.java
@@ -0,0 +1,324 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.Legal_Union_Record;
+import TaxationWithRoot.Tax_Property;
+import TaxationWithRoot.TaxationWithRootPackage;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EcoreUtil;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Tax Property</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link TaxationWithRoot.impl.Tax_PropertyImpl#getStarting_year <em>Starting year</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Tax_PropertyImpl#getId10 <em>Id10</em>}</li>
+ *   <li>{@link TaxationWithRoot.impl.Tax_PropertyImpl#getUnion_record <em>Union record</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class Tax_PropertyImpl extends MinimalEObjectImpl.Container implements Tax_Property {
+	/**
+	 * The default value of the '{@link #getStarting_year() <em>Starting year</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStarting_year()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int STARTING_YEAR_EDEFAULT = 0;
+
+	/**
+	 * The cached value of the '{@link #getStarting_year() <em>Starting year</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStarting_year()
+	 * @generated
+	 * @ordered
+	 */
+	protected int starting_year = STARTING_YEAR_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getId10() <em>Id10</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getId10()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ID10_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getId10() <em>Id10</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getId10()
+	 * @generated
+	 * @ordered
+	 */
+	protected String id10 = ID10_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Tax_PropertyImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.TAX_PROPERTY;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getStarting_year() {
+		return starting_year;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setStarting_year(int newStarting_year) {
+		int oldStarting_year = starting_year;
+		starting_year = newStarting_year;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.TAX_PROPERTY__STARTING_YEAR, oldStarting_year, starting_year));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getId10() {
+		return id10;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setId10(String newId10) {
+		String oldId10 = id10;
+		id10 = newId10;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.TAX_PROPERTY__ID10, oldId10, id10));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Legal_Union_Record getUnion_record() {
+		if (eContainerFeatureID() != TaxationWithRootPackage.TAX_PROPERTY__UNION_RECORD) return null;
+		return (Legal_Union_Record)eInternalContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetUnion_record(Legal_Union_Record newUnion_record, NotificationChain msgs) {
+		msgs = eBasicSetContainer((InternalEObject)newUnion_record, TaxationWithRootPackage.TAX_PROPERTY__UNION_RECORD, msgs);
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setUnion_record(Legal_Union_Record newUnion_record) {
+		if (newUnion_record != eInternalContainer() || (eContainerFeatureID() != TaxationWithRootPackage.TAX_PROPERTY__UNION_RECORD && newUnion_record != null)) {
+			if (EcoreUtil.isAncestor(this, newUnion_record))
+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+			NotificationChain msgs = null;
+			if (eInternalContainer() != null)
+				msgs = eBasicRemoveFromContainer(msgs);
+			if (newUnion_record != null)
+				msgs = ((InternalEObject)newUnion_record).eInverseAdd(this, TaxationWithRootPackage.LEGAL_UNION_RECORD__PROPERTIES, Legal_Union_Record.class, msgs);
+			msgs = basicSetUnion_record(newUnion_record, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TaxationWithRootPackage.TAX_PROPERTY__UNION_RECORD, newUnion_record, newUnion_record));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case TaxationWithRootPackage.TAX_PROPERTY__UNION_RECORD:
+				if (eInternalContainer() != null)
+					msgs = eBasicRemoveFromContainer(msgs);
+				return basicSetUnion_record((Legal_Union_Record)otherEnd, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case TaxationWithRootPackage.TAX_PROPERTY__UNION_RECORD:
+				return basicSetUnion_record(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+		switch (eContainerFeatureID()) {
+			case TaxationWithRootPackage.TAX_PROPERTY__UNION_RECORD:
+				return eInternalContainer().eInverseRemove(this, TaxationWithRootPackage.LEGAL_UNION_RECORD__PROPERTIES, Legal_Union_Record.class, msgs);
+		}
+		return super.eBasicRemoveFromContainerFeature(msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case TaxationWithRootPackage.TAX_PROPERTY__STARTING_YEAR:
+				return getStarting_year();
+			case TaxationWithRootPackage.TAX_PROPERTY__ID10:
+				return getId10();
+			case TaxationWithRootPackage.TAX_PROPERTY__UNION_RECORD:
+				return getUnion_record();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case TaxationWithRootPackage.TAX_PROPERTY__STARTING_YEAR:
+				setStarting_year((Integer)newValue);
+				return;
+			case TaxationWithRootPackage.TAX_PROPERTY__ID10:
+				setId10((String)newValue);
+				return;
+			case TaxationWithRootPackage.TAX_PROPERTY__UNION_RECORD:
+				setUnion_record((Legal_Union_Record)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.TAX_PROPERTY__STARTING_YEAR:
+				setStarting_year(STARTING_YEAR_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.TAX_PROPERTY__ID10:
+				setId10(ID10_EDEFAULT);
+				return;
+			case TaxationWithRootPackage.TAX_PROPERTY__UNION_RECORD:
+				setUnion_record((Legal_Union_Record)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case TaxationWithRootPackage.TAX_PROPERTY__STARTING_YEAR:
+				return starting_year != STARTING_YEAR_EDEFAULT;
+			case TaxationWithRootPackage.TAX_PROPERTY__ID10:
+				return ID10_EDEFAULT == null ? id10 != null : !ID10_EDEFAULT.equals(id10);
+			case TaxationWithRootPackage.TAX_PROPERTY__UNION_RECORD:
+				return getUnion_record() != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuilder result = new StringBuilder(super.toString());
+		result.append(" (starting_year: ");
+		result.append(starting_year);
+		result.append(", id10: ");
+		result.append(id10);
+		result.append(')');
+		return result.toString();
+	}
+
+} //Tax_PropertyImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/TaxationWithRootFactoryImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/TaxationWithRootFactoryImpl.java
new file mode 100644
index 00000000..876fa851
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/TaxationWithRootFactoryImpl.java
@@ -0,0 +1,988 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.*;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class TaxationWithRootFactoryImpl extends EFactoryImpl implements TaxationWithRootFactory {
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static TaxationWithRootFactory init() {
+		try {
+			TaxationWithRootFactory theTaxationWithRootFactory = (TaxationWithRootFactory)EPackage.Registry.INSTANCE.getEFactory(TaxationWithRootPackage.eNS_URI);
+			if (theTaxationWithRootFactory != null) {
+				return theTaxationWithRootFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new TaxationWithRootFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public TaxationWithRootFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case TaxationWithRootPackage.INCOME_TAX: return createIncome_Tax();
+			case TaxationWithRootPackage.PHYSICAL_PERSON: return createPhysical_Person();
+			case TaxationWithRootPackage.ADDRESS: return createAddress();
+			case TaxationWithRootPackage.EXPENSE: return createExpense();
+			case TaxationWithRootPackage.DEPENDENT: return createDependent();
+			case TaxationWithRootPackage.EXTERNAL_ALLOWANCE: return createExternal_Allowance();
+			case TaxationWithRootPackage.HOUSEHOLD: return createHousehold();
+			case TaxationWithRootPackage.TAX_PROPERTY: return createTax_Property();
+			case TaxationWithRootPackage.FROM_AGENT: return createFromAgent();
+			case TaxationWithRootPackage.TAX_CARD: return createTax_Card();
+			case TaxationWithRootPackage.INCOME_TAX_CREDIT: return createIncome_Tax_Credit();
+			case TaxationWithRootPackage.INCOME_DETAIL: return createIncome_Detail();
+			case TaxationWithRootPackage.FROM_LAW: return createFromLaw();
+			case TaxationWithRootPackage.FISCAL_ADDRESS: return createFiscal_Address();
+			case TaxationWithRootPackage.HABITUAL_ADDRESS: return createHabitual_Address();
+			case TaxationWithRootPackage.MARRIAGE_RECORD: return createMarriage_Record();
+			case TaxationWithRootPackage.NON_RESIDENT_TAX_PAYER: return createNon_Resident_Tax_Payer();
+			case TaxationWithRootPackage.PARTNERSHIP_RECORD: return createPartnership_Record();
+			case TaxationWithRootPackage.RESIDENT_TAX_PAYER: return createResident_Tax_Payer();
+			case TaxationWithRootPackage.TRADE_AND_BUSINESS_INCOME: return createTrade_and_Business_Income();
+			case TaxationWithRootPackage.AGRICULTURE_AND_FORESTRY_INCOME: return createAgriculture_and_Forestry_Income();
+			case TaxationWithRootPackage.PENSIONS_AND_ANNUITIES_INCOME: return createPensions_and_Annuities_Income();
+			case TaxationWithRootPackage.CAPITAL_AND_INVESTMENTS_INCOME: return createCapital_and_Investments_Income();
+			case TaxationWithRootPackage.EMPLOYMENT_INCOME: return createEmployment_Income();
+			case TaxationWithRootPackage.RENTALS_AND_LEASES_INCOME: return createRentals_and_Leases_Income();
+			case TaxationWithRootPackage.FOREIGN_INCOME: return createForeign_Income();
+			case TaxationWithRootPackage.LOCAL_INCOME: return createLocal_Income();
+			case TaxationWithRootPackage.CIM: return createCIM();
+			case TaxationWithRootPackage.CIP: return createCIP();
+			case TaxationWithRootPackage.CIS: return createCIS();
+			case TaxationWithRootPackage.PERMANENT_EXPENSE: return createPermanent_Expense();
+			case TaxationWithRootPackage.SPECIAL_EXPENSE_DS: return createSpecial_Expense_DS();
+			case TaxationWithRootPackage.INTEREST_EXPENSE: return createInterest_Expense();
+			case TaxationWithRootPackage.PRIVATE_INSURANCE_AND_PLAN: return createPrivate_Insurance_and_Plan();
+			case TaxationWithRootPackage.HEALTH_AND_PENSION_INSURANCE: return createHealth_and_Pension_Insurance();
+			case TaxationWithRootPackage.DONATION: return createDonation();
+			case TaxationWithRootPackage.LOSS_CARRYFORWARD: return createLoss_Carryforward();
+			case TaxationWithRootPackage.SPOUSAL_EXPENSE_AC: return createSpousal_Expense_AC();
+			case TaxationWithRootPackage.EXTRAORDINARY_EXPENSE_CE: return createExtraordinary_Expense_CE();
+			case TaxationWithRootPackage.TRAVEL_EXPENSE_FD: return createTravel_Expense_FD();
+			case TaxationWithRootPackage.PROFESSIONAL_EXPENSE: return createProfessional_Expense();
+			case TaxationWithRootPackage.MISCELLANEOUS_EXPENSE_FO: return createMiscellaneous_Expense_FO();
+			case TaxationWithRootPackage.RESOURCE: return createResource();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object createFromString(EDataType eDataType, String initialValue) {
+		switch (eDataType.getClassifierID()) {
+			case TaxationWithRootPackage.GRANTOR:
+				return createGrantorFromString(eDataType, initialValue);
+			case TaxationWithRootPackage.DISABILITY_TYPES:
+				return createDisability_TypesFromString(eDataType, initialValue);
+			case TaxationWithRootPackage.COUNTRY:
+				return createCountryFromString(eDataType, initialValue);
+			case TaxationWithRootPackage.TAX_OFFICE:
+				return createTax_OfficeFromString(eDataType, initialValue);
+			case TaxationWithRootPackage.TAX_CLASS_CATEGORY:
+				return createTax_Class_CategoryFromString(eDataType, initialValue);
+			case TaxationWithRootPackage.JOB_ACTIVITY:
+				return createJob_ActivityFromString(eDataType, initialValue);
+			case TaxationWithRootPackage.TOWN:
+				return createTownFromString(eDataType, initialValue);
+			case TaxationWithRootPackage.CE_TYPE:
+				return createCE_TypeFromString(eDataType, initialValue);
+			case TaxationWithRootPackage.EXPENSE_PURPOSE:
+				return createExpense_PurposeFromString(eDataType, initialValue);
+			case TaxationWithRootPackage.DEPENDENT_TYPE:
+				return createDependent_TypeFromString(eDataType, initialValue);
+			case TaxationWithRootPackage.SEPARATION_CAUSES:
+				return createSeparation_CausesFromString(eDataType, initialValue);
+			case TaxationWithRootPackage.CATEGORY_OF_PERMANENT_EXPENSE:
+				return createCategory_of_Permanent_ExpenseFromString(eDataType, initialValue);
+			case TaxationWithRootPackage.CATEGORY_OF_HEALTH_AND_PENSION_INSURANCES:
+				return createCategory_of_Health_and_Pension_InsurancesFromString(eDataType, initialValue);
+			case TaxationWithRootPackage.CATEGORY_OF_PRIVATE_INSURANCE_AND_PLAN:
+				return createCategory_of_Private_Insurance_and_PlanFromString(eDataType, initialValue);
+			case TaxationWithRootPackage.LEGAL_UNION_TYPES:
+				return createLegal_Union_TypesFromString(eDataType, initialValue);
+			default:
+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String convertToString(EDataType eDataType, Object instanceValue) {
+		switch (eDataType.getClassifierID()) {
+			case TaxationWithRootPackage.GRANTOR:
+				return convertGrantorToString(eDataType, instanceValue);
+			case TaxationWithRootPackage.DISABILITY_TYPES:
+				return convertDisability_TypesToString(eDataType, instanceValue);
+			case TaxationWithRootPackage.COUNTRY:
+				return convertCountryToString(eDataType, instanceValue);
+			case TaxationWithRootPackage.TAX_OFFICE:
+				return convertTax_OfficeToString(eDataType, instanceValue);
+			case TaxationWithRootPackage.TAX_CLASS_CATEGORY:
+				return convertTax_Class_CategoryToString(eDataType, instanceValue);
+			case TaxationWithRootPackage.JOB_ACTIVITY:
+				return convertJob_ActivityToString(eDataType, instanceValue);
+			case TaxationWithRootPackage.TOWN:
+				return convertTownToString(eDataType, instanceValue);
+			case TaxationWithRootPackage.CE_TYPE:
+				return convertCE_TypeToString(eDataType, instanceValue);
+			case TaxationWithRootPackage.EXPENSE_PURPOSE:
+				return convertExpense_PurposeToString(eDataType, instanceValue);
+			case TaxationWithRootPackage.DEPENDENT_TYPE:
+				return convertDependent_TypeToString(eDataType, instanceValue);
+			case TaxationWithRootPackage.SEPARATION_CAUSES:
+				return convertSeparation_CausesToString(eDataType, instanceValue);
+			case TaxationWithRootPackage.CATEGORY_OF_PERMANENT_EXPENSE:
+				return convertCategory_of_Permanent_ExpenseToString(eDataType, instanceValue);
+			case TaxationWithRootPackage.CATEGORY_OF_HEALTH_AND_PENSION_INSURANCES:
+				return convertCategory_of_Health_and_Pension_InsurancesToString(eDataType, instanceValue);
+			case TaxationWithRootPackage.CATEGORY_OF_PRIVATE_INSURANCE_AND_PLAN:
+				return convertCategory_of_Private_Insurance_and_PlanToString(eDataType, instanceValue);
+			case TaxationWithRootPackage.LEGAL_UNION_TYPES:
+				return convertLegal_Union_TypesToString(eDataType, instanceValue);
+			default:
+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Income_Tax createIncome_Tax() {
+		Income_TaxImpl income_Tax = new Income_TaxImpl();
+		return income_Tax;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Physical_Person createPhysical_Person() {
+		Physical_PersonImpl physical_Person = new Physical_PersonImpl();
+		return physical_Person;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Address createAddress() {
+		AddressImpl address = new AddressImpl();
+		return address;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Expense createExpense() {
+		ExpenseImpl expense = new ExpenseImpl();
+		return expense;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Dependent createDependent() {
+		DependentImpl dependent = new DependentImpl();
+		return dependent;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public External_Allowance createExternal_Allowance() {
+		External_AllowanceImpl external_Allowance = new External_AllowanceImpl();
+		return external_Allowance;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Household createHousehold() {
+		HouseholdImpl household = new HouseholdImpl();
+		return household;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Tax_Property createTax_Property() {
+		Tax_PropertyImpl tax_Property = new Tax_PropertyImpl();
+		return tax_Property;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public FromAgent createFromAgent() {
+		FromAgentImpl fromAgent = new FromAgentImpl();
+		return fromAgent;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Tax_Card createTax_Card() {
+		Tax_CardImpl tax_Card = new Tax_CardImpl();
+		return tax_Card;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Income_Tax_Credit createIncome_Tax_Credit() {
+		Income_Tax_CreditImpl income_Tax_Credit = new Income_Tax_CreditImpl();
+		return income_Tax_Credit;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Income_Detail createIncome_Detail() {
+		Income_DetailImpl income_Detail = new Income_DetailImpl();
+		return income_Detail;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public FromLaw createFromLaw() {
+		FromLawImpl fromLaw = new FromLawImpl();
+		return fromLaw;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Fiscal_Address createFiscal_Address() {
+		Fiscal_AddressImpl fiscal_Address = new Fiscal_AddressImpl();
+		return fiscal_Address;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Habitual_Address createHabitual_Address() {
+		Habitual_AddressImpl habitual_Address = new Habitual_AddressImpl();
+		return habitual_Address;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Marriage_Record createMarriage_Record() {
+		Marriage_RecordImpl marriage_Record = new Marriage_RecordImpl();
+		return marriage_Record;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Non_Resident_Tax_Payer createNon_Resident_Tax_Payer() {
+		Non_Resident_Tax_PayerImpl non_Resident_Tax_Payer = new Non_Resident_Tax_PayerImpl();
+		return non_Resident_Tax_Payer;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Partnership_Record createPartnership_Record() {
+		Partnership_RecordImpl partnership_Record = new Partnership_RecordImpl();
+		return partnership_Record;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Resident_Tax_Payer createResident_Tax_Payer() {
+		Resident_Tax_PayerImpl resident_Tax_Payer = new Resident_Tax_PayerImpl();
+		return resident_Tax_Payer;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Trade_and_Business_Income createTrade_and_Business_Income() {
+		Trade_and_Business_IncomeImpl trade_and_Business_Income = new Trade_and_Business_IncomeImpl();
+		return trade_and_Business_Income;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Agriculture_and_Forestry_Income createAgriculture_and_Forestry_Income() {
+		Agriculture_and_Forestry_IncomeImpl agriculture_and_Forestry_Income = new Agriculture_and_Forestry_IncomeImpl();
+		return agriculture_and_Forestry_Income;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Pensions_and_Annuities_Income createPensions_and_Annuities_Income() {
+		Pensions_and_Annuities_IncomeImpl pensions_and_Annuities_Income = new Pensions_and_Annuities_IncomeImpl();
+		return pensions_and_Annuities_Income;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Capital_and_Investments_Income createCapital_and_Investments_Income() {
+		Capital_and_Investments_IncomeImpl capital_and_Investments_Income = new Capital_and_Investments_IncomeImpl();
+		return capital_and_Investments_Income;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Employment_Income createEmployment_Income() {
+		Employment_IncomeImpl employment_Income = new Employment_IncomeImpl();
+		return employment_Income;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Rentals_and_Leases_Income createRentals_and_Leases_Income() {
+		Rentals_and_Leases_IncomeImpl rentals_and_Leases_Income = new Rentals_and_Leases_IncomeImpl();
+		return rentals_and_Leases_Income;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Foreign_Income createForeign_Income() {
+		Foreign_IncomeImpl foreign_Income = new Foreign_IncomeImpl();
+		return foreign_Income;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Local_Income createLocal_Income() {
+		Local_IncomeImpl local_Income = new Local_IncomeImpl();
+		return local_Income;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public CIM createCIM() {
+		CIMImpl cim = new CIMImpl();
+		return cim;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public CIP createCIP() {
+		CIPImpl cip = new CIPImpl();
+		return cip;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public CIS createCIS() {
+		CISImpl cis = new CISImpl();
+		return cis;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Permanent_Expense createPermanent_Expense() {
+		Permanent_ExpenseImpl permanent_Expense = new Permanent_ExpenseImpl();
+		return permanent_Expense;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Special_Expense_DS createSpecial_Expense_DS() {
+		Special_Expense_DSImpl special_Expense_DS = new Special_Expense_DSImpl();
+		return special_Expense_DS;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Interest_Expense createInterest_Expense() {
+		Interest_ExpenseImpl interest_Expense = new Interest_ExpenseImpl();
+		return interest_Expense;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Private_Insurance_and_Plan createPrivate_Insurance_and_Plan() {
+		Private_Insurance_and_PlanImpl private_Insurance_and_Plan = new Private_Insurance_and_PlanImpl();
+		return private_Insurance_and_Plan;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Health_and_Pension_Insurance createHealth_and_Pension_Insurance() {
+		Health_and_Pension_InsuranceImpl health_and_Pension_Insurance = new Health_and_Pension_InsuranceImpl();
+		return health_and_Pension_Insurance;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Donation createDonation() {
+		DonationImpl donation = new DonationImpl();
+		return donation;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Loss_Carryforward createLoss_Carryforward() {
+		Loss_CarryforwardImpl loss_Carryforward = new Loss_CarryforwardImpl();
+		return loss_Carryforward;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Spousal_Expense_AC createSpousal_Expense_AC() {
+		Spousal_Expense_ACImpl spousal_Expense_AC = new Spousal_Expense_ACImpl();
+		return spousal_Expense_AC;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Extraordinary_Expense_CE createExtraordinary_Expense_CE() {
+		Extraordinary_Expense_CEImpl extraordinary_Expense_CE = new Extraordinary_Expense_CEImpl();
+		return extraordinary_Expense_CE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Travel_Expense_FD createTravel_Expense_FD() {
+		Travel_Expense_FDImpl travel_Expense_FD = new Travel_Expense_FDImpl();
+		return travel_Expense_FD;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Professional_Expense createProfessional_Expense() {
+		Professional_ExpenseImpl professional_Expense = new Professional_ExpenseImpl();
+		return professional_Expense;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Miscellaneous_Expense_FO createMiscellaneous_Expense_FO() {
+		Miscellaneous_Expense_FOImpl miscellaneous_Expense_FO = new Miscellaneous_Expense_FOImpl();
+		return miscellaneous_Expense_FO;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Resource createResource() {
+		ResourceImpl resource = new ResourceImpl();
+		return resource;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Grantor createGrantorFromString(EDataType eDataType, String initialValue) {
+		Grantor result = Grantor.get(initialValue);
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertGrantorToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Disability_Types createDisability_TypesFromString(EDataType eDataType, String initialValue) {
+		Disability_Types result = Disability_Types.get(initialValue);
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertDisability_TypesToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Country createCountryFromString(EDataType eDataType, String initialValue) {
+		Country result = Country.get(initialValue);
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertCountryToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Tax_Office createTax_OfficeFromString(EDataType eDataType, String initialValue) {
+		Tax_Office result = Tax_Office.get(initialValue);
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertTax_OfficeToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Tax_Class_Category createTax_Class_CategoryFromString(EDataType eDataType, String initialValue) {
+		Tax_Class_Category result = Tax_Class_Category.get(initialValue);
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertTax_Class_CategoryToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Job_Activity createJob_ActivityFromString(EDataType eDataType, String initialValue) {
+		Job_Activity result = Job_Activity.get(initialValue);
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertJob_ActivityToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Town createTownFromString(EDataType eDataType, String initialValue) {
+		Town result = Town.get(initialValue);
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertTownToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CE_Type createCE_TypeFromString(EDataType eDataType, String initialValue) {
+		CE_Type result = CE_Type.get(initialValue);
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertCE_TypeToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Expense_Purpose createExpense_PurposeFromString(EDataType eDataType, String initialValue) {
+		Expense_Purpose result = Expense_Purpose.get(initialValue);
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertExpense_PurposeToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Dependent_Type createDependent_TypeFromString(EDataType eDataType, String initialValue) {
+		Dependent_Type result = Dependent_Type.get(initialValue);
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertDependent_TypeToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Separation_Causes createSeparation_CausesFromString(EDataType eDataType, String initialValue) {
+		Separation_Causes result = Separation_Causes.get(initialValue);
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertSeparation_CausesToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Category_of_Permanent_Expense createCategory_of_Permanent_ExpenseFromString(EDataType eDataType, String initialValue) {
+		Category_of_Permanent_Expense result = Category_of_Permanent_Expense.get(initialValue);
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertCategory_of_Permanent_ExpenseToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Category_of_Health_and_Pension_Insurances createCategory_of_Health_and_Pension_InsurancesFromString(EDataType eDataType, String initialValue) {
+		Category_of_Health_and_Pension_Insurances result = Category_of_Health_and_Pension_Insurances.get(initialValue);
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertCategory_of_Health_and_Pension_InsurancesToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Category_of_Private_Insurance_and_Plan createCategory_of_Private_Insurance_and_PlanFromString(EDataType eDataType, String initialValue) {
+		Category_of_Private_Insurance_and_Plan result = Category_of_Private_Insurance_and_Plan.get(initialValue);
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertCategory_of_Private_Insurance_and_PlanToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Legal_Union_Types createLegal_Union_TypesFromString(EDataType eDataType, String initialValue) {
+		Legal_Union_Types result = Legal_Union_Types.get(initialValue);
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertLegal_Union_TypesToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public TaxationWithRootPackage getTaxationWithRootPackage() {
+		return (TaxationWithRootPackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static TaxationWithRootPackage getPackage() {
+		return TaxationWithRootPackage.eINSTANCE;
+	}
+
+} //TaxationWithRootFactoryImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/TaxationWithRootPackageImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/TaxationWithRootPackageImpl.java
new file mode 100644
index 00000000..acf4425a
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/TaxationWithRootPackageImpl.java
@@ -0,0 +1,3663 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.Address;
+import TaxationWithRoot.Agriculture_and_Forestry_Income;
+import TaxationWithRoot.CE_Type;
+import TaxationWithRoot.Capital_and_Investments_Income;
+import TaxationWithRoot.Category_of_Health_and_Pension_Insurances;
+import TaxationWithRoot.Category_of_Permanent_Expense;
+import TaxationWithRoot.Category_of_Private_Insurance_and_Plan;
+import TaxationWithRoot.Constants;
+import TaxationWithRoot.Country;
+import TaxationWithRoot.Dependent;
+import TaxationWithRoot.Dependent_Type;
+import TaxationWithRoot.Disability_Types;
+import TaxationWithRoot.Donation;
+import TaxationWithRoot.Employment_Income;
+import TaxationWithRoot.Expense;
+import TaxationWithRoot.Expense_Purpose;
+import TaxationWithRoot.External_Allowance;
+import TaxationWithRoot.Extraordinary_Expense_CE;
+import TaxationWithRoot.Fiscal_Address;
+import TaxationWithRoot.Foreign_Income;
+import TaxationWithRoot.FromAgent;
+import TaxationWithRoot.FromLaw;
+import TaxationWithRoot.Grantor;
+import TaxationWithRoot.Habitual_Address;
+import TaxationWithRoot.Health_and_Pension_Insurance;
+import TaxationWithRoot.Household;
+import TaxationWithRoot.Income;
+import TaxationWithRoot.Income_Detail;
+import TaxationWithRoot.Income_Tax;
+import TaxationWithRoot.Income_Tax_Credit;
+import TaxationWithRoot.Income_Type;
+import TaxationWithRoot.Interest_Expense;
+import TaxationWithRoot.Job_Activity;
+import TaxationWithRoot.Legal_Union_Record;
+import TaxationWithRoot.Legal_Union_Types;
+import TaxationWithRoot.Local_Income;
+import TaxationWithRoot.Loss_Carryforward;
+import TaxationWithRoot.Marriage_Record;
+import TaxationWithRoot.Miscellaneous_Expense_FO;
+import TaxationWithRoot.Non_Resident_Tax_Payer;
+import TaxationWithRoot.Partnership_Record;
+import TaxationWithRoot.Pensions_and_Annuities_Income;
+import TaxationWithRoot.Permanent_Expense;
+import TaxationWithRoot.Physical_Person;
+import TaxationWithRoot.Private_Insurance_and_Plan;
+import TaxationWithRoot.Professional_Expense;
+import TaxationWithRoot.Rentals_and_Leases_Income;
+import TaxationWithRoot.Resident_Tax_Payer;
+import TaxationWithRoot.Resource;
+import TaxationWithRoot.Separation_Causes;
+import TaxationWithRoot.Special_Expense_DS;
+import TaxationWithRoot.Spousal_Expense_AC;
+import TaxationWithRoot.Tax_Card;
+import TaxationWithRoot.Tax_Case;
+import TaxationWithRoot.Tax_Class_Category;
+import TaxationWithRoot.Tax_Office;
+import TaxationWithRoot.Tax_Payer;
+import TaxationWithRoot.Tax_Property;
+import TaxationWithRoot.TaxationWithRootFactory;
+import TaxationWithRoot.TaxationWithRootPackage;
+import TaxationWithRoot.Town;
+import TaxationWithRoot.Trade_and_Business_Income;
+import TaxationWithRoot.Travel_Expense_FD;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class TaxationWithRootPackageImpl extends EPackageImpl implements TaxationWithRootPackage {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass constantsEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass income_TaxEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass tax_PayerEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass physical_PersonEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass addressEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass expenseEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass dependentEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass external_AllowanceEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass householdEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass legal_Union_RecordEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass tax_PropertyEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass tax_CaseEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass fromAgentEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass incomeEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass income_TypeEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass tax_CardEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass income_Tax_CreditEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass income_DetailEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass fromLawEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass fiscal_AddressEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass habitual_AddressEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass marriage_RecordEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass non_Resident_Tax_PayerEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass partnership_RecordEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass resident_Tax_PayerEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass trade_and_Business_IncomeEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass agriculture_and_Forestry_IncomeEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass pensions_and_Annuities_IncomeEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass capital_and_Investments_IncomeEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass employment_IncomeEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass rentals_and_Leases_IncomeEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass foreign_IncomeEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass local_IncomeEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cimEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cipEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cisEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass permanent_ExpenseEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass special_Expense_DSEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass interest_ExpenseEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass private_Insurance_and_PlanEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass health_and_Pension_InsuranceEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass donationEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass loss_CarryforwardEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass spousal_Expense_ACEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass extraordinary_Expense_CEEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass travel_Expense_FDEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass professional_ExpenseEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass miscellaneous_Expense_FOEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass resourceEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EEnum grantorEEnum = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EEnum disability_TypesEEnum = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EEnum countryEEnum = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EEnum tax_OfficeEEnum = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EEnum tax_Class_CategoryEEnum = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EEnum job_ActivityEEnum = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EEnum townEEnum = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EEnum cE_TypeEEnum = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EEnum expense_PurposeEEnum = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EEnum dependent_TypeEEnum = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EEnum separation_CausesEEnum = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EEnum category_of_Permanent_ExpenseEEnum = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EEnum category_of_Health_and_Pension_InsurancesEEnum = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EEnum category_of_Private_Insurance_and_PlanEEnum = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EEnum legal_Union_TypesEEnum = null;
+
+	/**
+	 * Creates an instance of the model <b>Package</b>, registered with
+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * package URI value.
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see TaxationWithRoot.TaxationWithRootPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private TaxationWithRootPackageImpl() {
+		super(eNS_URI, TaxationWithRootFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 *
+	 * <p>This method is used to initialize {@link TaxationWithRootPackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static TaxationWithRootPackage init() {
+		if (isInited) return (TaxationWithRootPackage)EPackage.Registry.INSTANCE.getEPackage(TaxationWithRootPackage.eNS_URI);
+
+		// Obtain or create and register package
+		Object registeredTaxationWithRootPackage = EPackage.Registry.INSTANCE.get(eNS_URI);
+		TaxationWithRootPackageImpl theTaxationWithRootPackage = registeredTaxationWithRootPackage instanceof TaxationWithRootPackageImpl ? (TaxationWithRootPackageImpl)registeredTaxationWithRootPackage : new TaxationWithRootPackageImpl();
+
+		isInited = true;
+
+		// Create package meta-data objects
+		theTaxationWithRootPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theTaxationWithRootPackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theTaxationWithRootPackage.freeze();
+
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(TaxationWithRootPackage.eNS_URI, theTaxationWithRootPackage);
+		return theTaxationWithRootPackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getConstants() {
+		return constantsEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getConstants_MAXIMUM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD() {
+		return (EAttribute)constantsEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getConstants_MAXIMUM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE() {
+		return (EAttribute)constantsEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getConstants_MINIMUM_SALARY() {
+		return (EAttribute)constantsEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getConstants_FLAT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION() {
+		return (EAttribute)constantsEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getConstants_MAXIMUM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS() {
+		return (EAttribute)constantsEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getConstants_MINIMUM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS() {
+		return (EAttribute)constantsEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getConstants_MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC() {
+		return (EAttribute)constantsEClass.getEStructuralFeatures().get(6);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getConstants_MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE() {
+		return (EAttribute)constantsEClass.getEStructuralFeatures().get(7);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getConstants_MAXIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION() {
+		return (EAttribute)constantsEClass.getEStructuralFeatures().get(8);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getConstants_MAXIMAL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION() {
+		return (EAttribute)constantsEClass.getEStructuralFeatures().get(9);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getConstants_MINIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION() {
+		return (EAttribute)constantsEClass.getEStructuralFeatures().get(10);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getConstants_FLAT_RATE_CIM_DAILY() {
+		return (EAttribute)constantsEClass.getEStructuralFeatures().get(11);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getConstants_FLAT_RATE_CIM_MONTHLY() {
+		return (EAttribute)constantsEClass.getEStructuralFeatures().get(12);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getConstants_FLAT_RATE_CIM_YEARLY() {
+		return (EAttribute)constantsEClass.getEStructuralFeatures().get(13);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getConstants_FLAT_RATE_CIP_DAILY() {
+		return (EAttribute)constantsEClass.getEStructuralFeatures().get(14);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getConstants_FLAT_RATE_CIP_MONTHLY() {
+		return (EAttribute)constantsEClass.getEStructuralFeatures().get(15);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getConstants_FLAT_RATE_CIP_YEARLY() {
+		return (EAttribute)constantsEClass.getEStructuralFeatures().get(16);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getConstants_FLAT_RATE_CIS_DAILY() {
+		return (EAttribute)constantsEClass.getEStructuralFeatures().get(17);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getConstants_FLAT_RATE_CIS_MONTHLY() {
+		return (EAttribute)constantsEClass.getEStructuralFeatures().get(18);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getConstants_FLAT_RATE_CIS_YEARLY() {
+		return (EAttribute)constantsEClass.getEStructuralFeatures().get(19);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getConstants_FLAT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT() {
+		return (EAttribute)constantsEClass.getEStructuralFeatures().get(20);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getConstants_MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_DS() {
+		return (EAttribute)constantsEClass.getEStructuralFeatures().get(21);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getConstants_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE() {
+		return (EAttribute)constantsEClass.getEStructuralFeatures().get(22);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getConstants_DISABILITY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE() {
+		return (EAttribute)constantsEClass.getEStructuralFeatures().get(23);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getConstants_MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE() {
+		return (EAttribute)constantsEClass.getEStructuralFeatures().get(24);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getIncome_Tax() {
+		return income_TaxEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getIncome_Tax_TaxPayer() {
+		return (EReference)income_TaxEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getIncome_Tax_Tax_amount() {
+		return (EAttribute)income_TaxEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getIncome_Tax_Tax_year() {
+		return (EAttribute)income_TaxEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getIncome_Tax_Id6() {
+		return (EAttribute)income_TaxEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getTax_Payer() {
+		return tax_PayerEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getTax_Payer_Dependents() {
+		return (EReference)tax_PayerEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getTax_Payer_From_agent() {
+		return (EReference)tax_PayerEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getTax_Payer_Incomes() {
+		return (EReference)tax_PayerEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getTax_Payer_From_law() {
+		return (EReference)tax_PayerEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getPhysical_Person() {
+		return physical_PersonEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getPhysical_Person_SSNo() {
+		return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getPhysical_Person_Addresses() {
+		return (EReference)physical_PersonEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getPhysical_Person_Birth_year() {
+		return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getPhysical_Person_Disability_percentage() {
+		return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getPhysical_Person_Disability_type() {
+		return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getPhysical_Person_Birth_month() {
+		return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getPhysical_Person_Birth_day() {
+		return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(6);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getPhysical_Person_Expenses() {
+		return (EReference)physical_PersonEClass.getEStructuralFeatures().get(7);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getPhysical_Person_Is_widower() {
+		return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(8);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getAddress() {
+		return addressEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getAddress_Country() {
+		return (EAttribute)addressEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getAddress_Street() {
+		return (EAttribute)addressEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getAddress_ZipCode() {
+		return (EAttribute)addressEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getAddress_City() {
+		return (EAttribute)addressEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getAddress_Id2() {
+		return (EAttribute)addressEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getAddress_TaxPayer() {
+		return (EReference)addressEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getExpense() {
+		return expenseEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getExpense_Declared_amount() {
+		return (EAttribute)expenseEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getExpense_Expense_purpose() {
+		return (EAttribute)expenseEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getExpense_Dependent() {
+		return (EReference)expenseEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getExpense_From_agent() {
+		return (EReference)expenseEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getExpense_Income() {
+		return (EReference)expenseEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getExpense_Id4() {
+		return (EAttribute)expenseEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getExpense_Beneficiary() {
+		return (EReference)expenseEClass.getEStructuralFeatures().get(6);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getDependent() {
+		return dependentEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getDependent_Dependent_type() {
+		return (EAttribute)dependentEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getDependent_Responsible_person() {
+		return (EReference)dependentEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getDependent_Continued_studies() {
+		return (EAttribute)dependentEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getDependent_Allowances() {
+		return (EReference)dependentEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getDependent_Household() {
+		return (EReference)dependentEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getDependent_From_agent() {
+		return (EReference)dependentEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getDependent_Expense() {
+		return (EReference)dependentEClass.getEStructuralFeatures().get(6);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getExternal_Allowance() {
+		return external_AllowanceEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getExternal_Allowance_Grantor() {
+		return (EAttribute)external_AllowanceEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getExternal_Allowance_Starting_year() {
+		return (EAttribute)external_AllowanceEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getExternal_Allowance_Ending_year() {
+		return (EAttribute)external_AllowanceEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getExternal_Allowance_Reciver() {
+		return (EReference)external_AllowanceEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getExternal_Allowance_Id5() {
+		return (EAttribute)external_AllowanceEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getExternal_Allowance_Person() {
+		return (EReference)external_AllowanceEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getHousehold() {
+		return householdEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getHousehold_Parents() {
+		return (EReference)householdEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getHousehold_Id1() {
+		return (EAttribute)householdEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getHousehold_Children() {
+		return (EReference)householdEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getLegal_Union_Record() {
+		return legal_Union_RecordEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getLegal_Union_Record_Start_year() {
+		return (EAttribute)legal_Union_RecordEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getLegal_Union_Record_End_year() {
+		return (EAttribute)legal_Union_RecordEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getLegal_Union_Record_Separation_cause() {
+		return (EAttribute)legal_Union_RecordEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getLegal_Union_Record_Individual_A() {
+		return (EReference)legal_Union_RecordEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getLegal_Union_Record_Individual_B() {
+		return (EReference)legal_Union_RecordEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getLegal_Union_Record_Properties() {
+		return (EReference)legal_Union_RecordEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getLegal_Union_Record_Mutual_agreement() {
+		return (EAttribute)legal_Union_RecordEClass.getEStructuralFeatures().get(6);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getLegal_Union_Record_Id9() {
+		return (EAttribute)legal_Union_RecordEClass.getEStructuralFeatures().get(7);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getLegal_Union_Record_Household() {
+		return (EReference)legal_Union_RecordEClass.getEStructuralFeatures().get(8);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getTax_Property() {
+		return tax_PropertyEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getTax_Property_Starting_year() {
+		return (EAttribute)tax_PropertyEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getTax_Property_Id10() {
+		return (EAttribute)tax_PropertyEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getTax_Property_Union_record() {
+		return (EReference)tax_PropertyEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getTax_Case() {
+		return tax_CaseEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getFromAgent() {
+		return fromAgentEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getFromAgent_TaxPayer() {
+		return (EReference)fromAgentEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getFromAgent_Is_dependent_eligible_for_CE_Not_In_Houshold_Children_Care() {
+		return (EAttribute)fromAgentEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getFromAgent_Expense() {
+		return (EReference)fromAgentEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getFromAgent_Is_eligible_debt() {
+		return (EAttribute)fromAgentEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getFromAgent_Dependent() {
+		return (EReference)fromAgentEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getIncome() {
+		return incomeEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getIncome_Income_amount() {
+		return (EAttribute)incomeEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getIncome_Income_type() {
+		return (EReference)incomeEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getIncome_Tax_card() {
+		return (EReference)incomeEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getIncome_Tax_liability() {
+		return (EAttribute)incomeEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getIncome_TaxPayer() {
+		return (EReference)incomeEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getIncome_Details() {
+		return (EReference)incomeEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getIncome_Num() {
+		return (EAttribute)incomeEClass.getEStructuralFeatures().get(6);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getIncome_Expenses() {
+		return (EReference)incomeEClass.getEStructuralFeatures().get(7);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getIncome_Type() {
+		return income_TypeEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getIncome_Type_Id8() {
+		return (EAttribute)income_TypeEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getIncome_Type_Income() {
+		return (EReference)income_TypeEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getTax_Card() {
+		return tax_CardEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getTax_Card_Card_identifier() {
+		return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getTax_Card_Tax_office() {
+		return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getTax_Card_Percentage_of_witholding() {
+		return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getTax_Card_Tax_payers_name_surname() {
+		return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getTax_Card_Tax_payers_partner_name_surname() {
+		return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getTax_Card_Tax_payers_address() {
+		return (EReference)tax_CardEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getTax_Card_Jobs_Employer_SSNo() {
+		return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(6);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getTax_Card_Jobs_employers_name() {
+		return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(7);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getTax_Card_Jobs_activity_type() {
+		return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(8);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getTax_Card_Jobs_place_of_work() {
+		return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(9);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getTax_Card_Deduction_FD_daily() {
+		return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(10);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getTax_Card_Deduction_FD_monthly() {
+		return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(11);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getTax_Card_Deduction_AC_daily() {
+		return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(12);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getTax_Card_Deduction_AC_monthly() {
+		return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(13);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getTax_Card_Deduction_AC_yearly() {
+		return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(14);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getTax_Card_Deduction_CE_daily() {
+		return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(15);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getTax_Card_Deduction_CE_monthly() {
+		return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(16);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getTax_Card_Deduction_CE_yearly() {
+		return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(17);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getTax_Card_Deduction_DS_daily() {
+		return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(18);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getTax_Card_Deduction_DS_monthly() {
+		return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(19);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getTax_Card_Deduction_FO_daily() {
+		return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(20);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getTax_Card_Deduction_FO_monthly() {
+		return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(21);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getTax_Card_Deduction_FO_yearly() {
+		return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(22);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getTax_Card_Credit_CIS_daily() {
+		return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(23);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getTax_Card_Credit_CIS_monthly() {
+		return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(24);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getTax_Card_Credit_CIM_daily() {
+		return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(25);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getTax_Card_Validity() {
+		return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(26);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getTax_Card_Income_Tax_Credit() {
+		return (EReference)tax_CardEClass.getEStructuralFeatures().get(27);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getTax_Card_Previous() {
+		return (EReference)tax_CardEClass.getEStructuralFeatures().get(28);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getTax_Card_Current_tax_card() {
+		return (EReference)tax_CardEClass.getEStructuralFeatures().get(29);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getTax_Card_Credit_CIM_yearly() {
+		return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(30);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getTax_Card_Deduction_DS_Alimony_yearly() {
+		return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(31);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getTax_Card_Deduction_DS_Debt_yearly() {
+		return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(32);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getTax_Card_Income() {
+		return (EReference)tax_CardEClass.getEStructuralFeatures().get(33);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getIncome_Tax_Credit() {
+		return income_Tax_CreditEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getIncome_Tax_Credit_GrantedBy() {
+		return (EAttribute)income_Tax_CreditEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getIncome_Tax_Credit_TaxPayer() {
+		return (EReference)income_Tax_CreditEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getIncome_Tax_Credit_Tax_year() {
+		return (EAttribute)income_Tax_CreditEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getIncome_Tax_Credit_Yearly() {
+		return (EAttribute)income_Tax_CreditEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getIncome_Tax_Credit_Monthly() {
+		return (EAttribute)income_Tax_CreditEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getIncome_Tax_Credit_Daily() {
+		return (EAttribute)income_Tax_CreditEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getIncome_Tax_Credit_Id7() {
+		return (EAttribute)income_Tax_CreditEClass.getEStructuralFeatures().get(6);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getIncome_Tax_Credit_Taxation_Frame() {
+		return (EReference)income_Tax_CreditEClass.getEStructuralFeatures().get(7);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getIncome_Detail() {
+		return income_DetailEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getIncome_Detail_Amount() {
+		return (EAttribute)income_DetailEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getIncome_Detail_Is_worked() {
+		return (EAttribute)income_DetailEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getIncome_Detail_Distance() {
+		return (EAttribute)income_DetailEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getIncome_Detail_Worked_days() {
+		return (EAttribute)income_DetailEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getIncome_Detail_Is_contributing_CNS() {
+		return (EAttribute)income_DetailEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getIncome_Detail_Id5() {
+		return (EAttribute)income_DetailEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getIncome_Detail_Income() {
+		return (EReference)income_DetailEClass.getEStructuralFeatures().get(6);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getFromLaw() {
+		return fromLawEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getFromLaw_Id() {
+		return (EAttribute)fromLawEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getFromLaw_TaxPayer() {
+		return (EReference)fromLawEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getFiscal_Address() {
+		return fiscal_AddressEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getHabitual_Address() {
+		return habitual_AddressEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getMarriage_Record() {
+		return marriage_RecordEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getNon_Resident_Tax_Payer() {
+		return non_Resident_Tax_PayerEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getNon_Resident_Tax_Payer_Is_assimilated_to_resident() {
+		return (EAttribute)non_Resident_Tax_PayerEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getPartnership_Record() {
+		return partnership_RecordEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getResident_Tax_Payer() {
+		return resident_Tax_PayerEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getTrade_and_Business_Income() {
+		return trade_and_Business_IncomeEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getAgriculture_and_Forestry_Income() {
+		return agriculture_and_Forestry_IncomeEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getPensions_and_Annuities_Income() {
+		return pensions_and_Annuities_IncomeEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getPensions_and_Annuities_Income_Occasional_payement() {
+		return (EAttribute)pensions_and_Annuities_IncomeEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getCapital_and_Investments_Income() {
+		return capital_and_Investments_IncomeEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getEmployment_Income() {
+		return employment_IncomeEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getRentals_and_Leases_Income() {
+		return rentals_and_Leases_IncomeEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getRentals_and_Leases_Income_Is_periodic() {
+		return (EAttribute)rentals_and_Leases_IncomeEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getForeign_Income() {
+		return foreign_IncomeEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getLocal_Income() {
+		return local_IncomeEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getCIM() {
+		return cimEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getCIP() {
+		return cipEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getCIS() {
+		return cisEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getPermanent_Expense() {
+		return permanent_ExpenseEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getPermanent_Expense_Category() {
+		return (EAttribute)permanent_ExpenseEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getSpecial_Expense_DS() {
+		return special_Expense_DSEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getInterest_Expense() {
+		return interest_ExpenseEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getPrivate_Insurance_and_Plan() {
+		return private_Insurance_and_PlanEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getPrivate_Insurance_and_Plan_Category() {
+		return (EAttribute)private_Insurance_and_PlanEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getPrivate_Insurance_and_Plan_Duration_of_contract() {
+		return (EAttribute)private_Insurance_and_PlanEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getHealth_and_Pension_Insurance() {
+		return health_and_Pension_InsuranceEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getHealth_and_Pension_Insurance_Category() {
+		return (EAttribute)health_and_Pension_InsuranceEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getHealth_and_Pension_Insurance_Is_related_to_additional_salary() {
+		return (EAttribute)health_and_Pension_InsuranceEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getDonation() {
+		return donationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getDonation_Beneficiary1() {
+		return (EAttribute)donationEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getDonation_Is_donation_reported() {
+		return (EAttribute)donationEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getLoss_Carryforward() {
+		return loss_CarryforwardEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getSpousal_Expense_AC() {
+		return spousal_Expense_ACEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getExtraordinary_Expense_CE() {
+		return extraordinary_Expense_CEEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getExtraordinary_Expense_CE_Thresholded_deduction_percentage() {
+		return (EAttribute)extraordinary_Expense_CEEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getExtraordinary_Expense_CE_Ce_type() {
+		return (EAttribute)extraordinary_Expense_CEEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getTravel_Expense_FD() {
+		return travel_Expense_FDEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getProfessional_Expense() {
+		return professional_ExpenseEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getMiscellaneous_Expense_FO() {
+		return miscellaneous_Expense_FOEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getResource() {
+		return resourceEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getResource_Contains() {
+		return (EReference)resourceEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EEnum getGrantor() {
+		return grantorEEnum;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EEnum getDisability_Types() {
+		return disability_TypesEEnum;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EEnum getCountry() {
+		return countryEEnum;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EEnum getTax_Office() {
+		return tax_OfficeEEnum;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EEnum getTax_Class_Category() {
+		return tax_Class_CategoryEEnum;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EEnum getJob_Activity() {
+		return job_ActivityEEnum;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EEnum getTown() {
+		return townEEnum;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EEnum getCE_Type() {
+		return cE_TypeEEnum;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EEnum getExpense_Purpose() {
+		return expense_PurposeEEnum;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EEnum getDependent_Type() {
+		return dependent_TypeEEnum;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EEnum getSeparation_Causes() {
+		return separation_CausesEEnum;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EEnum getCategory_of_Permanent_Expense() {
+		return category_of_Permanent_ExpenseEEnum;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EEnum getCategory_of_Health_and_Pension_Insurances() {
+		return category_of_Health_and_Pension_InsurancesEEnum;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EEnum getCategory_of_Private_Insurance_and_Plan() {
+		return category_of_Private_Insurance_and_PlanEEnum;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EEnum getLegal_Union_Types() {
+		return legal_Union_TypesEEnum;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public TaxationWithRootFactory getTaxationWithRootFactory() {
+		return (TaxationWithRootFactory)getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) return;
+		isCreated = true;
+
+		// Create classes and their features
+		constantsEClass = createEClass(CONSTANTS);
+		createEAttribute(constantsEClass, CONSTANTS__MAXIMUM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD);
+		createEAttribute(constantsEClass, CONSTANTS__MAXIMUM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE);
+		createEAttribute(constantsEClass, CONSTANTS__MINIMUM_SALARY);
+		createEAttribute(constantsEClass, CONSTANTS__FLAT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION);
+		createEAttribute(constantsEClass, CONSTANTS__MAXIMUM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS);
+		createEAttribute(constantsEClass, CONSTANTS__MINIMUM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS);
+		createEAttribute(constantsEClass, CONSTANTS__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC);
+		createEAttribute(constantsEClass, CONSTANTS__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE);
+		createEAttribute(constantsEClass, CONSTANTS__MAXIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION);
+		createEAttribute(constantsEClass, CONSTANTS__MAXIMAL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION);
+		createEAttribute(constantsEClass, CONSTANTS__MINIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION);
+		createEAttribute(constantsEClass, CONSTANTS__FLAT_RATE_CIM_DAILY);
+		createEAttribute(constantsEClass, CONSTANTS__FLAT_RATE_CIM_MONTHLY);
+		createEAttribute(constantsEClass, CONSTANTS__FLAT_RATE_CIM_YEARLY);
+		createEAttribute(constantsEClass, CONSTANTS__FLAT_RATE_CIP_DAILY);
+		createEAttribute(constantsEClass, CONSTANTS__FLAT_RATE_CIP_MONTHLY);
+		createEAttribute(constantsEClass, CONSTANTS__FLAT_RATE_CIP_YEARLY);
+		createEAttribute(constantsEClass, CONSTANTS__FLAT_RATE_CIS_DAILY);
+		createEAttribute(constantsEClass, CONSTANTS__FLAT_RATE_CIS_MONTHLY);
+		createEAttribute(constantsEClass, CONSTANTS__FLAT_RATE_CIS_YEARLY);
+		createEAttribute(constantsEClass, CONSTANTS__FLAT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT);
+		createEAttribute(constantsEClass, CONSTANTS__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_DS);
+		createEAttribute(constantsEClass, CONSTANTS__FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE);
+		createEAttribute(constantsEClass, CONSTANTS__DISABILITY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE);
+		createEAttribute(constantsEClass, CONSTANTS__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE);
+
+		income_TaxEClass = createEClass(INCOME_TAX);
+		createEReference(income_TaxEClass, INCOME_TAX__TAX_PAYER);
+		createEAttribute(income_TaxEClass, INCOME_TAX__TAX_AMOUNT);
+		createEAttribute(income_TaxEClass, INCOME_TAX__TAX_YEAR);
+		createEAttribute(income_TaxEClass, INCOME_TAX__ID6);
+
+		tax_PayerEClass = createEClass(TAX_PAYER);
+		createEReference(tax_PayerEClass, TAX_PAYER__DEPENDENTS);
+		createEReference(tax_PayerEClass, TAX_PAYER__FROM_AGENT);
+		createEReference(tax_PayerEClass, TAX_PAYER__INCOMES);
+		createEReference(tax_PayerEClass, TAX_PAYER__FROM_LAW);
+
+		physical_PersonEClass = createEClass(PHYSICAL_PERSON);
+		createEAttribute(physical_PersonEClass, PHYSICAL_PERSON__SS_NO);
+		createEReference(physical_PersonEClass, PHYSICAL_PERSON__ADDRESSES);
+		createEAttribute(physical_PersonEClass, PHYSICAL_PERSON__BIRTH_YEAR);
+		createEAttribute(physical_PersonEClass, PHYSICAL_PERSON__DISABILITY_PERCENTAGE);
+		createEAttribute(physical_PersonEClass, PHYSICAL_PERSON__DISABILITY_TYPE);
+		createEAttribute(physical_PersonEClass, PHYSICAL_PERSON__BIRTH_MONTH);
+		createEAttribute(physical_PersonEClass, PHYSICAL_PERSON__BIRTH_DAY);
+		createEReference(physical_PersonEClass, PHYSICAL_PERSON__EXPENSES);
+		createEAttribute(physical_PersonEClass, PHYSICAL_PERSON__IS_WIDOWER);
+
+		addressEClass = createEClass(ADDRESS);
+		createEAttribute(addressEClass, ADDRESS__COUNTRY);
+		createEAttribute(addressEClass, ADDRESS__STREET);
+		createEAttribute(addressEClass, ADDRESS__ZIP_CODE);
+		createEAttribute(addressEClass, ADDRESS__CITY);
+		createEAttribute(addressEClass, ADDRESS__ID2);
+		createEReference(addressEClass, ADDRESS__TAX_PAYER);
+
+		expenseEClass = createEClass(EXPENSE);
+		createEAttribute(expenseEClass, EXPENSE__DECLARED_AMOUNT);
+		createEAttribute(expenseEClass, EXPENSE__EXPENSE_PURPOSE);
+		createEReference(expenseEClass, EXPENSE__DEPENDENT);
+		createEReference(expenseEClass, EXPENSE__FROM_AGENT);
+		createEReference(expenseEClass, EXPENSE__INCOME);
+		createEAttribute(expenseEClass, EXPENSE__ID4);
+		createEReference(expenseEClass, EXPENSE__BENEFICIARY);
+
+		dependentEClass = createEClass(DEPENDENT);
+		createEAttribute(dependentEClass, DEPENDENT__DEPENDENT_TYPE);
+		createEReference(dependentEClass, DEPENDENT__RESPONSIBLE_PERSON);
+		createEAttribute(dependentEClass, DEPENDENT__CONTINUED_STUDIES);
+		createEReference(dependentEClass, DEPENDENT__ALLOWANCES);
+		createEReference(dependentEClass, DEPENDENT__HOUSEHOLD);
+		createEReference(dependentEClass, DEPENDENT__FROM_AGENT);
+		createEReference(dependentEClass, DEPENDENT__EXPENSE);
+
+		external_AllowanceEClass = createEClass(EXTERNAL_ALLOWANCE);
+		createEAttribute(external_AllowanceEClass, EXTERNAL_ALLOWANCE__GRANTOR);
+		createEAttribute(external_AllowanceEClass, EXTERNAL_ALLOWANCE__STARTING_YEAR);
+		createEAttribute(external_AllowanceEClass, EXTERNAL_ALLOWANCE__ENDING_YEAR);
+		createEReference(external_AllowanceEClass, EXTERNAL_ALLOWANCE__RECIVER);
+		createEAttribute(external_AllowanceEClass, EXTERNAL_ALLOWANCE__ID5);
+		createEReference(external_AllowanceEClass, EXTERNAL_ALLOWANCE__PERSON);
+
+		householdEClass = createEClass(HOUSEHOLD);
+		createEReference(householdEClass, HOUSEHOLD__PARENTS);
+		createEAttribute(householdEClass, HOUSEHOLD__ID1);
+		createEReference(householdEClass, HOUSEHOLD__CHILDREN);
+
+		legal_Union_RecordEClass = createEClass(LEGAL_UNION_RECORD);
+		createEAttribute(legal_Union_RecordEClass, LEGAL_UNION_RECORD__START_YEAR);
+		createEAttribute(legal_Union_RecordEClass, LEGAL_UNION_RECORD__END_YEAR);
+		createEAttribute(legal_Union_RecordEClass, LEGAL_UNION_RECORD__SEPARATION_CAUSE);
+		createEReference(legal_Union_RecordEClass, LEGAL_UNION_RECORD__INDIVIDUAL_A);
+		createEReference(legal_Union_RecordEClass, LEGAL_UNION_RECORD__INDIVIDUAL_B);
+		createEReference(legal_Union_RecordEClass, LEGAL_UNION_RECORD__PROPERTIES);
+		createEAttribute(legal_Union_RecordEClass, LEGAL_UNION_RECORD__MUTUAL_AGREEMENT);
+		createEAttribute(legal_Union_RecordEClass, LEGAL_UNION_RECORD__ID9);
+		createEReference(legal_Union_RecordEClass, LEGAL_UNION_RECORD__HOUSEHOLD);
+
+		tax_PropertyEClass = createEClass(TAX_PROPERTY);
+		createEAttribute(tax_PropertyEClass, TAX_PROPERTY__STARTING_YEAR);
+		createEAttribute(tax_PropertyEClass, TAX_PROPERTY__ID10);
+		createEReference(tax_PropertyEClass, TAX_PROPERTY__UNION_RECORD);
+
+		tax_CaseEClass = createEClass(TAX_CASE);
+
+		fromAgentEClass = createEClass(FROM_AGENT);
+		createEReference(fromAgentEClass, FROM_AGENT__TAX_PAYER);
+		createEAttribute(fromAgentEClass, FROM_AGENT__IS_DEPENDENT_ELIGIBLE_FOR_CE_NOT_IN_HOUSHOLD_CHILDREN_CARE);
+		createEReference(fromAgentEClass, FROM_AGENT__EXPENSE);
+		createEAttribute(fromAgentEClass, FROM_AGENT__IS_ELIGIBLE_DEBT);
+		createEReference(fromAgentEClass, FROM_AGENT__DEPENDENT);
+
+		incomeEClass = createEClass(INCOME);
+		createEAttribute(incomeEClass, INCOME__INCOME_AMOUNT);
+		createEReference(incomeEClass, INCOME__INCOME_TYPE);
+		createEReference(incomeEClass, INCOME__TAX_CARD);
+		createEAttribute(incomeEClass, INCOME__TAX_LIABILITY);
+		createEReference(incomeEClass, INCOME__TAX_PAYER);
+		createEReference(incomeEClass, INCOME__DETAILS);
+		createEAttribute(incomeEClass, INCOME__NUM);
+		createEReference(incomeEClass, INCOME__EXPENSES);
+
+		income_TypeEClass = createEClass(INCOME_TYPE);
+		createEAttribute(income_TypeEClass, INCOME_TYPE__ID8);
+		createEReference(income_TypeEClass, INCOME_TYPE__INCOME);
+
+		tax_CardEClass = createEClass(TAX_CARD);
+		createEAttribute(tax_CardEClass, TAX_CARD__CARD_IDENTIFIER);
+		createEAttribute(tax_CardEClass, TAX_CARD__TAX_OFFICE);
+		createEAttribute(tax_CardEClass, TAX_CARD__PERCENTAGE_OF_WITHOLDING);
+		createEAttribute(tax_CardEClass, TAX_CARD__TAX_PAYERS_NAME_SURNAME);
+		createEAttribute(tax_CardEClass, TAX_CARD__TAX_PAYERS_PARTNER_NAME_SURNAME);
+		createEReference(tax_CardEClass, TAX_CARD__TAX_PAYERS_ADDRESS);
+		createEAttribute(tax_CardEClass, TAX_CARD__JOBS_EMPLOYER_SS_NO);
+		createEAttribute(tax_CardEClass, TAX_CARD__JOBS_EMPLOYERS_NAME);
+		createEAttribute(tax_CardEClass, TAX_CARD__JOBS_ACTIVITY_TYPE);
+		createEAttribute(tax_CardEClass, TAX_CARD__JOBS_PLACE_OF_WORK);
+		createEAttribute(tax_CardEClass, TAX_CARD__DEDUCTION_FD_DAILY);
+		createEAttribute(tax_CardEClass, TAX_CARD__DEDUCTION_FD_MONTHLY);
+		createEAttribute(tax_CardEClass, TAX_CARD__DEDUCTION_AC_DAILY);
+		createEAttribute(tax_CardEClass, TAX_CARD__DEDUCTION_AC_MONTHLY);
+		createEAttribute(tax_CardEClass, TAX_CARD__DEDUCTION_AC_YEARLY);
+		createEAttribute(tax_CardEClass, TAX_CARD__DEDUCTION_CE_DAILY);
+		createEAttribute(tax_CardEClass, TAX_CARD__DEDUCTION_CE_MONTHLY);
+		createEAttribute(tax_CardEClass, TAX_CARD__DEDUCTION_CE_YEARLY);
+		createEAttribute(tax_CardEClass, TAX_CARD__DEDUCTION_DS_DAILY);
+		createEAttribute(tax_CardEClass, TAX_CARD__DEDUCTION_DS_MONTHLY);
+		createEAttribute(tax_CardEClass, TAX_CARD__DEDUCTION_FO_DAILY);
+		createEAttribute(tax_CardEClass, TAX_CARD__DEDUCTION_FO_MONTHLY);
+		createEAttribute(tax_CardEClass, TAX_CARD__DEDUCTION_FO_YEARLY);
+		createEAttribute(tax_CardEClass, TAX_CARD__CREDIT_CIS_DAILY);
+		createEAttribute(tax_CardEClass, TAX_CARD__CREDIT_CIS_MONTHLY);
+		createEAttribute(tax_CardEClass, TAX_CARD__CREDIT_CIM_DAILY);
+		createEAttribute(tax_CardEClass, TAX_CARD__VALIDITY);
+		createEReference(tax_CardEClass, TAX_CARD__INCOME_TAX_CREDIT);
+		createEReference(tax_CardEClass, TAX_CARD__PREVIOUS);
+		createEReference(tax_CardEClass, TAX_CARD__CURRENT_TAX_CARD);
+		createEAttribute(tax_CardEClass, TAX_CARD__CREDIT_CIM_YEARLY);
+		createEAttribute(tax_CardEClass, TAX_CARD__DEDUCTION_DS_ALIMONY_YEARLY);
+		createEAttribute(tax_CardEClass, TAX_CARD__DEDUCTION_DS_DEBT_YEARLY);
+		createEReference(tax_CardEClass, TAX_CARD__INCOME);
+
+		income_Tax_CreditEClass = createEClass(INCOME_TAX_CREDIT);
+		createEAttribute(income_Tax_CreditEClass, INCOME_TAX_CREDIT__GRANTED_BY);
+		createEReference(income_Tax_CreditEClass, INCOME_TAX_CREDIT__TAX_PAYER);
+		createEAttribute(income_Tax_CreditEClass, INCOME_TAX_CREDIT__TAX_YEAR);
+		createEAttribute(income_Tax_CreditEClass, INCOME_TAX_CREDIT__YEARLY);
+		createEAttribute(income_Tax_CreditEClass, INCOME_TAX_CREDIT__MONTHLY);
+		createEAttribute(income_Tax_CreditEClass, INCOME_TAX_CREDIT__DAILY);
+		createEAttribute(income_Tax_CreditEClass, INCOME_TAX_CREDIT__ID7);
+		createEReference(income_Tax_CreditEClass, INCOME_TAX_CREDIT__TAXATION_FRAME);
+
+		income_DetailEClass = createEClass(INCOME_DETAIL);
+		createEAttribute(income_DetailEClass, INCOME_DETAIL__AMOUNT);
+		createEAttribute(income_DetailEClass, INCOME_DETAIL__IS_WORKED);
+		createEAttribute(income_DetailEClass, INCOME_DETAIL__DISTANCE);
+		createEAttribute(income_DetailEClass, INCOME_DETAIL__WORKED_DAYS);
+		createEAttribute(income_DetailEClass, INCOME_DETAIL__IS_CONTRIBUTING_CNS);
+		createEAttribute(income_DetailEClass, INCOME_DETAIL__ID5);
+		createEReference(income_DetailEClass, INCOME_DETAIL__INCOME);
+
+		fromLawEClass = createEClass(FROM_LAW);
+		createEAttribute(fromLawEClass, FROM_LAW__ID);
+		createEReference(fromLawEClass, FROM_LAW__TAX_PAYER);
+
+		fiscal_AddressEClass = createEClass(FISCAL_ADDRESS);
+
+		habitual_AddressEClass = createEClass(HABITUAL_ADDRESS);
+
+		marriage_RecordEClass = createEClass(MARRIAGE_RECORD);
+
+		non_Resident_Tax_PayerEClass = createEClass(NON_RESIDENT_TAX_PAYER);
+		createEAttribute(non_Resident_Tax_PayerEClass, NON_RESIDENT_TAX_PAYER__IS_ASSIMILATED_TO_RESIDENT);
+
+		partnership_RecordEClass = createEClass(PARTNERSHIP_RECORD);
+
+		resident_Tax_PayerEClass = createEClass(RESIDENT_TAX_PAYER);
+
+		trade_and_Business_IncomeEClass = createEClass(TRADE_AND_BUSINESS_INCOME);
+
+		agriculture_and_Forestry_IncomeEClass = createEClass(AGRICULTURE_AND_FORESTRY_INCOME);
+
+		pensions_and_Annuities_IncomeEClass = createEClass(PENSIONS_AND_ANNUITIES_INCOME);
+		createEAttribute(pensions_and_Annuities_IncomeEClass, PENSIONS_AND_ANNUITIES_INCOME__OCCASIONAL_PAYEMENT);
+
+		capital_and_Investments_IncomeEClass = createEClass(CAPITAL_AND_INVESTMENTS_INCOME);
+
+		employment_IncomeEClass = createEClass(EMPLOYMENT_INCOME);
+
+		rentals_and_Leases_IncomeEClass = createEClass(RENTALS_AND_LEASES_INCOME);
+		createEAttribute(rentals_and_Leases_IncomeEClass, RENTALS_AND_LEASES_INCOME__IS_PERIODIC);
+
+		foreign_IncomeEClass = createEClass(FOREIGN_INCOME);
+
+		local_IncomeEClass = createEClass(LOCAL_INCOME);
+
+		cimEClass = createEClass(CIM);
+
+		cipEClass = createEClass(CIP);
+
+		cisEClass = createEClass(CIS);
+
+		permanent_ExpenseEClass = createEClass(PERMANENT_EXPENSE);
+		createEAttribute(permanent_ExpenseEClass, PERMANENT_EXPENSE__CATEGORY);
+
+		special_Expense_DSEClass = createEClass(SPECIAL_EXPENSE_DS);
+
+		interest_ExpenseEClass = createEClass(INTEREST_EXPENSE);
+
+		private_Insurance_and_PlanEClass = createEClass(PRIVATE_INSURANCE_AND_PLAN);
+		createEAttribute(private_Insurance_and_PlanEClass, PRIVATE_INSURANCE_AND_PLAN__CATEGORY);
+		createEAttribute(private_Insurance_and_PlanEClass, PRIVATE_INSURANCE_AND_PLAN__DURATION_OF_CONTRACT);
+
+		health_and_Pension_InsuranceEClass = createEClass(HEALTH_AND_PENSION_INSURANCE);
+		createEAttribute(health_and_Pension_InsuranceEClass, HEALTH_AND_PENSION_INSURANCE__CATEGORY);
+		createEAttribute(health_and_Pension_InsuranceEClass, HEALTH_AND_PENSION_INSURANCE__IS_RELATED_TO_ADDITIONAL_SALARY);
+
+		donationEClass = createEClass(DONATION);
+		createEAttribute(donationEClass, DONATION__BENEFICIARY1);
+		createEAttribute(donationEClass, DONATION__IS_DONATION_REPORTED);
+
+		loss_CarryforwardEClass = createEClass(LOSS_CARRYFORWARD);
+
+		spousal_Expense_ACEClass = createEClass(SPOUSAL_EXPENSE_AC);
+
+		extraordinary_Expense_CEEClass = createEClass(EXTRAORDINARY_EXPENSE_CE);
+		createEAttribute(extraordinary_Expense_CEEClass, EXTRAORDINARY_EXPENSE_CE__THRESHOLDED_DEDUCTION_PERCENTAGE);
+		createEAttribute(extraordinary_Expense_CEEClass, EXTRAORDINARY_EXPENSE_CE__CE_TYPE);
+
+		travel_Expense_FDEClass = createEClass(TRAVEL_EXPENSE_FD);
+
+		professional_ExpenseEClass = createEClass(PROFESSIONAL_EXPENSE);
+
+		miscellaneous_Expense_FOEClass = createEClass(MISCELLANEOUS_EXPENSE_FO);
+
+		resourceEClass = createEClass(RESOURCE);
+		createEReference(resourceEClass, RESOURCE__CONTAINS);
+
+		// Create enums
+		grantorEEnum = createEEnum(GRANTOR);
+		disability_TypesEEnum = createEEnum(DISABILITY_TYPES);
+		countryEEnum = createEEnum(COUNTRY);
+		tax_OfficeEEnum = createEEnum(TAX_OFFICE);
+		tax_Class_CategoryEEnum = createEEnum(TAX_CLASS_CATEGORY);
+		job_ActivityEEnum = createEEnum(JOB_ACTIVITY);
+		townEEnum = createEEnum(TOWN);
+		cE_TypeEEnum = createEEnum(CE_TYPE);
+		expense_PurposeEEnum = createEEnum(EXPENSE_PURPOSE);
+		dependent_TypeEEnum = createEEnum(DEPENDENT_TYPE);
+		separation_CausesEEnum = createEEnum(SEPARATION_CAUSES);
+		category_of_Permanent_ExpenseEEnum = createEEnum(CATEGORY_OF_PERMANENT_EXPENSE);
+		category_of_Health_and_Pension_InsurancesEEnum = createEEnum(CATEGORY_OF_HEALTH_AND_PENSION_INSURANCES);
+		category_of_Private_Insurance_and_PlanEEnum = createEEnum(CATEGORY_OF_PRIVATE_INSURANCE_AND_PLAN);
+		legal_Union_TypesEEnum = createEEnum(LEGAL_UNION_TYPES);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model.  This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+		tax_PayerEClass.getESuperTypes().add(this.getPhysical_Person());
+		tax_PayerEClass.getESuperTypes().add(this.getTax_Case());
+		dependentEClass.getESuperTypes().add(this.getPhysical_Person());
+		householdEClass.getESuperTypes().add(this.getTax_Case());
+		fiscal_AddressEClass.getESuperTypes().add(this.getAddress());
+		habitual_AddressEClass.getESuperTypes().add(this.getAddress());
+		marriage_RecordEClass.getESuperTypes().add(this.getLegal_Union_Record());
+		non_Resident_Tax_PayerEClass.getESuperTypes().add(this.getTax_Payer());
+		partnership_RecordEClass.getESuperTypes().add(this.getLegal_Union_Record());
+		resident_Tax_PayerEClass.getESuperTypes().add(this.getTax_Payer());
+		trade_and_Business_IncomeEClass.getESuperTypes().add(this.getIncome_Type());
+		agriculture_and_Forestry_IncomeEClass.getESuperTypes().add(this.getIncome_Type());
+		pensions_and_Annuities_IncomeEClass.getESuperTypes().add(this.getIncome_Type());
+		capital_and_Investments_IncomeEClass.getESuperTypes().add(this.getIncome_Type());
+		employment_IncomeEClass.getESuperTypes().add(this.getIncome_Type());
+		rentals_and_Leases_IncomeEClass.getESuperTypes().add(this.getIncome_Type());
+		foreign_IncomeEClass.getESuperTypes().add(this.getIncome());
+		local_IncomeEClass.getESuperTypes().add(this.getIncome());
+		cimEClass.getESuperTypes().add(this.getIncome_Tax_Credit());
+		cipEClass.getESuperTypes().add(this.getIncome_Tax_Credit());
+		cisEClass.getESuperTypes().add(this.getIncome_Tax_Credit());
+		permanent_ExpenseEClass.getESuperTypes().add(this.getSpecial_Expense_DS());
+		special_Expense_DSEClass.getESuperTypes().add(this.getExpense());
+		interest_ExpenseEClass.getESuperTypes().add(this.getSpecial_Expense_DS());
+		private_Insurance_and_PlanEClass.getESuperTypes().add(this.getSpecial_Expense_DS());
+		health_and_Pension_InsuranceEClass.getESuperTypes().add(this.getSpecial_Expense_DS());
+		donationEClass.getESuperTypes().add(this.getSpecial_Expense_DS());
+		loss_CarryforwardEClass.getESuperTypes().add(this.getSpecial_Expense_DS());
+		spousal_Expense_ACEClass.getESuperTypes().add(this.getExpense());
+		extraordinary_Expense_CEEClass.getESuperTypes().add(this.getExpense());
+		travel_Expense_FDEClass.getESuperTypes().add(this.getProfessional_Expense());
+		professional_ExpenseEClass.getESuperTypes().add(this.getExpense());
+		miscellaneous_Expense_FOEClass.getESuperTypes().add(this.getProfessional_Expense());
+
+		// Initialize classes, features, and operations; add parameters
+		initEClass(constantsEClass, Constants.class, "Constants", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getConstants_MAXIMUM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD(), ecorePackage.getEDouble(), "MAXIMUM_CE_RATE_FOR_CHILD_NOT_BEING_PART_OF_HOUSEHOLD", "3480.0", 1, 1, Constants.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getConstants_MAXIMUM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE(), ecorePackage.getEDouble(), "MAXIMUM_CE_RATE_FOR_HOUSE_CARE_AND_CHILD_PART_OF_THE_HOUSEHOLD_CARE", "3600.0", 1, 1, Constants.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getConstants_MINIMUM_SALARY(), ecorePackage.getEDouble(), "MINIMUM_SALARY", "1500.0", 1, 1, Constants.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getConstants_FLAT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION(), ecorePackage.getEDouble(), "FLAT_RATE_FOR_EXTRA_PROFESSIONAL_DEDUCTION", "4500.0", 1, 1, Constants.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getConstants_MAXIMUM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS(), ecorePackage.getEDouble(), "MAXIMUM_DEDUCTIBLE_PERCENTAGE_FOR_DONATIONS", "20.0", 1, 1, Constants.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getConstants_MINIMUM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS(), ecorePackage.getEDouble(), "MINIMUM_DEDUCTIBLE_AMOUNT_FOR_DONATIONS", "120.0", 1, 1, Constants.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getConstants_MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC(), ecorePackage.getEDouble(), "MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANC", "0.0", 1, 1, Constants.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getConstants_MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE(), ecorePackage.getEDouble(), "MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ALIMONY_EXPENSE", "24000.0", 1, 1, Constants.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getConstants_MAXIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION(), ecorePackage.getEDouble(), "MAXIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION", "99.0", 1, 1, Constants.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getConstants_MAXIMAL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION(), ecorePackage.getEDouble(), "MAXIMAL_FLAT_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION", "30.0", 1, 1, Constants.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getConstants_MINIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION(), ecorePackage.getEDouble(), "MINIMAL_DISTANCE_FOR_TRAVEL_EXPENSE_DEDUCTION", "4.0", 1, 1, Constants.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getConstants_FLAT_RATE_CIM_DAILY(), ecorePackage.getEDouble(), "FLAT_RATE_CIM_DAILY", "2.0", 1, 1, Constants.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getConstants_FLAT_RATE_CIM_MONTHLY(), ecorePackage.getEDouble(), "FLAT_RATE_CIM_MONTHLY", "62.0", 1, 1, Constants.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getConstants_FLAT_RATE_CIM_YEARLY(), ecorePackage.getEDouble(), "FLAT_RATE_CIM_YEARLY", "750.0", 1, 1, Constants.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getConstants_FLAT_RATE_CIP_DAILY(), ecorePackage.getEDouble(), "FLAT_RATE_CIP_DAILY", "1.0", 1, 1, Constants.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getConstants_FLAT_RATE_CIP_MONTHLY(), ecorePackage.getEDouble(), "FLAT_RATE_CIP_MONTHLY", "25.0", 1, 1, Constants.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getConstants_FLAT_RATE_CIP_YEARLY(), ecorePackage.getEDouble(), "FLAT_RATE_CIP_YEARLY", "30.0", 1, 1, Constants.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getConstants_FLAT_RATE_CIS_DAILY(), ecorePackage.getEDouble(), "FLAT_RATE_CIS_DAILY", "1.0", 1, 1, Constants.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getConstants_FLAT_RATE_CIS_MONTHLY(), ecorePackage.getEDouble(), "FLAT_RATE_CIS_MONTHLY", "25.0", 1, 1, Constants.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getConstants_FLAT_RATE_CIS_YEARLY(), ecorePackage.getEDouble(), "FLAT_RATE_CIS_YEARLY", "300.0", 1, 1, Constants.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getConstants_FLAT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT(), ecorePackage.getEDouble(), "FLAT_RATE_FOR_TRAVEL_EXPENSE_PER_UNIT", "99.0", 1, 1, Constants.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getConstants_MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_DS(), ecorePackage.getEDouble(), "MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_DS", null, 1, 1, Constants.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getConstants_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE(), ecorePackage.getEDouble(), "FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE", null, 1, 1, Constants.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getConstants_DISABILITY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE(), ecorePackage.getEDouble(), "DISABILITY_FLAT_RATE_FOR_MISCELLANEOUS_EXPENSE", null, 1, 1, Constants.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getConstants_MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE(), ecorePackage.getEDouble(), "MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_ADDITIONAL_PENSION_AND_INSURANCE", null, 1, 1, Constants.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(income_TaxEClass, Income_Tax.class, "Income_Tax", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getIncome_Tax_TaxPayer(), this.getTax_Payer(), null, "taxPayer", null, 1, 1, Income_Tax.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getIncome_Tax_Tax_amount(), ecorePackage.getEDouble(), "tax_amount", null, 1, 1, Income_Tax.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getIncome_Tax_Tax_year(), ecorePackage.getEInt(), "tax_year", null, 1, 1, Income_Tax.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getIncome_Tax_Id6(), ecorePackage.getEString(), "id6", null, 1, 1, Income_Tax.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		initEClass(tax_PayerEClass, Tax_Payer.class, "Tax_Payer", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getTax_Payer_Dependents(), this.getDependent(), this.getDependent_Responsible_person(), "dependents", null, 0, 6, Tax_Payer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getTax_Payer_From_agent(), this.getFromAgent(), this.getFromAgent_TaxPayer(), "from_agent", null, 1, 1, Tax_Payer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getTax_Payer_Incomes(), this.getIncome(), this.getIncome_TaxPayer(), "incomes", null, 1, -1, Tax_Payer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getTax_Payer_From_law(), this.getFromLaw(), this.getFromLaw_TaxPayer(), "from_law", null, 1, 1, Tax_Payer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(physical_PersonEClass, Physical_Person.class, "Physical_Person", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getPhysical_Person_SSNo(), ecorePackage.getEString(), "SSNo", null, 1, 1, Physical_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getPhysical_Person_Addresses(), this.getAddress(), this.getAddress_TaxPayer(), "addresses", null, 0, -1, Physical_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getPhysical_Person_Birth_year(), ecorePackage.getEInt(), "birth_year", null, 1, 1, Physical_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getPhysical_Person_Disability_percentage(), ecorePackage.getEDouble(), "disability_percentage", null, 1, 1, Physical_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getPhysical_Person_Disability_type(), this.getDisability_Types(), "disability_type", null, 1, 1, Physical_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getPhysical_Person_Birth_month(), ecorePackage.getEInt(), "birth_month", null, 1, 1, Physical_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getPhysical_Person_Birth_day(), ecorePackage.getEInt(), "birth_day", null, 1, 1, Physical_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getPhysical_Person_Expenses(), this.getExpense(), this.getExpense_Beneficiary(), "expenses", null, 0, -1, Physical_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getPhysical_Person_Is_widower(), ecorePackage.getEBoolean(), "is_widower", null, 1, 1, Physical_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		initEClass(addressEClass, Address.class, "Address", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getAddress_Country(), this.getCountry(), "country", "ZZ", 1, 1, Address.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getAddress_Street(), ecorePackage.getEString(), "street", null, 1, 1, Address.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getAddress_ZipCode(), ecorePackage.getEString(), "zipCode", null, 1, 1, Address.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getAddress_City(), ecorePackage.getEString(), "city", null, 1, 1, Address.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getAddress_Id2(), ecorePackage.getEString(), "id2", null, 1, 1, Address.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getAddress_TaxPayer(), this.getPhysical_Person(), this.getPhysical_Person_Addresses(), "taxPayer", null, 0, -1, Address.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		initEClass(expenseEClass, Expense.class, "Expense", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getExpense_Declared_amount(), ecorePackage.getEDouble(), "declared_amount", null, 1, 1, Expense.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getExpense_Expense_purpose(), this.getExpense_Purpose(), "expense_purpose", "OTHER", 1, 1, Expense.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getExpense_Dependent(), this.getDependent(), this.getDependent_Expense(), "dependent", null, 0, 1, Expense.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getExpense_From_agent(), this.getFromAgent(), this.getFromAgent_Expense(), "from_agent", null, 0, 1, Expense.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getExpense_Income(), this.getIncome(), this.getIncome_Expenses(), "income", null, 1, 1, Expense.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getExpense_Id4(), ecorePackage.getEString(), "id4", null, 1, 1, Expense.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getExpense_Beneficiary(), this.getPhysical_Person(), this.getPhysical_Person_Expenses(), "beneficiary", null, 0, 1, Expense.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		initEClass(dependentEClass, Dependent.class, "Dependent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getDependent_Dependent_type(), this.getDependent_Type(), "dependent_type", null, 1, 1, Dependent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getDependent_Responsible_person(), this.getTax_Payer(), this.getTax_Payer_Dependents(), "responsible_person", null, 0, 1, Dependent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDependent_Continued_studies(), ecorePackage.getEBoolean(), "continued_studies", "false", 1, 1, Dependent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getDependent_Allowances(), this.getExternal_Allowance(), this.getExternal_Allowance_Person(), "allowances", null, 0, 1, Dependent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getDependent_Household(), this.getHousehold(), this.getHousehold_Children(), "household", null, 0, 1, Dependent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getDependent_From_agent(), this.getFromAgent(), this.getFromAgent_Dependent(), "from_agent", null, 0, 1, Dependent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getDependent_Expense(), this.getExpense(), this.getExpense_Dependent(), "expense", null, 0, -1, Dependent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		initEClass(external_AllowanceEClass, External_Allowance.class, "External_Allowance", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getExternal_Allowance_Grantor(), this.getGrantor(), "grantor", null, 1, 1, External_Allowance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getExternal_Allowance_Starting_year(), ecorePackage.getEInt(), "starting_year", null, 1, 1, External_Allowance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getExternal_Allowance_Ending_year(), ecorePackage.getEInt(), "ending_year", null, 1, 1, External_Allowance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getExternal_Allowance_Reciver(), this.getPhysical_Person(), null, "reciver", null, 1, 1, External_Allowance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getExternal_Allowance_Id5(), ecorePackage.getEString(), "id5", null, 1, 1, External_Allowance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getExternal_Allowance_Person(), this.getDependent(), this.getDependent_Allowances(), "person", null, 1, 1, External_Allowance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		initEClass(householdEClass, Household.class, "Household", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getHousehold_Parents(), this.getLegal_Union_Record(), this.getLegal_Union_Record_Household(), "parents", null, 1, 1, Household.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getHousehold_Id1(), ecorePackage.getEString(), "id1", null, 1, 1, Household.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getHousehold_Children(), this.getDependent(), this.getDependent_Household(), "children", null, 0, -1, Household.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		initEClass(legal_Union_RecordEClass, Legal_Union_Record.class, "Legal_Union_Record", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getLegal_Union_Record_Start_year(), ecorePackage.getEInt(), "start_year", null, 1, 1, Legal_Union_Record.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getLegal_Union_Record_End_year(), ecorePackage.getEInt(), "end_year", null, 1, 1, Legal_Union_Record.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getLegal_Union_Record_Separation_cause(), this.getSeparation_Causes(), "separation_cause", null, 1, 1, Legal_Union_Record.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getLegal_Union_Record_Individual_A(), this.getPhysical_Person(), null, "individual_A", null, 1, 1, Legal_Union_Record.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getLegal_Union_Record_Individual_B(), this.getPhysical_Person(), null, "individual_B", null, 1, -1, Legal_Union_Record.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getLegal_Union_Record_Properties(), this.getTax_Property(), this.getTax_Property_Union_record(), "properties", null, 1, -1, Legal_Union_Record.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getLegal_Union_Record_Mutual_agreement(), ecorePackage.getEBoolean(), "mutual_agreement", null, 1, 1, Legal_Union_Record.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getLegal_Union_Record_Id9(), ecorePackage.getEString(), "id9", null, 1, 1, Legal_Union_Record.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getLegal_Union_Record_Household(), this.getHousehold(), this.getHousehold_Parents(), "household", null, 1, 1, Legal_Union_Record.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		initEClass(tax_PropertyEClass, Tax_Property.class, "Tax_Property", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getTax_Property_Starting_year(), ecorePackage.getEInt(), "starting_year", null, 1, 1, Tax_Property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getTax_Property_Id10(), ecorePackage.getEString(), "id10", null, 1, 1, Tax_Property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getTax_Property_Union_record(), this.getLegal_Union_Record(), this.getLegal_Union_Record_Properties(), "union_record", null, 1, 1, Tax_Property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		initEClass(tax_CaseEClass, Tax_Case.class, "Tax_Case", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(fromAgentEClass, FromAgent.class, "FromAgent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getFromAgent_TaxPayer(), this.getTax_Payer(), this.getTax_Payer_From_agent(), "taxPayer", null, 1, 1, FromAgent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getFromAgent_Is_dependent_eligible_for_CE_Not_In_Houshold_Children_Care(), ecorePackage.getEBoolean(), "is_dependent_eligible_for_CE_Not_In_Houshold_Children_Care", null, 1, 1, FromAgent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getFromAgent_Expense(), this.getExpense(), this.getExpense_From_agent(), "expense", null, 0, 1, FromAgent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getFromAgent_Is_eligible_debt(), ecorePackage.getEBoolean(), "is_eligible_debt", null, 1, 1, FromAgent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getFromAgent_Dependent(), this.getDependent(), this.getDependent_From_agent(), "dependent", null, 0, 1, FromAgent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		initEClass(incomeEClass, Income.class, "Income", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getIncome_Income_amount(), ecorePackage.getEDouble(), "income_amount", null, 1, 1, Income.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getIncome_Income_type(), this.getIncome_Type(), this.getIncome_Type_Income(), "income_type", null, 1, 1, Income.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getIncome_Tax_card(), this.getTax_Card(), this.getTax_Card_Income(), "tax_card", null, 0, 1, Income.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getIncome_Tax_liability(), ecorePackage.getEDouble(), "tax_liability", null, 1, 1, Income.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getIncome_TaxPayer(), this.getTax_Payer(), this.getTax_Payer_Incomes(), "taxPayer", null, 1, 1, Income.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getIncome_Details(), this.getIncome_Detail(), this.getIncome_Detail_Income(), "details", null, 12, 12, Income.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getIncome_Num(), ecorePackage.getEInt(), "num", null, 1, 1, Income.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getIncome_Expenses(), this.getExpense(), this.getExpense_Income(), "expenses", null, 0, -1, Income.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		initEClass(income_TypeEClass, Income_Type.class, "Income_Type", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getIncome_Type_Id8(), ecorePackage.getEString(), "id8", null, 1, 1, Income_Type.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getIncome_Type_Income(), this.getIncome(), this.getIncome_Income_type(), "income", null, 1, 1, Income_Type.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(tax_CardEClass, Tax_Card.class, "Tax_Card", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getTax_Card_Card_identifier(), ecorePackage.getEString(), "card_identifier", null, 0, 1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTax_Card_Tax_office(), this.getTax_Office(), "tax_office", null, 1, 1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTax_Card_Percentage_of_witholding(), ecorePackage.getEDouble(), "percentage_of_witholding", null, 1, 1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTax_Card_Tax_payers_name_surname(), ecorePackage.getEString(), "tax_payers_name_surname", null, 0, -1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getTax_Card_Tax_payers_partner_name_surname(), ecorePackage.getEString(), "tax_payers_partner_name_surname", null, 0, -1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getTax_Card_Tax_payers_address(), this.getAddress(), null, "tax_payers_address", null, 0, 1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTax_Card_Jobs_Employer_SSNo(), ecorePackage.getEString(), "jobs_Employer_SSNo", null, 0, 1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getTax_Card_Jobs_employers_name(), ecorePackage.getEString(), "jobs_employers_name", null, 0, 1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getTax_Card_Jobs_activity_type(), this.getJob_Activity(), "jobs_activity_type", null, 1, 1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTax_Card_Jobs_place_of_work(), this.getTown(), "jobs_place_of_work", null, 1, 1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTax_Card_Deduction_FD_daily(), ecorePackage.getEDouble(), "deduction_FD_daily", "0.0", 1, 1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getTax_Card_Deduction_FD_monthly(), ecorePackage.getEDouble(), "deduction_FD_monthly", "0.0", 1, 1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getTax_Card_Deduction_AC_daily(), ecorePackage.getEDouble(), "deduction_AC_daily", "0.0", 1, 1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTax_Card_Deduction_AC_monthly(), ecorePackage.getEDouble(), "deduction_AC_monthly", "0.0", 1, 1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTax_Card_Deduction_AC_yearly(), ecorePackage.getEDouble(), "deduction_AC_yearly", "0.0", 1, 1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTax_Card_Deduction_CE_daily(), ecorePackage.getEDouble(), "deduction_CE_daily", "0.0", 1, 1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTax_Card_Deduction_CE_monthly(), ecorePackage.getEDouble(), "deduction_CE_monthly", "0.0", 1, 1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTax_Card_Deduction_CE_yearly(), ecorePackage.getEDouble(), "deduction_CE_yearly", "0.0", 1, 1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTax_Card_Deduction_DS_daily(), ecorePackage.getEDouble(), "deduction_DS_daily", "0.0", 1, 1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTax_Card_Deduction_DS_monthly(), ecorePackage.getEDouble(), "deduction_DS_monthly", "0.0", 1, 1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTax_Card_Deduction_FO_daily(), ecorePackage.getEDouble(), "deduction_FO_daily", "0.0", 1, 1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTax_Card_Deduction_FO_monthly(), ecorePackage.getEDouble(), "deduction_FO_monthly", "0.0", 1, 1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTax_Card_Deduction_FO_yearly(), ecorePackage.getEDouble(), "deduction_FO_yearly", "0.0", 1, 1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTax_Card_Credit_CIS_daily(), ecorePackage.getEDouble(), "credit_CIS_daily", "0.0", 1, 1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTax_Card_Credit_CIS_monthly(), ecorePackage.getEDouble(), "credit_CIS_monthly", "0.0", 1, 1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTax_Card_Credit_CIM_daily(), ecorePackage.getEDouble(), "credit_CIM_daily", "0.0", 1, 1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTax_Card_Validity(), ecorePackage.getEBoolean(), "validity", null, 1, 1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getTax_Card_Income_Tax_Credit(), this.getIncome_Tax_Credit(), this.getIncome_Tax_Credit_Taxation_Frame(), "income_Tax_Credit", null, 0, -1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getTax_Card_Previous(), this.getTax_Card(), this.getTax_Card_Current_tax_card(), "previous", null, 0, 1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getTax_Card_Current_tax_card(), this.getTax_Card(), this.getTax_Card_Previous(), "current_tax_card", null, 0, 1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTax_Card_Credit_CIM_yearly(), ecorePackage.getEDouble(), "credit_CIM_yearly", null, 1, 1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getTax_Card_Deduction_DS_Alimony_yearly(), ecorePackage.getEDouble(), "deduction_DS_Alimony_yearly", null, 1, 1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getTax_Card_Deduction_DS_Debt_yearly(), ecorePackage.getEDouble(), "deduction_DS_Debt_yearly", null, 1, 1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getTax_Card_Income(), this.getIncome(), this.getIncome_Tax_card(), "income", null, 1, 1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(income_Tax_CreditEClass, Income_Tax_Credit.class, "Income_Tax_Credit", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getIncome_Tax_Credit_GrantedBy(), this.getGrantor(), "grantedBy", null, 1, 1, Income_Tax_Credit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getIncome_Tax_Credit_TaxPayer(), this.getTax_Payer(), null, "taxPayer", null, 0, 1, Income_Tax_Credit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getIncome_Tax_Credit_Tax_year(), ecorePackage.getEInt(), "tax_year", null, 1, 1, Income_Tax_Credit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getIncome_Tax_Credit_Yearly(), ecorePackage.getEDouble(), "yearly", "300.0", 1, 1, Income_Tax_Credit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getIncome_Tax_Credit_Monthly(), ecorePackage.getEDouble(), "monthly", "25.0", 1, 1, Income_Tax_Credit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getIncome_Tax_Credit_Daily(), ecorePackage.getEDouble(), "daily", "1.0", 1, 1, Income_Tax_Credit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getIncome_Tax_Credit_Id7(), ecorePackage.getEString(), "id7", null, 1, 1, Income_Tax_Credit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getIncome_Tax_Credit_Taxation_Frame(), this.getTax_Card(), this.getTax_Card_Income_Tax_Credit(), "taxation_Frame", null, 0, 1, Income_Tax_Credit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(income_DetailEClass, Income_Detail.class, "Income_Detail", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getIncome_Detail_Amount(), ecorePackage.getEDouble(), "amount", null, 1, 1, Income_Detail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getIncome_Detail_Is_worked(), ecorePackage.getEBoolean(), "is_worked", null, 1, 1, Income_Detail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getIncome_Detail_Distance(), ecorePackage.getEDouble(), "distance", null, 1, 1, Income_Detail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getIncome_Detail_Worked_days(), ecorePackage.getEInt(), "worked_days", null, 1, 1, Income_Detail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getIncome_Detail_Is_contributing_CNS(), ecorePackage.getEBoolean(), "is_contributing_CNS", null, 1, 1, Income_Detail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getIncome_Detail_Id5(), ecorePackage.getEString(), "id5", null, 1, 1, Income_Detail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getIncome_Detail_Income(), this.getIncome(), this.getIncome_Details(), "income", null, 1, 1, Income_Detail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(fromLawEClass, FromLaw.class, "FromLaw", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getFromLaw_Id(), ecorePackage.getEString(), "id", null, 1, 1, FromLaw.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getFromLaw_TaxPayer(), this.getTax_Payer(), this.getTax_Payer_From_law(), "taxPayer", null, 1, 1, FromLaw.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(fiscal_AddressEClass, Fiscal_Address.class, "Fiscal_Address", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(habitual_AddressEClass, Habitual_Address.class, "Habitual_Address", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(marriage_RecordEClass, Marriage_Record.class, "Marriage_Record", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(non_Resident_Tax_PayerEClass, Non_Resident_Tax_Payer.class, "Non_Resident_Tax_Payer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getNon_Resident_Tax_Payer_Is_assimilated_to_resident(), ecorePackage.getEBoolean(), "is_assimilated_to_resident", "false", 1, 1, Non_Resident_Tax_Payer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(partnership_RecordEClass, Partnership_Record.class, "Partnership_Record", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(resident_Tax_PayerEClass, Resident_Tax_Payer.class, "Resident_Tax_Payer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(trade_and_Business_IncomeEClass, Trade_and_Business_Income.class, "Trade_and_Business_Income", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(agriculture_and_Forestry_IncomeEClass, Agriculture_and_Forestry_Income.class, "Agriculture_and_Forestry_Income", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(pensions_and_Annuities_IncomeEClass, Pensions_and_Annuities_Income.class, "Pensions_and_Annuities_Income", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getPensions_and_Annuities_Income_Occasional_payement(), ecorePackage.getEBoolean(), "occasional_payement", "false", 0, 1, Pensions_and_Annuities_Income.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(capital_and_Investments_IncomeEClass, Capital_and_Investments_Income.class, "Capital_and_Investments_Income", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(employment_IncomeEClass, Employment_Income.class, "Employment_Income", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(rentals_and_Leases_IncomeEClass, Rentals_and_Leases_Income.class, "Rentals_and_Leases_Income", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getRentals_and_Leases_Income_Is_periodic(), ecorePackage.getEBoolean(), "is_periodic", "true", 1, 1, Rentals_and_Leases_Income.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(foreign_IncomeEClass, Foreign_Income.class, "Foreign_Income", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(local_IncomeEClass, Local_Income.class, "Local_Income", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(cimEClass, TaxationWithRoot.CIM.class, "CIM", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(cipEClass, TaxationWithRoot.CIP.class, "CIP", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(cisEClass, TaxationWithRoot.CIS.class, "CIS", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(permanent_ExpenseEClass, Permanent_Expense.class, "Permanent_Expense", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getPermanent_Expense_Category(), this.getCategory_of_Permanent_Expense(), "category", null, 1, 1, Permanent_Expense.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(special_Expense_DSEClass, Special_Expense_DS.class, "Special_Expense_DS", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(interest_ExpenseEClass, Interest_Expense.class, "Interest_Expense", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(private_Insurance_and_PlanEClass, Private_Insurance_and_Plan.class, "Private_Insurance_and_Plan", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getPrivate_Insurance_and_Plan_Category(), this.getCategory_of_Private_Insurance_and_Plan(), "category", null, 1, 1, Private_Insurance_and_Plan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getPrivate_Insurance_and_Plan_Duration_of_contract(), ecorePackage.getEInt(), "duration_of_contract", null, 1, 1, Private_Insurance_and_Plan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(health_and_Pension_InsuranceEClass, Health_and_Pension_Insurance.class, "Health_and_Pension_Insurance", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getHealth_and_Pension_Insurance_Category(), this.getCategory_of_Health_and_Pension_Insurances(), "category", null, 1, 1, Health_and_Pension_Insurance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getHealth_and_Pension_Insurance_Is_related_to_additional_salary(), ecorePackage.getEBoolean(), "is_related_to_additional_salary", "false", 1, 1, Health_and_Pension_Insurance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(donationEClass, Donation.class, "Donation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getDonation_Beneficiary1(), ecorePackage.getEString(), "beneficiary1", null, 1, 1, Donation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDonation_Is_donation_reported(), ecorePackage.getEBoolean(), "is_donation_reported", null, 1, 1, Donation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(loss_CarryforwardEClass, Loss_Carryforward.class, "Loss_Carryforward", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(spousal_Expense_ACEClass, Spousal_Expense_AC.class, "Spousal_Expense_AC", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(extraordinary_Expense_CEEClass, Extraordinary_Expense_CE.class, "Extraordinary_Expense_CE", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getExtraordinary_Expense_CE_Thresholded_deduction_percentage(), ecorePackage.getEDouble(), "thresholded_deduction_percentage", null, 1, 1, Extraordinary_Expense_CE.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getExtraordinary_Expense_CE_Ce_type(), this.getCE_Type(), "ce_type", null, 1, 1, Extraordinary_Expense_CE.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(travel_Expense_FDEClass, Travel_Expense_FD.class, "Travel_Expense_FD", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(professional_ExpenseEClass, Professional_Expense.class, "Professional_Expense", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(miscellaneous_Expense_FOEClass, Miscellaneous_Expense_FO.class, "Miscellaneous_Expense_FO", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(resourceEClass, Resource.class, "Resource", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getResource_Contains(), this.getHousehold(), null, "contains", null, 0, -1, Resource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		// Initialize enums and add enum literals
+		initEEnum(grantorEEnum, Grantor.class, "Grantor");
+		addEEnumLiteral(grantorEEnum, Grantor.WWW);
+		addEEnumLiteral(grantorEEnum, Grantor.EMPLOYER);
+		addEEnumLiteral(grantorEEnum, Grantor.MMM);
+		addEEnumLiteral(grantorEEnum, Grantor.UUU);
+		addEEnumLiteral(grantorEEnum, Grantor.YYY);
+		addEEnumLiteral(grantorEEnum, Grantor.OOO);
+
+		initEEnum(disability_TypesEEnum, Disability_Types.class, "Disability_Types");
+		addEEnumLiteral(disability_TypesEEnum, Disability_Types.BEUG);
+		addEEnumLiteral(disability_TypesEEnum, Disability_Types.NONE);
+		addEEnumLiteral(disability_TypesEEnum, Disability_Types.A);
+		addEEnumLiteral(disability_TypesEEnum, Disability_Types.B);
+		addEEnumLiteral(disability_TypesEEnum, Disability_Types.C);
+		addEEnumLiteral(disability_TypesEEnum, Disability_Types.D);
+		addEEnumLiteral(disability_TypesEEnum, Disability_Types.E);
+		addEEnumLiteral(disability_TypesEEnum, Disability_Types.OTHER);
+
+		initEEnum(countryEEnum, Country.class, "Country");
+		addEEnumLiteral(countryEEnum, Country.ZZ);
+		addEEnumLiteral(countryEEnum, Country.FF);
+		addEEnumLiteral(countryEEnum, Country.BB);
+		addEEnumLiteral(countryEEnum, Country.DD);
+		addEEnumLiteral(countryEEnum, Country.NN);
+		addEEnumLiteral(countryEEnum, Country.OTHER);
+
+		initEEnum(tax_OfficeEEnum, Tax_Office.class, "Tax_Office");
+		addEEnumLiteral(tax_OfficeEEnum, Tax_Office.RTS_2);
+		addEEnumLiteral(tax_OfficeEEnum, Tax_Office.RTS_3);
+		addEEnumLiteral(tax_OfficeEEnum, Tax_Office.RTS_4);
+		addEEnumLiteral(tax_OfficeEEnum, Tax_Office.RTS_5);
+
+		initEEnum(tax_Class_CategoryEEnum, Tax_Class_Category.class, "Tax_Class_Category");
+		addEEnumLiteral(tax_Class_CategoryEEnum, Tax_Class_Category.ONE);
+		addEEnumLiteral(tax_Class_CategoryEEnum, Tax_Class_Category.ONE_A);
+		addEEnumLiteral(tax_Class_CategoryEEnum, Tax_Class_Category.TWO);
+
+		initEEnum(job_ActivityEEnum, Job_Activity.class, "Job_Activity");
+		addEEnumLiteral(job_ActivityEEnum, Job_Activity.SALARY);
+		addEEnumLiteral(job_ActivityEEnum, Job_Activity.PENSION);
+		addEEnumLiteral(job_ActivityEEnum, Job_Activity.ANNUITY);
+
+		initEEnum(townEEnum, Town.class, "Town");
+		addEEnumLiteral(townEEnum, Town.LL);
+		addEEnumLiteral(townEEnum, Town.BB);
+		addEEnumLiteral(townEEnum, Town.SS);
+		addEEnumLiteral(townEEnum, Town.TT);
+		addEEnumLiteral(townEEnum, Town.OTHER);
+
+		initEEnum(cE_TypeEEnum, CE_Type.class, "CE_Type");
+		addEEnumLiteral(cE_TypeEEnum, CE_Type.INALIDITY_AND_INFIRMITY);
+		addEEnumLiteral(cE_TypeEEnum, CE_Type.DEPENDENCE_AND_CARE_EXCLUDING_CHLIDREN_NOT_PART_OF_HOUSEHOLD);
+		addEEnumLiteral(cE_TypeEEnum, CE_Type.CARE_FOR_CHILDREN_NOT_BEING_PART_OF_HOUSEHOLD);
+
+		initEEnum(expense_PurposeEEnum, Expense_Purpose.class, "Expense_Purpose");
+		addEEnumLiteral(expense_PurposeEEnum, Expense_Purpose.HOUSE_CARE);
+		addEEnumLiteral(expense_PurposeEEnum, Expense_Purpose.CHILD_CARE);
+		addEEnumLiteral(expense_PurposeEEnum, Expense_Purpose.DEPENDENCE_CARE);
+		addEEnumLiteral(expense_PurposeEEnum, Expense_Purpose.OTHER);
+		addEEnumLiteral(expense_PurposeEEnum, Expense_Purpose.ALIMONY);
+		addEEnumLiteral(expense_PurposeEEnum, Expense_Purpose.RECURRENT_DEPT);
+
+		initEEnum(dependent_TypeEEnum, Dependent_Type.class, "Dependent_Type");
+		addEEnumLiteral(dependent_TypeEEnum, Dependent_Type.CHILD);
+		addEEnumLiteral(dependent_TypeEEnum, Dependent_Type.SPOUSE);
+		addEEnumLiteral(dependent_TypeEEnum, Dependent_Type.RELATIVE);
+		addEEnumLiteral(dependent_TypeEEnum, Dependent_Type.OTHER_FAMILY_MEMBER);
+		addEEnumLiteral(dependent_TypeEEnum, Dependent_Type.NOT_OWN_CHILD);
+
+		initEEnum(separation_CausesEEnum, Separation_Causes.class, "Separation_Causes");
+		addEEnumLiteral(separation_CausesEEnum, Separation_Causes.NONE);
+		addEEnumLiteral(separation_CausesEEnum, Separation_Causes.DIVORCE);
+		addEEnumLiteral(separation_CausesEEnum, Separation_Causes.SEPARATION_DE_FAIT);
+		addEEnumLiteral(separation_CausesEEnum, Separation_Causes.SEPARATION_BY_COURT);
+
+		initEEnum(category_of_Permanent_ExpenseEEnum, Category_of_Permanent_Expense.class, "Category_of_Permanent_Expense");
+		addEEnumLiteral(category_of_Permanent_ExpenseEEnum, Category_of_Permanent_Expense.MISCELLANEOUS_DEBT);
+		addEEnumLiteral(category_of_Permanent_ExpenseEEnum, Category_of_Permanent_Expense.ALIMONY);
+
+		initEEnum(category_of_Health_and_Pension_InsurancesEEnum, Category_of_Health_and_Pension_Insurances.class, "Category_of_Health_and_Pension_Insurances");
+		addEEnumLiteral(category_of_Health_and_Pension_InsurancesEEnum, Category_of_Health_and_Pension_Insurances.MANDATORY_HEALTH_AND_PENSION_INSURANCE);
+		addEEnumLiteral(category_of_Health_and_Pension_InsurancesEEnum, Category_of_Health_and_Pension_Insurances.ADDITIONAL_EMPLOYERS_PENSION_INSURANCE);
+		addEEnumLiteral(category_of_Health_and_Pension_InsurancesEEnum, Category_of_Health_and_Pension_Insurances.CONTINUED_HEALTH_AND_PENSION_INSURANCE);
+
+		initEEnum(category_of_Private_Insurance_and_PlanEEnum, Category_of_Private_Insurance_and_Plan.class, "Category_of_Private_Insurance_and_Plan");
+		addEEnumLiteral(category_of_Private_Insurance_and_PlanEEnum, Category_of_Private_Insurance_and_Plan.PRIVATE_INSURANCE);
+		addEEnumLiteral(category_of_Private_Insurance_and_PlanEEnum, Category_of_Private_Insurance_and_Plan.PRIVATE_LIFE_INSURANCE);
+		addEEnumLiteral(category_of_Private_Insurance_and_PlanEEnum, Category_of_Private_Insurance_and_Plan.COMPANY_MEMBERS_PRIVATE_INSURANCE);
+		addEEnumLiteral(category_of_Private_Insurance_and_PlanEEnum, Category_of_Private_Insurance_and_Plan.HOUSING_SAVING_PLAN);
+		addEEnumLiteral(category_of_Private_Insurance_and_PlanEEnum, Category_of_Private_Insurance_and_Plan.OLD_AGE_PENSION_PLAN);
+
+		initEEnum(legal_Union_TypesEEnum, Legal_Union_Types.class, "Legal_Union_Types");
+		addEEnumLiteral(legal_Union_TypesEEnum, Legal_Union_Types.MARIAGE);
+		addEEnumLiteral(legal_Union_TypesEEnum, Legal_Union_Types.PARTNERSHIP);
+		addEEnumLiteral(legal_Union_TypesEEnum, Legal_Union_Types.OTHER);
+
+		// Create resource
+		createResource(eNS_URI);
+
+		// Create annotations
+		// http://www.eclipse.org/OCL/Import
+		createImportAnnotations();
+		// duplicates
+		createDuplicatesAnnotations();
+		// http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName
+		createEmofAnnotations();
+		// http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot
+		createPivotAnnotations();
+	}
+
+	/**
+	 * Initializes the annotations for <b>http://www.eclipse.org/OCL/Import</b>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void createImportAnnotations() {
+		String source = "http://www.eclipse.org/OCL/Import";
+		addAnnotation
+		  (this,
+		   source,
+		   new String[] {
+			   "ecore", "http://www.eclipse.org/emf/2002/Ecore"
+		   });
+	}
+
+	/**
+	 * Initializes the annotations for <b>duplicates</b>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void createDuplicatesAnnotations() {
+		String source = "duplicates";
+		addAnnotation
+		  (tax_PayerEClass,
+		   source,
+		   new String[] {
+		   });
+	}
+
+	/**
+	 * Initializes the annotations for <b>http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName</b>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void createEmofAnnotations() {
+		String source = "http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName";
+		addAnnotation
+		  (getLegal_Union_Record_Individual_A(),
+		   source,
+		   new String[] {
+			   "body", "legal_union_A"
+		   });
+		addAnnotation
+		  (getLegal_Union_Record_Individual_B(),
+		   source,
+		   new String[] {
+			   "body", "legal_union_B"
+		   });
+	}
+
+	/**
+	 * Initializes the annotations for <b>http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot</b>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void createPivotAnnotations() {
+		String source = "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot";
+		addAnnotation
+		  (getIncome_Income_amount(),
+		   source,
+		   new String[] {
+			   "derivation", "let non_null_amounts:OrderedSet(Income_Detail)=self.details->select(det:Income_Detail|det.amount>0)->asOrderedSet() in\nnon_null_amounts->collect(amount)->min()"
+		   });
+	}
+
+} //TaxationWithRootPackageImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Trade_and_Business_IncomeImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Trade_and_Business_IncomeImpl.java
new file mode 100644
index 00000000..5c85d666
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Trade_and_Business_IncomeImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.TaxationWithRootPackage;
+import TaxationWithRoot.Trade_and_Business_Income;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Trade and Business Income</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class Trade_and_Business_IncomeImpl extends Income_TypeImpl implements Trade_and_Business_Income {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Trade_and_Business_IncomeImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.TRADE_AND_BUSINESS_INCOME;
+	}
+
+} //Trade_and_Business_IncomeImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Travel_Expense_FDImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Travel_Expense_FDImpl.java
new file mode 100644
index 00000000..cfa52929
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/impl/Travel_Expense_FDImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package TaxationWithRoot.impl;
+
+import TaxationWithRoot.TaxationWithRootPackage;
+import TaxationWithRoot.Travel_Expense_FD;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Travel Expense FD</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class Travel_Expense_FDImpl extends Professional_ExpenseImpl implements Travel_Expense_FD {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Travel_Expense_FDImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TaxationWithRootPackage.Literals.TRAVEL_EXPENSE_FD;
+	}
+
+} //Travel_Expense_FDImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/util/TaxationWithRootAdapterFactory.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/util/TaxationWithRootAdapterFactory.java
new file mode 100644
index 00000000..bc6cd6e2
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/util/TaxationWithRootAdapterFactory.java
@@ -0,0 +1,984 @@
+/**
+ */
+package TaxationWithRoot.util;
+
+import TaxationWithRoot.*;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see TaxationWithRoot.TaxationWithRootPackage
+ * @generated
+ */
+public class TaxationWithRootAdapterFactory extends AdapterFactoryImpl {
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static TaxationWithRootPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public TaxationWithRootAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = TaxationWithRootPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TaxationWithRootSwitch<Adapter> modelSwitch =
+		new TaxationWithRootSwitch<Adapter>() {
+			@Override
+			public Adapter caseConstants(Constants object) {
+				return createConstantsAdapter();
+			}
+			@Override
+			public Adapter caseIncome_Tax(Income_Tax object) {
+				return createIncome_TaxAdapter();
+			}
+			@Override
+			public Adapter caseTax_Payer(Tax_Payer object) {
+				return createTax_PayerAdapter();
+			}
+			@Override
+			public Adapter casePhysical_Person(Physical_Person object) {
+				return createPhysical_PersonAdapter();
+			}
+			@Override
+			public Adapter caseAddress(Address object) {
+				return createAddressAdapter();
+			}
+			@Override
+			public Adapter caseExpense(Expense object) {
+				return createExpenseAdapter();
+			}
+			@Override
+			public Adapter caseDependent(Dependent object) {
+				return createDependentAdapter();
+			}
+			@Override
+			public Adapter caseExternal_Allowance(External_Allowance object) {
+				return createExternal_AllowanceAdapter();
+			}
+			@Override
+			public Adapter caseHousehold(Household object) {
+				return createHouseholdAdapter();
+			}
+			@Override
+			public Adapter caseLegal_Union_Record(Legal_Union_Record object) {
+				return createLegal_Union_RecordAdapter();
+			}
+			@Override
+			public Adapter caseTax_Property(Tax_Property object) {
+				return createTax_PropertyAdapter();
+			}
+			@Override
+			public Adapter caseTax_Case(Tax_Case object) {
+				return createTax_CaseAdapter();
+			}
+			@Override
+			public Adapter caseFromAgent(FromAgent object) {
+				return createFromAgentAdapter();
+			}
+			@Override
+			public Adapter caseIncome(Income object) {
+				return createIncomeAdapter();
+			}
+			@Override
+			public Adapter caseIncome_Type(Income_Type object) {
+				return createIncome_TypeAdapter();
+			}
+			@Override
+			public Adapter caseTax_Card(Tax_Card object) {
+				return createTax_CardAdapter();
+			}
+			@Override
+			public Adapter caseIncome_Tax_Credit(Income_Tax_Credit object) {
+				return createIncome_Tax_CreditAdapter();
+			}
+			@Override
+			public Adapter caseIncome_Detail(Income_Detail object) {
+				return createIncome_DetailAdapter();
+			}
+			@Override
+			public Adapter caseFromLaw(FromLaw object) {
+				return createFromLawAdapter();
+			}
+			@Override
+			public Adapter caseFiscal_Address(Fiscal_Address object) {
+				return createFiscal_AddressAdapter();
+			}
+			@Override
+			public Adapter caseHabitual_Address(Habitual_Address object) {
+				return createHabitual_AddressAdapter();
+			}
+			@Override
+			public Adapter caseMarriage_Record(Marriage_Record object) {
+				return createMarriage_RecordAdapter();
+			}
+			@Override
+			public Adapter caseNon_Resident_Tax_Payer(Non_Resident_Tax_Payer object) {
+				return createNon_Resident_Tax_PayerAdapter();
+			}
+			@Override
+			public Adapter casePartnership_Record(Partnership_Record object) {
+				return createPartnership_RecordAdapter();
+			}
+			@Override
+			public Adapter caseResident_Tax_Payer(Resident_Tax_Payer object) {
+				return createResident_Tax_PayerAdapter();
+			}
+			@Override
+			public Adapter caseTrade_and_Business_Income(Trade_and_Business_Income object) {
+				return createTrade_and_Business_IncomeAdapter();
+			}
+			@Override
+			public Adapter caseAgriculture_and_Forestry_Income(Agriculture_and_Forestry_Income object) {
+				return createAgriculture_and_Forestry_IncomeAdapter();
+			}
+			@Override
+			public Adapter casePensions_and_Annuities_Income(Pensions_and_Annuities_Income object) {
+				return createPensions_and_Annuities_IncomeAdapter();
+			}
+			@Override
+			public Adapter caseCapital_and_Investments_Income(Capital_and_Investments_Income object) {
+				return createCapital_and_Investments_IncomeAdapter();
+			}
+			@Override
+			public Adapter caseEmployment_Income(Employment_Income object) {
+				return createEmployment_IncomeAdapter();
+			}
+			@Override
+			public Adapter caseRentals_and_Leases_Income(Rentals_and_Leases_Income object) {
+				return createRentals_and_Leases_IncomeAdapter();
+			}
+			@Override
+			public Adapter caseForeign_Income(Foreign_Income object) {
+				return createForeign_IncomeAdapter();
+			}
+			@Override
+			public Adapter caseLocal_Income(Local_Income object) {
+				return createLocal_IncomeAdapter();
+			}
+			@Override
+			public Adapter caseCIM(CIM object) {
+				return createCIMAdapter();
+			}
+			@Override
+			public Adapter caseCIP(CIP object) {
+				return createCIPAdapter();
+			}
+			@Override
+			public Adapter caseCIS(CIS object) {
+				return createCISAdapter();
+			}
+			@Override
+			public Adapter casePermanent_Expense(Permanent_Expense object) {
+				return createPermanent_ExpenseAdapter();
+			}
+			@Override
+			public Adapter caseSpecial_Expense_DS(Special_Expense_DS object) {
+				return createSpecial_Expense_DSAdapter();
+			}
+			@Override
+			public Adapter caseInterest_Expense(Interest_Expense object) {
+				return createInterest_ExpenseAdapter();
+			}
+			@Override
+			public Adapter casePrivate_Insurance_and_Plan(Private_Insurance_and_Plan object) {
+				return createPrivate_Insurance_and_PlanAdapter();
+			}
+			@Override
+			public Adapter caseHealth_and_Pension_Insurance(Health_and_Pension_Insurance object) {
+				return createHealth_and_Pension_InsuranceAdapter();
+			}
+			@Override
+			public Adapter caseDonation(Donation object) {
+				return createDonationAdapter();
+			}
+			@Override
+			public Adapter caseLoss_Carryforward(Loss_Carryforward object) {
+				return createLoss_CarryforwardAdapter();
+			}
+			@Override
+			public Adapter caseSpousal_Expense_AC(Spousal_Expense_AC object) {
+				return createSpousal_Expense_ACAdapter();
+			}
+			@Override
+			public Adapter caseExtraordinary_Expense_CE(Extraordinary_Expense_CE object) {
+				return createExtraordinary_Expense_CEAdapter();
+			}
+			@Override
+			public Adapter caseTravel_Expense_FD(Travel_Expense_FD object) {
+				return createTravel_Expense_FDAdapter();
+			}
+			@Override
+			public Adapter caseProfessional_Expense(Professional_Expense object) {
+				return createProfessional_ExpenseAdapter();
+			}
+			@Override
+			public Adapter caseMiscellaneous_Expense_FO(Miscellaneous_Expense_FO object) {
+				return createMiscellaneous_Expense_FOAdapter();
+			}
+			@Override
+			public Adapter caseResource(Resource object) {
+				return createResourceAdapter();
+			}
+			@Override
+			public Adapter defaultCase(EObject object) {
+				return createEObjectAdapter();
+			}
+		};
+
+	/**
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param target the object to adapt.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject)target);
+	}
+
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.Constants <em>Constants</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.Constants
+	 * @generated
+	 */
+	public Adapter createConstantsAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.Income_Tax <em>Income Tax</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.Income_Tax
+	 * @generated
+	 */
+	public Adapter createIncome_TaxAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.Tax_Payer <em>Tax Payer</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.Tax_Payer
+	 * @generated
+	 */
+	public Adapter createTax_PayerAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.Physical_Person <em>Physical Person</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.Physical_Person
+	 * @generated
+	 */
+	public Adapter createPhysical_PersonAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.Address <em>Address</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.Address
+	 * @generated
+	 */
+	public Adapter createAddressAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.Expense <em>Expense</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.Expense
+	 * @generated
+	 */
+	public Adapter createExpenseAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.Dependent <em>Dependent</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.Dependent
+	 * @generated
+	 */
+	public Adapter createDependentAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.External_Allowance <em>External Allowance</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.External_Allowance
+	 * @generated
+	 */
+	public Adapter createExternal_AllowanceAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.Household <em>Household</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.Household
+	 * @generated
+	 */
+	public Adapter createHouseholdAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.Legal_Union_Record <em>Legal Union Record</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.Legal_Union_Record
+	 * @generated
+	 */
+	public Adapter createLegal_Union_RecordAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.Tax_Property <em>Tax Property</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.Tax_Property
+	 * @generated
+	 */
+	public Adapter createTax_PropertyAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.Tax_Case <em>Tax Case</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.Tax_Case
+	 * @generated
+	 */
+	public Adapter createTax_CaseAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.FromAgent <em>From Agent</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.FromAgent
+	 * @generated
+	 */
+	public Adapter createFromAgentAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.Income <em>Income</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.Income
+	 * @generated
+	 */
+	public Adapter createIncomeAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.Income_Type <em>Income Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.Income_Type
+	 * @generated
+	 */
+	public Adapter createIncome_TypeAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.Tax_Card <em>Tax Card</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.Tax_Card
+	 * @generated
+	 */
+	public Adapter createTax_CardAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.Income_Tax_Credit <em>Income Tax Credit</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.Income_Tax_Credit
+	 * @generated
+	 */
+	public Adapter createIncome_Tax_CreditAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.Income_Detail <em>Income Detail</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.Income_Detail
+	 * @generated
+	 */
+	public Adapter createIncome_DetailAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.FromLaw <em>From Law</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.FromLaw
+	 * @generated
+	 */
+	public Adapter createFromLawAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.Fiscal_Address <em>Fiscal Address</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.Fiscal_Address
+	 * @generated
+	 */
+	public Adapter createFiscal_AddressAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.Habitual_Address <em>Habitual Address</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.Habitual_Address
+	 * @generated
+	 */
+	public Adapter createHabitual_AddressAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.Marriage_Record <em>Marriage Record</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.Marriage_Record
+	 * @generated
+	 */
+	public Adapter createMarriage_RecordAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.Non_Resident_Tax_Payer <em>Non Resident Tax Payer</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.Non_Resident_Tax_Payer
+	 * @generated
+	 */
+	public Adapter createNon_Resident_Tax_PayerAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.Partnership_Record <em>Partnership Record</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.Partnership_Record
+	 * @generated
+	 */
+	public Adapter createPartnership_RecordAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.Resident_Tax_Payer <em>Resident Tax Payer</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.Resident_Tax_Payer
+	 * @generated
+	 */
+	public Adapter createResident_Tax_PayerAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.Trade_and_Business_Income <em>Trade and Business Income</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.Trade_and_Business_Income
+	 * @generated
+	 */
+	public Adapter createTrade_and_Business_IncomeAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.Agriculture_and_Forestry_Income <em>Agriculture and Forestry Income</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.Agriculture_and_Forestry_Income
+	 * @generated
+	 */
+	public Adapter createAgriculture_and_Forestry_IncomeAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.Pensions_and_Annuities_Income <em>Pensions and Annuities Income</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.Pensions_and_Annuities_Income
+	 * @generated
+	 */
+	public Adapter createPensions_and_Annuities_IncomeAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.Capital_and_Investments_Income <em>Capital and Investments Income</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.Capital_and_Investments_Income
+	 * @generated
+	 */
+	public Adapter createCapital_and_Investments_IncomeAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.Employment_Income <em>Employment Income</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.Employment_Income
+	 * @generated
+	 */
+	public Adapter createEmployment_IncomeAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.Rentals_and_Leases_Income <em>Rentals and Leases Income</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.Rentals_and_Leases_Income
+	 * @generated
+	 */
+	public Adapter createRentals_and_Leases_IncomeAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.Foreign_Income <em>Foreign Income</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.Foreign_Income
+	 * @generated
+	 */
+	public Adapter createForeign_IncomeAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.Local_Income <em>Local Income</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.Local_Income
+	 * @generated
+	 */
+	public Adapter createLocal_IncomeAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.CIM <em>CIM</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.CIM
+	 * @generated
+	 */
+	public Adapter createCIMAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.CIP <em>CIP</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.CIP
+	 * @generated
+	 */
+	public Adapter createCIPAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.CIS <em>CIS</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.CIS
+	 * @generated
+	 */
+	public Adapter createCISAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.Permanent_Expense <em>Permanent Expense</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.Permanent_Expense
+	 * @generated
+	 */
+	public Adapter createPermanent_ExpenseAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.Special_Expense_DS <em>Special Expense DS</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.Special_Expense_DS
+	 * @generated
+	 */
+	public Adapter createSpecial_Expense_DSAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.Interest_Expense <em>Interest Expense</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.Interest_Expense
+	 * @generated
+	 */
+	public Adapter createInterest_ExpenseAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.Private_Insurance_and_Plan <em>Private Insurance and Plan</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.Private_Insurance_and_Plan
+	 * @generated
+	 */
+	public Adapter createPrivate_Insurance_and_PlanAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.Health_and_Pension_Insurance <em>Health and Pension Insurance</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.Health_and_Pension_Insurance
+	 * @generated
+	 */
+	public Adapter createHealth_and_Pension_InsuranceAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.Donation <em>Donation</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.Donation
+	 * @generated
+	 */
+	public Adapter createDonationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.Loss_Carryforward <em>Loss Carryforward</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.Loss_Carryforward
+	 * @generated
+	 */
+	public Adapter createLoss_CarryforwardAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.Spousal_Expense_AC <em>Spousal Expense AC</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.Spousal_Expense_AC
+	 * @generated
+	 */
+	public Adapter createSpousal_Expense_ACAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.Extraordinary_Expense_CE <em>Extraordinary Expense CE</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.Extraordinary_Expense_CE
+	 * @generated
+	 */
+	public Adapter createExtraordinary_Expense_CEAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.Travel_Expense_FD <em>Travel Expense FD</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.Travel_Expense_FD
+	 * @generated
+	 */
+	public Adapter createTravel_Expense_FDAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.Professional_Expense <em>Professional Expense</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.Professional_Expense
+	 * @generated
+	 */
+	public Adapter createProfessional_ExpenseAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.Miscellaneous_Expense_FO <em>Miscellaneous Expense FO</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.Miscellaneous_Expense_FO
+	 * @generated
+	 */
+	public Adapter createMiscellaneous_Expense_FOAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link TaxationWithRoot.Resource <em>Resource</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see TaxationWithRoot.Resource
+	 * @generated
+	 */
+	public Adapter createResourceAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+
+} //TaxationWithRootAdapterFactory
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/util/TaxationWithRootSwitch.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/util/TaxationWithRootSwitch.java
new file mode 100644
index 00000000..5cba1393
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/TaxationWithRoot/util/TaxationWithRootSwitch.java
@@ -0,0 +1,1163 @@
+/**
+ */
+package TaxationWithRoot.util;
+
+import TaxationWithRoot.*;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.util.Switch;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
+ * to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see TaxationWithRoot.TaxationWithRootPackage
+ * @generated
+ */
+public class TaxationWithRootSwitch<T> extends Switch<T> {
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static TaxationWithRootPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public TaxationWithRootSwitch() {
+		if (modelPackage == null) {
+			modelPackage = TaxationWithRootPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+			case TaxationWithRootPackage.CONSTANTS: {
+				Constants constants = (Constants)theEObject;
+				T result = caseConstants(constants);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.INCOME_TAX: {
+				Income_Tax income_Tax = (Income_Tax)theEObject;
+				T result = caseIncome_Tax(income_Tax);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.TAX_PAYER: {
+				Tax_Payer tax_Payer = (Tax_Payer)theEObject;
+				T result = caseTax_Payer(tax_Payer);
+				if (result == null) result = casePhysical_Person(tax_Payer);
+				if (result == null) result = caseTax_Case(tax_Payer);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.PHYSICAL_PERSON: {
+				Physical_Person physical_Person = (Physical_Person)theEObject;
+				T result = casePhysical_Person(physical_Person);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.ADDRESS: {
+				Address address = (Address)theEObject;
+				T result = caseAddress(address);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.EXPENSE: {
+				Expense expense = (Expense)theEObject;
+				T result = caseExpense(expense);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.DEPENDENT: {
+				Dependent dependent = (Dependent)theEObject;
+				T result = caseDependent(dependent);
+				if (result == null) result = casePhysical_Person(dependent);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.EXTERNAL_ALLOWANCE: {
+				External_Allowance external_Allowance = (External_Allowance)theEObject;
+				T result = caseExternal_Allowance(external_Allowance);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.HOUSEHOLD: {
+				Household household = (Household)theEObject;
+				T result = caseHousehold(household);
+				if (result == null) result = caseTax_Case(household);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.LEGAL_UNION_RECORD: {
+				Legal_Union_Record legal_Union_Record = (Legal_Union_Record)theEObject;
+				T result = caseLegal_Union_Record(legal_Union_Record);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.TAX_PROPERTY: {
+				Tax_Property tax_Property = (Tax_Property)theEObject;
+				T result = caseTax_Property(tax_Property);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.TAX_CASE: {
+				Tax_Case tax_Case = (Tax_Case)theEObject;
+				T result = caseTax_Case(tax_Case);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.FROM_AGENT: {
+				FromAgent fromAgent = (FromAgent)theEObject;
+				T result = caseFromAgent(fromAgent);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.INCOME: {
+				Income income = (Income)theEObject;
+				T result = caseIncome(income);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.INCOME_TYPE: {
+				Income_Type income_Type = (Income_Type)theEObject;
+				T result = caseIncome_Type(income_Type);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.TAX_CARD: {
+				Tax_Card tax_Card = (Tax_Card)theEObject;
+				T result = caseTax_Card(tax_Card);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.INCOME_TAX_CREDIT: {
+				Income_Tax_Credit income_Tax_Credit = (Income_Tax_Credit)theEObject;
+				T result = caseIncome_Tax_Credit(income_Tax_Credit);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.INCOME_DETAIL: {
+				Income_Detail income_Detail = (Income_Detail)theEObject;
+				T result = caseIncome_Detail(income_Detail);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.FROM_LAW: {
+				FromLaw fromLaw = (FromLaw)theEObject;
+				T result = caseFromLaw(fromLaw);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.FISCAL_ADDRESS: {
+				Fiscal_Address fiscal_Address = (Fiscal_Address)theEObject;
+				T result = caseFiscal_Address(fiscal_Address);
+				if (result == null) result = caseAddress(fiscal_Address);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.HABITUAL_ADDRESS: {
+				Habitual_Address habitual_Address = (Habitual_Address)theEObject;
+				T result = caseHabitual_Address(habitual_Address);
+				if (result == null) result = caseAddress(habitual_Address);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.MARRIAGE_RECORD: {
+				Marriage_Record marriage_Record = (Marriage_Record)theEObject;
+				T result = caseMarriage_Record(marriage_Record);
+				if (result == null) result = caseLegal_Union_Record(marriage_Record);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.NON_RESIDENT_TAX_PAYER: {
+				Non_Resident_Tax_Payer non_Resident_Tax_Payer = (Non_Resident_Tax_Payer)theEObject;
+				T result = caseNon_Resident_Tax_Payer(non_Resident_Tax_Payer);
+				if (result == null) result = caseTax_Payer(non_Resident_Tax_Payer);
+				if (result == null) result = casePhysical_Person(non_Resident_Tax_Payer);
+				if (result == null) result = caseTax_Case(non_Resident_Tax_Payer);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.PARTNERSHIP_RECORD: {
+				Partnership_Record partnership_Record = (Partnership_Record)theEObject;
+				T result = casePartnership_Record(partnership_Record);
+				if (result == null) result = caseLegal_Union_Record(partnership_Record);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.RESIDENT_TAX_PAYER: {
+				Resident_Tax_Payer resident_Tax_Payer = (Resident_Tax_Payer)theEObject;
+				T result = caseResident_Tax_Payer(resident_Tax_Payer);
+				if (result == null) result = caseTax_Payer(resident_Tax_Payer);
+				if (result == null) result = casePhysical_Person(resident_Tax_Payer);
+				if (result == null) result = caseTax_Case(resident_Tax_Payer);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.TRADE_AND_BUSINESS_INCOME: {
+				Trade_and_Business_Income trade_and_Business_Income = (Trade_and_Business_Income)theEObject;
+				T result = caseTrade_and_Business_Income(trade_and_Business_Income);
+				if (result == null) result = caseIncome_Type(trade_and_Business_Income);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.AGRICULTURE_AND_FORESTRY_INCOME: {
+				Agriculture_and_Forestry_Income agriculture_and_Forestry_Income = (Agriculture_and_Forestry_Income)theEObject;
+				T result = caseAgriculture_and_Forestry_Income(agriculture_and_Forestry_Income);
+				if (result == null) result = caseIncome_Type(agriculture_and_Forestry_Income);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.PENSIONS_AND_ANNUITIES_INCOME: {
+				Pensions_and_Annuities_Income pensions_and_Annuities_Income = (Pensions_and_Annuities_Income)theEObject;
+				T result = casePensions_and_Annuities_Income(pensions_and_Annuities_Income);
+				if (result == null) result = caseIncome_Type(pensions_and_Annuities_Income);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.CAPITAL_AND_INVESTMENTS_INCOME: {
+				Capital_and_Investments_Income capital_and_Investments_Income = (Capital_and_Investments_Income)theEObject;
+				T result = caseCapital_and_Investments_Income(capital_and_Investments_Income);
+				if (result == null) result = caseIncome_Type(capital_and_Investments_Income);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.EMPLOYMENT_INCOME: {
+				Employment_Income employment_Income = (Employment_Income)theEObject;
+				T result = caseEmployment_Income(employment_Income);
+				if (result == null) result = caseIncome_Type(employment_Income);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.RENTALS_AND_LEASES_INCOME: {
+				Rentals_and_Leases_Income rentals_and_Leases_Income = (Rentals_and_Leases_Income)theEObject;
+				T result = caseRentals_and_Leases_Income(rentals_and_Leases_Income);
+				if (result == null) result = caseIncome_Type(rentals_and_Leases_Income);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.FOREIGN_INCOME: {
+				Foreign_Income foreign_Income = (Foreign_Income)theEObject;
+				T result = caseForeign_Income(foreign_Income);
+				if (result == null) result = caseIncome(foreign_Income);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.LOCAL_INCOME: {
+				Local_Income local_Income = (Local_Income)theEObject;
+				T result = caseLocal_Income(local_Income);
+				if (result == null) result = caseIncome(local_Income);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.CIM: {
+				CIM cim = (CIM)theEObject;
+				T result = caseCIM(cim);
+				if (result == null) result = caseIncome_Tax_Credit(cim);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.CIP: {
+				CIP cip = (CIP)theEObject;
+				T result = caseCIP(cip);
+				if (result == null) result = caseIncome_Tax_Credit(cip);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.CIS: {
+				CIS cis = (CIS)theEObject;
+				T result = caseCIS(cis);
+				if (result == null) result = caseIncome_Tax_Credit(cis);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.PERMANENT_EXPENSE: {
+				Permanent_Expense permanent_Expense = (Permanent_Expense)theEObject;
+				T result = casePermanent_Expense(permanent_Expense);
+				if (result == null) result = caseSpecial_Expense_DS(permanent_Expense);
+				if (result == null) result = caseExpense(permanent_Expense);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.SPECIAL_EXPENSE_DS: {
+				Special_Expense_DS special_Expense_DS = (Special_Expense_DS)theEObject;
+				T result = caseSpecial_Expense_DS(special_Expense_DS);
+				if (result == null) result = caseExpense(special_Expense_DS);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.INTEREST_EXPENSE: {
+				Interest_Expense interest_Expense = (Interest_Expense)theEObject;
+				T result = caseInterest_Expense(interest_Expense);
+				if (result == null) result = caseSpecial_Expense_DS(interest_Expense);
+				if (result == null) result = caseExpense(interest_Expense);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.PRIVATE_INSURANCE_AND_PLAN: {
+				Private_Insurance_and_Plan private_Insurance_and_Plan = (Private_Insurance_and_Plan)theEObject;
+				T result = casePrivate_Insurance_and_Plan(private_Insurance_and_Plan);
+				if (result == null) result = caseSpecial_Expense_DS(private_Insurance_and_Plan);
+				if (result == null) result = caseExpense(private_Insurance_and_Plan);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.HEALTH_AND_PENSION_INSURANCE: {
+				Health_and_Pension_Insurance health_and_Pension_Insurance = (Health_and_Pension_Insurance)theEObject;
+				T result = caseHealth_and_Pension_Insurance(health_and_Pension_Insurance);
+				if (result == null) result = caseSpecial_Expense_DS(health_and_Pension_Insurance);
+				if (result == null) result = caseExpense(health_and_Pension_Insurance);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.DONATION: {
+				Donation donation = (Donation)theEObject;
+				T result = caseDonation(donation);
+				if (result == null) result = caseSpecial_Expense_DS(donation);
+				if (result == null) result = caseExpense(donation);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.LOSS_CARRYFORWARD: {
+				Loss_Carryforward loss_Carryforward = (Loss_Carryforward)theEObject;
+				T result = caseLoss_Carryforward(loss_Carryforward);
+				if (result == null) result = caseSpecial_Expense_DS(loss_Carryforward);
+				if (result == null) result = caseExpense(loss_Carryforward);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.SPOUSAL_EXPENSE_AC: {
+				Spousal_Expense_AC spousal_Expense_AC = (Spousal_Expense_AC)theEObject;
+				T result = caseSpousal_Expense_AC(spousal_Expense_AC);
+				if (result == null) result = caseExpense(spousal_Expense_AC);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.EXTRAORDINARY_EXPENSE_CE: {
+				Extraordinary_Expense_CE extraordinary_Expense_CE = (Extraordinary_Expense_CE)theEObject;
+				T result = caseExtraordinary_Expense_CE(extraordinary_Expense_CE);
+				if (result == null) result = caseExpense(extraordinary_Expense_CE);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.TRAVEL_EXPENSE_FD: {
+				Travel_Expense_FD travel_Expense_FD = (Travel_Expense_FD)theEObject;
+				T result = caseTravel_Expense_FD(travel_Expense_FD);
+				if (result == null) result = caseProfessional_Expense(travel_Expense_FD);
+				if (result == null) result = caseExpense(travel_Expense_FD);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.PROFESSIONAL_EXPENSE: {
+				Professional_Expense professional_Expense = (Professional_Expense)theEObject;
+				T result = caseProfessional_Expense(professional_Expense);
+				if (result == null) result = caseExpense(professional_Expense);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.MISCELLANEOUS_EXPENSE_FO: {
+				Miscellaneous_Expense_FO miscellaneous_Expense_FO = (Miscellaneous_Expense_FO)theEObject;
+				T result = caseMiscellaneous_Expense_FO(miscellaneous_Expense_FO);
+				if (result == null) result = caseProfessional_Expense(miscellaneous_Expense_FO);
+				if (result == null) result = caseExpense(miscellaneous_Expense_FO);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case TaxationWithRootPackage.RESOURCE: {
+				Resource resource = (Resource)theEObject;
+				T result = caseResource(resource);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Constants</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Constants</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseConstants(Constants object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Income Tax</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Income Tax</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseIncome_Tax(Income_Tax object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Tax Payer</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Tax Payer</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseTax_Payer(Tax_Payer object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Physical Person</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Physical Person</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T casePhysical_Person(Physical_Person object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Address</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Address</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseAddress(Address object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Expense</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Expense</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseExpense(Expense object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Dependent</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Dependent</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDependent(Dependent object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>External Allowance</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>External Allowance</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseExternal_Allowance(External_Allowance object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Household</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Household</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseHousehold(Household object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Legal Union Record</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Legal Union Record</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseLegal_Union_Record(Legal_Union_Record object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Tax Property</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Tax Property</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseTax_Property(Tax_Property object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Tax Case</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Tax Case</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseTax_Case(Tax_Case object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>From Agent</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>From Agent</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseFromAgent(FromAgent object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Income</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Income</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseIncome(Income object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Income Type</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Income Type</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseIncome_Type(Income_Type object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Tax Card</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Tax Card</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseTax_Card(Tax_Card object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Income Tax Credit</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Income Tax Credit</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseIncome_Tax_Credit(Income_Tax_Credit object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Income Detail</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Income Detail</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseIncome_Detail(Income_Detail object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>From Law</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>From Law</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseFromLaw(FromLaw object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Fiscal Address</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Fiscal Address</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseFiscal_Address(Fiscal_Address object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Habitual Address</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Habitual Address</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseHabitual_Address(Habitual_Address object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Marriage Record</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Marriage Record</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseMarriage_Record(Marriage_Record object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Non Resident Tax Payer</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Non Resident Tax Payer</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseNon_Resident_Tax_Payer(Non_Resident_Tax_Payer object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Partnership Record</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Partnership Record</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T casePartnership_Record(Partnership_Record object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Resident Tax Payer</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Resident Tax Payer</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseResident_Tax_Payer(Resident_Tax_Payer object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Trade and Business Income</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Trade and Business Income</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseTrade_and_Business_Income(Trade_and_Business_Income object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Agriculture and Forestry Income</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Agriculture and Forestry Income</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseAgriculture_and_Forestry_Income(Agriculture_and_Forestry_Income object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Pensions and Annuities Income</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Pensions and Annuities Income</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T casePensions_and_Annuities_Income(Pensions_and_Annuities_Income object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Capital and Investments Income</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Capital and Investments Income</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCapital_and_Investments_Income(Capital_and_Investments_Income object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Employment Income</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Employment Income</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEmployment_Income(Employment_Income object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Rentals and Leases Income</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Rentals and Leases Income</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseRentals_and_Leases_Income(Rentals_and_Leases_Income object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Foreign Income</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Foreign Income</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseForeign_Income(Foreign_Income object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Local Income</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Local Income</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseLocal_Income(Local_Income object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>CIM</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>CIM</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCIM(CIM object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>CIP</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>CIP</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCIP(CIP object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>CIS</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>CIS</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCIS(CIS object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Permanent Expense</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Permanent Expense</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T casePermanent_Expense(Permanent_Expense object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Special Expense DS</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Special Expense DS</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseSpecial_Expense_DS(Special_Expense_DS object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Interest Expense</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Interest Expense</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseInterest_Expense(Interest_Expense object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Private Insurance and Plan</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Private Insurance and Plan</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T casePrivate_Insurance_and_Plan(Private_Insurance_and_Plan object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Health and Pension Insurance</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Health and Pension Insurance</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseHealth_and_Pension_Insurance(Health_and_Pension_Insurance object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Donation</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Donation</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDonation(Donation object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Loss Carryforward</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Loss Carryforward</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseLoss_Carryforward(Loss_Carryforward object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Spousal Expense AC</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Spousal Expense AC</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseSpousal_Expense_AC(Spousal_Expense_AC object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Extraordinary Expense CE</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Extraordinary Expense CE</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseExtraordinary_Expense_CE(Extraordinary_Expense_CE object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Travel Expense FD</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Travel Expense FD</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseTravel_Expense_FD(Travel_Expense_FD object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Professional Expense</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Professional Expense</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseProfessional_Expense(Professional_Expense object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Miscellaneous Expense FO</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Miscellaneous Expense FO</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseMiscellaneous_Expense_FO(Miscellaneous_Expense_FO object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Resource</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Resource</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseResource(Resource object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+
+} //TaxationWithRootSwitch
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/familytree/FamilyTree.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/familytree/FamilyTree.java
new file mode 100644
index 00000000..408373a3
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/familytree/FamilyTree.java
@@ -0,0 +1,38 @@
+/**
+ */
+package familytree;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Family Tree</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link familytree.FamilyTree#getMembers <em>Members</em>}</li>
+ * </ul>
+ *
+ * @see familytree.FamilytreePackage#getFamilyTree()
+ * @model
+ * @generated
+ */
+public interface FamilyTree extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Members</b></em>' containment reference list.
+	 * The list contents are of type {@link familytree.Member}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Members</em>' containment reference list.
+	 * @see familytree.FamilytreePackage#getFamilyTree_Members()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<Member> getMembers();
+
+} // FamilyTree
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/familytree/FamilytreeFactory.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/familytree/FamilytreeFactory.java
new file mode 100644
index 00000000..534da223
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/familytree/FamilytreeFactory.java
@@ -0,0 +1,51 @@
+/**
+ */
+package familytree;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see familytree.FamilytreePackage
+ * @generated
+ */
+public interface FamilytreeFactory extends EFactory {
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	FamilytreeFactory eINSTANCE = familytree.impl.FamilytreeFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Family Tree</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Family Tree</em>'.
+	 * @generated
+	 */
+	FamilyTree createFamilyTree();
+
+	/**
+	 * Returns a new object of class '<em>Member</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Member</em>'.
+	 * @generated
+	 */
+	Member createMember();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	FamilytreePackage getFamilytreePackage();
+
+} //FamilytreeFactory
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/familytree/FamilytreePackage.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/familytree/FamilytreePackage.java
new file mode 100644
index 00000000..572a0fe4
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/familytree/FamilytreePackage.java
@@ -0,0 +1,321 @@
+/**
+ */
+package familytree;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ *   <li>each class,</li>
+ *   <li>each feature of each class,</li>
+ *   <li>each operation of each class,</li>
+ *   <li>each enum,</li>
+ *   <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see familytree.FamilytreeFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface FamilytreePackage extends EPackage {
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "familytree";
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "http://www.example.org/familytree";
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "familytree";
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	FamilytreePackage eINSTANCE = familytree.impl.FamilytreePackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link familytree.impl.FamilyTreeImpl <em>Family Tree</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see familytree.impl.FamilyTreeImpl
+	 * @see familytree.impl.FamilytreePackageImpl#getFamilyTree()
+	 * @generated
+	 */
+	int FAMILY_TREE = 0;
+
+	/**
+	 * The feature id for the '<em><b>Members</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FAMILY_TREE__MEMBERS = 0;
+
+	/**
+	 * The number of structural features of the '<em>Family Tree</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FAMILY_TREE_FEATURE_COUNT = 1;
+
+	/**
+	 * The number of operations of the '<em>Family Tree</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FAMILY_TREE_OPERATION_COUNT = 0;
+
+	/**
+	 * The meta object id for the '{@link familytree.impl.MemberImpl <em>Member</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see familytree.impl.MemberImpl
+	 * @see familytree.impl.FamilytreePackageImpl#getMember()
+	 * @generated
+	 */
+	int MEMBER = 1;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MEMBER__NAME = 0;
+
+	/**
+	 * The feature id for the '<em><b>Age</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MEMBER__AGE = 1;
+
+	/**
+	 * The feature id for the '<em><b>Children</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MEMBER__CHILDREN = 2;
+
+	/**
+	 * The feature id for the '<em><b>Parents</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MEMBER__PARENTS = 3;
+
+	/**
+	 * The number of structural features of the '<em>Member</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MEMBER_FEATURE_COUNT = 4;
+
+	/**
+	 * The number of operations of the '<em>Member</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MEMBER_OPERATION_COUNT = 0;
+
+
+	/**
+	 * Returns the meta object for class '{@link familytree.FamilyTree <em>Family Tree</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Family Tree</em>'.
+	 * @see familytree.FamilyTree
+	 * @generated
+	 */
+	EClass getFamilyTree();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link familytree.FamilyTree#getMembers <em>Members</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Members</em>'.
+	 * @see familytree.FamilyTree#getMembers()
+	 * @see #getFamilyTree()
+	 * @generated
+	 */
+	EReference getFamilyTree_Members();
+
+	/**
+	 * Returns the meta object for class '{@link familytree.Member <em>Member</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Member</em>'.
+	 * @see familytree.Member
+	 * @generated
+	 */
+	EClass getMember();
+
+	/**
+	 * Returns the meta object for the attribute '{@link familytree.Member#getName <em>Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Name</em>'.
+	 * @see familytree.Member#getName()
+	 * @see #getMember()
+	 * @generated
+	 */
+	EAttribute getMember_Name();
+
+	/**
+	 * Returns the meta object for the attribute '{@link familytree.Member#getAge <em>Age</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Age</em>'.
+	 * @see familytree.Member#getAge()
+	 * @see #getMember()
+	 * @generated
+	 */
+	EAttribute getMember_Age();
+
+	/**
+	 * Returns the meta object for the reference list '{@link familytree.Member#getChildren <em>Children</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference list '<em>Children</em>'.
+	 * @see familytree.Member#getChildren()
+	 * @see #getMember()
+	 * @generated
+	 */
+	EReference getMember_Children();
+
+	/**
+	 * Returns the meta object for the reference list '{@link familytree.Member#getParents <em>Parents</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference list '<em>Parents</em>'.
+	 * @see familytree.Member#getParents()
+	 * @see #getMember()
+	 * @generated
+	 */
+	EReference getMember_Parents();
+
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+	FamilytreeFactory getFamilytreeFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 *   <li>each class,</li>
+	 *   <li>each feature of each class,</li>
+	 *   <li>each operation of each class,</li>
+	 *   <li>each enum,</li>
+	 *   <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals {
+		/**
+		 * The meta object literal for the '{@link familytree.impl.FamilyTreeImpl <em>Family Tree</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see familytree.impl.FamilyTreeImpl
+		 * @see familytree.impl.FamilytreePackageImpl#getFamilyTree()
+		 * @generated
+		 */
+		EClass FAMILY_TREE = eINSTANCE.getFamilyTree();
+
+		/**
+		 * The meta object literal for the '<em><b>Members</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference FAMILY_TREE__MEMBERS = eINSTANCE.getFamilyTree_Members();
+
+		/**
+		 * The meta object literal for the '{@link familytree.impl.MemberImpl <em>Member</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see familytree.impl.MemberImpl
+		 * @see familytree.impl.FamilytreePackageImpl#getMember()
+		 * @generated
+		 */
+		EClass MEMBER = eINSTANCE.getMember();
+
+		/**
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute MEMBER__NAME = eINSTANCE.getMember_Name();
+
+		/**
+		 * The meta object literal for the '<em><b>Age</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute MEMBER__AGE = eINSTANCE.getMember_Age();
+
+		/**
+		 * The meta object literal for the '<em><b>Children</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference MEMBER__CHILDREN = eINSTANCE.getMember_Children();
+
+		/**
+		 * The meta object literal for the '<em><b>Parents</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference MEMBER__PARENTS = eINSTANCE.getMember_Parents();
+
+	}
+
+} //FamilytreePackage
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/familytree/Member.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/familytree/Member.java
new file mode 100644
index 00000000..9438b5e3
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/familytree/Member.java
@@ -0,0 +1,102 @@
+/**
+ */
+package familytree;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Member</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link familytree.Member#getName <em>Name</em>}</li>
+ *   <li>{@link familytree.Member#getAge <em>Age</em>}</li>
+ *   <li>{@link familytree.Member#getChildren <em>Children</em>}</li>
+ *   <li>{@link familytree.Member#getParents <em>Parents</em>}</li>
+ * </ul>
+ *
+ * @see familytree.FamilytreePackage#getMember()
+ * @model
+ * @generated
+ */
+public interface Member extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Name</em>' attribute.
+	 * @see #setName(String)
+	 * @see familytree.FamilytreePackage#getMember_Name()
+	 * @model
+	 * @generated
+	 */
+	String getName();
+
+	/**
+	 * Sets the value of the '{@link familytree.Member#getName <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Name</em>' attribute.
+	 * @see #getName()
+	 * @generated
+	 */
+	void setName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Age</b></em>' attribute.
+	 * The default value is <code>"0"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Age</em>' attribute.
+	 * @see #setAge(int)
+	 * @see familytree.FamilytreePackage#getMember_Age()
+	 * @model default="0" required="true"
+	 * @generated
+	 */
+	int getAge();
+
+	/**
+	 * Sets the value of the '{@link familytree.Member#getAge <em>Age</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Age</em>' attribute.
+	 * @see #getAge()
+	 * @generated
+	 */
+	void setAge(int value);
+
+	/**
+	 * Returns the value of the '<em><b>Children</b></em>' reference list.
+	 * The list contents are of type {@link familytree.Member}.
+	 * It is bidirectional and its opposite is '{@link familytree.Member#getParents <em>Parents</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Children</em>' reference list.
+	 * @see familytree.FamilytreePackage#getMember_Children()
+	 * @see familytree.Member#getParents
+	 * @model opposite="parents"
+	 * @generated
+	 */
+	EList<Member> getChildren();
+
+	/**
+	 * Returns the value of the '<em><b>Parents</b></em>' reference list.
+	 * The list contents are of type {@link familytree.Member}.
+	 * It is bidirectional and its opposite is '{@link familytree.Member#getChildren <em>Children</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Parents</em>' reference list.
+	 * @see familytree.FamilytreePackage#getMember_Parents()
+	 * @see familytree.Member#getChildren
+	 * @model opposite="children" upper="2"
+	 * @generated
+	 */
+	EList<Member> getParents();
+
+} // Member
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/familytree/impl/FamilyTreeImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/familytree/impl/FamilyTreeImpl.java
new file mode 100644
index 00000000..07b0a1dd
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/familytree/impl/FamilyTreeImpl.java
@@ -0,0 +1,153 @@
+/**
+ */
+package familytree.impl;
+
+import familytree.FamilyTree;
+import familytree.FamilytreePackage;
+import familytree.Member;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Family Tree</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link familytree.impl.FamilyTreeImpl#getMembers <em>Members</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class FamilyTreeImpl extends MinimalEObjectImpl.Container implements FamilyTree {
+	/**
+	 * The cached value of the '{@link #getMembers() <em>Members</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMembers()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Member> members;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected FamilyTreeImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return FamilytreePackage.Literals.FAMILY_TREE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<Member> getMembers() {
+		if (members == null) {
+			members = new EObjectContainmentEList<Member>(Member.class, this, FamilytreePackage.FAMILY_TREE__MEMBERS);
+		}
+		return members;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case FamilytreePackage.FAMILY_TREE__MEMBERS:
+				return ((InternalEList<?>)getMembers()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case FamilytreePackage.FAMILY_TREE__MEMBERS:
+				return getMembers();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case FamilytreePackage.FAMILY_TREE__MEMBERS:
+				getMembers().clear();
+				getMembers().addAll((Collection<? extends Member>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case FamilytreePackage.FAMILY_TREE__MEMBERS:
+				getMembers().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case FamilytreePackage.FAMILY_TREE__MEMBERS:
+				return members != null && !members.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //FamilyTreeImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/familytree/impl/FamilytreeFactoryImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/familytree/impl/FamilytreeFactoryImpl.java
new file mode 100644
index 00000000..bc54d09c
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/familytree/impl/FamilytreeFactoryImpl.java
@@ -0,0 +1,109 @@
+/**
+ */
+package familytree.impl;
+
+import familytree.*;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class FamilytreeFactoryImpl extends EFactoryImpl implements FamilytreeFactory {
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static FamilytreeFactory init() {
+		try {
+			FamilytreeFactory theFamilytreeFactory = (FamilytreeFactory)EPackage.Registry.INSTANCE.getEFactory(FamilytreePackage.eNS_URI);
+			if (theFamilytreeFactory != null) {
+				return theFamilytreeFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new FamilytreeFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public FamilytreeFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case FamilytreePackage.FAMILY_TREE: return createFamilyTree();
+			case FamilytreePackage.MEMBER: return createMember();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public FamilyTree createFamilyTree() {
+		FamilyTreeImpl familyTree = new FamilyTreeImpl();
+		return familyTree;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Member createMember() {
+		MemberImpl member = new MemberImpl();
+		return member;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public FamilytreePackage getFamilytreePackage() {
+		return (FamilytreePackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static FamilytreePackage getPackage() {
+		return FamilytreePackage.eINSTANCE;
+	}
+
+} //FamilytreeFactoryImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/familytree/impl/FamilytreePackageImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/familytree/impl/FamilytreePackageImpl.java
new file mode 100644
index 00000000..7e5078ab
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/familytree/impl/FamilytreePackageImpl.java
@@ -0,0 +1,251 @@
+/**
+ */
+package familytree.impl;
+
+import familytree.FamilyTree;
+import familytree.FamilytreeFactory;
+import familytree.FamilytreePackage;
+import familytree.Member;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class FamilytreePackageImpl extends EPackageImpl implements FamilytreePackage {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass familyTreeEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass memberEClass = null;
+
+	/**
+	 * Creates an instance of the model <b>Package</b>, registered with
+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * package URI value.
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see familytree.FamilytreePackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private FamilytreePackageImpl() {
+		super(eNS_URI, FamilytreeFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 *
+	 * <p>This method is used to initialize {@link FamilytreePackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static FamilytreePackage init() {
+		if (isInited) return (FamilytreePackage)EPackage.Registry.INSTANCE.getEPackage(FamilytreePackage.eNS_URI);
+
+		// Obtain or create and register package
+		Object registeredFamilytreePackage = EPackage.Registry.INSTANCE.get(eNS_URI);
+		FamilytreePackageImpl theFamilytreePackage = registeredFamilytreePackage instanceof FamilytreePackageImpl ? (FamilytreePackageImpl)registeredFamilytreePackage : new FamilytreePackageImpl();
+
+		isInited = true;
+
+		// Create package meta-data objects
+		theFamilytreePackage.createPackageContents();
+
+		// Initialize created meta-data
+		theFamilytreePackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theFamilytreePackage.freeze();
+
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(FamilytreePackage.eNS_URI, theFamilytreePackage);
+		return theFamilytreePackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getFamilyTree() {
+		return familyTreeEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getFamilyTree_Members() {
+		return (EReference)familyTreeEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getMember() {
+		return memberEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getMember_Name() {
+		return (EAttribute)memberEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getMember_Age() {
+		return (EAttribute)memberEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getMember_Children() {
+		return (EReference)memberEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getMember_Parents() {
+		return (EReference)memberEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public FamilytreeFactory getFamilytreeFactory() {
+		return (FamilytreeFactory)getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) return;
+		isCreated = true;
+
+		// Create classes and their features
+		familyTreeEClass = createEClass(FAMILY_TREE);
+		createEReference(familyTreeEClass, FAMILY_TREE__MEMBERS);
+
+		memberEClass = createEClass(MEMBER);
+		createEAttribute(memberEClass, MEMBER__NAME);
+		createEAttribute(memberEClass, MEMBER__AGE);
+		createEReference(memberEClass, MEMBER__CHILDREN);
+		createEReference(memberEClass, MEMBER__PARENTS);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model.  This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+
+		// Initialize classes, features, and operations; add parameters
+		initEClass(familyTreeEClass, FamilyTree.class, "FamilyTree", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getFamilyTree_Members(), this.getMember(), null, "members", null, 0, -1, FamilyTree.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(memberEClass, Member.class, "Member", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getMember_Name(), ecorePackage.getEString(), "name", null, 0, 1, Member.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getMember_Age(), ecorePackage.getEInt(), "age", "0", 1, 1, Member.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getMember_Children(), this.getMember(), this.getMember_Parents(), "children", null, 0, -1, Member.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getMember_Parents(), this.getMember(), this.getMember_Children(), "parents", null, 0, 2, Member.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		// Create resource
+		createResource(eNS_URI);
+	}
+
+} //FamilytreePackageImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/familytree/impl/MemberImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/familytree/impl/MemberImpl.java
new file mode 100644
index 00000000..77e423bd
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/familytree/impl/MemberImpl.java
@@ -0,0 +1,334 @@
+/**
+ */
+package familytree.impl;
+
+import familytree.FamilytreePackage;
+import familytree.Member;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Member</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link familytree.impl.MemberImpl#getName <em>Name</em>}</li>
+ *   <li>{@link familytree.impl.MemberImpl#getAge <em>Age</em>}</li>
+ *   <li>{@link familytree.impl.MemberImpl#getChildren <em>Children</em>}</li>
+ *   <li>{@link familytree.impl.MemberImpl#getParents <em>Parents</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class MemberImpl extends MinimalEObjectImpl.Container implements Member {
+	/**
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String name = NAME_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getAge() <em>Age</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAge()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int AGE_EDEFAULT = 0;
+
+	/**
+	 * The cached value of the '{@link #getAge() <em>Age</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAge()
+	 * @generated
+	 * @ordered
+	 */
+	protected int age = AGE_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getChildren() <em>Children</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getChildren()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Member> children;
+
+	/**
+	 * The cached value of the '{@link #getParents() <em>Parents</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getParents()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Member> parents;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected MemberImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return FamilytreePackage.Literals.MEMBER;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setName(String newName) {
+		String oldName = name;
+		name = newName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, FamilytreePackage.MEMBER__NAME, oldName, name));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getAge() {
+		return age;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setAge(int newAge) {
+		int oldAge = age;
+		age = newAge;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, FamilytreePackage.MEMBER__AGE, oldAge, age));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<Member> getChildren() {
+		if (children == null) {
+			children = new EObjectWithInverseResolvingEList.ManyInverse<Member>(Member.class, this, FamilytreePackage.MEMBER__CHILDREN, FamilytreePackage.MEMBER__PARENTS);
+		}
+		return children;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<Member> getParents() {
+		if (parents == null) {
+			parents = new EObjectWithInverseResolvingEList.ManyInverse<Member>(Member.class, this, FamilytreePackage.MEMBER__PARENTS, FamilytreePackage.MEMBER__CHILDREN);
+		}
+		return parents;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case FamilytreePackage.MEMBER__CHILDREN:
+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);
+			case FamilytreePackage.MEMBER__PARENTS:
+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getParents()).basicAdd(otherEnd, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case FamilytreePackage.MEMBER__CHILDREN:
+				return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);
+			case FamilytreePackage.MEMBER__PARENTS:
+				return ((InternalEList<?>)getParents()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case FamilytreePackage.MEMBER__NAME:
+				return getName();
+			case FamilytreePackage.MEMBER__AGE:
+				return getAge();
+			case FamilytreePackage.MEMBER__CHILDREN:
+				return getChildren();
+			case FamilytreePackage.MEMBER__PARENTS:
+				return getParents();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case FamilytreePackage.MEMBER__NAME:
+				setName((String)newValue);
+				return;
+			case FamilytreePackage.MEMBER__AGE:
+				setAge((Integer)newValue);
+				return;
+			case FamilytreePackage.MEMBER__CHILDREN:
+				getChildren().clear();
+				getChildren().addAll((Collection<? extends Member>)newValue);
+				return;
+			case FamilytreePackage.MEMBER__PARENTS:
+				getParents().clear();
+				getParents().addAll((Collection<? extends Member>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case FamilytreePackage.MEMBER__NAME:
+				setName(NAME_EDEFAULT);
+				return;
+			case FamilytreePackage.MEMBER__AGE:
+				setAge(AGE_EDEFAULT);
+				return;
+			case FamilytreePackage.MEMBER__CHILDREN:
+				getChildren().clear();
+				return;
+			case FamilytreePackage.MEMBER__PARENTS:
+				getParents().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case FamilytreePackage.MEMBER__NAME:
+				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+			case FamilytreePackage.MEMBER__AGE:
+				return age != AGE_EDEFAULT;
+			case FamilytreePackage.MEMBER__CHILDREN:
+				return children != null && !children.isEmpty();
+			case FamilytreePackage.MEMBER__PARENTS:
+				return parents != null && !parents.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuilder result = new StringBuilder(super.toString());
+		result.append(" (name: ");
+		result.append(name);
+		result.append(", age: ");
+		result.append(age);
+		result.append(')');
+		return result.toString();
+	}
+
+} //MemberImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/familytree/util/FamilytreeAdapterFactory.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/familytree/util/FamilytreeAdapterFactory.java
new file mode 100644
index 00000000..6412c40f
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/familytree/util/FamilytreeAdapterFactory.java
@@ -0,0 +1,138 @@
+/**
+ */
+package familytree.util;
+
+import familytree.*;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see familytree.FamilytreePackage
+ * @generated
+ */
+public class FamilytreeAdapterFactory extends AdapterFactoryImpl {
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static FamilytreePackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public FamilytreeAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = FamilytreePackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected FamilytreeSwitch<Adapter> modelSwitch =
+		new FamilytreeSwitch<Adapter>() {
+			@Override
+			public Adapter caseFamilyTree(FamilyTree object) {
+				return createFamilyTreeAdapter();
+			}
+			@Override
+			public Adapter caseMember(Member object) {
+				return createMemberAdapter();
+			}
+			@Override
+			public Adapter defaultCase(EObject object) {
+				return createEObjectAdapter();
+			}
+		};
+
+	/**
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param target the object to adapt.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject)target);
+	}
+
+
+	/**
+	 * Creates a new adapter for an object of class '{@link familytree.FamilyTree <em>Family Tree</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see familytree.FamilyTree
+	 * @generated
+	 */
+	public Adapter createFamilyTreeAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link familytree.Member <em>Member</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see familytree.Member
+	 * @generated
+	 */
+	public Adapter createMemberAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+
+} //FamilytreeAdapterFactory
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/familytree/util/FamilytreeSwitch.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/familytree/util/FamilytreeSwitch.java
new file mode 100644
index 00000000..75bbce3d
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/familytree/util/FamilytreeSwitch.java
@@ -0,0 +1,131 @@
+/**
+ */
+package familytree.util;
+
+import familytree.*;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.util.Switch;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
+ * to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see familytree.FamilytreePackage
+ * @generated
+ */
+public class FamilytreeSwitch<T> extends Switch<T> {
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static FamilytreePackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public FamilytreeSwitch() {
+		if (modelPackage == null) {
+			modelPackage = FamilytreePackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+			case FamilytreePackage.FAMILY_TREE: {
+				FamilyTree familyTree = (FamilyTree)theEObject;
+				T result = caseFamilyTree(familyTree);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case FamilytreePackage.MEMBER: {
+				Member member = (Member)theEObject;
+				T result = caseMember(member);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Family Tree</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Family Tree</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseFamilyTree(FamilyTree object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Member</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Member</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseMember(Member object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+
+} //FamilytreeSwitch
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/hu/bme/mit/inf/dslreasoner/diversitycalculator/MeasureDiversity.xtend b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/hu/bme/mit/inf/dslreasoner/diversitycalculator/MeasureDiversity.xtend
new file mode 100644
index 00000000..8a2bff1a
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/hu/bme/mit/inf/dslreasoner/diversitycalculator/MeasureDiversity.xtend
@@ -0,0 +1,283 @@
+package hu.bme.mit.inf.dslreasoner.diversitycalculator
+
+import TaxationWithRoot.TaxationWithRootPackage
+import familytree.FamilytreePackage
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2LogicConfiguration
+import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor
+import hu.bme.mit.inf.dslreasoner.ecore2logic.ecore2logicannotations.Ecore2logicannotationsPackage
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.DefinedElement
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage
+import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicproblemPackage
+import hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.Viatra2LogicAnnotationsPackage
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2PartialInterpretation
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.neighbourhood.AbstractNodeDescriptor
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.neighbourhood.PartialInterpretation2ImmutableTypeLattice
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage
+import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace
+import java.io.File
+import java.io.PrintWriter
+import java.util.ArrayList
+import java.util.Collections
+import java.util.Comparator
+import java.util.HashMap
+import java.util.HashSet
+import java.util.LinkedList
+import java.util.List
+import java.util.Map
+import org.eclipse.emf.ecore.EClass
+import org.eclipse.emf.ecore.EEnum
+import org.eclipse.emf.ecore.EObject
+import org.eclipse.emf.ecore.EcorePackage
+import org.eclipse.emf.ecore.resource.Resource
+import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngineOptions
+import org.eclipse.viatra.query.runtime.localsearch.matcher.integration.LocalSearchEMFBackendFactory
+import org.eclipse.viatra.query.runtime.rete.matcher.ReteBackendFactory
+import org.eclipse.xtend.lib.annotations.Data
+import satellite.SatellitePackage
+
+class MeasureDiversity {
+	static val partialInterpretation2Logic = new InstanceModel2PartialInterpretation
+	static val neiguboirhoodComputer = new PartialInterpretation2ImmutableTypeLattice
+	static val Ecore2Logic ecore2Logic = new Ecore2Logic
+	
+	static private def init() {
+		LogiclanguagePackage.eINSTANCE.class
+		LogicproblemPackage.eINSTANCE.class
+		PartialinterpretationPackage.eINSTANCE.class
+		Ecore2logicannotationsPackage.eINSTANCE.class
+		Viatra2LogicAnnotationsPackage.eINSTANCE.class
+		Resource.Factory.Registry.INSTANCE.extensionToFactoryMap.put("*",new XMIResourceFactoryImpl)
+		ViatraQueryEngineOptions.setSystemDefaultBackends(ReteBackendFactory.INSTANCE, ReteBackendFactory.INSTANCE, LocalSearchEMFBackendFactory.INSTANCE)
+	}
+	static class BenchmarkConfig {
+	 	int range;
+	 	int size
+	 	PrintWriter writer
+	 	String scenario
+	 }
+	 
+	def static void main(String[] args) {
+		init()
+	
+		val path = '''inputs'''
+		val scenarios = #[
+
+			'''FamilyTree''',
+			'''Satellite''',
+			'''Taxation''',
+			'''FamilyTreeNoNum''',
+			'''SatelliteNoNum''',
+			'''TaxationNoNum'''
+		]
+		
+		val writer = new PrintWriter(path+"/diversity.csv", "UTF-8");
+		for(scenario : scenarios) {
+			val config=new BenchmarkConfig();
+			config.writer=writer
+			config.range = 3
+			config.scenario = scenario
+			//config.size = 5
+			//for (var i=1; i<=21;i++) {
+				measureDiversity(scenario,path+"/"+scenario,config)	
+			//}
+			println(scenario+" finished")
+		}
+		writer.close();	
+	}
+	
+	def static void measureDiversity(String scenario, String path, BenchmarkConfig config) {
+		val file = new File(path)
+		if(file.isDirectory) {
+			val subfiles = file.list
+			val xmiSubfiles = subfiles.filter[it.endsWith(".xmi")]
+			if(!xmiSubfiles.empty) {
+				measureDiversity(scenario, file,xmiSubfiles.map[new File(path+"/"+it)].toList,path,config)
+			} else {
+				for(subfile : subfiles) {
+					measureDiversity(scenario, path+"/"+subfile,config)
+				}
+			}
+		} else if(file.isFile) {
+			// Do nothing
+		}
+	}
+	
+	def static void measureDiversity(String scenario, File parent, List<File> files, String path, BenchmarkConfig config) {
+		val depth=config.range
+		
+		//collect and order models
+		val workspace = new FileSystemWorkspace(path, "")
+		EcorePackage.eINSTANCE.eClass
+		TaxationWithRootPackage.eINSTANCE.eClass
+		SatellitePackage.eINSTANCE.eClass
+		FamilytreePackage.eINSTANCE.eClass
+		files.sort(new FileComparator)
+		
+		//calculate shapes
+		val modelShapeLists=new HashMap<File,List<Map<? extends AbstractNodeDescriptor, Integer>>>();
+		val modelShapes=new HashMap<File,Map<? extends AbstractNodeDescriptor, Integer>>();
+		for (file : files) {
+			
+			val model = workspace.readModel(EObject, file.name)
+			
+			val pckg = model.eClass.EPackage
+			val metamodel = new EcoreMetamodelDescriptor(
+				pckg.EClassifiers.filter(EClass).toList,
+				Collections::emptySet,
+				false,
+				pckg.EClassifiers.filter(EEnum).toList,
+				pckg.EClassifiers.filter(EEnum).map[ELiterals].flatten.toList,
+				pckg.EClassifiers.filter(EClass).map[EReferences].flatten.toList,
+				pckg.EClassifiers.filter(EClass).map[EAttributes].flatten.toList
+			)
+			val metamodelTransformationOutput = ecore2Logic.transformMetamodel(metamodel,new Ecore2LogicConfiguration)
+
+			
+			val partialModelOutput = partialInterpretation2Logic.transform(metamodelTransformationOutput, model.eResource,
+				false)
+			
+				
+			
+			val list = shapeList(partialModelOutput, depth/*,matchesList*/)
+			//	modelShapeLists.put(file,list)
+			modelShapes.put(file,list.get(depth-1))
+		}
+		//println('''shapes done.''')
+		val writer=config.writer
+		println("Printing internal diversity of models")
+		//writer.println("Scenario;File;Diversity")
+		//val size= config.size as double
+		for (model:files) {
+			val modelshape=modelShapes.get(model)
+			val amounts = modelshape.values.reduce[a,b|a+b]
+			val shapes=modelshape.size() as double
+			writer.println(config.scenario+","+model+","+shapes/amounts)
+		}
+	 }
+	
+	def static getRandomOrders(List<File> files, int number) {
+		val sequences=new ArrayList<List<File>>();
+		for (var i=0;i<number;i++) {
+			val seq=new ArrayList<File>(files);
+			Collections.shuffle(seq);
+			sequences.add(seq);
+		}
+		return sequences
+	}
+	
+	def static printShapeNumbersOnRandomOrders(List<File> files, HashMap<File, Map<? extends AbstractNodeDescriptor, Integer>> shapes, int number) {
+		val sequences=new ArrayList<List<File>>();
+		println("Printing generated random orders (models apper in original order)")
+		for (var i=0;i<number;i++) {
+			val seq=new ArrayList<File>(files);
+			Collections.shuffle(seq);
+			sequences.add(seq);
+			println("Model;NewIndex")
+			for (model:files) {
+				println(model+","+seq.indexOf(model));
+			}
+		}
+		
+		println("Printing generated random orders (models apper in original order)")
+		println("SeqNo;Index;Model;NewShapes;AllShapes")
+		
+		var seqindx=0;
+		for (seq:sequences) {
+			val currshapes=new HashSet<AbstractNodeDescriptor>()
+			var indx=0
+			for (model:seq){
+				val beforesize=currshapes.size
+				currshapes.addAll(shapes.get(model).keySet)
+				val aftersize=currshapes.size
+				val diff=aftersize-beforesize
+				println(seqindx+","+indx+","+model+","+diff+","+currshapes.size)	
+				indx++;
+			}
+			seqindx++;
+		}
+	}
+	
+	 def static void printShapeNumbers(List<File> order, Map<File,Map<? extends AbstractNodeDescriptor, Integer>> shapes) {
+	 	println("Model;InternalDiversity;NewShapes;AllCurrentShapes")
+		val currshapes=new HashSet<AbstractNodeDescriptor>()
+		
+		for (file:order) {
+			val beforesize=currshapes.size
+			currshapes.addAll(shapes.get(file).keySet)
+			val aftersize=currshapes.size
+			val diff=aftersize-beforesize
+			println(file+","+shapes.get(file).size+","+diff+","+currshapes.size)
+		}
+	 }
+	
+	
+	protected def static runIndex(String name) {
+		val res = name.split("\\.").head.split('_').get(0)
+		if(res.startsWith("result")) {
+			return res.substring(6)
+		} else {
+			return res
+		}
+	}
+	protected def static modelIndex(String name) {
+		name.split("\\.").head.split('_').get(1)
+	}
+	
+	protected def static  representationList(PartialInterpretation partialModel, int depth) {
+		val list = new LinkedList
+		for(i : 0..<depth) {
+			val neighbourhood = neiguboirhoodComputer.createRepresentation(partialModel,i,0,0)
+			//val m = neighbourhood.modelRepresentation
+			//println(m)
+			list.add(neighbourhood.modelRepresentation.keySet.map[it.hashCode].toSet)
+		}
+		return list
+	}
+	
+	protected def static List<Map<? extends AbstractNodeDescriptor, Integer>>  shapeList(PartialInterpretation partialModel, int depth/*, List<PatternWithMatches> matches*/) {
+
+		val list = new LinkedList
+		for(i : 0..<depth) {
+			
+			val neighbourhood = neiguboirhoodComputer.createRepresentation(partialModel,i,Integer.MAX_VALUE,Integer.MAX_VALUE/*, matchmap*/)
+
+			val openWorldElements = partialModel.openWorldElements //+ partialModel.newElements.filter(PrimitiveElement) + partialModel.problem.elements.filter(PrimitiveElement)
+			val representationsOfOpenElements = openWorldElements.map[neighbourhood.nodeRepresentations.get(it)].toSet 
+			val allElementRepresentation = new HashMap(neighbourhood.modelRepresentation)
+			representationsOfOpenElements.forEach[allElementRepresentation.remove(it)]
+			
+			val Map<Integer, Integer> hashedRepresentation = new HashMap()
+			for(entry : allElementRepresentation.entrySet) {
+				hashedRepresentation.put(entry.key.dataHash,entry.value)
+			}
+			list.add(allElementRepresentation)
+		}
+		return list
+	}
+}
+
+@Data
+class PatternWithMatches {
+	String name;
+	List<List<DefinedElement>> matches
+}
+
+class FileComparator implements Comparator<File> {
+	
+	override compare(File arg0, File arg1) {
+		val r1 = Integer.parseInt(MeasureDiversity::runIndex(arg0.name))
+		val r2 = Integer.parseInt(MeasureDiversity::runIndex(arg1.name))
+		val runRes = Integer.compare(r1, r2)
+		if(runRes === 0) {
+			val a = Integer.parseInt(MeasureDiversity::modelIndex(arg0.name))
+			val b = Integer.parseInt(MeasureDiversity::modelIndex(arg1.name))
+			Integer.compare(a,b)
+		} else {
+			return runRes
+		}
+		arg0.name.compareTo(arg1.name)
+	}
+}
\ No newline at end of file
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/hu/bme/mit/inf/dslreasoner/diversitycalculator/MeasureInternalDiversity.xtend b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/hu/bme/mit/inf/dslreasoner/diversitycalculator/MeasureInternalDiversity.xtend
new file mode 100644
index 00000000..1510eeb8
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/hu/bme/mit/inf/dslreasoner/diversitycalculator/MeasureInternalDiversity.xtend
@@ -0,0 +1,107 @@
+package hu.bme.mit.inf.dslreasoner.diversitycalculator
+
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2LogicConfiguration
+import hu.bme.mit.inf.dslreasoner.ecore2logic.ecore2logicannotations.Ecore2logicannotationsPackage
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage
+import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicproblemPackage
+import hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.Viatra2LogicAnnotationsPackage
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2PartialInterpretation
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.neighbourhood.PartialInterpretation2ImmutableTypeLattice
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage
+import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace
+import java.io.File
+import java.util.LinkedList
+import java.util.List
+import org.eclipse.emf.ecore.EObject
+import org.eclipse.emf.ecore.resource.Resource
+import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl
+import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor
+
+class MeasureInternalDiversity {
+		static val partialInterpretation2Logic = new InstanceModel2PartialInterpretation
+	static val neiguboirhoodComputer = new PartialInterpretation2ImmutableTypeLattice
+	
+	static val Ecore2Logic ecore2Logic = new Ecore2Logic
+	
+	static private def init() {
+		LogiclanguagePackage.eINSTANCE.class
+		LogicproblemPackage.eINSTANCE.class
+		PartialinterpretationPackage.eINSTANCE.class
+		Ecore2logicannotationsPackage.eINSTANCE.class
+		Viatra2LogicAnnotationsPackage.eINSTANCE.class
+		Resource.Factory.Registry.INSTANCE.extensionToFactoryMap.put("*",new XMIResourceFactoryImpl)
+	}
+	
+	
+	def static void main(String[] args) {
+		init()
+	}
+	
+	def static run(EcoreMetamodelDescriptor metamodel, String path, String scenario) {
+		val range = 20
+		
+		measureDiversity(metamodel,scenario,path,range)
+	}
+	
+	def static void measureDiversity(EcoreMetamodelDescriptor metamodel, String scenario, String path, int depth) {
+		val file = new File(path)
+		if(file.isDirectory) {
+			val subfiles = file.list
+			val xmiSubfiles = subfiles.filter[it.endsWith(".xmi")]
+			if(!xmiSubfiles.empty) {
+				measureDiversity(metamodel, scenario,file,xmiSubfiles.map[new File(path+"/"+it)].toList,path,depth)
+			} else {
+				for(subfile : subfiles) {
+					measureDiversity(metamodel, scenario,path+"/"+subfile,depth)
+				}
+			}
+		} else if(file.isFile) {
+			// Do nothing
+		}	
+	}
+	
+	def static void measureDiversity(EcoreMetamodelDescriptor metamodel, String scenario, File parent, List<File> files, String path, int depth) {
+		val workspace = new FileSystemWorkspace(path,"")
+		//val file2Neighbourhood = new HashMap<File,List<?>>
+		for(file : files) {
+			
+			val metamodelTransformationOutput = ecore2Logic.transformMetamodel(metamodel,new Ecore2LogicConfiguration)
+			
+			val model = workspace.readModel(EObject,file.name)
+			val partialModel = partialInterpretation2Logic.transform(metamodelTransformationOutput,model.eResource,false)
+			val list = representationList(partialModel,depth)
+			try {
+				val runIndex = file.name.runIndex
+				val modelIndex = file.name.modelIndex
+				print('''«scenario»;«runIndex»;«modelIndex»''')
+			} catch (Exception e) {
+				print('''«scenario»;0;«file.name»''')
+			}
+			for(i : 0..<list.size) {
+				print(''';«list.get(i).keySet.size»''')
+			}
+			print(";"+(list.last.keySet.size*1.0 /partialModel.newElements.size))
+			println
+		}
+	}
+	
+	protected def static runIndex(String name) {
+		name.split("\\.").head.split('_').get(1)
+	}
+	protected def static modelIndex(String name) {
+		name.split("\\.").head.split('_').get(2)
+	}
+	
+	protected def static  representationList(PartialInterpretation partialModel, int depth) {
+		val list = new LinkedList
+		for(i : 0..<depth) {
+			val neighbourhood = neiguboirhoodComputer.createRepresentation(partialModel,i,0,0)
+			//val m = neighbourhood.modelRepresentation
+			//println(m)
+			list.add(neighbourhood.modelRepresentation)
+		}
+		return list
+	}
+}
\ No newline at end of file
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/CommSubsystem.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/CommSubsystem.java
new file mode 100644
index 00000000..905f5c3c
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/CommSubsystem.java
@@ -0,0 +1,92 @@
+/**
+ */
+package satellite;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Comm Subsystem</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link satellite.CommSubsystem#getTarget <em>Target</em>}</li>
+ *   <li>{@link satellite.CommSubsystem#getFrequency <em>Frequency</em>}</li>
+ *   <li>{@link satellite.CommSubsystem#getPathLength <em>Path Length</em>}</li>
+ * </ul>
+ *
+ * @see satellite.SatellitePackage#getCommSubsystem()
+ * @model abstract="true"
+ * @generated
+ */
+public interface CommSubsystem extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Target</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Target</em>' reference.
+	 * @see #setTarget(CommSubsystem)
+	 * @see satellite.SatellitePackage#getCommSubsystem_Target()
+	 * @model
+	 * @generated
+	 */
+	CommSubsystem getTarget();
+
+	/**
+	 * Sets the value of the '{@link satellite.CommSubsystem#getTarget <em>Target</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Target</em>' reference.
+	 * @see #getTarget()
+	 * @generated
+	 */
+	void setTarget(CommSubsystem value);
+
+	/**
+	 * Returns the value of the '<em><b>Frequency</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Frequency</em>' attribute.
+	 * @see #setFrequency(int)
+	 * @see satellite.SatellitePackage#getCommSubsystem_Frequency()
+	 * @model required="true"
+	 * @generated
+	 */
+	int getFrequency();
+
+	/**
+	 * Sets the value of the '{@link satellite.CommSubsystem#getFrequency <em>Frequency</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Frequency</em>' attribute.
+	 * @see #getFrequency()
+	 * @generated
+	 */
+	void setFrequency(int value);
+
+	/**
+	 * Returns the value of the '<em><b>Path Length</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Path Length</em>' attribute.
+	 * @see #setPathLength(int)
+	 * @see satellite.SatellitePackage#getCommSubsystem_PathLength()
+	 * @model required="true"
+	 * @generated
+	 */
+	int getPathLength();
+
+	/**
+	 * Sets the value of the '{@link satellite.CommSubsystem#getPathLength <em>Path Length</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Path Length</em>' attribute.
+	 * @see #getPathLength()
+	 * @generated
+	 */
+	void setPathLength(int value);
+
+} // CommSubsystem
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/CommunicatingElement.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/CommunicatingElement.java
new file mode 100644
index 00000000..c77ee70d
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/CommunicatingElement.java
@@ -0,0 +1,38 @@
+/**
+ */
+package satellite;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Communicating Element</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link satellite.CommunicatingElement#getCommSubsystem <em>Comm Subsystem</em>}</li>
+ * </ul>
+ *
+ * @see satellite.SatellitePackage#getCommunicatingElement()
+ * @model abstract="true"
+ * @generated
+ */
+public interface CommunicatingElement extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Comm Subsystem</b></em>' containment reference list.
+	 * The list contents are of type {@link satellite.CommSubsystem}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Comm Subsystem</em>' containment reference list.
+	 * @see satellite.SatellitePackage#getCommunicatingElement_CommSubsystem()
+	 * @model containment="true" required="true" upper="2"
+	 * @generated
+	 */
+	EList<CommSubsystem> getCommSubsystem();
+
+} // CommunicatingElement
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/ConstellationMission.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/ConstellationMission.java
new file mode 100644
index 00000000..82efd31c
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/ConstellationMission.java
@@ -0,0 +1,61 @@
+/**
+ */
+package satellite;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Constellation Mission</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link satellite.ConstellationMission#getGroundStationNetwork <em>Ground Station Network</em>}</li>
+ *   <li>{@link satellite.ConstellationMission#getSpacecraft <em>Spacecraft</em>}</li>
+ * </ul>
+ *
+ * @see satellite.SatellitePackage#getConstellationMission()
+ * @model abstract="true"
+ * @generated
+ */
+public interface ConstellationMission extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Ground Station Network</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Ground Station Network</em>' containment reference.
+	 * @see #setGroundStationNetwork(GroundStationNetwork)
+	 * @see satellite.SatellitePackage#getConstellationMission_GroundStationNetwork()
+	 * @model containment="true" required="true"
+	 * @generated
+	 */
+	GroundStationNetwork getGroundStationNetwork();
+
+	/**
+	 * Sets the value of the '{@link satellite.ConstellationMission#getGroundStationNetwork <em>Ground Station Network</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Ground Station Network</em>' containment reference.
+	 * @see #getGroundStationNetwork()
+	 * @generated
+	 */
+	void setGroundStationNetwork(GroundStationNetwork value);
+
+	/**
+	 * Returns the value of the '<em><b>Spacecraft</b></em>' containment reference list.
+	 * The list contents are of type {@link satellite.Spacecraft}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Spacecraft</em>' containment reference list.
+	 * @see satellite.SatellitePackage#getConstellationMission_Spacecraft()
+	 * @model containment="true" lower="2"
+	 * @generated
+	 */
+	EList<Spacecraft> getSpacecraft();
+
+} // ConstellationMission
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/CubeSat.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/CubeSat.java
new file mode 100644
index 00000000..6b04d5f8
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/CubeSat.java
@@ -0,0 +1,17 @@
+/**
+ */
+package satellite;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Cube Sat</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see satellite.SatellitePackage#getCubeSat()
+ * @model abstract="true"
+ * @generated
+ */
+public interface CubeSat extends Spacecraft {
+} // CubeSat
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/CubeSat3U.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/CubeSat3U.java
new file mode 100644
index 00000000..68ff7a71
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/CubeSat3U.java
@@ -0,0 +1,17 @@
+/**
+ */
+package satellite;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Cube Sat3 U</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see satellite.SatellitePackage#getCubeSat3U()
+ * @model
+ * @generated
+ */
+public interface CubeSat3U extends CubeSat {
+} // CubeSat3U
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/CubeSat6U.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/CubeSat6U.java
new file mode 100644
index 00000000..bf3d8525
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/CubeSat6U.java
@@ -0,0 +1,17 @@
+/**
+ */
+package satellite;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Cube Sat6 U</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see satellite.SatellitePackage#getCubeSat6U()
+ * @model
+ * @generated
+ */
+public interface CubeSat6U extends CubeSat {
+} // CubeSat6U
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/GroundStationNetwork.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/GroundStationNetwork.java
new file mode 100644
index 00000000..a58c0ff4
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/GroundStationNetwork.java
@@ -0,0 +1,17 @@
+/**
+ */
+package satellite;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Ground Station Network</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see satellite.SatellitePackage#getGroundStationNetwork()
+ * @model
+ * @generated
+ */
+public interface GroundStationNetwork extends CommunicatingElement {
+} // GroundStationNetwork
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/InterferometryMission.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/InterferometryMission.java
new file mode 100644
index 00000000..f0859bda
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/InterferometryMission.java
@@ -0,0 +1,45 @@
+/**
+ */
+package satellite;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Interferometry Mission</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link satellite.InterferometryMission#getObservationTime <em>Observation Time</em>}</li>
+ * </ul>
+ *
+ * @see satellite.SatellitePackage#getInterferometryMission()
+ * @model
+ * @generated
+ */
+public interface InterferometryMission extends ConstellationMission {
+	/**
+	 * Returns the value of the '<em><b>Observation Time</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Observation Time</em>' attribute.
+	 * @see #setObservationTime(int)
+	 * @see satellite.SatellitePackage#getInterferometryMission_ObservationTime()
+	 * @model required="true"
+	 * @generated
+	 */
+	int getObservationTime();
+
+	/**
+	 * Sets the value of the '{@link satellite.InterferometryMission#getObservationTime <em>Observation Time</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Observation Time</em>' attribute.
+	 * @see #getObservationTime()
+	 * @generated
+	 */
+	void setObservationTime(int value);
+
+} // InterferometryMission
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/InterferometryPayload.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/InterferometryPayload.java
new file mode 100644
index 00000000..bd2545a3
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/InterferometryPayload.java
@@ -0,0 +1,17 @@
+/**
+ */
+package satellite;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Interferometry Payload</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see satellite.SatellitePackage#getInterferometryPayload()
+ * @model
+ * @generated
+ */
+public interface InterferometryPayload extends Payload {
+} // InterferometryPayload
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/KaCommSubsystem.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/KaCommSubsystem.java
new file mode 100644
index 00000000..a30cdfd5
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/KaCommSubsystem.java
@@ -0,0 +1,17 @@
+/**
+ */
+package satellite;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Ka Comm Subsystem</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see satellite.SatellitePackage#getKaCommSubsystem()
+ * @model
+ * @generated
+ */
+public interface KaCommSubsystem extends CommSubsystem {
+} // KaCommSubsystem
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/Payload.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/Payload.java
new file mode 100644
index 00000000..b4d0f02f
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/Payload.java
@@ -0,0 +1,18 @@
+/**
+ */
+package satellite;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Payload</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see satellite.SatellitePackage#getPayload()
+ * @model abstract="true"
+ * @generated
+ */
+public interface Payload extends EObject {
+} // Payload
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/SatelliteFactory.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/SatelliteFactory.java
new file mode 100644
index 00000000..50414622
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/SatelliteFactory.java
@@ -0,0 +1,114 @@
+/**
+ */
+package satellite;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see satellite.SatellitePackage
+ * @generated
+ */
+public interface SatelliteFactory extends EFactory {
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	SatelliteFactory eINSTANCE = satellite.impl.SatelliteFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Interferometry Mission</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Interferometry Mission</em>'.
+	 * @generated
+	 */
+	InterferometryMission createInterferometryMission();
+
+	/**
+	 * Returns a new object of class '<em>Ground Station Network</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Ground Station Network</em>'.
+	 * @generated
+	 */
+	GroundStationNetwork createGroundStationNetwork();
+
+	/**
+	 * Returns a new object of class '<em>Interferometry Payload</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Interferometry Payload</em>'.
+	 * @generated
+	 */
+	InterferometryPayload createInterferometryPayload();
+
+	/**
+	 * Returns a new object of class '<em>Cube Sat3 U</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Cube Sat3 U</em>'.
+	 * @generated
+	 */
+	CubeSat3U createCubeSat3U();
+
+	/**
+	 * Returns a new object of class '<em>Cube Sat6 U</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Cube Sat6 U</em>'.
+	 * @generated
+	 */
+	CubeSat6U createCubeSat6U();
+
+	/**
+	 * Returns a new object of class '<em>Small Sat</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Small Sat</em>'.
+	 * @generated
+	 */
+	SmallSat createSmallSat();
+
+	/**
+	 * Returns a new object of class '<em>UHF Comm Subsystem</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>UHF Comm Subsystem</em>'.
+	 * @generated
+	 */
+	UHFCommSubsystem createUHFCommSubsystem();
+
+	/**
+	 * Returns a new object of class '<em>XComm Subsystem</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>XComm Subsystem</em>'.
+	 * @generated
+	 */
+	XCommSubsystem createXCommSubsystem();
+
+	/**
+	 * Returns a new object of class '<em>Ka Comm Subsystem</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Ka Comm Subsystem</em>'.
+	 * @generated
+	 */
+	KaCommSubsystem createKaCommSubsystem();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	SatellitePackage getSatellitePackage();
+
+} //SatelliteFactory
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/SatellitePackage.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/SatellitePackage.java
new file mode 100644
index 00000000..fa3fa0e9
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/SatellitePackage.java
@@ -0,0 +1,1218 @@
+/**
+ */
+package satellite;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ *   <li>each class,</li>
+ *   <li>each feature of each class,</li>
+ *   <li>each operation of each class,</li>
+ *   <li>each enum,</li>
+ *   <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see satellite.SatelliteFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface SatellitePackage extends EPackage {
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "satellite";
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "http://www.example.org/satellite";
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "satellite";
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	SatellitePackage eINSTANCE = satellite.impl.SatellitePackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link satellite.impl.ConstellationMissionImpl <em>Constellation Mission</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see satellite.impl.ConstellationMissionImpl
+	 * @see satellite.impl.SatellitePackageImpl#getConstellationMission()
+	 * @generated
+	 */
+	int CONSTELLATION_MISSION = 0;
+
+	/**
+	 * The feature id for the '<em><b>Ground Station Network</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTELLATION_MISSION__GROUND_STATION_NETWORK = 0;
+
+	/**
+	 * The feature id for the '<em><b>Spacecraft</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTELLATION_MISSION__SPACECRAFT = 1;
+
+	/**
+	 * The number of structural features of the '<em>Constellation Mission</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTELLATION_MISSION_FEATURE_COUNT = 2;
+
+	/**
+	 * The number of operations of the '<em>Constellation Mission</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTELLATION_MISSION_OPERATION_COUNT = 0;
+
+	/**
+	 * The meta object id for the '{@link satellite.impl.InterferometryMissionImpl <em>Interferometry Mission</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see satellite.impl.InterferometryMissionImpl
+	 * @see satellite.impl.SatellitePackageImpl#getInterferometryMission()
+	 * @generated
+	 */
+	int INTERFEROMETRY_MISSION = 1;
+
+	/**
+	 * The feature id for the '<em><b>Ground Station Network</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFEROMETRY_MISSION__GROUND_STATION_NETWORK = CONSTELLATION_MISSION__GROUND_STATION_NETWORK;
+
+	/**
+	 * The feature id for the '<em><b>Spacecraft</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFEROMETRY_MISSION__SPACECRAFT = CONSTELLATION_MISSION__SPACECRAFT;
+
+	/**
+	 * The feature id for the '<em><b>Observation Time</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFEROMETRY_MISSION__OBSERVATION_TIME = CONSTELLATION_MISSION_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Interferometry Mission</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFEROMETRY_MISSION_FEATURE_COUNT = CONSTELLATION_MISSION_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of operations of the '<em>Interferometry Mission</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFEROMETRY_MISSION_OPERATION_COUNT = CONSTELLATION_MISSION_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link satellite.impl.CommunicatingElementImpl <em>Communicating Element</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see satellite.impl.CommunicatingElementImpl
+	 * @see satellite.impl.SatellitePackageImpl#getCommunicatingElement()
+	 * @generated
+	 */
+	int COMMUNICATING_ELEMENT = 2;
+
+	/**
+	 * The feature id for the '<em><b>Comm Subsystem</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMUNICATING_ELEMENT__COMM_SUBSYSTEM = 0;
+
+	/**
+	 * The number of structural features of the '<em>Communicating Element</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMUNICATING_ELEMENT_FEATURE_COUNT = 1;
+
+	/**
+	 * The number of operations of the '<em>Communicating Element</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMUNICATING_ELEMENT_OPERATION_COUNT = 0;
+
+	/**
+	 * The meta object id for the '{@link satellite.impl.GroundStationNetworkImpl <em>Ground Station Network</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see satellite.impl.GroundStationNetworkImpl
+	 * @see satellite.impl.SatellitePackageImpl#getGroundStationNetwork()
+	 * @generated
+	 */
+	int GROUND_STATION_NETWORK = 3;
+
+	/**
+	 * The feature id for the '<em><b>Comm Subsystem</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int GROUND_STATION_NETWORK__COMM_SUBSYSTEM = COMMUNICATING_ELEMENT__COMM_SUBSYSTEM;
+
+	/**
+	 * The number of structural features of the '<em>Ground Station Network</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int GROUND_STATION_NETWORK_FEATURE_COUNT = COMMUNICATING_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Ground Station Network</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int GROUND_STATION_NETWORK_OPERATION_COUNT = COMMUNICATING_ELEMENT_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link satellite.impl.SpacecraftImpl <em>Spacecraft</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see satellite.impl.SpacecraftImpl
+	 * @see satellite.impl.SatellitePackageImpl#getSpacecraft()
+	 * @generated
+	 */
+	int SPACECRAFT = 4;
+
+	/**
+	 * The feature id for the '<em><b>Comm Subsystem</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SPACECRAFT__COMM_SUBSYSTEM = COMMUNICATING_ELEMENT__COMM_SUBSYSTEM;
+
+	/**
+	 * The feature id for the '<em><b>Payload</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SPACECRAFT__PAYLOAD = COMMUNICATING_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Spacecraft</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SPACECRAFT_FEATURE_COUNT = COMMUNICATING_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of operations of the '<em>Spacecraft</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SPACECRAFT_OPERATION_COUNT = COMMUNICATING_ELEMENT_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link satellite.impl.CommSubsystemImpl <em>Comm Subsystem</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see satellite.impl.CommSubsystemImpl
+	 * @see satellite.impl.SatellitePackageImpl#getCommSubsystem()
+	 * @generated
+	 */
+	int COMM_SUBSYSTEM = 5;
+
+	/**
+	 * The feature id for the '<em><b>Target</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMM_SUBSYSTEM__TARGET = 0;
+
+	/**
+	 * The feature id for the '<em><b>Frequency</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMM_SUBSYSTEM__FREQUENCY = 1;
+
+	/**
+	 * The feature id for the '<em><b>Path Length</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMM_SUBSYSTEM__PATH_LENGTH = 2;
+
+	/**
+	 * The number of structural features of the '<em>Comm Subsystem</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMM_SUBSYSTEM_FEATURE_COUNT = 3;
+
+	/**
+	 * The number of operations of the '<em>Comm Subsystem</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMM_SUBSYSTEM_OPERATION_COUNT = 0;
+
+	/**
+	 * The meta object id for the '{@link satellite.impl.PayloadImpl <em>Payload</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see satellite.impl.PayloadImpl
+	 * @see satellite.impl.SatellitePackageImpl#getPayload()
+	 * @generated
+	 */
+	int PAYLOAD = 6;
+
+	/**
+	 * The number of structural features of the '<em>Payload</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAYLOAD_FEATURE_COUNT = 0;
+
+	/**
+	 * The number of operations of the '<em>Payload</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PAYLOAD_OPERATION_COUNT = 0;
+
+	/**
+	 * The meta object id for the '{@link satellite.impl.InterferometryPayloadImpl <em>Interferometry Payload</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see satellite.impl.InterferometryPayloadImpl
+	 * @see satellite.impl.SatellitePackageImpl#getInterferometryPayload()
+	 * @generated
+	 */
+	int INTERFEROMETRY_PAYLOAD = 7;
+
+	/**
+	 * The number of structural features of the '<em>Interferometry Payload</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFEROMETRY_PAYLOAD_FEATURE_COUNT = PAYLOAD_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Interferometry Payload</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFEROMETRY_PAYLOAD_OPERATION_COUNT = PAYLOAD_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link satellite.impl.CubeSatImpl <em>Cube Sat</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see satellite.impl.CubeSatImpl
+	 * @see satellite.impl.SatellitePackageImpl#getCubeSat()
+	 * @generated
+	 */
+	int CUBE_SAT = 11;
+
+	/**
+	 * The feature id for the '<em><b>Comm Subsystem</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CUBE_SAT__COMM_SUBSYSTEM = SPACECRAFT__COMM_SUBSYSTEM;
+
+	/**
+	 * The feature id for the '<em><b>Payload</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CUBE_SAT__PAYLOAD = SPACECRAFT__PAYLOAD;
+
+	/**
+	 * The number of structural features of the '<em>Cube Sat</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CUBE_SAT_FEATURE_COUNT = SPACECRAFT_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Cube Sat</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CUBE_SAT_OPERATION_COUNT = SPACECRAFT_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link satellite.impl.CubeSat3UImpl <em>Cube Sat3 U</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see satellite.impl.CubeSat3UImpl
+	 * @see satellite.impl.SatellitePackageImpl#getCubeSat3U()
+	 * @generated
+	 */
+	int CUBE_SAT3_U = 8;
+
+	/**
+	 * The feature id for the '<em><b>Comm Subsystem</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CUBE_SAT3_U__COMM_SUBSYSTEM = CUBE_SAT__COMM_SUBSYSTEM;
+
+	/**
+	 * The feature id for the '<em><b>Payload</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CUBE_SAT3_U__PAYLOAD = CUBE_SAT__PAYLOAD;
+
+	/**
+	 * The number of structural features of the '<em>Cube Sat3 U</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CUBE_SAT3_U_FEATURE_COUNT = CUBE_SAT_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Cube Sat3 U</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CUBE_SAT3_U_OPERATION_COUNT = CUBE_SAT_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link satellite.impl.CubeSat6UImpl <em>Cube Sat6 U</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see satellite.impl.CubeSat6UImpl
+	 * @see satellite.impl.SatellitePackageImpl#getCubeSat6U()
+	 * @generated
+	 */
+	int CUBE_SAT6_U = 9;
+
+	/**
+	 * The feature id for the '<em><b>Comm Subsystem</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CUBE_SAT6_U__COMM_SUBSYSTEM = CUBE_SAT__COMM_SUBSYSTEM;
+
+	/**
+	 * The feature id for the '<em><b>Payload</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CUBE_SAT6_U__PAYLOAD = CUBE_SAT__PAYLOAD;
+
+	/**
+	 * The number of structural features of the '<em>Cube Sat6 U</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CUBE_SAT6_U_FEATURE_COUNT = CUBE_SAT_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Cube Sat6 U</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CUBE_SAT6_U_OPERATION_COUNT = CUBE_SAT_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link satellite.impl.SmallSatImpl <em>Small Sat</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see satellite.impl.SmallSatImpl
+	 * @see satellite.impl.SatellitePackageImpl#getSmallSat()
+	 * @generated
+	 */
+	int SMALL_SAT = 10;
+
+	/**
+	 * The feature id for the '<em><b>Comm Subsystem</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SMALL_SAT__COMM_SUBSYSTEM = SPACECRAFT__COMM_SUBSYSTEM;
+
+	/**
+	 * The feature id for the '<em><b>Payload</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SMALL_SAT__PAYLOAD = SPACECRAFT__PAYLOAD;
+
+	/**
+	 * The number of structural features of the '<em>Small Sat</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SMALL_SAT_FEATURE_COUNT = SPACECRAFT_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Small Sat</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SMALL_SAT_OPERATION_COUNT = SPACECRAFT_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link satellite.impl.UHFCommSubsystemImpl <em>UHF Comm Subsystem</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see satellite.impl.UHFCommSubsystemImpl
+	 * @see satellite.impl.SatellitePackageImpl#getUHFCommSubsystem()
+	 * @generated
+	 */
+	int UHF_COMM_SUBSYSTEM = 12;
+
+	/**
+	 * The feature id for the '<em><b>Target</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UHF_COMM_SUBSYSTEM__TARGET = COMM_SUBSYSTEM__TARGET;
+
+	/**
+	 * The feature id for the '<em><b>Frequency</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UHF_COMM_SUBSYSTEM__FREQUENCY = COMM_SUBSYSTEM__FREQUENCY;
+
+	/**
+	 * The feature id for the '<em><b>Path Length</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UHF_COMM_SUBSYSTEM__PATH_LENGTH = COMM_SUBSYSTEM__PATH_LENGTH;
+
+	/**
+	 * The number of structural features of the '<em>UHF Comm Subsystem</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UHF_COMM_SUBSYSTEM_FEATURE_COUNT = COMM_SUBSYSTEM_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>UHF Comm Subsystem</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UHF_COMM_SUBSYSTEM_OPERATION_COUNT = COMM_SUBSYSTEM_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link satellite.impl.XCommSubsystemImpl <em>XComm Subsystem</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see satellite.impl.XCommSubsystemImpl
+	 * @see satellite.impl.SatellitePackageImpl#getXCommSubsystem()
+	 * @generated
+	 */
+	int XCOMM_SUBSYSTEM = 13;
+
+	/**
+	 * The feature id for the '<em><b>Target</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XCOMM_SUBSYSTEM__TARGET = COMM_SUBSYSTEM__TARGET;
+
+	/**
+	 * The feature id for the '<em><b>Frequency</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XCOMM_SUBSYSTEM__FREQUENCY = COMM_SUBSYSTEM__FREQUENCY;
+
+	/**
+	 * The feature id for the '<em><b>Path Length</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XCOMM_SUBSYSTEM__PATH_LENGTH = COMM_SUBSYSTEM__PATH_LENGTH;
+
+	/**
+	 * The number of structural features of the '<em>XComm Subsystem</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XCOMM_SUBSYSTEM_FEATURE_COUNT = COMM_SUBSYSTEM_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>XComm Subsystem</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int XCOMM_SUBSYSTEM_OPERATION_COUNT = COMM_SUBSYSTEM_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link satellite.impl.KaCommSubsystemImpl <em>Ka Comm Subsystem</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see satellite.impl.KaCommSubsystemImpl
+	 * @see satellite.impl.SatellitePackageImpl#getKaCommSubsystem()
+	 * @generated
+	 */
+	int KA_COMM_SUBSYSTEM = 14;
+
+	/**
+	 * The feature id for the '<em><b>Target</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int KA_COMM_SUBSYSTEM__TARGET = COMM_SUBSYSTEM__TARGET;
+
+	/**
+	 * The feature id for the '<em><b>Frequency</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int KA_COMM_SUBSYSTEM__FREQUENCY = COMM_SUBSYSTEM__FREQUENCY;
+
+	/**
+	 * The feature id for the '<em><b>Path Length</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int KA_COMM_SUBSYSTEM__PATH_LENGTH = COMM_SUBSYSTEM__PATH_LENGTH;
+
+	/**
+	 * The number of structural features of the '<em>Ka Comm Subsystem</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int KA_COMM_SUBSYSTEM_FEATURE_COUNT = COMM_SUBSYSTEM_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Ka Comm Subsystem</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int KA_COMM_SUBSYSTEM_OPERATION_COUNT = COMM_SUBSYSTEM_OPERATION_COUNT + 0;
+
+
+	/**
+	 * Returns the meta object for class '{@link satellite.ConstellationMission <em>Constellation Mission</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Constellation Mission</em>'.
+	 * @see satellite.ConstellationMission
+	 * @generated
+	 */
+	EClass getConstellationMission();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link satellite.ConstellationMission#getGroundStationNetwork <em>Ground Station Network</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Ground Station Network</em>'.
+	 * @see satellite.ConstellationMission#getGroundStationNetwork()
+	 * @see #getConstellationMission()
+	 * @generated
+	 */
+	EReference getConstellationMission_GroundStationNetwork();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link satellite.ConstellationMission#getSpacecraft <em>Spacecraft</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Spacecraft</em>'.
+	 * @see satellite.ConstellationMission#getSpacecraft()
+	 * @see #getConstellationMission()
+	 * @generated
+	 */
+	EReference getConstellationMission_Spacecraft();
+
+	/**
+	 * Returns the meta object for class '{@link satellite.InterferometryMission <em>Interferometry Mission</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Interferometry Mission</em>'.
+	 * @see satellite.InterferometryMission
+	 * @generated
+	 */
+	EClass getInterferometryMission();
+
+	/**
+	 * Returns the meta object for the attribute '{@link satellite.InterferometryMission#getObservationTime <em>Observation Time</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Observation Time</em>'.
+	 * @see satellite.InterferometryMission#getObservationTime()
+	 * @see #getInterferometryMission()
+	 * @generated
+	 */
+	EAttribute getInterferometryMission_ObservationTime();
+
+	/**
+	 * Returns the meta object for class '{@link satellite.CommunicatingElement <em>Communicating Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Communicating Element</em>'.
+	 * @see satellite.CommunicatingElement
+	 * @generated
+	 */
+	EClass getCommunicatingElement();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link satellite.CommunicatingElement#getCommSubsystem <em>Comm Subsystem</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Comm Subsystem</em>'.
+	 * @see satellite.CommunicatingElement#getCommSubsystem()
+	 * @see #getCommunicatingElement()
+	 * @generated
+	 */
+	EReference getCommunicatingElement_CommSubsystem();
+
+	/**
+	 * Returns the meta object for class '{@link satellite.GroundStationNetwork <em>Ground Station Network</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Ground Station Network</em>'.
+	 * @see satellite.GroundStationNetwork
+	 * @generated
+	 */
+	EClass getGroundStationNetwork();
+
+	/**
+	 * Returns the meta object for class '{@link satellite.Spacecraft <em>Spacecraft</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Spacecraft</em>'.
+	 * @see satellite.Spacecraft
+	 * @generated
+	 */
+	EClass getSpacecraft();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link satellite.Spacecraft#getPayload <em>Payload</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Payload</em>'.
+	 * @see satellite.Spacecraft#getPayload()
+	 * @see #getSpacecraft()
+	 * @generated
+	 */
+	EReference getSpacecraft_Payload();
+
+	/**
+	 * Returns the meta object for class '{@link satellite.CommSubsystem <em>Comm Subsystem</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Comm Subsystem</em>'.
+	 * @see satellite.CommSubsystem
+	 * @generated
+	 */
+	EClass getCommSubsystem();
+
+	/**
+	 * Returns the meta object for the reference '{@link satellite.CommSubsystem#getTarget <em>Target</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Target</em>'.
+	 * @see satellite.CommSubsystem#getTarget()
+	 * @see #getCommSubsystem()
+	 * @generated
+	 */
+	EReference getCommSubsystem_Target();
+
+	/**
+	 * Returns the meta object for the attribute '{@link satellite.CommSubsystem#getFrequency <em>Frequency</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Frequency</em>'.
+	 * @see satellite.CommSubsystem#getFrequency()
+	 * @see #getCommSubsystem()
+	 * @generated
+	 */
+	EAttribute getCommSubsystem_Frequency();
+
+	/**
+	 * Returns the meta object for the attribute '{@link satellite.CommSubsystem#getPathLength <em>Path Length</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Path Length</em>'.
+	 * @see satellite.CommSubsystem#getPathLength()
+	 * @see #getCommSubsystem()
+	 * @generated
+	 */
+	EAttribute getCommSubsystem_PathLength();
+
+	/**
+	 * Returns the meta object for class '{@link satellite.Payload <em>Payload</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Payload</em>'.
+	 * @see satellite.Payload
+	 * @generated
+	 */
+	EClass getPayload();
+
+	/**
+	 * Returns the meta object for class '{@link satellite.InterferometryPayload <em>Interferometry Payload</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Interferometry Payload</em>'.
+	 * @see satellite.InterferometryPayload
+	 * @generated
+	 */
+	EClass getInterferometryPayload();
+
+	/**
+	 * Returns the meta object for class '{@link satellite.CubeSat3U <em>Cube Sat3 U</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Cube Sat3 U</em>'.
+	 * @see satellite.CubeSat3U
+	 * @generated
+	 */
+	EClass getCubeSat3U();
+
+	/**
+	 * Returns the meta object for class '{@link satellite.CubeSat6U <em>Cube Sat6 U</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Cube Sat6 U</em>'.
+	 * @see satellite.CubeSat6U
+	 * @generated
+	 */
+	EClass getCubeSat6U();
+
+	/**
+	 * Returns the meta object for class '{@link satellite.SmallSat <em>Small Sat</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Small Sat</em>'.
+	 * @see satellite.SmallSat
+	 * @generated
+	 */
+	EClass getSmallSat();
+
+	/**
+	 * Returns the meta object for class '{@link satellite.CubeSat <em>Cube Sat</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Cube Sat</em>'.
+	 * @see satellite.CubeSat
+	 * @generated
+	 */
+	EClass getCubeSat();
+
+	/**
+	 * Returns the meta object for class '{@link satellite.UHFCommSubsystem <em>UHF Comm Subsystem</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>UHF Comm Subsystem</em>'.
+	 * @see satellite.UHFCommSubsystem
+	 * @generated
+	 */
+	EClass getUHFCommSubsystem();
+
+	/**
+	 * Returns the meta object for class '{@link satellite.XCommSubsystem <em>XComm Subsystem</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>XComm Subsystem</em>'.
+	 * @see satellite.XCommSubsystem
+	 * @generated
+	 */
+	EClass getXCommSubsystem();
+
+	/**
+	 * Returns the meta object for class '{@link satellite.KaCommSubsystem <em>Ka Comm Subsystem</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Ka Comm Subsystem</em>'.
+	 * @see satellite.KaCommSubsystem
+	 * @generated
+	 */
+	EClass getKaCommSubsystem();
+
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+	SatelliteFactory getSatelliteFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 *   <li>each class,</li>
+	 *   <li>each feature of each class,</li>
+	 *   <li>each operation of each class,</li>
+	 *   <li>each enum,</li>
+	 *   <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals {
+		/**
+		 * The meta object literal for the '{@link satellite.impl.ConstellationMissionImpl <em>Constellation Mission</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see satellite.impl.ConstellationMissionImpl
+		 * @see satellite.impl.SatellitePackageImpl#getConstellationMission()
+		 * @generated
+		 */
+		EClass CONSTELLATION_MISSION = eINSTANCE.getConstellationMission();
+
+		/**
+		 * The meta object literal for the '<em><b>Ground Station Network</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CONSTELLATION_MISSION__GROUND_STATION_NETWORK = eINSTANCE.getConstellationMission_GroundStationNetwork();
+
+		/**
+		 * The meta object literal for the '<em><b>Spacecraft</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CONSTELLATION_MISSION__SPACECRAFT = eINSTANCE.getConstellationMission_Spacecraft();
+
+		/**
+		 * The meta object literal for the '{@link satellite.impl.InterferometryMissionImpl <em>Interferometry Mission</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see satellite.impl.InterferometryMissionImpl
+		 * @see satellite.impl.SatellitePackageImpl#getInterferometryMission()
+		 * @generated
+		 */
+		EClass INTERFEROMETRY_MISSION = eINSTANCE.getInterferometryMission();
+
+		/**
+		 * The meta object literal for the '<em><b>Observation Time</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute INTERFEROMETRY_MISSION__OBSERVATION_TIME = eINSTANCE.getInterferometryMission_ObservationTime();
+
+		/**
+		 * The meta object literal for the '{@link satellite.impl.CommunicatingElementImpl <em>Communicating Element</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see satellite.impl.CommunicatingElementImpl
+		 * @see satellite.impl.SatellitePackageImpl#getCommunicatingElement()
+		 * @generated
+		 */
+		EClass COMMUNICATING_ELEMENT = eINSTANCE.getCommunicatingElement();
+
+		/**
+		 * The meta object literal for the '<em><b>Comm Subsystem</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference COMMUNICATING_ELEMENT__COMM_SUBSYSTEM = eINSTANCE.getCommunicatingElement_CommSubsystem();
+
+		/**
+		 * The meta object literal for the '{@link satellite.impl.GroundStationNetworkImpl <em>Ground Station Network</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see satellite.impl.GroundStationNetworkImpl
+		 * @see satellite.impl.SatellitePackageImpl#getGroundStationNetwork()
+		 * @generated
+		 */
+		EClass GROUND_STATION_NETWORK = eINSTANCE.getGroundStationNetwork();
+
+		/**
+		 * The meta object literal for the '{@link satellite.impl.SpacecraftImpl <em>Spacecraft</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see satellite.impl.SpacecraftImpl
+		 * @see satellite.impl.SatellitePackageImpl#getSpacecraft()
+		 * @generated
+		 */
+		EClass SPACECRAFT = eINSTANCE.getSpacecraft();
+
+		/**
+		 * The meta object literal for the '<em><b>Payload</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference SPACECRAFT__PAYLOAD = eINSTANCE.getSpacecraft_Payload();
+
+		/**
+		 * The meta object literal for the '{@link satellite.impl.CommSubsystemImpl <em>Comm Subsystem</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see satellite.impl.CommSubsystemImpl
+		 * @see satellite.impl.SatellitePackageImpl#getCommSubsystem()
+		 * @generated
+		 */
+		EClass COMM_SUBSYSTEM = eINSTANCE.getCommSubsystem();
+
+		/**
+		 * The meta object literal for the '<em><b>Target</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference COMM_SUBSYSTEM__TARGET = eINSTANCE.getCommSubsystem_Target();
+
+		/**
+		 * The meta object literal for the '<em><b>Frequency</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute COMM_SUBSYSTEM__FREQUENCY = eINSTANCE.getCommSubsystem_Frequency();
+
+		/**
+		 * The meta object literal for the '<em><b>Path Length</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute COMM_SUBSYSTEM__PATH_LENGTH = eINSTANCE.getCommSubsystem_PathLength();
+
+		/**
+		 * The meta object literal for the '{@link satellite.impl.PayloadImpl <em>Payload</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see satellite.impl.PayloadImpl
+		 * @see satellite.impl.SatellitePackageImpl#getPayload()
+		 * @generated
+		 */
+		EClass PAYLOAD = eINSTANCE.getPayload();
+
+		/**
+		 * The meta object literal for the '{@link satellite.impl.InterferometryPayloadImpl <em>Interferometry Payload</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see satellite.impl.InterferometryPayloadImpl
+		 * @see satellite.impl.SatellitePackageImpl#getInterferometryPayload()
+		 * @generated
+		 */
+		EClass INTERFEROMETRY_PAYLOAD = eINSTANCE.getInterferometryPayload();
+
+		/**
+		 * The meta object literal for the '{@link satellite.impl.CubeSat3UImpl <em>Cube Sat3 U</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see satellite.impl.CubeSat3UImpl
+		 * @see satellite.impl.SatellitePackageImpl#getCubeSat3U()
+		 * @generated
+		 */
+		EClass CUBE_SAT3_U = eINSTANCE.getCubeSat3U();
+
+		/**
+		 * The meta object literal for the '{@link satellite.impl.CubeSat6UImpl <em>Cube Sat6 U</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see satellite.impl.CubeSat6UImpl
+		 * @see satellite.impl.SatellitePackageImpl#getCubeSat6U()
+		 * @generated
+		 */
+		EClass CUBE_SAT6_U = eINSTANCE.getCubeSat6U();
+
+		/**
+		 * The meta object literal for the '{@link satellite.impl.SmallSatImpl <em>Small Sat</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see satellite.impl.SmallSatImpl
+		 * @see satellite.impl.SatellitePackageImpl#getSmallSat()
+		 * @generated
+		 */
+		EClass SMALL_SAT = eINSTANCE.getSmallSat();
+
+		/**
+		 * The meta object literal for the '{@link satellite.impl.CubeSatImpl <em>Cube Sat</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see satellite.impl.CubeSatImpl
+		 * @see satellite.impl.SatellitePackageImpl#getCubeSat()
+		 * @generated
+		 */
+		EClass CUBE_SAT = eINSTANCE.getCubeSat();
+
+		/**
+		 * The meta object literal for the '{@link satellite.impl.UHFCommSubsystemImpl <em>UHF Comm Subsystem</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see satellite.impl.UHFCommSubsystemImpl
+		 * @see satellite.impl.SatellitePackageImpl#getUHFCommSubsystem()
+		 * @generated
+		 */
+		EClass UHF_COMM_SUBSYSTEM = eINSTANCE.getUHFCommSubsystem();
+
+		/**
+		 * The meta object literal for the '{@link satellite.impl.XCommSubsystemImpl <em>XComm Subsystem</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see satellite.impl.XCommSubsystemImpl
+		 * @see satellite.impl.SatellitePackageImpl#getXCommSubsystem()
+		 * @generated
+		 */
+		EClass XCOMM_SUBSYSTEM = eINSTANCE.getXCommSubsystem();
+
+		/**
+		 * The meta object literal for the '{@link satellite.impl.KaCommSubsystemImpl <em>Ka Comm Subsystem</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see satellite.impl.KaCommSubsystemImpl
+		 * @see satellite.impl.SatellitePackageImpl#getKaCommSubsystem()
+		 * @generated
+		 */
+		EClass KA_COMM_SUBSYSTEM = eINSTANCE.getKaCommSubsystem();
+
+	}
+
+} //SatellitePackage
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/SmallSat.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/SmallSat.java
new file mode 100644
index 00000000..4925ff12
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/SmallSat.java
@@ -0,0 +1,17 @@
+/**
+ */
+package satellite;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Small Sat</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see satellite.SatellitePackage#getSmallSat()
+ * @model
+ * @generated
+ */
+public interface SmallSat extends Spacecraft {
+} // SmallSat
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/Spacecraft.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/Spacecraft.java
new file mode 100644
index 00000000..4dd77329
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/Spacecraft.java
@@ -0,0 +1,45 @@
+/**
+ */
+package satellite;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Spacecraft</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link satellite.Spacecraft#getPayload <em>Payload</em>}</li>
+ * </ul>
+ *
+ * @see satellite.SatellitePackage#getSpacecraft()
+ * @model abstract="true"
+ * @generated
+ */
+public interface Spacecraft extends CommunicatingElement {
+	/**
+	 * Returns the value of the '<em><b>Payload</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Payload</em>' containment reference.
+	 * @see #setPayload(Payload)
+	 * @see satellite.SatellitePackage#getSpacecraft_Payload()
+	 * @model containment="true"
+	 * @generated
+	 */
+	Payload getPayload();
+
+	/**
+	 * Sets the value of the '{@link satellite.Spacecraft#getPayload <em>Payload</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Payload</em>' containment reference.
+	 * @see #getPayload()
+	 * @generated
+	 */
+	void setPayload(Payload value);
+
+} // Spacecraft
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/UHFCommSubsystem.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/UHFCommSubsystem.java
new file mode 100644
index 00000000..01f95ad5
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/UHFCommSubsystem.java
@@ -0,0 +1,17 @@
+/**
+ */
+package satellite;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>UHF Comm Subsystem</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see satellite.SatellitePackage#getUHFCommSubsystem()
+ * @model
+ * @generated
+ */
+public interface UHFCommSubsystem extends CommSubsystem {
+} // UHFCommSubsystem
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/XCommSubsystem.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/XCommSubsystem.java
new file mode 100644
index 00000000..8e388d38
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/XCommSubsystem.java
@@ -0,0 +1,17 @@
+/**
+ */
+package satellite;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>XComm Subsystem</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see satellite.SatellitePackage#getXCommSubsystem()
+ * @model
+ * @generated
+ */
+public interface XCommSubsystem extends CommSubsystem {
+} // XCommSubsystem
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/CommSubsystemImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/CommSubsystemImpl.java
new file mode 100644
index 00000000..564e9dcb
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/CommSubsystemImpl.java
@@ -0,0 +1,284 @@
+/**
+ */
+package satellite.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import satellite.CommSubsystem;
+import satellite.SatellitePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Comm Subsystem</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link satellite.impl.CommSubsystemImpl#getTarget <em>Target</em>}</li>
+ *   <li>{@link satellite.impl.CommSubsystemImpl#getFrequency <em>Frequency</em>}</li>
+ *   <li>{@link satellite.impl.CommSubsystemImpl#getPathLength <em>Path Length</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class CommSubsystemImpl extends MinimalEObjectImpl.Container implements CommSubsystem {
+	/**
+	 * The cached value of the '{@link #getTarget() <em>Target</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTarget()
+	 * @generated
+	 * @ordered
+	 */
+	protected CommSubsystem target;
+
+	/**
+	 * The default value of the '{@link #getFrequency() <em>Frequency</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFrequency()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int FREQUENCY_EDEFAULT = 0;
+
+	/**
+	 * The cached value of the '{@link #getFrequency() <em>Frequency</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFrequency()
+	 * @generated
+	 * @ordered
+	 */
+	protected int frequency = FREQUENCY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getPathLength() <em>Path Length</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPathLength()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int PATH_LENGTH_EDEFAULT = 0;
+
+	/**
+	 * The cached value of the '{@link #getPathLength() <em>Path Length</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPathLength()
+	 * @generated
+	 * @ordered
+	 */
+	protected int pathLength = PATH_LENGTH_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CommSubsystemImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return SatellitePackage.Literals.COMM_SUBSYSTEM;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public CommSubsystem getTarget() {
+		if (target != null && target.eIsProxy()) {
+			InternalEObject oldTarget = (InternalEObject)target;
+			target = (CommSubsystem)eResolveProxy(oldTarget);
+			if (target != oldTarget) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, SatellitePackage.COMM_SUBSYSTEM__TARGET, oldTarget, target));
+			}
+		}
+		return target;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CommSubsystem basicGetTarget() {
+		return target;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setTarget(CommSubsystem newTarget) {
+		CommSubsystem oldTarget = target;
+		target = newTarget;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, SatellitePackage.COMM_SUBSYSTEM__TARGET, oldTarget, target));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getFrequency() {
+		return frequency;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setFrequency(int newFrequency) {
+		int oldFrequency = frequency;
+		frequency = newFrequency;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, SatellitePackage.COMM_SUBSYSTEM__FREQUENCY, oldFrequency, frequency));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getPathLength() {
+		return pathLength;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setPathLength(int newPathLength) {
+		int oldPathLength = pathLength;
+		pathLength = newPathLength;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, SatellitePackage.COMM_SUBSYSTEM__PATH_LENGTH, oldPathLength, pathLength));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case SatellitePackage.COMM_SUBSYSTEM__TARGET:
+				if (resolve) return getTarget();
+				return basicGetTarget();
+			case SatellitePackage.COMM_SUBSYSTEM__FREQUENCY:
+				return getFrequency();
+			case SatellitePackage.COMM_SUBSYSTEM__PATH_LENGTH:
+				return getPathLength();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case SatellitePackage.COMM_SUBSYSTEM__TARGET:
+				setTarget((CommSubsystem)newValue);
+				return;
+			case SatellitePackage.COMM_SUBSYSTEM__FREQUENCY:
+				setFrequency((Integer)newValue);
+				return;
+			case SatellitePackage.COMM_SUBSYSTEM__PATH_LENGTH:
+				setPathLength((Integer)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case SatellitePackage.COMM_SUBSYSTEM__TARGET:
+				setTarget((CommSubsystem)null);
+				return;
+			case SatellitePackage.COMM_SUBSYSTEM__FREQUENCY:
+				setFrequency(FREQUENCY_EDEFAULT);
+				return;
+			case SatellitePackage.COMM_SUBSYSTEM__PATH_LENGTH:
+				setPathLength(PATH_LENGTH_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case SatellitePackage.COMM_SUBSYSTEM__TARGET:
+				return target != null;
+			case SatellitePackage.COMM_SUBSYSTEM__FREQUENCY:
+				return frequency != FREQUENCY_EDEFAULT;
+			case SatellitePackage.COMM_SUBSYSTEM__PATH_LENGTH:
+				return pathLength != PATH_LENGTH_EDEFAULT;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuilder result = new StringBuilder(super.toString());
+		result.append(" (frequency: ");
+		result.append(frequency);
+		result.append(", pathLength: ");
+		result.append(pathLength);
+		result.append(')');
+		return result.toString();
+	}
+
+} //CommSubsystemImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/CommunicatingElementImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/CommunicatingElementImpl.java
new file mode 100644
index 00000000..318f3ac0
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/CommunicatingElementImpl.java
@@ -0,0 +1,153 @@
+/**
+ */
+package satellite.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import satellite.CommSubsystem;
+import satellite.CommunicatingElement;
+import satellite.SatellitePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Communicating Element</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link satellite.impl.CommunicatingElementImpl#getCommSubsystem <em>Comm Subsystem</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class CommunicatingElementImpl extends MinimalEObjectImpl.Container implements CommunicatingElement {
+	/**
+	 * The cached value of the '{@link #getCommSubsystem() <em>Comm Subsystem</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCommSubsystem()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<CommSubsystem> commSubsystem;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CommunicatingElementImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return SatellitePackage.Literals.COMMUNICATING_ELEMENT;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<CommSubsystem> getCommSubsystem() {
+		if (commSubsystem == null) {
+			commSubsystem = new EObjectContainmentEList<CommSubsystem>(CommSubsystem.class, this, SatellitePackage.COMMUNICATING_ELEMENT__COMM_SUBSYSTEM);
+		}
+		return commSubsystem;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case SatellitePackage.COMMUNICATING_ELEMENT__COMM_SUBSYSTEM:
+				return ((InternalEList<?>)getCommSubsystem()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case SatellitePackage.COMMUNICATING_ELEMENT__COMM_SUBSYSTEM:
+				return getCommSubsystem();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case SatellitePackage.COMMUNICATING_ELEMENT__COMM_SUBSYSTEM:
+				getCommSubsystem().clear();
+				getCommSubsystem().addAll((Collection<? extends CommSubsystem>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case SatellitePackage.COMMUNICATING_ELEMENT__COMM_SUBSYSTEM:
+				getCommSubsystem().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case SatellitePackage.COMMUNICATING_ELEMENT__COMM_SUBSYSTEM:
+				return commSubsystem != null && !commSubsystem.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //CommunicatingElementImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/ConstellationMissionImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/ConstellationMissionImpl.java
new file mode 100644
index 00000000..3b70f35f
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/ConstellationMissionImpl.java
@@ -0,0 +1,224 @@
+/**
+ */
+package satellite.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import satellite.ConstellationMission;
+import satellite.GroundStationNetwork;
+import satellite.SatellitePackage;
+import satellite.Spacecraft;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Constellation Mission</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link satellite.impl.ConstellationMissionImpl#getGroundStationNetwork <em>Ground Station Network</em>}</li>
+ *   <li>{@link satellite.impl.ConstellationMissionImpl#getSpacecraft <em>Spacecraft</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class ConstellationMissionImpl extends MinimalEObjectImpl.Container implements ConstellationMission {
+	/**
+	 * The cached value of the '{@link #getGroundStationNetwork() <em>Ground Station Network</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getGroundStationNetwork()
+	 * @generated
+	 * @ordered
+	 */
+	protected GroundStationNetwork groundStationNetwork;
+
+	/**
+	 * The cached value of the '{@link #getSpacecraft() <em>Spacecraft</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSpacecraft()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Spacecraft> spacecraft;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ConstellationMissionImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return SatellitePackage.Literals.CONSTELLATION_MISSION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public GroundStationNetwork getGroundStationNetwork() {
+		return groundStationNetwork;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetGroundStationNetwork(GroundStationNetwork newGroundStationNetwork, NotificationChain msgs) {
+		GroundStationNetwork oldGroundStationNetwork = groundStationNetwork;
+		groundStationNetwork = newGroundStationNetwork;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SatellitePackage.CONSTELLATION_MISSION__GROUND_STATION_NETWORK, oldGroundStationNetwork, newGroundStationNetwork);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setGroundStationNetwork(GroundStationNetwork newGroundStationNetwork) {
+		if (newGroundStationNetwork != groundStationNetwork) {
+			NotificationChain msgs = null;
+			if (groundStationNetwork != null)
+				msgs = ((InternalEObject)groundStationNetwork).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SatellitePackage.CONSTELLATION_MISSION__GROUND_STATION_NETWORK, null, msgs);
+			if (newGroundStationNetwork != null)
+				msgs = ((InternalEObject)newGroundStationNetwork).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SatellitePackage.CONSTELLATION_MISSION__GROUND_STATION_NETWORK, null, msgs);
+			msgs = basicSetGroundStationNetwork(newGroundStationNetwork, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, SatellitePackage.CONSTELLATION_MISSION__GROUND_STATION_NETWORK, newGroundStationNetwork, newGroundStationNetwork));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<Spacecraft> getSpacecraft() {
+		if (spacecraft == null) {
+			spacecraft = new EObjectContainmentEList<Spacecraft>(Spacecraft.class, this, SatellitePackage.CONSTELLATION_MISSION__SPACECRAFT);
+		}
+		return spacecraft;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case SatellitePackage.CONSTELLATION_MISSION__GROUND_STATION_NETWORK:
+				return basicSetGroundStationNetwork(null, msgs);
+			case SatellitePackage.CONSTELLATION_MISSION__SPACECRAFT:
+				return ((InternalEList<?>)getSpacecraft()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case SatellitePackage.CONSTELLATION_MISSION__GROUND_STATION_NETWORK:
+				return getGroundStationNetwork();
+			case SatellitePackage.CONSTELLATION_MISSION__SPACECRAFT:
+				return getSpacecraft();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case SatellitePackage.CONSTELLATION_MISSION__GROUND_STATION_NETWORK:
+				setGroundStationNetwork((GroundStationNetwork)newValue);
+				return;
+			case SatellitePackage.CONSTELLATION_MISSION__SPACECRAFT:
+				getSpacecraft().clear();
+				getSpacecraft().addAll((Collection<? extends Spacecraft>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case SatellitePackage.CONSTELLATION_MISSION__GROUND_STATION_NETWORK:
+				setGroundStationNetwork((GroundStationNetwork)null);
+				return;
+			case SatellitePackage.CONSTELLATION_MISSION__SPACECRAFT:
+				getSpacecraft().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case SatellitePackage.CONSTELLATION_MISSION__GROUND_STATION_NETWORK:
+				return groundStationNetwork != null;
+			case SatellitePackage.CONSTELLATION_MISSION__SPACECRAFT:
+				return spacecraft != null && !spacecraft.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //ConstellationMissionImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/CubeSat3UImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/CubeSat3UImpl.java
new file mode 100644
index 00000000..2b12336a
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/CubeSat3UImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package satellite.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import satellite.CubeSat3U;
+import satellite.SatellitePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Cube Sat3 U</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class CubeSat3UImpl extends CubeSatImpl implements CubeSat3U {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CubeSat3UImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return SatellitePackage.Literals.CUBE_SAT3_U;
+	}
+
+} //CubeSat3UImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/CubeSat6UImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/CubeSat6UImpl.java
new file mode 100644
index 00000000..e2490a39
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/CubeSat6UImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package satellite.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import satellite.CubeSat6U;
+import satellite.SatellitePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Cube Sat6 U</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class CubeSat6UImpl extends CubeSatImpl implements CubeSat6U {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CubeSat6UImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return SatellitePackage.Literals.CUBE_SAT6_U;
+	}
+
+} //CubeSat6UImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/CubeSatImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/CubeSatImpl.java
new file mode 100644
index 00000000..5ca34ee5
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/CubeSatImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package satellite.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import satellite.CubeSat;
+import satellite.SatellitePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Cube Sat</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public abstract class CubeSatImpl extends SpacecraftImpl implements CubeSat {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CubeSatImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return SatellitePackage.Literals.CUBE_SAT;
+	}
+
+} //CubeSatImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/GroundStationNetworkImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/GroundStationNetworkImpl.java
new file mode 100644
index 00000000..3bb8604b
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/GroundStationNetworkImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package satellite.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import satellite.GroundStationNetwork;
+import satellite.SatellitePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Ground Station Network</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class GroundStationNetworkImpl extends CommunicatingElementImpl implements GroundStationNetwork {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected GroundStationNetworkImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return SatellitePackage.Literals.GROUND_STATION_NETWORK;
+	}
+
+} //GroundStationNetworkImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/InterferometryMissionImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/InterferometryMissionImpl.java
new file mode 100644
index 00000000..e588be96
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/InterferometryMissionImpl.java
@@ -0,0 +1,164 @@
+/**
+ */
+package satellite.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import satellite.InterferometryMission;
+import satellite.SatellitePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Interferometry Mission</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link satellite.impl.InterferometryMissionImpl#getObservationTime <em>Observation Time</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class InterferometryMissionImpl extends ConstellationMissionImpl implements InterferometryMission {
+	/**
+	 * The default value of the '{@link #getObservationTime() <em>Observation Time</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getObservationTime()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int OBSERVATION_TIME_EDEFAULT = 0;
+
+	/**
+	 * The cached value of the '{@link #getObservationTime() <em>Observation Time</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getObservationTime()
+	 * @generated
+	 * @ordered
+	 */
+	protected int observationTime = OBSERVATION_TIME_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected InterferometryMissionImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return SatellitePackage.Literals.INTERFEROMETRY_MISSION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int getObservationTime() {
+		return observationTime;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setObservationTime(int newObservationTime) {
+		int oldObservationTime = observationTime;
+		observationTime = newObservationTime;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, SatellitePackage.INTERFEROMETRY_MISSION__OBSERVATION_TIME, oldObservationTime, observationTime));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case SatellitePackage.INTERFEROMETRY_MISSION__OBSERVATION_TIME:
+				return getObservationTime();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case SatellitePackage.INTERFEROMETRY_MISSION__OBSERVATION_TIME:
+				setObservationTime((Integer)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case SatellitePackage.INTERFEROMETRY_MISSION__OBSERVATION_TIME:
+				setObservationTime(OBSERVATION_TIME_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case SatellitePackage.INTERFEROMETRY_MISSION__OBSERVATION_TIME:
+				return observationTime != OBSERVATION_TIME_EDEFAULT;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuilder result = new StringBuilder(super.toString());
+		result.append(" (observationTime: ");
+		result.append(observationTime);
+		result.append(')');
+		return result.toString();
+	}
+
+} //InterferometryMissionImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/InterferometryPayloadImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/InterferometryPayloadImpl.java
new file mode 100644
index 00000000..2612e617
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/InterferometryPayloadImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package satellite.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import satellite.InterferometryPayload;
+import satellite.SatellitePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Interferometry Payload</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class InterferometryPayloadImpl extends PayloadImpl implements InterferometryPayload {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected InterferometryPayloadImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return SatellitePackage.Literals.INTERFEROMETRY_PAYLOAD;
+	}
+
+} //InterferometryPayloadImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/KaCommSubsystemImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/KaCommSubsystemImpl.java
new file mode 100644
index 00000000..da3338be
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/KaCommSubsystemImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package satellite.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import satellite.KaCommSubsystem;
+import satellite.SatellitePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Ka Comm Subsystem</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class KaCommSubsystemImpl extends CommSubsystemImpl implements KaCommSubsystem {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected KaCommSubsystemImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return SatellitePackage.Literals.KA_COMM_SUBSYSTEM;
+	}
+
+} //KaCommSubsystemImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/PayloadImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/PayloadImpl.java
new file mode 100644
index 00000000..5ec893e2
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/PayloadImpl.java
@@ -0,0 +1,39 @@
+/**
+ */
+package satellite.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import satellite.Payload;
+import satellite.SatellitePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Payload</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public abstract class PayloadImpl extends MinimalEObjectImpl.Container implements Payload {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected PayloadImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return SatellitePackage.Literals.PAYLOAD;
+	}
+
+} //PayloadImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/SatelliteFactoryImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/SatelliteFactoryImpl.java
new file mode 100644
index 00000000..8d9faa3c
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/SatelliteFactoryImpl.java
@@ -0,0 +1,193 @@
+/**
+ */
+package satellite.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+
+import satellite.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class SatelliteFactoryImpl extends EFactoryImpl implements SatelliteFactory {
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static SatelliteFactory init() {
+		try {
+			SatelliteFactory theSatelliteFactory = (SatelliteFactory)EPackage.Registry.INSTANCE.getEFactory(SatellitePackage.eNS_URI);
+			if (theSatelliteFactory != null) {
+				return theSatelliteFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new SatelliteFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public SatelliteFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case SatellitePackage.INTERFEROMETRY_MISSION: return createInterferometryMission();
+			case SatellitePackage.GROUND_STATION_NETWORK: return createGroundStationNetwork();
+			case SatellitePackage.INTERFEROMETRY_PAYLOAD: return createInterferometryPayload();
+			case SatellitePackage.CUBE_SAT3_U: return createCubeSat3U();
+			case SatellitePackage.CUBE_SAT6_U: return createCubeSat6U();
+			case SatellitePackage.SMALL_SAT: return createSmallSat();
+			case SatellitePackage.UHF_COMM_SUBSYSTEM: return createUHFCommSubsystem();
+			case SatellitePackage.XCOMM_SUBSYSTEM: return createXCommSubsystem();
+			case SatellitePackage.KA_COMM_SUBSYSTEM: return createKaCommSubsystem();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public InterferometryMission createInterferometryMission() {
+		InterferometryMissionImpl interferometryMission = new InterferometryMissionImpl();
+		return interferometryMission;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public GroundStationNetwork createGroundStationNetwork() {
+		GroundStationNetworkImpl groundStationNetwork = new GroundStationNetworkImpl();
+		return groundStationNetwork;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public InterferometryPayload createInterferometryPayload() {
+		InterferometryPayloadImpl interferometryPayload = new InterferometryPayloadImpl();
+		return interferometryPayload;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public CubeSat3U createCubeSat3U() {
+		CubeSat3UImpl cubeSat3U = new CubeSat3UImpl();
+		return cubeSat3U;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public CubeSat6U createCubeSat6U() {
+		CubeSat6UImpl cubeSat6U = new CubeSat6UImpl();
+		return cubeSat6U;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public SmallSat createSmallSat() {
+		SmallSatImpl smallSat = new SmallSatImpl();
+		return smallSat;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public UHFCommSubsystem createUHFCommSubsystem() {
+		UHFCommSubsystemImpl uhfCommSubsystem = new UHFCommSubsystemImpl();
+		return uhfCommSubsystem;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public XCommSubsystem createXCommSubsystem() {
+		XCommSubsystemImpl xCommSubsystem = new XCommSubsystemImpl();
+		return xCommSubsystem;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public KaCommSubsystem createKaCommSubsystem() {
+		KaCommSubsystemImpl kaCommSubsystem = new KaCommSubsystemImpl();
+		return kaCommSubsystem;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public SatellitePackage getSatellitePackage() {
+		return (SatellitePackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static SatellitePackage getPackage() {
+		return SatellitePackage.eINSTANCE;
+	}
+
+} //SatelliteFactoryImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/SatellitePackageImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/SatellitePackageImpl.java
new file mode 100644
index 00000000..d34429d2
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/SatellitePackageImpl.java
@@ -0,0 +1,584 @@
+/**
+ */
+package satellite.impl;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+
+import satellite.CommSubsystem;
+import satellite.CommunicatingElement;
+import satellite.ConstellationMission;
+import satellite.CubeSat;
+import satellite.CubeSat3U;
+import satellite.CubeSat6U;
+import satellite.GroundStationNetwork;
+import satellite.InterferometryMission;
+import satellite.InterferometryPayload;
+import satellite.KaCommSubsystem;
+import satellite.Payload;
+import satellite.SatelliteFactory;
+import satellite.SatellitePackage;
+import satellite.SmallSat;
+import satellite.Spacecraft;
+import satellite.UHFCommSubsystem;
+import satellite.XCommSubsystem;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class SatellitePackageImpl extends EPackageImpl implements SatellitePackage {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass constellationMissionEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass interferometryMissionEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass communicatingElementEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass groundStationNetworkEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass spacecraftEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass commSubsystemEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass payloadEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass interferometryPayloadEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cubeSat3UEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cubeSat6UEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass smallSatEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cubeSatEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass uhfCommSubsystemEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass xCommSubsystemEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass kaCommSubsystemEClass = null;
+
+	/**
+	 * Creates an instance of the model <b>Package</b>, registered with
+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * package URI value.
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see satellite.SatellitePackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private SatellitePackageImpl() {
+		super(eNS_URI, SatelliteFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 *
+	 * <p>This method is used to initialize {@link SatellitePackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static SatellitePackage init() {
+		if (isInited) return (SatellitePackage)EPackage.Registry.INSTANCE.getEPackage(SatellitePackage.eNS_URI);
+
+		// Obtain or create and register package
+		Object registeredSatellitePackage = EPackage.Registry.INSTANCE.get(eNS_URI);
+		SatellitePackageImpl theSatellitePackage = registeredSatellitePackage instanceof SatellitePackageImpl ? (SatellitePackageImpl)registeredSatellitePackage : new SatellitePackageImpl();
+
+		isInited = true;
+
+		// Create package meta-data objects
+		theSatellitePackage.createPackageContents();
+
+		// Initialize created meta-data
+		theSatellitePackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theSatellitePackage.freeze();
+
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(SatellitePackage.eNS_URI, theSatellitePackage);
+		return theSatellitePackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getConstellationMission() {
+		return constellationMissionEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getConstellationMission_GroundStationNetwork() {
+		return (EReference)constellationMissionEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getConstellationMission_Spacecraft() {
+		return (EReference)constellationMissionEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getInterferometryMission() {
+		return interferometryMissionEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getInterferometryMission_ObservationTime() {
+		return (EAttribute)interferometryMissionEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getCommunicatingElement() {
+		return communicatingElementEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getCommunicatingElement_CommSubsystem() {
+		return (EReference)communicatingElementEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getGroundStationNetwork() {
+		return groundStationNetworkEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getSpacecraft() {
+		return spacecraftEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getSpacecraft_Payload() {
+		return (EReference)spacecraftEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getCommSubsystem() {
+		return commSubsystemEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getCommSubsystem_Target() {
+		return (EReference)commSubsystemEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getCommSubsystem_Frequency() {
+		return (EAttribute)commSubsystemEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getCommSubsystem_PathLength() {
+		return (EAttribute)commSubsystemEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getPayload() {
+		return payloadEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getInterferometryPayload() {
+		return interferometryPayloadEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getCubeSat3U() {
+		return cubeSat3UEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getCubeSat6U() {
+		return cubeSat6UEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getSmallSat() {
+		return smallSatEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getCubeSat() {
+		return cubeSatEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getUHFCommSubsystem() {
+		return uhfCommSubsystemEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getXCommSubsystem() {
+		return xCommSubsystemEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getKaCommSubsystem() {
+		return kaCommSubsystemEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public SatelliteFactory getSatelliteFactory() {
+		return (SatelliteFactory)getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) return;
+		isCreated = true;
+
+		// Create classes and their features
+		constellationMissionEClass = createEClass(CONSTELLATION_MISSION);
+		createEReference(constellationMissionEClass, CONSTELLATION_MISSION__GROUND_STATION_NETWORK);
+		createEReference(constellationMissionEClass, CONSTELLATION_MISSION__SPACECRAFT);
+
+		interferometryMissionEClass = createEClass(INTERFEROMETRY_MISSION);
+		createEAttribute(interferometryMissionEClass, INTERFEROMETRY_MISSION__OBSERVATION_TIME);
+
+		communicatingElementEClass = createEClass(COMMUNICATING_ELEMENT);
+		createEReference(communicatingElementEClass, COMMUNICATING_ELEMENT__COMM_SUBSYSTEM);
+
+		groundStationNetworkEClass = createEClass(GROUND_STATION_NETWORK);
+
+		spacecraftEClass = createEClass(SPACECRAFT);
+		createEReference(spacecraftEClass, SPACECRAFT__PAYLOAD);
+
+		commSubsystemEClass = createEClass(COMM_SUBSYSTEM);
+		createEReference(commSubsystemEClass, COMM_SUBSYSTEM__TARGET);
+		createEAttribute(commSubsystemEClass, COMM_SUBSYSTEM__FREQUENCY);
+		createEAttribute(commSubsystemEClass, COMM_SUBSYSTEM__PATH_LENGTH);
+
+		payloadEClass = createEClass(PAYLOAD);
+
+		interferometryPayloadEClass = createEClass(INTERFEROMETRY_PAYLOAD);
+
+		cubeSat3UEClass = createEClass(CUBE_SAT3_U);
+
+		cubeSat6UEClass = createEClass(CUBE_SAT6_U);
+
+		smallSatEClass = createEClass(SMALL_SAT);
+
+		cubeSatEClass = createEClass(CUBE_SAT);
+
+		uhfCommSubsystemEClass = createEClass(UHF_COMM_SUBSYSTEM);
+
+		xCommSubsystemEClass = createEClass(XCOMM_SUBSYSTEM);
+
+		kaCommSubsystemEClass = createEClass(KA_COMM_SUBSYSTEM);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model.  This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+		interferometryMissionEClass.getESuperTypes().add(this.getConstellationMission());
+		groundStationNetworkEClass.getESuperTypes().add(this.getCommunicatingElement());
+		spacecraftEClass.getESuperTypes().add(this.getCommunicatingElement());
+		interferometryPayloadEClass.getESuperTypes().add(this.getPayload());
+		cubeSat3UEClass.getESuperTypes().add(this.getCubeSat());
+		cubeSat6UEClass.getESuperTypes().add(this.getCubeSat());
+		smallSatEClass.getESuperTypes().add(this.getSpacecraft());
+		cubeSatEClass.getESuperTypes().add(this.getSpacecraft());
+		uhfCommSubsystemEClass.getESuperTypes().add(this.getCommSubsystem());
+		xCommSubsystemEClass.getESuperTypes().add(this.getCommSubsystem());
+		kaCommSubsystemEClass.getESuperTypes().add(this.getCommSubsystem());
+
+		// Initialize classes, features, and operations; add parameters
+		initEClass(constellationMissionEClass, ConstellationMission.class, "ConstellationMission", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getConstellationMission_GroundStationNetwork(), this.getGroundStationNetwork(), null, "groundStationNetwork", null, 1, 1, ConstellationMission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getConstellationMission_Spacecraft(), this.getSpacecraft(), null, "spacecraft", null, 2, -1, ConstellationMission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(interferometryMissionEClass, InterferometryMission.class, "InterferometryMission", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getInterferometryMission_ObservationTime(), ecorePackage.getEInt(), "observationTime", null, 1, 1, InterferometryMission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(communicatingElementEClass, CommunicatingElement.class, "CommunicatingElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getCommunicatingElement_CommSubsystem(), this.getCommSubsystem(), null, "commSubsystem", null, 1, 2, CommunicatingElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(groundStationNetworkEClass, GroundStationNetwork.class, "GroundStationNetwork", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(spacecraftEClass, Spacecraft.class, "Spacecraft", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getSpacecraft_Payload(), this.getPayload(), null, "payload", null, 0, 1, Spacecraft.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(commSubsystemEClass, CommSubsystem.class, "CommSubsystem", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getCommSubsystem_Target(), this.getCommSubsystem(), null, "target", null, 0, 1, CommSubsystem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCommSubsystem_Frequency(), ecorePackage.getEInt(), "frequency", null, 1, 1, CommSubsystem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCommSubsystem_PathLength(), ecorePackage.getEInt(), "pathLength", null, 1, 1, CommSubsystem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(payloadEClass, Payload.class, "Payload", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(interferometryPayloadEClass, InterferometryPayload.class, "InterferometryPayload", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(cubeSat3UEClass, CubeSat3U.class, "CubeSat3U", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(cubeSat6UEClass, CubeSat6U.class, "CubeSat6U", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(smallSatEClass, SmallSat.class, "SmallSat", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(cubeSatEClass, CubeSat.class, "CubeSat", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(uhfCommSubsystemEClass, UHFCommSubsystem.class, "UHFCommSubsystem", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(xCommSubsystemEClass, XCommSubsystem.class, "XCommSubsystem", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(kaCommSubsystemEClass, KaCommSubsystem.class, "KaCommSubsystem", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		// Create resource
+		createResource(eNS_URI);
+	}
+
+} //SatellitePackageImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/SmallSatImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/SmallSatImpl.java
new file mode 100644
index 00000000..504df64c
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/SmallSatImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package satellite.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import satellite.SatellitePackage;
+import satellite.SmallSat;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Small Sat</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class SmallSatImpl extends SpacecraftImpl implements SmallSat {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected SmallSatImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return SatellitePackage.Literals.SMALL_SAT;
+	}
+
+} //SmallSatImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/SpacecraftImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/SpacecraftImpl.java
new file mode 100644
index 00000000..c7dff706
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/SpacecraftImpl.java
@@ -0,0 +1,177 @@
+/**
+ */
+package satellite.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import satellite.Payload;
+import satellite.SatellitePackage;
+import satellite.Spacecraft;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Spacecraft</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link satellite.impl.SpacecraftImpl#getPayload <em>Payload</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class SpacecraftImpl extends CommunicatingElementImpl implements Spacecraft {
+	/**
+	 * The cached value of the '{@link #getPayload() <em>Payload</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPayload()
+	 * @generated
+	 * @ordered
+	 */
+	protected Payload payload;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected SpacecraftImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return SatellitePackage.Literals.SPACECRAFT;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Payload getPayload() {
+		return payload;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetPayload(Payload newPayload, NotificationChain msgs) {
+		Payload oldPayload = payload;
+		payload = newPayload;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SatellitePackage.SPACECRAFT__PAYLOAD, oldPayload, newPayload);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setPayload(Payload newPayload) {
+		if (newPayload != payload) {
+			NotificationChain msgs = null;
+			if (payload != null)
+				msgs = ((InternalEObject)payload).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SatellitePackage.SPACECRAFT__PAYLOAD, null, msgs);
+			if (newPayload != null)
+				msgs = ((InternalEObject)newPayload).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SatellitePackage.SPACECRAFT__PAYLOAD, null, msgs);
+			msgs = basicSetPayload(newPayload, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, SatellitePackage.SPACECRAFT__PAYLOAD, newPayload, newPayload));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case SatellitePackage.SPACECRAFT__PAYLOAD:
+				return basicSetPayload(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case SatellitePackage.SPACECRAFT__PAYLOAD:
+				return getPayload();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case SatellitePackage.SPACECRAFT__PAYLOAD:
+				setPayload((Payload)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case SatellitePackage.SPACECRAFT__PAYLOAD:
+				setPayload((Payload)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case SatellitePackage.SPACECRAFT__PAYLOAD:
+				return payload != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //SpacecraftImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/UHFCommSubsystemImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/UHFCommSubsystemImpl.java
new file mode 100644
index 00000000..cc2fe056
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/UHFCommSubsystemImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package satellite.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import satellite.SatellitePackage;
+import satellite.UHFCommSubsystem;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>UHF Comm Subsystem</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class UHFCommSubsystemImpl extends CommSubsystemImpl implements UHFCommSubsystem {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected UHFCommSubsystemImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return SatellitePackage.Literals.UHF_COMM_SUBSYSTEM;
+	}
+
+} //UHFCommSubsystemImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/XCommSubsystemImpl.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/XCommSubsystemImpl.java
new file mode 100644
index 00000000..df9a491f
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/impl/XCommSubsystemImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package satellite.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import satellite.SatellitePackage;
+import satellite.XCommSubsystem;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>XComm Subsystem</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class XCommSubsystemImpl extends CommSubsystemImpl implements XCommSubsystem {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected XCommSubsystemImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return SatellitePackage.Literals.XCOMM_SUBSYSTEM;
+	}
+
+} //XCommSubsystemImpl
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/util/SatelliteAdapterFactory.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/util/SatelliteAdapterFactory.java
new file mode 100644
index 00000000..1e06efde
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/util/SatelliteAdapterFactory.java
@@ -0,0 +1,372 @@
+/**
+ */
+package satellite.util;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+
+import org.eclipse.emf.ecore.EObject;
+
+import satellite.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see satellite.SatellitePackage
+ * @generated
+ */
+public class SatelliteAdapterFactory extends AdapterFactoryImpl {
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static SatellitePackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public SatelliteAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = SatellitePackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected SatelliteSwitch<Adapter> modelSwitch =
+		new SatelliteSwitch<Adapter>() {
+			@Override
+			public Adapter caseConstellationMission(ConstellationMission object) {
+				return createConstellationMissionAdapter();
+			}
+			@Override
+			public Adapter caseInterferometryMission(InterferometryMission object) {
+				return createInterferometryMissionAdapter();
+			}
+			@Override
+			public Adapter caseCommunicatingElement(CommunicatingElement object) {
+				return createCommunicatingElementAdapter();
+			}
+			@Override
+			public Adapter caseGroundStationNetwork(GroundStationNetwork object) {
+				return createGroundStationNetworkAdapter();
+			}
+			@Override
+			public Adapter caseSpacecraft(Spacecraft object) {
+				return createSpacecraftAdapter();
+			}
+			@Override
+			public Adapter caseCommSubsystem(CommSubsystem object) {
+				return createCommSubsystemAdapter();
+			}
+			@Override
+			public Adapter casePayload(Payload object) {
+				return createPayloadAdapter();
+			}
+			@Override
+			public Adapter caseInterferometryPayload(InterferometryPayload object) {
+				return createInterferometryPayloadAdapter();
+			}
+			@Override
+			public Adapter caseCubeSat3U(CubeSat3U object) {
+				return createCubeSat3UAdapter();
+			}
+			@Override
+			public Adapter caseCubeSat6U(CubeSat6U object) {
+				return createCubeSat6UAdapter();
+			}
+			@Override
+			public Adapter caseSmallSat(SmallSat object) {
+				return createSmallSatAdapter();
+			}
+			@Override
+			public Adapter caseCubeSat(CubeSat object) {
+				return createCubeSatAdapter();
+			}
+			@Override
+			public Adapter caseUHFCommSubsystem(UHFCommSubsystem object) {
+				return createUHFCommSubsystemAdapter();
+			}
+			@Override
+			public Adapter caseXCommSubsystem(XCommSubsystem object) {
+				return createXCommSubsystemAdapter();
+			}
+			@Override
+			public Adapter caseKaCommSubsystem(KaCommSubsystem object) {
+				return createKaCommSubsystemAdapter();
+			}
+			@Override
+			public Adapter defaultCase(EObject object) {
+				return createEObjectAdapter();
+			}
+		};
+
+	/**
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param target the object to adapt.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject)target);
+	}
+
+
+	/**
+	 * Creates a new adapter for an object of class '{@link satellite.ConstellationMission <em>Constellation Mission</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see satellite.ConstellationMission
+	 * @generated
+	 */
+	public Adapter createConstellationMissionAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link satellite.InterferometryMission <em>Interferometry Mission</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see satellite.InterferometryMission
+	 * @generated
+	 */
+	public Adapter createInterferometryMissionAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link satellite.CommunicatingElement <em>Communicating Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see satellite.CommunicatingElement
+	 * @generated
+	 */
+	public Adapter createCommunicatingElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link satellite.GroundStationNetwork <em>Ground Station Network</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see satellite.GroundStationNetwork
+	 * @generated
+	 */
+	public Adapter createGroundStationNetworkAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link satellite.Spacecraft <em>Spacecraft</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see satellite.Spacecraft
+	 * @generated
+	 */
+	public Adapter createSpacecraftAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link satellite.CommSubsystem <em>Comm Subsystem</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see satellite.CommSubsystem
+	 * @generated
+	 */
+	public Adapter createCommSubsystemAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link satellite.Payload <em>Payload</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see satellite.Payload
+	 * @generated
+	 */
+	public Adapter createPayloadAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link satellite.InterferometryPayload <em>Interferometry Payload</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see satellite.InterferometryPayload
+	 * @generated
+	 */
+	public Adapter createInterferometryPayloadAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link satellite.CubeSat3U <em>Cube Sat3 U</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see satellite.CubeSat3U
+	 * @generated
+	 */
+	public Adapter createCubeSat3UAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link satellite.CubeSat6U <em>Cube Sat6 U</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see satellite.CubeSat6U
+	 * @generated
+	 */
+	public Adapter createCubeSat6UAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link satellite.SmallSat <em>Small Sat</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see satellite.SmallSat
+	 * @generated
+	 */
+	public Adapter createSmallSatAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link satellite.CubeSat <em>Cube Sat</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see satellite.CubeSat
+	 * @generated
+	 */
+	public Adapter createCubeSatAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link satellite.UHFCommSubsystem <em>UHF Comm Subsystem</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see satellite.UHFCommSubsystem
+	 * @generated
+	 */
+	public Adapter createUHFCommSubsystemAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link satellite.XCommSubsystem <em>XComm Subsystem</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see satellite.XCommSubsystem
+	 * @generated
+	 */
+	public Adapter createXCommSubsystemAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link satellite.KaCommSubsystem <em>Ka Comm Subsystem</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see satellite.KaCommSubsystem
+	 * @generated
+	 */
+	public Adapter createKaCommSubsystemAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+
+} //SatelliteAdapterFactory
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/util/SatelliteSwitch.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/util/SatelliteSwitch.java
new file mode 100644
index 00000000..a380d3f6
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/src/satellite/util/SatelliteSwitch.java
@@ -0,0 +1,421 @@
+/**
+ */
+package satellite.util;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.util.Switch;
+
+import satellite.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
+ * to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see satellite.SatellitePackage
+ * @generated
+ */
+public class SatelliteSwitch<T> extends Switch<T> {
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static SatellitePackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public SatelliteSwitch() {
+		if (modelPackage == null) {
+			modelPackage = SatellitePackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+			case SatellitePackage.CONSTELLATION_MISSION: {
+				ConstellationMission constellationMission = (ConstellationMission)theEObject;
+				T result = caseConstellationMission(constellationMission);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case SatellitePackage.INTERFEROMETRY_MISSION: {
+				InterferometryMission interferometryMission = (InterferometryMission)theEObject;
+				T result = caseInterferometryMission(interferometryMission);
+				if (result == null) result = caseConstellationMission(interferometryMission);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case SatellitePackage.COMMUNICATING_ELEMENT: {
+				CommunicatingElement communicatingElement = (CommunicatingElement)theEObject;
+				T result = caseCommunicatingElement(communicatingElement);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case SatellitePackage.GROUND_STATION_NETWORK: {
+				GroundStationNetwork groundStationNetwork = (GroundStationNetwork)theEObject;
+				T result = caseGroundStationNetwork(groundStationNetwork);
+				if (result == null) result = caseCommunicatingElement(groundStationNetwork);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case SatellitePackage.SPACECRAFT: {
+				Spacecraft spacecraft = (Spacecraft)theEObject;
+				T result = caseSpacecraft(spacecraft);
+				if (result == null) result = caseCommunicatingElement(spacecraft);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case SatellitePackage.COMM_SUBSYSTEM: {
+				CommSubsystem commSubsystem = (CommSubsystem)theEObject;
+				T result = caseCommSubsystem(commSubsystem);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case SatellitePackage.PAYLOAD: {
+				Payload payload = (Payload)theEObject;
+				T result = casePayload(payload);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case SatellitePackage.INTERFEROMETRY_PAYLOAD: {
+				InterferometryPayload interferometryPayload = (InterferometryPayload)theEObject;
+				T result = caseInterferometryPayload(interferometryPayload);
+				if (result == null) result = casePayload(interferometryPayload);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case SatellitePackage.CUBE_SAT3_U: {
+				CubeSat3U cubeSat3U = (CubeSat3U)theEObject;
+				T result = caseCubeSat3U(cubeSat3U);
+				if (result == null) result = caseCubeSat(cubeSat3U);
+				if (result == null) result = caseSpacecraft(cubeSat3U);
+				if (result == null) result = caseCommunicatingElement(cubeSat3U);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case SatellitePackage.CUBE_SAT6_U: {
+				CubeSat6U cubeSat6U = (CubeSat6U)theEObject;
+				T result = caseCubeSat6U(cubeSat6U);
+				if (result == null) result = caseCubeSat(cubeSat6U);
+				if (result == null) result = caseSpacecraft(cubeSat6U);
+				if (result == null) result = caseCommunicatingElement(cubeSat6U);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case SatellitePackage.SMALL_SAT: {
+				SmallSat smallSat = (SmallSat)theEObject;
+				T result = caseSmallSat(smallSat);
+				if (result == null) result = caseSpacecraft(smallSat);
+				if (result == null) result = caseCommunicatingElement(smallSat);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case SatellitePackage.CUBE_SAT: {
+				CubeSat cubeSat = (CubeSat)theEObject;
+				T result = caseCubeSat(cubeSat);
+				if (result == null) result = caseSpacecraft(cubeSat);
+				if (result == null) result = caseCommunicatingElement(cubeSat);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case SatellitePackage.UHF_COMM_SUBSYSTEM: {
+				UHFCommSubsystem uhfCommSubsystem = (UHFCommSubsystem)theEObject;
+				T result = caseUHFCommSubsystem(uhfCommSubsystem);
+				if (result == null) result = caseCommSubsystem(uhfCommSubsystem);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case SatellitePackage.XCOMM_SUBSYSTEM: {
+				XCommSubsystem xCommSubsystem = (XCommSubsystem)theEObject;
+				T result = caseXCommSubsystem(xCommSubsystem);
+				if (result == null) result = caseCommSubsystem(xCommSubsystem);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case SatellitePackage.KA_COMM_SUBSYSTEM: {
+				KaCommSubsystem kaCommSubsystem = (KaCommSubsystem)theEObject;
+				T result = caseKaCommSubsystem(kaCommSubsystem);
+				if (result == null) result = caseCommSubsystem(kaCommSubsystem);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Constellation Mission</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Constellation Mission</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseConstellationMission(ConstellationMission object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Interferometry Mission</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Interferometry Mission</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseInterferometryMission(InterferometryMission object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Communicating Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Communicating Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCommunicatingElement(CommunicatingElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Ground Station Network</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ground Station Network</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseGroundStationNetwork(GroundStationNetwork object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Spacecraft</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Spacecraft</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseSpacecraft(Spacecraft object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Comm Subsystem</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Comm Subsystem</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCommSubsystem(CommSubsystem object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Payload</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Payload</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T casePayload(Payload object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Interferometry Payload</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Interferometry Payload</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseInterferometryPayload(InterferometryPayload object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Cube Sat3 U</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Cube Sat3 U</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCubeSat3U(CubeSat3U object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Cube Sat6 U</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Cube Sat6 U</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCubeSat6U(CubeSat6U object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Small Sat</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Small Sat</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseSmallSat(SmallSat object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Cube Sat</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Cube Sat</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCubeSat(CubeSat object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>UHF Comm Subsystem</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>UHF Comm Subsystem</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseUHFCommSubsystem(UHFCommSubsystem object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>XComm Subsystem</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>XComm Subsystem</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseXCommSubsystem(XCommSubsystem object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Ka Comm Subsystem</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ka Comm Subsystem</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseKaCommSubsystem(KaCommSubsystem object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+
+} //SatelliteSwitch
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/xtend-gen/hu/bme/mit/inf/dslreasoner/diversitycalculator/.FileComparator.java._trace b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/xtend-gen/hu/bme/mit/inf/dslreasoner/diversitycalculator/.FileComparator.java._trace
new file mode 100644
index 00000000..66809531
Binary files /dev/null and b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/xtend-gen/hu/bme/mit/inf/dslreasoner/diversitycalculator/.FileComparator.java._trace differ
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/xtend-gen/hu/bme/mit/inf/dslreasoner/diversitycalculator/.MeasureDiversity.java._trace b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/xtend-gen/hu/bme/mit/inf/dslreasoner/diversitycalculator/.MeasureDiversity.java._trace
new file mode 100644
index 00000000..87a0a021
Binary files /dev/null and b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/xtend-gen/hu/bme/mit/inf/dslreasoner/diversitycalculator/.MeasureDiversity.java._trace differ
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/xtend-gen/hu/bme/mit/inf/dslreasoner/diversitycalculator/.MeasureDiversity.xtendbin b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/xtend-gen/hu/bme/mit/inf/dslreasoner/diversitycalculator/.MeasureDiversity.xtendbin
new file mode 100644
index 00000000..b2685222
Binary files /dev/null and b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/xtend-gen/hu/bme/mit/inf/dslreasoner/diversitycalculator/.MeasureDiversity.xtendbin differ
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/xtend-gen/hu/bme/mit/inf/dslreasoner/diversitycalculator/.MeasureInternalDiversity.java._trace b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/xtend-gen/hu/bme/mit/inf/dslreasoner/diversitycalculator/.MeasureInternalDiversity.java._trace
new file mode 100644
index 00000000..f9773278
Binary files /dev/null and b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/xtend-gen/hu/bme/mit/inf/dslreasoner/diversitycalculator/.MeasureInternalDiversity.java._trace differ
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/xtend-gen/hu/bme/mit/inf/dslreasoner/diversitycalculator/.MeasureInternalDiversity.xtendbin b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/xtend-gen/hu/bme/mit/inf/dslreasoner/diversitycalculator/.MeasureInternalDiversity.xtendbin
new file mode 100644
index 00000000..1ffee322
Binary files /dev/null and b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/xtend-gen/hu/bme/mit/inf/dslreasoner/diversitycalculator/.MeasureInternalDiversity.xtendbin differ
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/xtend-gen/hu/bme/mit/inf/dslreasoner/diversitycalculator/.PatternWithMatches.java._trace b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/xtend-gen/hu/bme/mit/inf/dslreasoner/diversitycalculator/.PatternWithMatches.java._trace
new file mode 100644
index 00000000..f8d273ed
Binary files /dev/null and b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/xtend-gen/hu/bme/mit/inf/dslreasoner/diversitycalculator/.PatternWithMatches.java._trace differ
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/xtend-gen/hu/bme/mit/inf/dslreasoner/diversitycalculator/FileComparator.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/xtend-gen/hu/bme/mit/inf/dslreasoner/diversitycalculator/FileComparator.java
new file mode 100644
index 00000000..d3992d29
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/xtend-gen/hu/bme/mit/inf/dslreasoner/diversitycalculator/FileComparator.java
@@ -0,0 +1,27 @@
+package hu.bme.mit.inf.dslreasoner.diversitycalculator;
+
+import hu.bme.mit.inf.dslreasoner.diversitycalculator.MeasureDiversity;
+import java.io.File;
+import java.util.Comparator;
+
+@SuppressWarnings("all")
+public class FileComparator implements Comparator<File> {
+  @Override
+  public int compare(final File arg0, final File arg1) {
+    int _xblockexpression = (int) 0;
+    {
+      final int r1 = Integer.parseInt(MeasureDiversity.runIndex(arg0.getName()));
+      final int r2 = Integer.parseInt(MeasureDiversity.runIndex(arg1.getName()));
+      final int runRes = Integer.compare(r1, r2);
+      if ((runRes == 0)) {
+        final int a = Integer.parseInt(MeasureDiversity.modelIndex(arg0.getName()));
+        final int b = Integer.parseInt(MeasureDiversity.modelIndex(arg1.getName()));
+        Integer.compare(a, b);
+      } else {
+        return runRes;
+      }
+      _xblockexpression = arg0.getName().compareTo(arg1.getName());
+    }
+    return _xblockexpression;
+  }
+}
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/xtend-gen/hu/bme/mit/inf/dslreasoner/diversitycalculator/MeasureDiversity.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/xtend-gen/hu/bme/mit/inf/dslreasoner/diversitycalculator/MeasureDiversity.java
new file mode 100644
index 00000000..bbf46409
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/xtend-gen/hu/bme/mit/inf/dslreasoner/diversitycalculator/MeasureDiversity.java
@@ -0,0 +1,350 @@
+package hu.bme.mit.inf.dslreasoner.diversitycalculator;
+
+import TaxationWithRoot.TaxationWithRootPackage;
+import com.google.common.collect.Iterables;
+import familytree.FamilytreePackage;
+import hu.bme.mit.inf.dslreasoner.diversitycalculator.FileComparator;
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic;
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2LogicConfiguration;
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace;
+import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor;
+import hu.bme.mit.inf.dslreasoner.ecore2logic.ecore2logicannotations.Ecore2logicannotationsPackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.builder.TracedOutput;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.DefinedElement;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem;
+import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicproblemPackage;
+import hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.Viatra2LogicAnnotationsPackage;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2PartialInterpretation;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.neighbourhood.AbstractNodeDescriptor;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.neighbourhood.NeighbourhoodWithTraces;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.neighbourhood.PartialInterpretation2ImmutableTypeLattice;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage;
+import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace;
+import java.io.File;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Consumer;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EEnumLiteral;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngineOptions;
+import org.eclipse.viatra.query.runtime.localsearch.matcher.integration.LocalSearchEMFBackendFactory;
+import org.eclipse.viatra.query.runtime.rete.matcher.ReteBackendFactory;
+import org.eclipse.xtend2.lib.StringConcatenation;
+import org.eclipse.xtext.xbase.lib.CollectionLiterals;
+import org.eclipse.xtext.xbase.lib.Conversions;
+import org.eclipse.xtext.xbase.lib.Exceptions;
+import org.eclipse.xtext.xbase.lib.ExclusiveRange;
+import org.eclipse.xtext.xbase.lib.Functions.Function1;
+import org.eclipse.xtext.xbase.lib.Functions.Function2;
+import org.eclipse.xtext.xbase.lib.InputOutput;
+import org.eclipse.xtext.xbase.lib.IterableExtensions;
+import org.eclipse.xtext.xbase.lib.ListExtensions;
+import satellite.SatellitePackage;
+
+@SuppressWarnings("all")
+public class MeasureDiversity {
+  public static class BenchmarkConfig {
+    private int range;
+    
+    private int size;
+    
+    private PrintWriter writer;
+    
+    private String scenario;
+  }
+  
+  private static final InstanceModel2PartialInterpretation partialInterpretation2Logic = new InstanceModel2PartialInterpretation();
+  
+  private static final PartialInterpretation2ImmutableTypeLattice neiguboirhoodComputer = new PartialInterpretation2ImmutableTypeLattice();
+  
+  private static final Ecore2Logic ecore2Logic = new Ecore2Logic();
+  
+  private static void init() {
+    LogiclanguagePackage.eINSTANCE.getClass();
+    LogicproblemPackage.eINSTANCE.getClass();
+    PartialinterpretationPackage.eINSTANCE.getClass();
+    Ecore2logicannotationsPackage.eINSTANCE.getClass();
+    Viatra2LogicAnnotationsPackage.eINSTANCE.getClass();
+    Map<String, Object> _extensionToFactoryMap = Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap();
+    XMIResourceFactoryImpl _xMIResourceFactoryImpl = new XMIResourceFactoryImpl();
+    _extensionToFactoryMap.put("*", _xMIResourceFactoryImpl);
+    ViatraQueryEngineOptions.setSystemDefaultBackends(ReteBackendFactory.INSTANCE, ReteBackendFactory.INSTANCE, LocalSearchEMFBackendFactory.INSTANCE);
+  }
+  
+  public static void main(final String[] args) {
+    try {
+      MeasureDiversity.init();
+      StringConcatenation _builder = new StringConcatenation();
+      _builder.append("inputs");
+      final String path = _builder.toString();
+      StringConcatenation _builder_1 = new StringConcatenation();
+      _builder_1.append("FamilyTree");
+      StringConcatenation _builder_2 = new StringConcatenation();
+      _builder_2.append("Satellite");
+      StringConcatenation _builder_3 = new StringConcatenation();
+      _builder_3.append("Taxation");
+      StringConcatenation _builder_4 = new StringConcatenation();
+      _builder_4.append("FamilyTreeNoNum");
+      StringConcatenation _builder_5 = new StringConcatenation();
+      _builder_5.append("SatelliteNoNum");
+      StringConcatenation _builder_6 = new StringConcatenation();
+      _builder_6.append("TaxationNoNum");
+      final List<String> scenarios = Collections.<String>unmodifiableList(CollectionLiterals.<String>newArrayList(_builder_1.toString(), _builder_2.toString(), _builder_3.toString(), _builder_4.toString(), _builder_5.toString(), _builder_6.toString()));
+      final PrintWriter writer = new PrintWriter((path + "/diversity.csv"), "UTF-8");
+      for (final String scenario : scenarios) {
+        {
+          final MeasureDiversity.BenchmarkConfig config = new MeasureDiversity.BenchmarkConfig();
+          config.writer = writer;
+          config.range = 3;
+          config.scenario = scenario;
+          MeasureDiversity.measureDiversity(scenario, ((path + "/") + scenario), config);
+          InputOutput.<String>println((scenario + " finished"));
+        }
+      }
+      writer.close();
+    } catch (Throwable _e) {
+      throw Exceptions.sneakyThrow(_e);
+    }
+  }
+  
+  public static void measureDiversity(final String scenario, final String path, final MeasureDiversity.BenchmarkConfig config) {
+    final File file = new File(path);
+    boolean _isDirectory = file.isDirectory();
+    if (_isDirectory) {
+      final String[] subfiles = file.list();
+      final Function1<String, Boolean> _function = (String it) -> {
+        return Boolean.valueOf(it.endsWith(".xmi"));
+      };
+      final Iterable<String> xmiSubfiles = IterableExtensions.<String>filter(((Iterable<String>)Conversions.doWrapArray(subfiles)), _function);
+      boolean _isEmpty = IterableExtensions.isEmpty(xmiSubfiles);
+      boolean _not = (!_isEmpty);
+      if (_not) {
+        final Function1<String, File> _function_1 = (String it) -> {
+          return new File(((path + "/") + it));
+        };
+        MeasureDiversity.measureDiversity(scenario, file, IterableExtensions.<File>toList(IterableExtensions.<String, File>map(xmiSubfiles, _function_1)), path, config);
+      } else {
+        for (final String subfile : subfiles) {
+          MeasureDiversity.measureDiversity(scenario, ((path + "/") + subfile), config);
+        }
+      }
+    } else {
+      boolean _isFile = file.isFile();
+      if (_isFile) {
+      }
+    }
+  }
+  
+  public static void measureDiversity(final String scenario, final File parent, final List<File> files, final String path, final MeasureDiversity.BenchmarkConfig config) {
+    final int depth = config.range;
+    final FileSystemWorkspace workspace = new FileSystemWorkspace(path, "");
+    EcorePackage.eINSTANCE.eClass();
+    TaxationWithRootPackage.eINSTANCE.eClass();
+    SatellitePackage.eINSTANCE.eClass();
+    FamilytreePackage.eINSTANCE.eClass();
+    FileComparator _fileComparator = new FileComparator();
+    files.sort(_fileComparator);
+    final HashMap<File, List<Map<? extends AbstractNodeDescriptor, Integer>>> modelShapeLists = new HashMap<File, List<Map<? extends AbstractNodeDescriptor, Integer>>>();
+    final HashMap<File, Map<? extends AbstractNodeDescriptor, Integer>> modelShapes = new HashMap<File, Map<? extends AbstractNodeDescriptor, Integer>>();
+    for (final File file : files) {
+      {
+        final EObject model = workspace.<EObject>readModel(EObject.class, file.getName());
+        final EPackage pckg = model.eClass().getEPackage();
+        List<EClass> _list = IterableExtensions.<EClass>toList(Iterables.<EClass>filter(pckg.getEClassifiers(), EClass.class));
+        Set<EClass> _emptySet = Collections.<EClass>emptySet();
+        List<EEnum> _list_1 = IterableExtensions.<EEnum>toList(Iterables.<EEnum>filter(pckg.getEClassifiers(), EEnum.class));
+        final Function1<EEnum, EList<EEnumLiteral>> _function = (EEnum it) -> {
+          return it.getELiterals();
+        };
+        List<EEnumLiteral> _list_2 = IterableExtensions.<EEnumLiteral>toList(Iterables.<EEnumLiteral>concat(IterableExtensions.<EEnum, EList<EEnumLiteral>>map(Iterables.<EEnum>filter(pckg.getEClassifiers(), EEnum.class), _function)));
+        final Function1<EClass, EList<EReference>> _function_1 = (EClass it) -> {
+          return it.getEReferences();
+        };
+        List<EReference> _list_3 = IterableExtensions.<EReference>toList(Iterables.<EReference>concat(IterableExtensions.<EClass, EList<EReference>>map(Iterables.<EClass>filter(pckg.getEClassifiers(), EClass.class), _function_1)));
+        final Function1<EClass, EList<EAttribute>> _function_2 = (EClass it) -> {
+          return it.getEAttributes();
+        };
+        List<EAttribute> _list_4 = IterableExtensions.<EAttribute>toList(Iterables.<EAttribute>concat(IterableExtensions.<EClass, EList<EAttribute>>map(Iterables.<EClass>filter(pckg.getEClassifiers(), EClass.class), _function_2)));
+        final EcoreMetamodelDescriptor metamodel = new EcoreMetamodelDescriptor(_list, _emptySet, 
+          false, _list_1, _list_2, _list_3, _list_4);
+        Ecore2LogicConfiguration _ecore2LogicConfiguration = new Ecore2LogicConfiguration();
+        final TracedOutput<LogicProblem, Ecore2Logic_Trace> metamodelTransformationOutput = MeasureDiversity.ecore2Logic.transformMetamodel(metamodel, _ecore2LogicConfiguration);
+        final PartialInterpretation partialModelOutput = MeasureDiversity.partialInterpretation2Logic.transform(metamodelTransformationOutput, model.eResource(), 
+          false);
+        final List<Map<? extends AbstractNodeDescriptor, Integer>> list = MeasureDiversity.shapeList(partialModelOutput, depth);
+        modelShapes.put(file, list.get((depth - 1)));
+      }
+    }
+    final PrintWriter writer = config.writer;
+    InputOutput.<String>println("Printing internal diversity of models");
+    for (final File model : files) {
+      {
+        final Map<? extends AbstractNodeDescriptor, Integer> modelshape = modelShapes.get(model);
+        final Function2<Integer, Integer, Integer> _function = (Integer a, Integer b) -> {
+          return Integer.valueOf(((a).intValue() + (b).intValue()));
+        };
+        final Integer amounts = IterableExtensions.<Integer>reduce(modelshape.values(), _function);
+        int _size = modelshape.size();
+        final double shapes = ((double) _size);
+        writer.println(((((config.scenario + ",") + model) + ",") + Double.valueOf((shapes / (amounts).intValue()))));
+      }
+    }
+  }
+  
+  public static ArrayList<List<File>> getRandomOrders(final List<File> files, final int number) {
+    final ArrayList<List<File>> sequences = new ArrayList<List<File>>();
+    for (int i = 0; (i < number); i++) {
+      {
+        final ArrayList<File> seq = new ArrayList<File>(files);
+        Collections.shuffle(seq);
+        sequences.add(seq);
+      }
+    }
+    return sequences;
+  }
+  
+  public static void printShapeNumbersOnRandomOrders(final List<File> files, final HashMap<File, Map<? extends AbstractNodeDescriptor, Integer>> shapes, final int number) {
+    final ArrayList<List<File>> sequences = new ArrayList<List<File>>();
+    InputOutput.<String>println("Printing generated random orders (models apper in original order)");
+    for (int i = 0; (i < number); i++) {
+      {
+        final ArrayList<File> seq = new ArrayList<File>(files);
+        Collections.shuffle(seq);
+        sequences.add(seq);
+        InputOutput.<String>println("Model;NewIndex");
+        for (final File model : files) {
+          String _plus = (model + ",");
+          int _indexOf = seq.indexOf(model);
+          String _plus_1 = (_plus + Integer.valueOf(_indexOf));
+          InputOutput.<String>println(_plus_1);
+        }
+      }
+    }
+    InputOutput.<String>println("Printing generated random orders (models apper in original order)");
+    InputOutput.<String>println("SeqNo;Index;Model;NewShapes;AllShapes");
+    int seqindx = 0;
+    for (final List<File> seq : sequences) {
+      {
+        final HashSet<AbstractNodeDescriptor> currshapes = new HashSet<AbstractNodeDescriptor>();
+        int indx = 0;
+        for (final File model : seq) {
+          {
+            final int beforesize = currshapes.size();
+            currshapes.addAll(shapes.get(model).keySet());
+            final int aftersize = currshapes.size();
+            final int diff = (aftersize - beforesize);
+            String _plus = (Integer.valueOf(seqindx) + ",");
+            String _plus_1 = (_plus + Integer.valueOf(indx));
+            String _plus_2 = (_plus_1 + ",");
+            String _plus_3 = (_plus_2 + model);
+            String _plus_4 = (_plus_3 + ",");
+            String _plus_5 = (_plus_4 + Integer.valueOf(diff));
+            String _plus_6 = (_plus_5 + ",");
+            int _size = currshapes.size();
+            String _plus_7 = (_plus_6 + Integer.valueOf(_size));
+            InputOutput.<String>println(_plus_7);
+            indx++;
+          }
+        }
+        seqindx++;
+      }
+    }
+  }
+  
+  public static void printShapeNumbers(final List<File> order, final Map<File, Map<? extends AbstractNodeDescriptor, Integer>> shapes) {
+    InputOutput.<String>println("Model;InternalDiversity;NewShapes;AllCurrentShapes");
+    final HashSet<AbstractNodeDescriptor> currshapes = new HashSet<AbstractNodeDescriptor>();
+    for (final File file : order) {
+      {
+        final int beforesize = currshapes.size();
+        currshapes.addAll(shapes.get(file).keySet());
+        final int aftersize = currshapes.size();
+        final int diff = (aftersize - beforesize);
+        String _plus = (file + ",");
+        int _size = shapes.get(file).size();
+        String _plus_1 = (_plus + Integer.valueOf(_size));
+        String _plus_2 = (_plus_1 + ",");
+        String _plus_3 = (_plus_2 + Integer.valueOf(diff));
+        String _plus_4 = (_plus_3 + ",");
+        int _size_1 = currshapes.size();
+        String _plus_5 = (_plus_4 + Integer.valueOf(_size_1));
+        InputOutput.<String>println(_plus_5);
+      }
+    }
+  }
+  
+  protected static String runIndex(final String name) {
+    final String res = IterableExtensions.<String>head(((Iterable<String>)Conversions.doWrapArray(name.split("\\.")))).split("_")[0];
+    boolean _startsWith = res.startsWith("result");
+    if (_startsWith) {
+      return res.substring(6);
+    } else {
+      return res;
+    }
+  }
+  
+  protected static String modelIndex(final String name) {
+    return IterableExtensions.<String>head(((Iterable<String>)Conversions.doWrapArray(name.split("\\.")))).split("_")[1];
+  }
+  
+  protected static LinkedList<Set<Integer>> representationList(final PartialInterpretation partialModel, final int depth) {
+    final LinkedList<Set<Integer>> list = new LinkedList<Set<Integer>>();
+    ExclusiveRange _doubleDotLessThan = new ExclusiveRange(0, depth, true);
+    for (final Integer i : _doubleDotLessThan) {
+      {
+        final NeighbourhoodWithTraces<Map<? extends AbstractNodeDescriptor, Integer>, AbstractNodeDescriptor> neighbourhood = MeasureDiversity.neiguboirhoodComputer.createRepresentation(partialModel, (i).intValue(), 0, 0);
+        final Function1<AbstractNodeDescriptor, Integer> _function = (AbstractNodeDescriptor it) -> {
+          return Integer.valueOf(it.hashCode());
+        };
+        list.add(IterableExtensions.<Integer>toSet(IterableExtensions.map(neighbourhood.getModelRepresentation().keySet(), _function)));
+      }
+    }
+    return list;
+  }
+  
+  protected static List<Map<? extends AbstractNodeDescriptor, Integer>> shapeList(final PartialInterpretation partialModel, final int depth) {
+    final LinkedList<Map<? extends AbstractNodeDescriptor, Integer>> list = new LinkedList<Map<? extends AbstractNodeDescriptor, Integer>>();
+    ExclusiveRange _doubleDotLessThan = new ExclusiveRange(0, depth, true);
+    for (final Integer i : _doubleDotLessThan) {
+      {
+        final NeighbourhoodWithTraces<Map<? extends AbstractNodeDescriptor, Integer>, AbstractNodeDescriptor> neighbourhood = MeasureDiversity.neiguboirhoodComputer.createRepresentation(partialModel, (i).intValue(), Integer.MAX_VALUE, Integer.MAX_VALUE);
+        final EList<DefinedElement> openWorldElements = partialModel.getOpenWorldElements();
+        final Function1<DefinedElement, AbstractNodeDescriptor> _function = (DefinedElement it) -> {
+          return neighbourhood.getNodeRepresentations().get(it);
+        };
+        final Set<AbstractNodeDescriptor> representationsOfOpenElements = IterableExtensions.<AbstractNodeDescriptor>toSet(ListExtensions.<DefinedElement, AbstractNodeDescriptor>map(openWorldElements, _function));
+        Map<? extends AbstractNodeDescriptor, Integer> _modelRepresentation = neighbourhood.getModelRepresentation();
+        final HashMap<AbstractNodeDescriptor, Integer> allElementRepresentation = new HashMap<AbstractNodeDescriptor, Integer>(_modelRepresentation);
+        final Consumer<AbstractNodeDescriptor> _function_1 = (AbstractNodeDescriptor it) -> {
+          allElementRepresentation.remove(it);
+        };
+        representationsOfOpenElements.forEach(_function_1);
+        final Map<Integer, Integer> hashedRepresentation = new HashMap<Integer, Integer>();
+        Set<Map.Entry<AbstractNodeDescriptor, Integer>> _entrySet = allElementRepresentation.entrySet();
+        for (final Map.Entry<AbstractNodeDescriptor, Integer> entry : _entrySet) {
+          hashedRepresentation.put(Integer.valueOf(entry.getKey().getDataHash()), entry.getValue());
+        }
+        list.add(allElementRepresentation);
+      }
+    }
+    return list;
+  }
+}
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/xtend-gen/hu/bme/mit/inf/dslreasoner/diversitycalculator/MeasureInternalDiversity.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/xtend-gen/hu/bme/mit/inf/dslreasoner/diversitycalculator/MeasureInternalDiversity.java
new file mode 100644
index 00000000..e1552b2f
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/xtend-gen/hu/bme/mit/inf/dslreasoner/diversitycalculator/MeasureInternalDiversity.java
@@ -0,0 +1,165 @@
+package hu.bme.mit.inf.dslreasoner.diversitycalculator;
+
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic;
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2LogicConfiguration;
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace;
+import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor;
+import hu.bme.mit.inf.dslreasoner.ecore2logic.ecore2logicannotations.Ecore2logicannotationsPackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.builder.TracedOutput;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem;
+import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicproblemPackage;
+import hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.Viatra2LogicAnnotationsPackage;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2PartialInterpretation;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.neighbourhood.AbstractNodeDescriptor;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.neighbourhood.NeighbourhoodWithTraces;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.neighbourhood.PartialInterpretation2ImmutableTypeLattice;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage;
+import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace;
+import java.io.File;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
+import org.eclipse.xtend2.lib.StringConcatenation;
+import org.eclipse.xtext.xbase.lib.Conversions;
+import org.eclipse.xtext.xbase.lib.Exceptions;
+import org.eclipse.xtext.xbase.lib.ExclusiveRange;
+import org.eclipse.xtext.xbase.lib.Functions.Function1;
+import org.eclipse.xtext.xbase.lib.InputOutput;
+import org.eclipse.xtext.xbase.lib.IterableExtensions;
+
+@SuppressWarnings("all")
+public class MeasureInternalDiversity {
+  private static final InstanceModel2PartialInterpretation partialInterpretation2Logic = new InstanceModel2PartialInterpretation();
+  
+  private static final PartialInterpretation2ImmutableTypeLattice neiguboirhoodComputer = new PartialInterpretation2ImmutableTypeLattice();
+  
+  private static final Ecore2Logic ecore2Logic = new Ecore2Logic();
+  
+  private static Object init() {
+    Object _xblockexpression = null;
+    {
+      LogiclanguagePackage.eINSTANCE.getClass();
+      LogicproblemPackage.eINSTANCE.getClass();
+      PartialinterpretationPackage.eINSTANCE.getClass();
+      Ecore2logicannotationsPackage.eINSTANCE.getClass();
+      Viatra2LogicAnnotationsPackage.eINSTANCE.getClass();
+      Map<String, Object> _extensionToFactoryMap = Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap();
+      XMIResourceFactoryImpl _xMIResourceFactoryImpl = new XMIResourceFactoryImpl();
+      _xblockexpression = _extensionToFactoryMap.put("*", _xMIResourceFactoryImpl);
+    }
+    return _xblockexpression;
+  }
+  
+  public static void main(final String[] args) {
+    MeasureInternalDiversity.init();
+  }
+  
+  public static void run(final EcoreMetamodelDescriptor metamodel, final String path, final String scenario) {
+    final int range = 20;
+    MeasureInternalDiversity.measureDiversity(metamodel, scenario, path, range);
+  }
+  
+  public static void measureDiversity(final EcoreMetamodelDescriptor metamodel, final String scenario, final String path, final int depth) {
+    final File file = new File(path);
+    boolean _isDirectory = file.isDirectory();
+    if (_isDirectory) {
+      final String[] subfiles = file.list();
+      final Function1<String, Boolean> _function = (String it) -> {
+        return Boolean.valueOf(it.endsWith(".xmi"));
+      };
+      final Iterable<String> xmiSubfiles = IterableExtensions.<String>filter(((Iterable<String>)Conversions.doWrapArray(subfiles)), _function);
+      boolean _isEmpty = IterableExtensions.isEmpty(xmiSubfiles);
+      boolean _not = (!_isEmpty);
+      if (_not) {
+        final Function1<String, File> _function_1 = (String it) -> {
+          return new File(((path + "/") + it));
+        };
+        MeasureInternalDiversity.measureDiversity(metamodel, scenario, file, IterableExtensions.<File>toList(IterableExtensions.<String, File>map(xmiSubfiles, _function_1)), path, depth);
+      } else {
+        for (final String subfile : subfiles) {
+          MeasureInternalDiversity.measureDiversity(metamodel, scenario, ((path + "/") + subfile), depth);
+        }
+      }
+    } else {
+      boolean _isFile = file.isFile();
+      if (_isFile) {
+      }
+    }
+  }
+  
+  public static void measureDiversity(final EcoreMetamodelDescriptor metamodel, final String scenario, final File parent, final List<File> files, final String path, final int depth) {
+    final FileSystemWorkspace workspace = new FileSystemWorkspace(path, "");
+    for (final File file : files) {
+      {
+        Ecore2LogicConfiguration _ecore2LogicConfiguration = new Ecore2LogicConfiguration();
+        final TracedOutput<LogicProblem, Ecore2Logic_Trace> metamodelTransformationOutput = MeasureInternalDiversity.ecore2Logic.transformMetamodel(metamodel, _ecore2LogicConfiguration);
+        final EObject model = workspace.<EObject>readModel(EObject.class, file.getName());
+        final PartialInterpretation partialModel = MeasureInternalDiversity.partialInterpretation2Logic.transform(metamodelTransformationOutput, model.eResource(), false);
+        final LinkedList<Map<? extends AbstractNodeDescriptor, Integer>> list = MeasureInternalDiversity.representationList(partialModel, depth);
+        try {
+          final String runIndex = MeasureInternalDiversity.runIndex(file.getName());
+          final String modelIndex = MeasureInternalDiversity.modelIndex(file.getName());
+          StringConcatenation _builder = new StringConcatenation();
+          _builder.append(scenario);
+          _builder.append(";");
+          _builder.append(runIndex);
+          _builder.append(";");
+          _builder.append(modelIndex);
+          InputOutput.<String>print(_builder.toString());
+        } catch (final Throwable _t) {
+          if (_t instanceof Exception) {
+            StringConcatenation _builder_1 = new StringConcatenation();
+            _builder_1.append(scenario);
+            _builder_1.append(";0;");
+            String _name = file.getName();
+            _builder_1.append(_name);
+            InputOutput.<String>print(_builder_1.toString());
+          } else {
+            throw Exceptions.sneakyThrow(_t);
+          }
+        }
+        int _size = list.size();
+        ExclusiveRange _doubleDotLessThan = new ExclusiveRange(0, _size, true);
+        for (final Integer i : _doubleDotLessThan) {
+          StringConcatenation _builder = new StringConcatenation();
+          _builder.append(";");
+          int _size_1 = list.get((i).intValue()).keySet().size();
+          _builder.append(_size_1);
+          InputOutput.<String>print(_builder.toString());
+        }
+        int _size_2 = list.getLast().keySet().size();
+        double _multiply = (_size_2 * 1.0);
+        int _size_3 = partialModel.getNewElements().size();
+        double _divide = (_multiply / _size_3);
+        String _plus = (";" + Double.valueOf(_divide));
+        InputOutput.<String>print(_plus);
+        InputOutput.println();
+      }
+    }
+  }
+  
+  protected static String runIndex(final String name) {
+    return IterableExtensions.<String>head(((Iterable<String>)Conversions.doWrapArray(name.split("\\.")))).split("_")[1];
+  }
+  
+  protected static String modelIndex(final String name) {
+    return IterableExtensions.<String>head(((Iterable<String>)Conversions.doWrapArray(name.split("\\.")))).split("_")[2];
+  }
+  
+  protected static LinkedList<Map<? extends AbstractNodeDescriptor, Integer>> representationList(final PartialInterpretation partialModel, final int depth) {
+    final LinkedList<Map<? extends AbstractNodeDescriptor, Integer>> list = new LinkedList<Map<? extends AbstractNodeDescriptor, Integer>>();
+    ExclusiveRange _doubleDotLessThan = new ExclusiveRange(0, depth, true);
+    for (final Integer i : _doubleDotLessThan) {
+      {
+        final NeighbourhoodWithTraces<Map<? extends AbstractNodeDescriptor, Integer>, AbstractNodeDescriptor> neighbourhood = MeasureInternalDiversity.neiguboirhoodComputer.createRepresentation(partialModel, (i).intValue(), 0, 0);
+        list.add(neighbourhood.getModelRepresentation());
+      }
+    }
+    return list;
+  }
+}
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/xtend-gen/hu/bme/mit/inf/dslreasoner/diversitycalculator/PatternWithMatches.java b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/xtend-gen/hu/bme/mit/inf/dslreasoner/diversitycalculator/PatternWithMatches.java
new file mode 100644
index 00000000..201269fd
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/xtend-gen/hu/bme/mit/inf/dslreasoner/diversitycalculator/PatternWithMatches.java
@@ -0,0 +1,72 @@
+package hu.bme.mit.inf.dslreasoner.diversitycalculator;
+
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.DefinedElement;
+import java.util.List;
+import org.eclipse.xtend.lib.annotations.Data;
+import org.eclipse.xtext.xbase.lib.Pure;
+import org.eclipse.xtext.xbase.lib.util.ToStringBuilder;
+
+@Data
+@SuppressWarnings("all")
+public class PatternWithMatches {
+  private final String name;
+  
+  private final List<List<DefinedElement>> matches;
+  
+  public PatternWithMatches(final String name, final List<List<DefinedElement>> matches) {
+    super();
+    this.name = name;
+    this.matches = matches;
+  }
+  
+  @Override
+  @Pure
+  public int hashCode() {
+    final int prime = 31;
+    int result = 1;
+    result = prime * result + ((this.name== null) ? 0 : this.name.hashCode());
+    return prime * result + ((this.matches== null) ? 0 : this.matches.hashCode());
+  }
+  
+  @Override
+  @Pure
+  public boolean equals(final Object obj) {
+    if (this == obj)
+      return true;
+    if (obj == null)
+      return false;
+    if (getClass() != obj.getClass())
+      return false;
+    PatternWithMatches other = (PatternWithMatches) obj;
+    if (this.name == null) {
+      if (other.name != null)
+        return false;
+    } else if (!this.name.equals(other.name))
+      return false;
+    if (this.matches == null) {
+      if (other.matches != null)
+        return false;
+    } else if (!this.matches.equals(other.matches))
+      return false;
+    return true;
+  }
+  
+  @Override
+  @Pure
+  public String toString() {
+    ToStringBuilder b = new ToStringBuilder(this);
+    b.add("name", this.name);
+    b.add("matches", this.matches);
+    return b.toString();
+  }
+  
+  @Pure
+  public String getName() {
+    return this.name;
+  }
+  
+  @Pure
+  public List<List<DefinedElement>> getMatches() {
+    return this.matches;
+  }
+}
-- 
cgit v1.2.3-70-g09d2