diff --git a/systems_design/src/common/aircraftSystems/ATAXX.cpp b/systems_design/src/common/aircraftSystems/ATAXX.cpp
index b204c515cab3b3f795aceb9809bd6796900a52d6..6e265d2232716866074e6d09e03c5b37f9ea439d 100644
--- a/systems_design/src/common/aircraftSystems/ATAXX.cpp
+++ b/systems_design/src/common/aircraftSystems/ATAXX.cpp
@@ -23,6 +23,7 @@
 /* The following statements import necessary header files */
 #include "ATAXX.h"                                // Import of header file from src/aircraftSystems folder for ATAXX
 #include <runtimeInfo/runtimeInfo.h>                          // Import of header file from external runtime library for using runtimeInfo
+#include <aircraftGeometry2/processing/transform.h>    //Import of header file for geometry transformation operations
 
 /* Constructor for ATAXX */
 ATAXX::ATAXX(const std::string& systemName, bool systemIsOperating, std::shared_ptr<systemsIOData> data, const RuntimeIO& rtIO)
@@ -159,9 +160,8 @@ Vec3 ATAXX::getRefPoint() {
     this->refPtX_cockpit = 0.0;
     this->refPtX_cockpit = data_->data.Accommodation.payload_tube_x_ref;
     /* Auto Flight System, Navigation & Communication: Placement in Avionics Bay */
-    if (avBayLocation == 0) {
-        this->refPtX_avionicsBay = data_->theWing.at(0).aerodynamicSurface.sections.front().origin[0] -
-                                   0.25 * data_->theWing.at(0).aerodynamicSurface.sections.front().get_chord_length(); // Initial method
+    if (avBayLocation == 0) {//Location of avionics bay at wing root
+        this->refPtX_avionicsBay = data_->theWing.at(0).position[0]; // Initial method
     } else if (avBayLocation == 1) {
         this->refPtX_avionicsBay = this->refPtX_cockpit * 0.25; // Location of the avionics bay in the nose for business-jet-like AC; approximation: 25% of the cockpit length
     } else if (avBayLocation == 2) {
diff --git a/systems_design/src/common/aircraftSystems/conventionalATA21.cpp b/systems_design/src/common/aircraftSystems/conventionalATA21.cpp
index cd68d60a1220052474cc7ae76aece9c88c096a86..b6d2bd070630adb4cc65482dcfdcad8f6282505d 100644
--- a/systems_design/src/common/aircraftSystems/conventionalATA21.cpp
+++ b/systems_design/src/common/aircraftSystems/conventionalATA21.cpp
@@ -51,10 +51,8 @@ conventionalATA21::~conventionalATA21() {
 void conventionalATA21::readParameters(const node& config) {
     std::string unit;
     scaling_factor = EndnodeReadOnly<double>("/module_configuration_file/program_settings/scaling_factors/environmental_control_system").read(config).value();
-    offTakeOff          = config.at("/module_configuration_file/program_settings/systems_constants/environmental_control_system/off_on_take_off/value");
-    data_->configuration.checkForValidity(offTakeOff, 0, 1, "offOnTakeOff");
-    ecoMode             = config.at("/module_configuration_file/program_settings/systems_constants/environmental_control_system/eco_mode/value");
-    data_->configuration.checkForValidity(ecoMode, 0, 1, "ecoMode");
+    offTakeOff          = EndnodeReadOnly<bool>("/module_configuration_file/program_settings/systems_constants/environmental_control_system/off_on_take_off").read(config).value();
+    ecoMode             = EndnodeReadOnly<bool>("/module_configuration_file/program_settings/systems_constants/environmental_control_system/eco_mode").read(config).value();
     airflowPerPax       = config.at("/module_configuration_file/program_settings/systems_constants/environmental_control_system/airflow_per_pax/value");
     data_->configuration.checkForValidity(airflowPerPax, 0.0, 0.02, "airflowPerPax");
     Recirculation       = config.at("/module_configuration_file/program_settings/systems_constants/environmental_control_system/recirculation/value");
@@ -65,8 +63,6 @@ void conventionalATA21::readParameters(const node& config) {
     data_->configuration.checkForValidity(heatSun, 0.0, 5000.0, "heatSun");
     heatPerPAX          = config.at("/module_configuration_file/program_settings/systems_constants/environmental_control_system/heat_per_pax/value");
     data_->configuration.checkForValidity(heatPerPAX, 0.0, 500.0, "heatPerPAX");
-    heatPerLightLength  = config.at("/module_configuration_file/program_settings/systems_constants/environmental_control_system/heat_per_light_length/value");
-    data_->configuration.checkForValidity(heatPerLightLength, 0.0, 500.0, "heatPerLightLength");
     efficiencyFactor    = config.at("/module_configuration_file/program_settings/systems_constants/environmental_control_system/efficiency_factor/value");
     data_->configuration.checkForValidity(efficiencyFactor, 0.0, 1.0, "efficiencyFactor");
     heatCapacityAir     = config.at("/module_configuration_file/program_settings/systems_constants/environmental_control_system/heat_capacity_air/value");
@@ -251,7 +247,7 @@ void conventionalATA21::getPower(std::vector<double> existingHeatLoads) {
         heatLoad.missionPower.at(i).baseLoad = (1. - efficiencyFactor) * (P_ACP
                                                + 0.1 * myElectricSum.missionPower.at(i).baseLoad);
         //Switching off the air condition during takeoff
-        if (offTakeOff == true && data_->mission.Steps.at(i).rating == "TO" && data_->mission.Steps.at(i).configuration == "TakeOff") {
+        if (offTakeOff == true && data_->mission.Steps.at(i).rating == "takeoff" && data_->mission.Steps.at(i).configuration == "takeoff") {
             bleedAir.missionPower.at(i).baseLoad = 0.0;
             heatLoad.missionPower.at(i).baseLoad = 0.0;
         }
@@ -306,9 +302,9 @@ double conventionalATA21::getMass(double massFlowECS) {
 /* Determination of the reference point */
 Vec3 conventionalATA21::getRefPoint() {
     /* Assumption: ECS is located in the belly fairing */
-    return Vec3(data_->theWing.back().aerodynamicSurface.origin[0] +
+    return Vec3(data_->theWing.back().position[0] +
                 0.5 * data_->theWing.back().aerodynamicSurface.sections.at(0).get_chord_length(),
-                data_->theWing.back().aerodynamicSurface.origin[1], data_->theWing.back().aerodynamicSurface.origin[2]);
+                data_->theWing.back().position[1], data_->theWing.back().position[2]);
 }
 
 /* Determination of the heat flux for ACP */
diff --git a/systems_design/src/common/aircraftSystems/conventionalATA21.h b/systems_design/src/common/aircraftSystems/conventionalATA21.h
index 48bd4637cea0887bf9760b0e97af866386aa6de8..24cc1a08d76725ccedc972b1db7804c0f4e15b2a 100644
--- a/systems_design/src/common/aircraftSystems/conventionalATA21.h
+++ b/systems_design/src/common/aircraftSystems/conventionalATA21.h
@@ -62,7 +62,6 @@ class conventionalATA21: public aircraftSystem {
     double heatSun;             /**< [W/m^2] heat from the sun **/
     double windowArea;          /**< [m^2] window area **/
     double heatPerPAX;          /**< [W] heat from each PAX **/
-    double heatPerLightLength;  /**< [W/m] heat per meter of lighting **/
     double efficiencyFactor;    /**< [---] efficiency factor of the ECS **/
     double heatCapacityAir;     /**< [J/(kg*K)] heat capacity of the air **/
     bool offTakeOff;            /**< switch if ECS is off during takeoff */
diff --git a/systems_design/src/common/aircraftSystems/conventionalATA27.cpp b/systems_design/src/common/aircraftSystems/conventionalATA27.cpp
index 61ab640ac8a9360d80b216d4d717ab686696b571..55b8c338bec2aca0cdc647d9b15dc0e8f536d078 100644
--- a/systems_design/src/common/aircraftSystems/conventionalATA27.cpp
+++ b/systems_design/src/common/aircraftSystems/conventionalATA27.cpp
@@ -146,11 +146,11 @@ void conventionalATA27::readParameters(const node& config) {
         myRuntimeInfo->err << "--> Abort!" << std::endl;
         exit(1);
     }
-    flightControl.defaultAileronActuator = EndnodeReadOnly<bool>(flightControlConfig + "/ailerons/default_actuator_architecture").read(config).value();
-    flightControl.defaultSpoilerActuator = EndnodeReadOnly<bool>(flightControlConfig + "/spoilers/default_actuator_architecture").read(config).value();
-    flightControl.defaultElevatorActuator = EndnodeReadOnly<bool>(flightControlConfig + "/elevators/default_actuator_architecture").read(config).value();
-    flightControl.defaultRudderActuator = EndnodeReadOnly<bool>(flightControlConfig + "/rudders/default_actuator_architecture").read(config).value();
-    flightControl.defaultTHSAActuator = EndnodeReadOnly<bool>(flightControlConfig + "/trimmable_horizontal_stabilizer/default_actuator_architecture").read(config).value();
+    flightControl.defaultAileronActuator = EndnodeReadOnly<bool>(flightControlConfig + "/ailerons/default_actuator_architecture_switch").read(config).value();
+    flightControl.defaultSpoilerActuator = EndnodeReadOnly<bool>(flightControlConfig + "/spoilers/default_actuator_architecture_switch").read(config).value();
+    flightControl.defaultElevatorActuator = EndnodeReadOnly<bool>(flightControlConfig + "/elevators/default_actuator_architecture_switch").read(config).value();
+    flightControl.defaultRudderActuator = EndnodeReadOnly<bool>(flightControlConfig + "/rudders/default_actuator_architecture_switch").read(config).value();
+    flightControl.defaultTHSAActuator = EndnodeReadOnly<bool>(flightControlConfig + "/trimmable_horizontal_stabilizer/default_actuator_architecture_switch").read(config).value();
 
     this->getAilerons(config);
     this->getSpoilers(config);
@@ -1716,9 +1716,9 @@ Vec3 conventionalATA27::getRefPoint() {
 //    return Vec3(x_cg_ATA27, 0., z_cg_ATA27);
     //alte Annahme: Schwerpunkt bei 45% Rumpflaenge
     // return Vec3(fuselageRef[0]+0.45*fuselageLength, fuselageRef[1], fuselageRef[2]);
-    return Vec3(data_->theWing.back().aerodynamicSurface.origin[0] +
+    return Vec3(data_->theWing.back().position[0] +
                 0.5 * data_->theWing.back().aerodynamicSurface.sections.at(0).get_chord_length(),
-                data_->theWing.back().aerodynamicSurface.origin[1], data_->theWing.back().aerodynamicSurface.origin[2]);
+                data_->theWing.back().position[1], data_->theWing.back().position[2]);
 }
 
 double conventionalATA27::getMaxDeflection(double minDeflection, double maxDeflection) {
diff --git a/systems_design/src/common/aircraftSystems/conventionalATA29.cpp b/systems_design/src/common/aircraftSystems/conventionalATA29.cpp
index 5b96a288febb74c57b8d6aa9c7df462e2f3acc0c..f341520168e234a6ee52bc095ffdd3659816afb6 100644
--- a/systems_design/src/common/aircraftSystems/conventionalATA29.cpp
+++ b/systems_design/src/common/aircraftSystems/conventionalATA29.cpp
@@ -54,18 +54,6 @@ void conventionalATA29::readParameters(const node& config) {
     scaling_factor = EndnodeReadOnly<double>("/module_configuration_file/program_settings/scaling_factors/hydraulic_system").read(config).value();
     std::string unit;
     std::string hydraulicSystemConfig = "/module_configuration_file/program_settings/systems_constants/hydraulic_system";
-    unit = std::string(config.at(hydraulicSystemConfig + "/pressure/unit"));
-    if (unit == "psi") {
-        Pressure  = 6894.76 * config.at(hydraulicSystemConfig + "/pressure/value");
-    } else if (unit == "Pa") {
-        Pressure  = config.at(hydraulicSystemConfig + "/pressure/value");
-    } else {
-        Pressure  = config.at(hydraulicSystemConfig + "/pressure/value");
-        myRuntimeInfo->err << "The unit of hydraulic pressure is not known.!" << std::endl;
-        myRuntimeInfo->err << "hydraulic pressure: " << Pressure << " " << unit << std::endl;
-        exit(1);
-    }
-    data_->configuration.checkForValidity(Pressure, 6894.76 * 2500, 6894.76 * 10000, "Hydraulic.Pressure");
     efficiencyFactorHydraulicSystem         = config.at(hydraulicSystemConfig + "/efficiency_factor_hydraulic_system/value");
     data_->configuration.checkForValidity(efficiencyFactorHydraulicSystem, 0.0, 1.0, "Hydraulic.efficiencyFactorHydraulicSystem");
     maxRelPower   =  config.at(hydraulicSystemConfig + "/rel_max_power/value");
@@ -358,11 +346,6 @@ double conventionalATA29::getDuctingLength(const geom2::MultisectionSurface<geom
 /* Determination of the reference point */
 Vec3 conventionalATA29::getRefPoint() {
     /* Assumption: hydraulic system is located in the belly fairing */
-    return Vec3(data_->theWing.back().aerodynamicSurface.origin[0] + 0.5 * data_->theWing.back().aerodynamicSurface.sections.at(0).get_chord_length(),
-                data_->theWing.back().aerodynamicSurface.origin[1], data_->theWing.back().aerodynamicSurface.origin[2]);
-}
-
-/* Determination of hydraulic volume flow */
-double conventionalATA29::getHydraulicVolumeFlow(double Power, double Pressure) {
-    return (Power / Pressure * (60 / 0.001));
+    return Vec3(data_->theWing.back().position[0] + 0.5 * data_->theWing.back().aerodynamicSurface.sections.at(0).get_chord_length(),
+                data_->theWing.back().position[1], data_->theWing.back().position[2]);
 }
diff --git a/systems_design/src/common/aircraftSystems/conventionalATA29.h b/systems_design/src/common/aircraftSystems/conventionalATA29.h
index 00a9472ad3b1fcce0b39e35e56c7f5d63c80dddb..7c7591b3008c3c00ac0df6e2af5aeb8fb9e20758 100644
--- a/systems_design/src/common/aircraftSystems/conventionalATA29.h
+++ b/systems_design/src/common/aircraftSystems/conventionalATA29.h
@@ -55,7 +55,6 @@ class conventionalATA29: public aircraftSystem {
 
     double lengthDucting;                       /**<[m] length of the ducting */
 
-    double Pressure; /**< [Pa] Pressure of the hydraulic System **/
     double efficiencyFactorHydraulicSystem;/**< [-] efficiency factor of the hydraulic system */
     double maxRelPower;
     double specificDuctingMass; /**< [kg/m] specific mass of hydraulic ducting */
@@ -117,13 +116,6 @@ class conventionalATA29: public aircraftSystem {
      */
     Vec3 getRefPoint();
 
-    /** \brief calculates the volume flow of the hydraulic system. UNUSED FUNCTION!
-     * \param Power double: [W]
-     * \param Pressure double: [N/m^2]
-     * \return double: volume flow [kg/s]
-     */
-    double getHydraulicVolumeFlow(double Power, double Pressure);   /** < Return of the volume flow [l/min] */
-
     /** \brief Constructor of the hydraulic system
      * \param systemName string
      * \param systemIsOperating bool: Switch whether system is operating (1) or not (0)
diff --git a/systems_design/src/common/aircraftSystems/conventionalATA32.cpp b/systems_design/src/common/aircraftSystems/conventionalATA32.cpp
index 6faed3a438f2906cb3ccbb4204a5cdd6029e0760..54b63e64d1a843d6d8c315096759ced291348cbc 100644
--- a/systems_design/src/common/aircraftSystems/conventionalATA32.cpp
+++ b/systems_design/src/common/aircraftSystems/conventionalATA32.cpp
@@ -40,7 +40,6 @@ conventionalATA32::~conventionalATA32() {
 
 /* Reading system specific parameters of configuration xml file */
 void conventionalATA32::readParameters(const node& config) {
-    scaling_factor = EndnodeReadOnly<double>("/module_configuration_file/program_settings/scaling_factors/landing_gear_system").read(config).value();
     efficiencyFactor = config.at("/module_configuration_file/program_settings/systems_constants/gear/efficiency_factor/value");
     retractionTime = config.at("/module_configuration_file/program_settings/systems_constants/gear/retraction_time/value");
     extensionTime = config.at("/module_configuration_file/program_settings/systems_constants/gear/extension_time/value");
@@ -99,6 +98,7 @@ void conventionalATA32::calculateSinkMass(const powerProfile& sourceBleed,
     UNUSED(sourceElectric);
     UNUSED(sourceHydraulic);
     /* Calculate Systems Mass */
+    //landing gear mass is required for power calculation. It is not considered in total system mass since it is accounted for in landing_gear_design
     if (data_->data.Mass.Gear > 0.0) {
         Mass = data_->data.Mass.Gear;
         refPoint = data_->data.CofG.landingGear;
@@ -191,7 +191,7 @@ void conventionalATA32::getPower() {
     cleanPowerPeaks(&bleedAir);
 }
 double conventionalATA32::getMass() {
-    //TODO(seabrooke): check that this is the landing gear actuation mass
+    //landing gear mass is required for power calculation but not considered for total system mass
     return  static_cast<double>(0.00271 * pow(data_->data.Mass.MLM, 1.24));
 }
 
diff --git a/systems_design/src/common/aircraftSystems/conventionalATA36.cpp b/systems_design/src/common/aircraftSystems/conventionalATA36.cpp
index c2a4e9fb02ae92213840be37464a8fc5077d8761..b90bacade05342e09fe5075b465b1ea1a5d81176 100644
--- a/systems_design/src/common/aircraftSystems/conventionalATA36.cpp
+++ b/systems_design/src/common/aircraftSystems/conventionalATA36.cpp
@@ -175,7 +175,7 @@ double conventionalATA36::getMass() {
 
 Vec3 conventionalATA36::getRefPoint() {
     /* Assumption: the bleed air system is located in the belly fairing **/
-    return Vec3(data_->theWing.back().aerodynamicSurface.origin[0] + 0.5 * data_->theWing.back().aerodynamicSurface.sections.at(0).get_chord_length(),
-                data_->theWing.back().aerodynamicSurface.origin[1],
-                data_->theWing.back().aerodynamicSurface.origin[2]);
+    return Vec3(data_->theWing.back().position[0] + 0.5 * data_->theWing.back().aerodynamicSurface.sections.at(0).get_chord_length(),
+                data_->theWing.back().position[1],
+                data_->theWing.back().position[2]);
 }
diff --git a/systems_design/src/common/systemsIOData.cpp b/systems_design/src/common/systemsIOData.cpp
index 2d7fd2eec9eeec804dfd6f78766269bdeb286798..8aa1cc810d5d06674ec8f6290539f08c9c1c88c2 100644
--- a/systems_design/src/common/systemsIOData.cpp
+++ b/systems_design/src/common/systemsIOData.cpp
@@ -95,6 +95,9 @@ void systemsIOData::readWing(const node& acxml, const std::string& airfoilDir) {
     geom2::WingFactory theWingfactory{ACXML, airfoilDir}; // wing factory
     for (size_t i = 0; i < wingVector.size(); i++) {
         Wing newWing;
+        newWing.position[0] = EndnodeReadOnly<double>("aircraft_exchange_file/component_design/wing/position/x").read(acxml).value();
+        newWing.position[1] = EndnodeReadOnly<double>("aircraft_exchange_file/component_design/wing/position/y").read(acxml).value();
+        newWing.position[2] = EndnodeReadOnly<double>("aircraft_exchange_file/component_design/wing/position/z").read(acxml).value();
         newWing.aerodynamicSurface = theWingfactory.create("wing/specific/geometry/aerodynamic_surface@0");
         theWing.push_back(newWing);
         myRuntimeInfo->out << "Create: " << theWing.at(i).aerodynamicSurface.name << " ..." << std::endl;
@@ -172,7 +175,7 @@ void systemsIOData::readFuselages(const node& acxml, const std::string& geometry
         myRuntimeInfo->out << "Create: " << theFuselage.at(i).name << " ..." << std::endl;
         /* Point between cockpit and cabin is needed for cable length / avionics positioning */
         // current implementation only for TAW aircraft with one payload tube
-        data.Accommodation.payload_tube_x_ref = fuselageVector[i]->at("/fuselage_accommodation/payload_tube@0/payload_tube_reference_points/front_reference_points/x/value");
+        data.Accommodation.payload_tube_x_ref = fuselageVector[i]->at("/fuselage_accommodation/position/x/value");
     }
 }
 
diff --git a/systems_design/src/common/systemsIOData.h b/systems_design/src/common/systemsIOData.h
index fe7c073d46129099d6854ae0fd9a6bcdca961f13..eaed585ed1178e9716bb3bb724ad9fdf8e40b84c 100644
--- a/systems_design/src/common/systemsIOData.h
+++ b/systems_design/src/common/systemsIOData.h
@@ -75,6 +75,7 @@ class systemsIOData {
     class Wing {
      public:
         geom2::MultisectionSurface<geom2::AirfoilSection> aerodynamicSurface;/** aerodynamic surface of the wing*/
+        Vec3 position;/**[m] Wing root position*/
         std::vector<geom2::MultisectionSurface<geom2::PolygonSection>> controlSurface;/** control surface of the wing*/
         std::vector<double> controlDevicePosDeflection;/**[°] maximum pos. deflection of the control device*/
         std::vector<double> controlDeviceNegDeflection;/**[°] maximum neg. deflection of the control device*/
diff --git a/systems_design/systems_design_conf.xml b/systems_design/systems_design_conf.xml
index 1c067f9c832284db5ef4c6dc0b005ef343ae95ef..d1a942dd840d560689845cb93afe84089ee40483 100644
--- a/systems_design/systems_design_conf.xml
+++ b/systems_design/systems_design_conf.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <module_configuration_file name="systems_design_conf.xml">
 	<control_settings description="General control settings for this tool">
         <aircraft_exchange_file_name description="Specify the name of the exchange file">
@@ -105,13 +105,6 @@
 				<upper_boundary>inf</upper_boundary>
 				<default>1</default>
 			</ice_rain_protection_system>
-			<landing_gear_system description="Scaling factor for the landing gear actuation.">
-				<value>1</value>
-				<unit>1</unit>
-				<lower_boundary>0</lower_boundary>
-				<upper_boundary>inf</upper_boundary>
-				<default>1</default>
-			</landing_gear_system>
 			<lighting_system description="Scaling factor for the lighting system.">
 				<value>1</value>
 				<unit>1</unit>
@@ -457,15 +450,12 @@
 					<unit>W</unit>
 					<default>75</default>
 				</heat_per_pax>
-				<heat_per_light_length description="Heat emission per light specific cabin length">
-					<value>40</value>
-					<unit>W/m</unit>
-					<default>40</default>
-				</heat_per_light_length>
 				<efficiency_factor description="Efficiency of the ACP">
 					<value>0.7</value>
 					<unit>1</unit>
 					<default>0.7</default>
+					<lower_boundary>0.0</lower_boundary>
+					<upper_boundary>1.0</upper_boundary>
 				</efficiency_factor>
 				<heat_capacity_air description="Heat capacity of air">
 					<value>1005.0</value>
@@ -473,14 +463,14 @@
 					<default>1005.0</default>
 				</heat_capacity_air>
 				<off_on_take_off description="Switch off ACP during take off (Airbus Getting Grips on Fuel Savings). Switch: true (ACP off during take off) / false (ACP always on)">
-					<value>1</value>
+					<value>true</value>
 					<unit>1</unit>
-					<default>1</default>
+					<default>true</default>
 				</off_on_take_off>
 				<eco_mode description="ECO Mode switch: 25% reduction in bleed air withdrawal (Airbus Getting Grips on Fuel Savings). Switch : true (ECO Mode) / false (normal mode)">
-					<value>1</value>
+					<value>true</value>
 					<unit>1</unit>
-					<default>1</default>
+					<default>true</default>
 				</eco_mode>
 				<shaft_power_sources description="Sources for possible existing shaft power consumption">
 					<number_of_power_sources description="Number of power sources">
@@ -618,6 +608,8 @@
 					<value>0.8</value>
 					<unit>1</unit>
 					<default>0.8</default>
+					<lower_boundary>0.0</lower_boundary>
+					<upper_boundary>1.0</upper_boundary>
 				</efficiency_factor_electro_thermic_anti_icing>
 				<shaft_power_sources description="Sources for possible existing shaft power consumption">
 					<number_of_power_sources description="Number of power sources">
@@ -720,6 +712,8 @@
 					<value>0.95</value>
 					<unit>1</unit>
 					<default>0.95</default>
+					<lower_boundary>0.0</lower_boundary>
+					<upper_boundary>1.0</upper_boundary>
 				</efficiency_factor>
 				<retraction_time description="Time to retract the landing gear">
 					<value>10.0</value>
@@ -780,6 +774,9 @@
 					<efficiency description="Actuator efficiency in average operation">
 						<value>0.85</value>
 						<default>0.85</default>
+						<unit>1</unit>
+						<lower_boundary>0.0</lower_boundary>
+						<upper_boundary>1.0</upper_boundary>
 					</efficiency>
 					<standby_power description="Average basic power in standby operation (e.g. due to leakage)">
 						<value>0.</value>
@@ -797,10 +794,10 @@
 						<value>0.25</value>
 						<default>0.5</default>
 					</electric_flight_control_system_weight_factor>
-					<default_actuator_architecture_switch description="Enables the default layout for the actuator architecture. Switch: 1 (true) / 0 (false)">
-						<value>1</value>
+					<default_actuator_architecture_switch description="Enables the default layout for the actuator architecture. Switch: true / false">
+						<value>true</value>
 						<unit>1</unit>
-						<default>1</default>
+						<default>true</default>
 					</default_actuator_architecture_switch>
 					<default_actuator_architecture description="Definition of the default actuator architecture">
 						<number_of_actuators_per_control_surface description="Number of actuators per control surface">
@@ -853,6 +850,8 @@
 										<value>0.85</value>
 										<unit>1</unit>
 										<default>0.85</default>
+										<lower_boundary>0.0</lower_boundary>
+										<upper_boundary>1.0</upper_boundary>
 									</efficiency>
 									<standby_power description="Average basic power in standby operation (e.g. due to leakage)">
 										<value>0.0</value>
@@ -883,6 +882,8 @@
 										<value>0.85</value>
 										<unit>1</unit>
 										<default>0.85</default>
+										<lower_boundary>0.0</lower_boundary>
+										<upper_boundary>1.0</upper_boundary>
 									</efficiency>
 									<standby_power description="Average basic power in standby operation (e.g. due to leakage)">
 										<value>0.0</value>
@@ -930,6 +931,8 @@
 										<value>0.85</value>
 										<unit>1</unit>
 										<default>0.85</default>
+										<lower_boundary>0.0</lower_boundary>
+										<upper_boundary>1.0</upper_boundary>
 									</efficiency>
 									<standby_power description="Average basic power in standby operation (e.g. due to leakage)">
 										<value>0.0</value>
@@ -960,6 +963,8 @@
 										<value>0.85</value>
 										<unit>1</unit>
 										<default>0.85</default>
+										<lower_boundary>0.0</lower_boundary>
+										<upper_boundary>1.0</upper_boundary>
 									</efficiency>
 									<standby_power description="Average basic power in standby operation (e.g. due to leakage)">
 										<value>0.0</value>
@@ -981,15 +986,15 @@
 						<value>0.25</value>
 						<default>0.5</default>
 					</electric_flight_control_system_weight_factor>
-					<default_actuator_architecture_switch description="Enables the default layout for the actuator architecture. Switch: 1 (true) / 0 (false)">
-						<value>1</value>
+					<default_actuator_architecture_switch description="Enables the default layout for the actuator architecture. Switch: true / false">
+						<value>true</value>
 						<unit>1</unit>
-						<default>1</default>
+						<default>true</default>
 					</default_actuator_architecture_switch>
 					<default_actuator_architecture description="Definition of the default actuator architecture">
 						<number_of_actuators_per_control_surface description="Number of actuators per control surface">
 							<value>3</value>
-							<unit></unit>
+							<unit>1</unit>
 							<default>3</default>
 						</number_of_actuators_per_control_surface>
 						<default_deflection_speed description="Deflection speed">
@@ -1033,6 +1038,8 @@
 										<value>0.85</value>
 										<unit>1</unit>
 										<default>1.</default>
+										<lower_boundary>0.0</lower_boundary>
+										<upper_boundary>1.0</upper_boundary>
 									</efficiency>
 									<standby_power description="Average basic power in standby operation (e.g. due to leakage)">
 										<value>0.0</value>
@@ -1062,6 +1069,8 @@
 										<value>0.85</value>
 										<unit>1</unit>
 										<default>1.</default>
+										<lower_boundary>0.0</lower_boundary>
+										<upper_boundary>1.0</upper_boundary>
 									</efficiency>
 									<standby_power description="Average basic power in standby operation (e.g. due to leakage)">
 										<value>0.0</value>
@@ -1091,6 +1100,8 @@
 										<value>0.85</value>
 										<unit>1</unit>
 										<default>1.</default>
+										<lower_boundary>0.0</lower_boundary>
+										<upper_boundary>1.0</upper_boundary>
 									</efficiency>
 									<standby_power description="Average basic power in standby operation (e.g. due to leakage)">
 										<value>0.0</value>
@@ -1120,6 +1131,8 @@
 										<value>1.</value>
 										<unit>1</unit>
 										<default>1.</default>
+										<lower_boundary>0.0</lower_boundary>
+										<upper_boundary>1.0</upper_boundary>
 									</efficiency>
 									<standby_power description="Average basic power in standby operation (e.g. due to leakage)">
 										<value>0.0</value>
@@ -1149,6 +1162,8 @@
 										<value>1.</value>
 										<unit>1</unit>
 										<default>1.</default>
+										<lower_boundary>0.0</lower_boundary>
+										<upper_boundary>1.0</upper_boundary>
 									</efficiency>
 									<standby_power description="Average basic power in standby operation (e.g. due to leakage)">
 										<value>0.0</value>
@@ -1171,10 +1186,10 @@
 						<unit></unit>
 						<default>0.5</default>
 					</electric_flight_control_system_weight_factor>
-					<default_actuator_architecture_switch description="Enables the default layout for the actuator architecture. Switch: 1 (true) / 0 (false)">
-						<value>1</value>
+					<default_actuator_architecture_switch description="Enables the default layout for the actuator architecture. Switch: true / false">
+						<value>true</value>
 						<unit>1</unit>
-						<default>1</default>
+						<default>true</default>
 					</default_actuator_architecture_switch>
 					<default_actuator_architecture description="Definition of the default actuator architecture">
 						<number_of_actuators_per_control_surface description="Number of actuators per control surface">
@@ -1223,6 +1238,8 @@
 										<value>0.85</value>
 										<unit>1</unit>
 										<default>1.</default>
+										<lower_boundary>0.0</lower_boundary>
+										<upper_boundary>1.0</upper_boundary>
 									</efficiency>
 									<standby_power description="Average basic power in standby operation (e.g. due to leakage)">
 										<value>0.0</value>
@@ -1252,6 +1269,8 @@
 										<value>0.85</value>
 										<unit>1</unit>
 										<default>1.</default>
+										<lower_boundary>0.0</lower_boundary>
+										<upper_boundary>1.0</upper_boundary>
 									</efficiency>
 									<standby_power description="Average basic power in standby operation (e.g. due to leakage)">
 										<value>0.0</value>
@@ -1296,6 +1315,8 @@
 										<value>0.85</value>
 										<unit>1</unit>
 										<default>1.</default>
+										<lower_boundary>0.0</lower_boundary>
+										<upper_boundary>1.0</upper_boundary>
 									</efficiency>
 									<standby_power description="Average basic power in standby operation (e.g. due to leakage)">
 										<value>0.0</value>
@@ -1325,6 +1346,8 @@
 										<value>0.85</value>
 										<unit>1</unit>
 										<default>1.</default>
+										<lower_boundary>0.0</lower_boundary>
+										<upper_boundary>1.0</upper_boundary>
 									</efficiency>
 									<standby_power description="Average basic power in standby operation (e.g. due to leakage)">
 										<value>0.0</value>
@@ -1347,10 +1370,10 @@
 						<unit></unit>
 						<default>0.5</default>
 					</electric_flight_control_system_weight_factor>
-					<default_actuator_architecture_switch description="Enables the default layout for the actuator architecture. Switch: 1 (true) / 0 (false)">
-						<value>1</value>
+					<default_actuator_architecture_switch description="Enables the default layout for the actuator architecture. Switch: true / false">
+						<value>true</value>
 						<unit>1</unit>
-						<default>1</default>
+						<default>true</default>
 					</default_actuator_architecture_switch>
 					<default_actuator_architecture description="Definition of the default actuator architecture">
 						<number_of_actuators_per_control_surface description="Number of actuators per control surface">
@@ -1399,6 +1422,8 @@
 										<value>0.85</value>
 										<unit>1</unit>
 										<default>1.</default>
+										<lower_boundary>0.0</lower_boundary>
+										<upper_boundary>1.0</upper_boundary>
 									</efficiency>
 									<standby_power description="Average basic power in standby operation (e.g. due to leakage)">
 										<value>0.0</value>
@@ -1443,6 +1468,8 @@
 										<value>0.85</value>
 										<unit>1</unit>
 										<default>1.</default>
+										<lower_boundary>0.0</lower_boundary>
+										<upper_boundary>1.0</upper_boundary>
 									</efficiency>
 									<standby_power description="Average basic power in standby operation (e.g. due to leakage)">
 										<value>0.0</value>
@@ -1487,6 +1514,8 @@
 										<value>0.85</value>
 										<unit>1</unit>
 										<default>1.</default>
+										<lower_boundary>0.0</lower_boundary>
+										<upper_boundary>1.0</upper_boundary>
 									</efficiency>
 									<standby_power description="Average basic power in standby operation (e.g. due to leakage)">
 										<value>0.0</value>
@@ -1531,6 +1560,8 @@
 										<value>0.85</value>
 										<unit>1</unit>
 										<default>1.</default>
+										<lower_boundary>0.0</lower_boundary>
+										<upper_boundary>1.0</upper_boundary>
 									</efficiency>
 									<standby_power description="Average basic power in standby operation (e.g. due to leakage)">
 										<value>0.0</value>
@@ -1575,6 +1606,8 @@
 										<value>0.85</value>
 										<unit>1</unit>
 										<default>1.</default>
+										<lower_boundary>0.0</lower_boundary>
+										<upper_boundary>1.0</upper_boundary>
 									</efficiency>
 									<standby_power description="Average basic power in standby operation (e.g. due to leakage)">
 										<value>0.0</value>
@@ -1619,6 +1652,8 @@
 										<value>0.85</value>
 										<unit>1</unit>
 										<default>1.</default>
+										<lower_boundary>0.0</lower_boundary>
+										<upper_boundary>1.0</upper_boundary>
 									</efficiency>
 									<standby_power description="Average basic power in standby operation (e.g. due to leakage)">
 										<value>0.0</value>
@@ -1663,6 +1698,8 @@
 										<value>0.85</value>
 										<unit>1</unit>
 										<default>1.</default>
+										<lower_boundary>0.0</lower_boundary>
+										<upper_boundary>1.0</upper_boundary>
 									</efficiency>
 									<standby_power description="Average basic power in standby operation (e.g. due to leakage)">
 										<value>0.0</value>
@@ -1707,6 +1744,8 @@
 										<value>0.85</value>
 										<unit>1</unit>
 										<default>1.</default>
+										<lower_boundary>0.0</lower_boundary>
+										<upper_boundary>1.0</upper_boundary>
 									</efficiency>
 									<standby_power description="Average basic power in standby operation (e.g. due to leakage)">
 										<value>0.0</value>
@@ -1751,6 +1790,8 @@
 										<value>0.85</value>
 										<unit>1</unit>
 										<default>1.</default>
+										<lower_boundary>0.0</lower_boundary>
+										<upper_boundary>1.0</upper_boundary>
 									</efficiency>
 									<standby_power description="Average basic power in standby operation (e.g. due to leakage)">
 										<value>0.0</value>
@@ -1795,6 +1836,8 @@
 										<value>0.85</value>
 										<unit>1</unit>
 										<default>1.</default>
+										<lower_boundary>0.0</lower_boundary>
+										<upper_boundary>1.0</upper_boundary>
 									</efficiency>
 									<standby_power description="Average basic power in standby operation (e.g. due to leakage)">
 										<value>0.0</value>
@@ -1821,10 +1864,10 @@
 						<unit></unit>
 						<default>0.5</default>
 					</electric_flight_control_system_weight_factor>
-					<default_actuator_architecture_switch description="Enables the default layout for the actuator architecture. Switch: 1 (true) / 0 (false)">
-						<value>1</value>
+					<default_actuator_architecture_switch description="Enables the default layout for the actuator architecture. Switch: true / false">
+						<value>ture</value>
 						<unit>1</unit>
-						<default>1</default>
+						<default>true</default>
 					</default_actuator_architecture_switch>
 					<default_actuator_architecture description="Definition of the default actuator architecture">
 						<number_of_actuators_per_control_surface description="Number of actuators per control surface">
@@ -1872,6 +1915,8 @@
 										<value>0.85</value>
 										<unit>1</unit>
 										<default>1.</default>
+										<lower_boundary>0.0</lower_boundary>
+										<upper_boundary>1.0</upper_boundary>
 									</efficiency>
 									<standby_power description="Average basic power in standby operation (e.g. due to leakage)">
 										<value>0.0</value>
@@ -1901,6 +1946,8 @@
 										<value>0.85</value>
 										<unit>1</unit>
 										<default>1.</default>
+										<lower_boundary>0.0</lower_boundary>
+										<upper_boundary>1.0</upper_boundary>
 									</efficiency>
 									<standby_power description="Average basic power in standby operation (e.g. due to leakage)">
 										<value>0.0</value>
@@ -2131,20 +2178,19 @@
 				</specific_ducting_mass>
 			</bleed_air>
 			<hydraulic_system>
-				<pressure description="Nominal pressure of the hydraulic system">
-					<value>20684000</value>
-					<unit>Pa</unit>
-					<default>20684000</default>
-				</pressure>
 				<efficiency_factor_hydraulic_system description="Efficiency of the hydraulic system, e.g. leakage losses">
 					<value>0.95</value>
 					<unit>1</unit>
 					<default>0.95</default>
+					<lower_boundary>0.0</lower_boundary>
+					<upper_boundary>1.0</upper_boundary>
 				</efficiency_factor_hydraulic_system>
 				<rel_max_power description="Ratio of maximum permanent power and maximum required power of all pumps">
 					<value>1.0</value>
 					<unit>1</unit>
 					<default>1.0</default>
+					<lower_boundary>1.0</lower_boundary>
+					<upper_boundary>10.0</upper_boundary>
 				</rel_max_power>
 				<specific_ducting_mass description="Specific weight of hydraulic lines">
 					<value>2.5</value>
@@ -2204,6 +2250,8 @@
 										<value>0.85</value>
 										<unit>1</unit>
 										<default>0.85</default>
+										<lower_boundary>0.0</lower_boundary>
+										<upper_boundary>1.0</upper_boundary>
 									</efficiency>
 									<operation_factor description="Percentage of total pump power in normal operation (value must be between">
 										<value>0.8</value>
@@ -2231,6 +2279,8 @@
 										<value>0.7</value>
 										<unit>1</unit>
 										<default>0.95</default>
+										<lower_boundary>0.0</lower_boundary>
+										<upper_boundary>1.0</upper_boundary>
 									</efficiency>
 									<operation_factor description="Percentage of total pump power in normal operation (value must be between 0 and 1. 0=off, 1=total)">
 										<value>0.2</value>
@@ -2278,11 +2328,15 @@
 					<value>1.0</value>
 					<unit>1</unit>
 					<default>1.0</default>
+					<lower_boundary>0.0</lower_boundary>
+					<upper_boundary>1.0</upper_boundary>
 				</efficiency_factor_electric_system>
 				<rel_max_power description="Ratio of maximum permanent power and maximum required power of all generators">
 					<value>1.0</value>
 					<unit>1</unit>
 					<default>1.0</default>
+					<lower_boundary>1.0</lower_boundary>
+					<upper_boundary>10.0</upper_boundary>
 				</rel_max_power>
 				<specific_cable_mass description="Specific weight of electrical wiring">
 					<value>6.5</value>
@@ -2314,6 +2368,8 @@
 										<value>0.665</value>
 										<unit>1</unit>
 										<default>0.665</default>
+										<lower_boundary>0.0</lower_boundary>
+										<upper_boundary>1.0</upper_boundary>
 									</generator_efficiency>
 									<operation_factor description="Share of total power in normal operation (value must be between 0 and 1. 0=off, 1=total)">
 										<value>1</value>
@@ -2360,6 +2416,8 @@
 					<value>0.95</value>
 					<unit>1</unit>
 					<default>0.95</default>
+					<lower_boundary>0.0</lower_boundary>
+					<upper_boundary>1.0</upper_boundary>
 				</efficiency_factor_bleed_air>
 			</propulsion_system>
 			<auxiliary_power_unit>
@@ -2387,6 +2445,8 @@
 					<value>0.90</value>
 					<unit>1</unit>
 					<default>0.90</default>
+					<lower_boundary>0.0</lower_boundary>
+					<upper_boundary>1.0</upper_boundary>
 				</efficiency_factor_bleed_air>
 				<installation_factor description="Installation factor for attached parts such as fire protection, noise protection, etc.">
 					<value>1.5</value>
@@ -2412,8 +2472,8 @@
 				</design_loads>
 			</auxiliary_power_unit>
 			<avionics description="Components grouped inside ATAXX">
-				<location_of_aviationics_bay description="0: Wing root, 1: Nose, 2: Behind cockpit">
-					<value>0</value>
+				<location_of_aviationics_bay description="Selector: 0 (Wing root) / 1 (Nose) / 2 (Behind cockpit)">
+					<value>1</value>
 					<unit>1</unit>
 					<default>0</default>
 				</location_of_aviationics_bay>