@enervance/insight-cim-model 0.0.36 → 0.0.37

package/dist/converter/integral7/converter-i7.js

@@ -2,131 +2,149 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConverterI7 = void 0;
 const tslib_1 = require("tslib");
-const Model_1 = require("../../model/model/Model");
-const export_frame_i7_1 = require("./interface-i7/export-frame-i7");
-const data_structures_i7_1 = require("./interface-i7/data-structures-i7");
-const mysql_controller_1 = require("../../util/database/mysql-controller");
+const fs_1 = tslib_1.__importDefault(require("fs"));
+const jszip_1 = tslib_1.__importDefault(require("jszip"));
+const path_1 = tslib_1.__importDefault(require("path"));
+const perf_hooks_1 = require("perf_hooks");
+const cim_class_names_1 = require("../../constants/cim-class-names");
+const cim_constants_1 = require("../../constants/cim-constants");
 const rdf_xml_1 = require("../../constants/rdf-xml");
-const utils_1 = require("../../util/utils");
-const LoadArea_1 = require("../../model/loadmodel/LoadArea");
-const SubLoadArea_1 = require("../../model/loadmodel/SubLoadArea");
-const ConformLoadGroup_1 = require("../../model/loadmodel/ConformLoadGroup");
 const CoordinateSystem_1 = require("../../model/common/CoordinateSystem");
-const integral_sql_1 = require("./sql/integral.sql");
-const GeographicalRegion_1 = require("../../model/core/GeographicalRegion");
-const SubGeographicalRegion_1 = require("../../model/core/SubGeographicalRegion");
-const integral_prefix_1 = require("./config/integral-prefix");
-const utils_2 = require("./utils");
-const AMPRIONSubstation_1 = require("../../model/extensions/amprion/core/AMPRIONSubstation");
 const Location_1 = require("../../model/common/Location");
 const PositionPoint_1 = require("../../model/common/PositionPoint");
-const Standort_1 = require("./model/integral/Standort");
-const ConverterIntegral7_1 = require("./ConverterIntegral7");
-const Line_1 = require("../../model/wires/Line");
-const Junction_1 = require("../../model/wires/Junction");
-const Schaltanlage_1 = require("./model/integral/Schaltanlage");
-const Schaltanlagenabschnitt_1 = require("./model/integral/Schaltanlagenabschnitt");
-const Schaltfeld_1 = require("./model/integral/Schaltfeld");
-const KnotenSo_1 = require("./model/integral/KnotenSo");
+const Bay_1 = require("../../model/core/Bay");
+const ConnectivityNode_1 = require("../../model/core/ConnectivityNode");
+const CurveData_1 = require("../../model/core/CurveData");
+const CurveStyle_1 = require("../../model/core/CurveStyle");
+const GeographicalRegion_1 = require("../../model/core/GeographicalRegion");
+const PhaseCode_1 = require("../../model/core/PhaseCode");
+const SubGeographicalRegion_1 = require("../../model/core/SubGeographicalRegion");
+const Substation_1 = require("../../model/core/Substation");
+const Terminal_1 = require("../../model/core/Terminal");
 const VoltageLevel_1 = require("../../model/core/VoltageLevel");
-const util_create_1 = require("../../util/util-create");
+const ACDCConverterDCTerminal_1 = require("../../model/dc/ACDCConverterDCTerminal");
+const CsConverter_1 = require("../../model/dc/CsConverter");
+const CsOperatingModeKind_1 = require("../../model/dc/CsOperatingModeKind");
+const DCConverterOperatingModeKind_1 = require("../../model/dc/DCConverterOperatingModeKind");
+const DCConverterUnit_1 = require("../../model/dc/DCConverterUnit");
+const DCLine_1 = require("../../model/dc/DCLine");
+const DCLineSegment_1 = require("../../model/dc/DCLineSegment");
+const DCNode_1 = require("../../model/dc/DCNode");
+const DCTerminal_1 = require("../../model/dc/DCTerminal");
+const VsConverter_1 = require("../../model/dc/VsConverter");
+const VsPpccControlKind_1 = require("../../model/dc/VsPpccControlKind");
+const VsQpccControlKind_1 = require("../../model/dc/VsQpccControlKind");
+const Diagram_1 = require("../../model/diagram/Diagram");
+const DiagramObject_1 = require("../../model/diagram/DiagramObject");
+const DiagramObjectPoint_1 = require("../../model/diagram/DiagramObjectPoint");
+const OrientationKind_1 = require("../../model/diagram/OrientationKind");
+const ApparentPower_1 = require("../../model/domain/ApparentPower");
+const CurrentFlow_1 = require("../../model/domain/CurrentFlow");
+const UnitMultiplier_1 = require("../../model/domain/UnitMultiplier");
+const UnitSymbol_1 = require("../../model/domain/UnitSymbol");
+const Voltage_1 = require("../../model/domain/Voltage");
+const SynchronousMachineTimeConstantReactance_1 = require("../../model/dynamics/standard-models/synchronous-machine-dynamics/SynchronousMachineTimeConstantReactance");
+const EquivalentBranch_1 = require("../../model/equivalents/EquivalentBranch");
+const EquivalentInjection_1 = require("../../model/equivalents/EquivalentInjection");
 const AMPRIONBay_1 = require("../../model/extensions/amprion/core/AMPRIONBay");
-const Substation_1 = require("../../model/core/Substation");
 const AMPRIONConnectivityNode_1 = require("../../model/extensions/amprion/core/AMPRIONConnectivityNode");
-const ConnectivityNode_1 = require("../../model/core/ConnectivityNode");
-const Bay_1 = require("../../model/core/Bay");
-const perf_hooks_1 = require("perf_hooks");
-const Terminal_1 = require("../../model/core/Terminal");
-const PhaseCode_1 = require("../../model/core/PhaseCode");
+const AMPRIONLine_1 = require("../../model/extensions/amprion/core/AMPRIONLine");
+const AMPRIONSubstation_1 = require("../../model/extensions/amprion/core/AMPRIONSubstation");
+const AMPRIONSeriesCompensator_1 = require("../../model/extensions/amprion/wires/AMPRIONSeriesCompensator");
+const EVPowerTransformerEndInfo_1 = require("../../model/extensions/enervance/assetinfo/EVPowerTransformerEndInfo");
+const EVPowerTransformerInfo_1 = require("../../model/extensions/enervance/assetinfo/EVPowerTransformerInfo");
+const EVTapChangerInfo_1 = require("../../model/extensions/enervance/assetinfo/EVTapChangerInfo");
+const EVWireInfo_1 = require("../../model/extensions/enervance/assetinfo/EVWireInfo");
+const GeneratingUnit_1 = require("../../model/generation/GeneratingUnit");
+const GeneratorControlSource_1 = require("../../model/generation/GeneratorControlSource");
+const HydroEnergyConversionKind_1 = require("../../model/generation/HydroEnergyConversionKind");
+const HydroGeneratingUnit_1 = require("../../model/generation/HydroGeneratingUnit");
+const NuclearGeneratingUnit_1 = require("../../model/generation/NuclearGeneratingUnit");
+const SolarGeneratingUnit_1 = require("../../model/generation/SolarGeneratingUnit");
+const ThermalGeneratingUnit_1 = require("../../model/generation/ThermalGeneratingUnit");
+const WindGeneratingUnit_1 = require("../../model/generation/WindGeneratingUnit");
+const WindGenUnitKind_1 = require("../../model/generation/WindGenUnitKind");
+const ConformLoadGroup_1 = require("../../model/loadmodel/ConformLoadGroup");
+const LoadArea_1 = require("../../model/loadmodel/LoadArea");
+const SubLoadArea_1 = require("../../model/loadmodel/SubLoadArea");
+const CurrentLimit_1 = require("../../model/operationallimits/CurrentLimit");
+const LimitTypeKind_1 = require("../../model/operationallimits/LimitTypeKind");
+const OperationalLimitDirectionKind_1 = require("../../model/operationallimits/OperationalLimitDirectionKind");
+const OperationalLimitSet_1 = require("../../model/operationallimits/OperationalLimitSet");
+const OperationalLimitType_1 = require("../../model/operationallimits/OperationalLimitType");
+const VoltageLimit_1 = require("../../model/operationallimits/VoltageLimit");
+const ControlArea_1 = require("../../model/operations/ControlArea");
+const Breaker_1 = require("../../model/wires/Breaker");
 const BusbarSection_1 = require("../../model/wires/BusbarSection");
-const cim_class_names_1 = require("../../constants/cim-class-names");
-const ConformLoad_1 = require("../../model/loadmodel/ConformLoad");
+const Disconnector_1 = require("../../model/wires/Disconnector");
 const EnergyConsumer_1 = require("../../model/wires/EnergyConsumer");
 const EnergySource_1 = require("../../model/wires/EnergySource");
-const EquivalentInjection_1 = require("../../model/equivalents/EquivalentInjection");
 const ExternalNetworkInjection_1 = require("../../model/wires/ExternalNetworkInjection");
-const Disconnector_1 = require("../../model/wires/Disconnector");
-const Breaker_1 = require("../../model/wires/Breaker");
 const GroundingImpedance_1 = require("../../model/wires/GroundingImpedance");
+const Junction_1 = require("../../model/wires/Junction");
+const Line_1 = require("../../model/wires/Line");
+const LinearShuntCompensator_1 = require("../../model/wires/LinearShuntCompensator");
 const PetersenCoil_1 = require("../../model/wires/PetersenCoil");
-const Leitung_1 = require("./model/integral/Leitung");
-const ACLineSegment_1 = require("../../model/wires/ACLineSegment");
-const CurrentLimit_1 = require("../../model/operationallimits/CurrentLimit");
-const CurrentFlow_1 = require("../../model/domain/CurrentFlow");
-const UnitMultiplier_1 = require("../../model/domain/UnitMultiplier");
-const UnitSymbol_1 = require("../../model/domain/UnitSymbol");
-const OperationalLimitSet_1 = require("../../model/operationallimits/OperationalLimitSet");
-const OperationalLimitType_1 = require("../../model/operationallimits/OperationalLimitType");
-const OperationalLimitDirectionKind_1 = require("../../model/operationallimits/OperationalLimitDirectionKind");
-const LimitTypeKind_1 = require("../../model/operationallimits/LimitTypeKind");
-const EVWireInfo_1 = require("../../model/extensions/enervance/assetinfo/EVWireInfo");
-const EVPowerTransformerInfo_1 = require("../../model/extensions/enervance/assetinfo/EVPowerTransformerInfo");
-const EVPowerTransformerEndInfo_1 = require("../../model/extensions/enervance/assetinfo/EVPowerTransformerEndInfo");
-const ApparentPower_1 = require("../../model/domain/ApparentPower");
-const Voltage_1 = require("../../model/domain/Voltage");
-const TapChangerInfo_1 = require("../../model/assetinfo/TapChangerInfo");
+const PhaseTapChangerAsymmetrical_1 = require("../../model/wires/PhaseTapChangerAsymmetrical");
+const PhaseTapChangerNonLinear_1 = require("../../model/wires/PhaseTapChangerNonLinear");
+const PhaseTapChangerSymmetrical_1 = require("../../model/wires/PhaseTapChangerSymmetrical");
 const PowerTransformer_1 = require("../../model/wires/PowerTransformer");
 const PowerTransformerEnd_1 = require("../../model/wires/PowerTransformerEnd");
-const VoltageLimit_1 = require("../../model/operationallimits/VoltageLimit");
-const PhaseTapChangerAsymmetrical_1 = require("../../model/wires/PhaseTapChangerAsymmetrical");
-const PhaseTapChangerLinear_1 = require("../../model/wires/PhaseTapChangerLinear");
-const TapChangerControl_1 = require("../../model/wires/TapChangerControl");
+const RatioTapChanger_1 = require("../../model/wires/RatioTapChanger");
+const RatioTapChangerTable_1 = require("../../model/wires/RatioTapChangerTable");
+const ReactiveCapabilityCurve_1 = require("../../model/wires/ReactiveCapabilityCurve");
+const RegulatingControl_1 = require("../../model/wires/RegulatingControl");
 const RegulatingControlModeKind_1 = require("../../model/wires/RegulatingControlModeKind");
-const utils_trafo3w_1 = require("./utils-trafo3w");
+const StaticVarCompensator_1 = require("../../model/wires/StaticVarCompensator");
 const SynchronousMachine_1 = require("../../model/wires/SynchronousMachine");
 const SynchronousMachineKind_1 = require("../../model/wires/SynchronousMachineKind");
 const SynchronousMachineOperatingMode_1 = require("../../model/wires/SynchronousMachineOperatingMode");
-const ReactiveCapabilityCurve_1 = require("../../model/wires/ReactiveCapabilityCurve");
-const CurveStyle_1 = require("../../model/core/CurveStyle");
-const CurveData_1 = require("../../model/core/CurveData");
-const RegulatingControl_1 = require("../../model/wires/RegulatingControl");
-const ThermalGeneratingUnit_1 = require("../../model/generation/ThermalGeneratingUnit");
-const SolarGeneratingUnit_1 = require("../../model/generation/SolarGeneratingUnit");
-const WindGeneratingUnit_1 = require("../../model/generation/WindGeneratingUnit");
-const WindGenUnitKind_1 = require("../../model/generation/WindGenUnitKind");
-const NuclearGeneratingUnit_1 = require("../../model/generation/NuclearGeneratingUnit");
-const HydroGeneratingUnit_1 = require("../../model/generation/HydroGeneratingUnit");
-const HydroEnergyConversionKind_1 = require("../../model/generation/HydroEnergyConversionKind");
-const GeneratingUnit_1 = require("../../model/generation/GeneratingUnit");
-const GeneratorControlSource_1 = require("../../model/generation/GeneratorControlSource");
-const SynchronousMachineTimeConstantReactance_1 = require("../../model/dynamics/standard-models/synchronous-machine-dynamics/SynchronousMachineTimeConstantReactance");
-const LinearShuntCompensator_1 = require("../../model/wires/LinearShuntCompensator");
-const StaticVarCompensator_1 = require("../../model/wires/StaticVarCompensator");
-const DCConverterUnit_1 = require("../../model/dc/DCConverterUnit");
-const CsConverter_1 = require("../../model/dc/CsConverter");
-const CsOperatingModeKind_1 = require("../../model/dc/CsOperatingModeKind");
-const DCNode_1 = require("../../model/dc/DCNode");
-const ACDCConverterDCTerminal_1 = require("../../model/dc/ACDCConverterDCTerminal");
-const VsConverter_1 = require("../../model/dc/VsConverter");
-const VsPpccControlKind_1 = require("../../model/dc/VsPpccControlKind");
-const VsQpccControlKind_1 = require("../../model/dc/VsQpccControlKind");
-const DCLine_1 = require("../../model/dc/DCLine");
-const DCLineSegment_1 = require("../../model/dc/DCLineSegment");
-const DCConverterOperatingModeKind_1 = require("../../model/dc/DCConverterOperatingModeKind");
-const DCTerminal_1 = require("../../model/dc/DCTerminal");
-const AMPRIONSeriesCompensator_1 = require("../../model/extensions/amprion/wires/AMPRIONSeriesCompensator");
-const jszip_1 = tslib_1.__importDefault(require("jszip"));
-const path_1 = tslib_1.__importDefault(require("path"));
-const fs_1 = tslib_1.__importDefault(require("fs"));
-const AsynchronousMachine_1 = require("../../model/wires/AsynchronousMachine");
-const EquivalentBranch_1 = require("../../model/equivalents/EquivalentBranch");
-const AMPRIONLine_1 = require("../../model/extensions/amprion/core/AMPRIONLine");
-const ControlArea_1 = require("../../model/operations/ControlArea");
-const PhaseTapChangerSymmetrical_1 = require("../../model/wires/PhaseTapChangerSymmetrical");
-const RatioTapChangerTable_1 = require("../../model/wires/RatioTapChangerTable");
-const RatioTapChanger_1 = require("../../model/wires/RatioTapChanger");
+const TapChangerControl_1 = require("../../model/wires/TapChangerControl");
 const TransformerControlMode_1 = require("../../model/wires/TransformerControlMode");
+const mysql_controller_1 = require("../../util/database/mysql-controller");
+const INTEGRALMultiplierFactor_1 = require("../../model/extensions/integral/common/INTEGRALMultiplierFactor");
+const INTEGRALACLineSegment_1 = require("../../model/extensions/integral/wires/INTEGRALACLineSegment");
+const INTEGRALAsynchronousMachine_1 = require("../../model/extensions/integral/wires/INTEGRALAsynchronousMachine");
+const INTEGRALExternalNetworkInjection_1 = require("../../model/extensions/integral/wires/INTEGRALExternalNetworkInjection");
+const INTEGRALSynchronousMachine_1 = require("../../model/extensions/integral/wires/INTEGRALSynchronousMachine");
+const util_create_1 = require("../../util/util-create");
+const utils_1 = require("../../util/utils");
+const integral_prefix_1 = require("./config/integral-prefix");
+const ConverterIntegral7_1 = require("./ConverterIntegral7");
+const data_structures_i7_1 = require("./interface-i7/data-structures-i7");
+const export_frame_i7_1 = require("./interface-i7/export-frame-i7");
+const KnotenSo_1 = require("./model/integral/KnotenSo");
+const Leitung_1 = require("./model/integral/Leitung");
+const Point_1 = require("./model/integral/Point");
+const Schaltanlage_1 = require("./model/integral/Schaltanlage");
+const Schaltanlagenabschnitt_1 = require("./model/integral/Schaltanlagenabschnitt");
+const SchaltanlagenabschnittNsg_1 = require("./model/integral/SchaltanlagenabschnittNsg");
+const SchaltanlageNSG_1 = require("./model/integral/SchaltanlageNSG");
+const Schaltfeld_1 = require("./model/integral/Schaltfeld");
+const Standort_1 = require("./model/integral/Standort");
+const StandortNsg_1 = require("./model/integral/StandortNsg");
+const integral_sql_1 = require("./sql/integral.sql");
+const utils_2 = require("./utils");
+const utils_schema_1 = require("./utils-schema");
+const utils_trafo3w_1 = require("./utils-trafo3w");
+const INTEGRALModel_1 = require("../../model/extensions/integral/model/INTEGRALModel");
+const constants_1 = require("./model/dl-utils/constants");
+const SsabNsg_1 = require("./model/dl-utils/SsabNsg");
+const Laengskupplung_1 = require("./model/integral/Laengskupplung");
+const INTEGRALConformLoad_1 = require("../../model/extensions/integral/loadmodel/INTEGRALConformLoad");
 class ConverterI7 {
     constructor() {
         this.exportFrames = new Map();
         this.exportFramesBoundary = new Map();
-        this.cimModelDefault = new Model_1.Model();
+        this.cimModelDefault = new INTEGRALModel_1.INTEGRALModel();
         this.availableTableNames = [];
         this.integralID2Type = new Map();
         this.coordinateSystem = 'EPSG:4326';
         this.integralID2UUID = new Map();
         this.UUID2Integral7ID = new Map();
         this.kdrosseltypen = new Map();
+        this.generatorTypen = new Map();
+        this.asynchronmotorTypen = new Map();
         this.leitungAnschlussKnotenIDs = new Set();
         this.trafo2wAnschlussKnotenIDs = new Set();
         this.trafo3wAnschlussKnotenIDs = new Set();
@@ -145,6 +163,9 @@ class ConverterI7 {
                     yield this.convertBetriebsmitteltypenKdrossel();
                     yield this.convertBetriebsmitteltypenLeitung();
                     yield this.convertBetriebsmitteltypenTrafo();
+                    yield this.convertBetriebsmitteltypenGenerator();
+                    yield this.convertBetriebsmitteltypenAsynchronmotor();
+                    yield this.convertMultiplikationsfaktoren();
                     yield this.queryLeitungsAnschlussIDs();
                     yield this.queryTrafosAnschlussIDs();
                     yield this.queryHgueAnschlussIDs();
@@ -236,8 +257,8 @@ class ConverterI7 {
             startTime = perf_hooks_1.performance.now();
             const standortIDs = [...integral7Modell.integralStandorte.keys()];
             if (standortIDs.length)
-                yield this.covertSchaltanlagen(cimModel, integral7Modell, standortIDs, defaultValuesConfig);
-            logExecutionTime(this.logger, startTime, `covertSchaltanlagen(${standortIDs.length})`);
+                yield this.convertSchaltanlagen(cimModel, integral7Modell, standortIDs, defaultValuesConfig);
+            logExecutionTime(this.logger, startTime, `convertSchaltanlagen(${standortIDs.length})`);
             startTime = perf_hooks_1.performance.now();
             const schaltanlagenIDs = [...integral7Modell.integralSchaltanlagen.keys()];
             if (schaltanlagenIDs.length)
@@ -320,7 +341,7 @@ class ConverterI7 {
             }
             if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
                 startTime = perf_hooks_1.performance.now();
-                yield this.convertErsatzQuerZweige(cimModel, soSfKnoten);
+                yield this.convertErsatzQuerZweige(cimModel, soSfKnoten, objectMappingConfig.Ersatzquerzweig.class);
                 logExecutionTime(this.logger, startTime, `convertErsatzQuerZweige`);
             }
             if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
@@ -407,6 +428,104 @@ class ConverterI7 {
             startTime = perf_hooks_1.performance.now();
             yield this.convertLaengskondensatoren(cimModel, integral7Modell, defaultValuesConfig);
             logExecutionTime(this.logger, startTime, `convertLaengskondensatoren`);
+            startTime = perf_hooks_1.performance.now();
+            yield this.assignTerminalSequenceNumber(cimModel);
+            logExecutionTime(this.logger, startTime, `assignment of sequence number`);
+            startTime = perf_hooks_1.performance.now();
+            yield this.convertNetzvarianten(cimModel, integral7Modell);
+            logExecutionTime(this.logger, startTime, `convertNetzvarianten`);
+            for (const key of integral7Modell.i7SchemaID2UUID.keys()) {
+                startTime = perf_hooks_1.performance.now();
+                yield this.convertSchemaStandorte(cimModel, integral7Modell, standortIDs, key, false);
+                logExecutionTime(this.logger, startTime, `convertSchemaStandorte`);
+                startTime = perf_hooks_1.performance.now();
+                yield this.convertSchemaKnotenSo(cimModel, integral7Modell, knotenSoIDs, key, false);
+                logExecutionTime(this.logger, startTime, `convertSchemaKnotenSo`);
+                startTime = perf_hooks_1.performance.now();
+                yield this.convertSchemaSchaltanlage(cimModel, integral7Modell, schaltanlagenIDs, key, false);
+                logExecutionTime(this.logger, startTime, `convertSchemaSchaltanlage`);
+                startTime = perf_hooks_1.performance.now();
+                yield this.convertSchemaSchaltanlagenAbschnitte(cimModel, integral7Modell, schaltanlagenAbschnittIDs, key, false);
+                logExecutionTime(this.logger, startTime, `convertSchemaSchaltanlagenAbschnitte`);
+                startTime = perf_hooks_1.performance.now();
+                yield this.convertSchemaSammelschienenAbschnitte(cimModel, integral7Modell, schaltanlagenAbschnittIDs, key, false);
+                logExecutionTime(this.logger, startTime, `convertSchemaSammelschienenAbschnitte`);
+                startTime = perf_hooks_1.performance.now();
+                yield this.convertSchemaSchaltfeldElemente(cimModel, integral7Modell, schaltfeldIDs, key, false);
+                logExecutionTime(this.logger, startTime, `convertSchemaSchaltfeldElemente`);
+                startTime = perf_hooks_1.performance.now();
+                yield this.convertSchemaQuerkupplungen(cimModel, integral7Modell, key, false);
+                logExecutionTime(this.logger, startTime, `convertSchemaQuerkupplungen`);
+                startTime = perf_hooks_1.performance.now();
+                yield this.convertSchemaLaengskupplungen(cimModel, integral7Modell, key, false);
+                logExecutionTime(this.logger, startTime, `convertSchemaLaengskupplungen`);
+                integral7Modell.integralNSGStandorte.clear();
+                integral7Modell.integralNSGSchaltanlage.clear();
+                integral7Modell.integralNSGSAAbschnitt.clear();
+                integral7Modell.integralNSGSsab.clear();
+            }
+        });
+    }
+    assignTerminalSequenceNumber(cimModel) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            let terminal_visited = [];
+            for (const obj of cimModel.dcTerminals.entries()) {
+                const terminal = obj[1];
+                const terminalUUID = terminal.getUUID();
+                if (!(terminalUUID in terminal_visited)) {
+                    const ce = terminal.dCConductingEquipment;
+                    if (ce) {
+                        let sequenceNumber = 0;
+                        for (const term of ce.dCTerminals.entries()) {
+                            let terminalTmp = term[1];
+                            sequenceNumber++;
+                            terminalTmp.sequenceNumber = sequenceNumber;
+                            terminal_visited.push(terminalTmp.getUUID());
+                        }
+                    }
+                    else {
+                        console.log(`Terminal without connection ${terminalUUID}`);
+                    }
+                }
+            }
+            for (const obj of cimModel.terminals.entries()) {
+                const terminal = obj[1];
+                const terminalUUID = terminal.getUUID();
+                if (!(terminalUUID in terminal_visited)) {
+                    const ce = terminal.conductingEquipment;
+                    if (ce) {
+                        let sequenceNumber = 0;
+                        for (const term of ce.terminals.entries()) {
+                            let terminalTmp = term[1];
+                            sequenceNumber++;
+                            terminalTmp.sequenceNumber = sequenceNumber;
+                            terminal_visited.push(terminalTmp.getUUID());
+                        }
+                    }
+                    else {
+                        console.log(`Terminal without connection ${terminalUUID}`);
+                    }
+                }
+            }
+            for (const obj of cimModel.acDCConverterDCTerminals.entries()) {
+                const terminal = obj[1];
+                const terminalUUID = terminal.getUUID();
+                if (!(terminalUUID in terminal_visited)) {
+                    const ce = terminal.dCConductingEquipment;
+                    if (ce) {
+                        let sequenceNumber = 0;
+                        for (const term of ce.dCTerminals.entries()) {
+                            let terminalTmp = term[1];
+                            sequenceNumber++;
+                            terminalTmp.sequenceNumber = sequenceNumber;
+                            terminal_visited.push(terminalTmp.getUUID());
+                        }
+                    }
+                    else {
+                        console.log(`Terminal without connection ${terminalUUID}`);
+                    }
+                }
+            }
         });
     }
     convertGeoRegionen() {
@@ -418,7 +537,7 @@ class ConverterI7 {
                         .then((result) => {
                         for (const i7Data of result) {
                             const i7Schluesel = integral_prefix_1.GEOREGION_PRAEFIX + utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
-                            const region = new GeographicalRegion_1.GeographicalRegion(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.ueberpruefeZeichenkette(i7Data.bezeichner), "_GR", `_${regions.length}`.toString()]), utils_2.ueberpruefeZeichenkette(i7Data.kurzname), i7Schluesel);
+                            const region = new GeographicalRegion_1.GeographicalRegion(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.ueberpruefeZeichenkette(i7Data.bezeichner), "_GR"]), utils_2.ueberpruefeZeichenkette(i7Data.kurzname), i7Schluesel);
                             this.addIdMapping(i7Data.id, region.mrid, integral_sql_1.Integral7TableNames.REGION);
                             regions.push(region);
                         }
@@ -443,7 +562,7 @@ class ConverterI7 {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.REGELZONE, 0, 0, []));
                 for (const i7Data of result) {
                     const i7Schluessel = integral_prefix_1.REGELZONE_PRAEFIX + utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
-                    const ctrlarea = new ControlArea_1.ControlArea(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.ueberpruefeZeichenkette(i7Data.bezeichner), "_RZ", `_${cimModel.controlArea.size}`.toString()]), utils_2.ueberpruefeZeichenkette(i7Data.kurzname), i7Schluessel);
+                    const ctrlarea = new ControlArea_1.ControlArea(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.ueberpruefeZeichenkette(i7Data.bezeichner), "_RZ"]), utils_2.ueberpruefeZeichenkette(i7Data.kurzname), i7Schluessel);
                     cimModel.addControlArea(ctrlarea);
                     this.addIdMapping(i7Data.id, ctrlarea.mrid, integral_sql_1.Integral7TableNames.REGELZONE);
                 }
@@ -462,11 +581,11 @@ class ConverterI7 {
                         .then((result) => {
                         for (const i7Data of result) {
                             const i7Schluesel = integral_prefix_1.SUBGEOREGION_PRAEFIX + utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
-                            const subregion = new SubGeographicalRegion_1.SubGeographicalRegion(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.ueberpruefeZeichenkette(i7Data.bezeichner), "_SGR", `_${subRegions.length}`.toString()]), utils_2.ueberpruefeZeichenkette(i7Data.kurzname), i7Schluesel);
+                            const subregion = new SubGeographicalRegion_1.SubGeographicalRegion(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.ueberpruefeZeichenkette(i7Data.bezeichner), "_SGR"]), utils_2.ueberpruefeZeichenkette(i7Data.kurzname), i7Schluesel);
                             const regionUUID = this.integralID2UUID.get(i7Data.georegion);
                             let region = regions.find(elem => elem.mrid === regionUUID);
                             if (!region) {
-                                region = utils_1.createIfNotExitsGeoregionByName(this.cimModelDefault, util_create_1.createNotation([defaultValuesConfig.GeographicalRegion.name, "_GR", `_${regions.length}`.toString()]));
+                                region = utils_1.createIfNotExitsGeoregionByName(this.cimModelDefault, util_create_1.createNotation([defaultValuesConfig.GeographicalRegion.name, "_GR"]));
                                 this.logger.debug(`SubGeographicalRegion UUID ${subregion.mrid} I7-ID ${i7Data.id} Name ${i7Data.bezeichner} hat keine Region.`);
                             }
                             subregion.region = region;
@@ -489,17 +608,316 @@ class ConverterI7 {
             }));
         });
     }
+    convertNetzvarianten(cimModel, integral7) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NETZVARIANTEN)) {
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NETZVARIANTEN, [2]));
+                for (const i7Data of result) {
+                    const diagram = new Diagram_1.Diagram(utils_1.getUUID(i7Data.guid), i7Data.name, String(i7Data.id));
+                    diagram.orientation = OrientationKind_1.OrientationKind.negative;
+                    diagram.diagramStyle = cimModel.getDiagramStyle(cim_constants_1.DIAGRAM_LAYOUT_TYPES.NODE_BREAKER);
+                    cimModel.addDiagram(diagram);
+                    integral7.i7SchemaID2UUID.set(i7Data.id, diagram.mrid);
+                }
+            }
+            else {
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.NETZVARIANTEN} ist nicht vorhanden.`);
+            }
+        });
+    }
+    convertSchemaStandorte(cimModel, integral7, standortIDs, variantenNr, onlyEingeblendet = true) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_STANDORT) && standortIDs.length > 0) {
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_STANDORT, standortIDs));
+                let filteredResults = result.filter(elem => elem.variantennr === variantenNr);
+                if (onlyEingeblendet) {
+                    filteredResults = filteredResults.filter(elem => elem.eingeblendet === 1);
+                }
+                for (const i7Data of filteredResults) {
+                    const standort = integral7.integralStandorte.get(i7Data.standort);
+                    if (standort) {
+                        standort.standortNsg = new StandortNsg_1.StandortNsgImpl(i7Data);
+                        integral7.integralNSGStandorte.set(i7Data.id, standort.standortNsg);
+                    }
+                }
+            }
+            else {
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_STANDORT} ist nicht vorhanden.`);
+            }
+        });
+    }
+    convertSchemaKnotenSo(cimModel, integral7, knotenSoIDs, variantenNr, onlyEingeblendet = true) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_KNOTEN_SO) && knotenSoIDs.length > 0) {
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_KNOTEN_SO, knotenSoIDs));
+                let filteredResults = result.filter(elem => elem.variantennr === variantenNr);
+                if (onlyEingeblendet) {
+                    filteredResults = filteredResults.filter(elem => elem.eingeblendet === 1);
+                }
+                for (const i7Data of filteredResults) {
+                    const diagramUUID = integral7.i7SchemaID2UUID.get(i7Data.variantennr);
+                    const diagram = cimModel.getDiagram(diagramUUID);
+                    const nsgStandort = integral7.integralNSGStandorte.get(i7Data.nsgso);
+                    if (!diagram || !nsgStandort) {
+                        continue;
+                    }
+                    const diagramObject = new DiagramObject_1.DiagramObject(utils_1.generateUUID(), 'Abzweig');
+                    diagramObject.diagramUUID = diagramUUID;
+                    diagramObject.setDiagram(diagram);
+                    const diagramObjectPoint = new DiagramObjectPoint_1.DiagramObjectPoint(nsgStandort.xrel + i7Data.xrel, nsgStandort.yrel + i7Data.yrel);
+                    diagramObjectPoint.mrid = utils_1.generateUUID();
+                    diagramObjectPoint.diagramObject = diagramObject;
+                    diagramObject.addDiagramObjectPoint(diagramObjectPoint);
+                    cimModel.addDiagramObject(diagramObject);
+                    cimModel.addDiagramObjectPoint(diagramObjectPoint);
+                    const cimObjectUUID = this.integralID2UUID.get(i7Data.knotenso);
+                    const cimObject = cimModel.getObject(cimObjectUUID);
+                    if (cimObject) {
+                        diagramObject.setIdentifiedObject(cimObject);
+                    }
+                    else {
+                        this.logger.debug(`KnotenSo/DiagramObject ${diagramObject.mrid} hat kein PSR-Objekt.`);
+                    }
+                }
+            }
+            else {
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_KNOTEN_SO} ist nicht vorhanden.`);
+            }
+        });
+    }
+    convertSchemaSchaltanlage(cimModel, integral7, saIDs, variantenNr, onlyEingeblendet = true) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_SCHALTANLAGE) && saIDs.length > 0) {
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_SCHALTANLAGE, saIDs));
+                let filteredResults = result.filter(elem => elem.variantennr === variantenNr);
+                if (onlyEingeblendet) {
+                    filteredResults = filteredResults.filter(elem => elem.eingeblendet === 1);
+                }
+                for (const i7Data of filteredResults) {
+                    const schaltanlage = integral7.integralSchaltanlagen.get(i7Data.schaltanlage);
+                    if (schaltanlage) {
+                        schaltanlage.schaltanlageNsg = new SchaltanlageNSG_1.SchaltanlageNsgImpl(i7Data);
+                        integral7.integralNSGSchaltanlage.set(i7Data.id, schaltanlage.schaltanlageNsg);
+                    }
+                }
+            }
+            else {
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_SCHALTANLAGE} ist nicht vorhanden.`);
+            }
+        });
+    }
+    convertSchemaSchaltanlagenAbschnitte(cimModel, integral7, schaltanlagenabschnittIDs, variantenNr, onlyEingeblendet = true) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_SCHALTANLAGENABSCHNITT) && schaltanlagenabschnittIDs.length > 0) {
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_SCHALTANLAGENABSCHNITT, schaltanlagenabschnittIDs));
+                let filteredResults = result.filter(elem => elem.variantennr === variantenNr);
+                if (onlyEingeblendet) {
+                    filteredResults = filteredResults.filter(elem => elem.eingeblendet === 1);
+                }
+                for (const i7Data of filteredResults) {
+                    const saabschnitt = integral7.integralSchaltanlagenAbschnitte.get(i7Data.saabschnitt);
+                    if (saabschnitt) {
+                        saabschnitt.schaltanlagenabschnittNsg = new SchaltanlagenabschnittNsg_1.SchaltanlagenabschnittNsg(i7Data);
+                        saabschnitt.schaltanlagenabschnittNsg.saabschnitt = saabschnitt;
+                        saabschnitt.schaltanlagenabschnittNsg.nsgsa = integral7.integralNSGSchaltanlage.get(i7Data.nsgsa);
+                        integral7.integralNSGSAAbschnitt.set(i7Data.id, saabschnitt.schaltanlagenabschnittNsg);
+                    }
+                }
+            }
+            else {
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_SCHALTANLAGENABSCHNITT} ist nicht vorhanden.`);
+            }
+        });
+    }
+    convertSchemaSammelschienenAbschnitte(cimModel, integral7, schaltanlagenabschnittIDs, variantenNr, onlyEingeblendet = true) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            if (schaltanlagenabschnittIDs.length <= 0)
+                return;
+            const isEingeblendet = 1;
+            const innerSQLisEingeblendet = `IFNULL(
+                                      (SELECT max(slotnummer) + 1
+                                      FROM nsg_nsgschaltfeld AS nsg_nsgsf
+                                      WHERE nsg_nsgsf.nsgsaa = nsg_nsgsaab.id
+                                      AND nsg_nsgsf.eingeblendet = ${isEingeblendet}),
+                                    1)`;
+            const outerSQLisEingeblendet = `AND nsg_nsgsaab.eingeblendet = ${isEingeblendet}`;
+            const sqlStatement = `SELECT nsg_nsgsaab.variantennr,
+              nsg_nsgsaab.id,
+              ${onlyEingeblendet ? innerSQLisEingeblendet : 'nsg_nsgsaab.laenge'} as laenge,
+              nsg_nsgsaab.nslots,
+              nsg_nsgsaab.saabschnitt,
+              nsg_nsgsaab.nsgsa,
+              nsg_nsgsaab.eingeblendet,
+              nsg_nsgsaab.nsglkp,
+              netz_ssab.pos AS posSSAB,
+              netz_ssab.id  AS idSSAB
+       FROM nsg_nsgsaabschnitt AS nsg_nsgsaab
+                LEFT JOIN netz_ssab ON nsg_nsgsaab.saabschnitt = netz_ssab.saabschnitt
+       WHERE (${integral_sql_1.getWhereIDs('nsg_nsgsaab.saabschnitt', schaltanlagenabschnittIDs).join(' OR ')})
+           ${onlyEingeblendet ? outerSQLisEingeblendet : ''};`;
+            const queryResults = yield this.mysqlController.execQuery(sqlStatement);
+            const filteredResults = queryResults.filter(elem => elem.variantennr === variantenNr);
+            for (const queryResult of filteredResults) {
+                const sa = integral7.integralNSGSchaltanlage.get(queryResult.nsgsa);
+                const so = integral7.integralNSGStandorte.get(sa.nsgsoid);
+                const leftOffset = queryResult.nslots * constants_1.NsgConstants.HORIZONTAL_OFFSET;
+                const topOffset = queryResult.posSSAB * constants_1.NsgConstants.VERTICAL_OFFSET;
+                const ssabLength = queryResult.laenge * constants_1.NsgConstants.HORIZONTAL_OFFSET;
+                let pointTopLeft = new Point_1.Point(leftOffset, topOffset);
+                let pointBottomRight = new Point_1.Point(leftOffset + ssabLength, topOffset);
+                const points = [];
+                points.push(pointTopLeft, pointBottomRight);
+                let maxX = 0;
+                for (const p of points) {
+                    maxX = maxX < p.x ? p.x : maxX;
+                    Point_1.Point.rotate(p, -90 * sa.ausrichtung);
+                }
+                const shiftValue = (queryResult.laenge + queryResult.nslots) * constants_1.NsgConstants.HORIZONTAL_OFFSET;
+                for (const p of points) {
+                    p.x += so.xrel + sa.xrel + (sa.ausrichtung === 2 ? maxX : 0);
+                    p.y += so.yrel + sa.yrel + (sa.ausrichtung === 3 ? maxX : 0);
+                }
+                integral7.integralNSGSsab.set(queryResult.idSSAB, queryResult);
+                const diagramObject = new DiagramObject_1.DiagramObject(utils_1.getUUID(''), 'SSAB Diagram');
+                diagramObject.rotation = 90 * sa.ausrichtung;
+                const cnUUID = this.integralID2UUID.get(queryResult.idSSAB);
+                const connectivityNode = cimModel.getConnectivityNode(cnUUID);
+                utils_schema_1.createDiagramObjectPoints(diagramObject, points);
+                diagramObject.setIdentifiedObject(connectivityNode);
+                const diagramUUID = integral7.i7SchemaID2UUID.get(sa.variantennr);
+                const diagram = cimModel.getDiagram(diagramUUID);
+                if (diagram) {
+                    diagramObject.setDiagram(diagram);
+                    diagram.addDiagramObject(diagramObject);
+                }
+                else {
+                    this.logger.debug(`SSAB/DiagramObject ${diagramObject.mrid} hat kein Diagram-Objekt.`);
+                }
+            }
+        });
+    }
+    convertSchemaSchaltfeldElemente(cimModel, integral7, schaltfeldIDs, variantenNr, onlyEingeblendet = true) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_SCHALTFELD) && schaltfeldIDs.length > 0) {
+                const i7relevantTables = [
+                    integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.LEISTUNGSSCHALTER],
+                    integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.TRENNER_3P],
+                    integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.TRENNERFI_3P],
+                    integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.KNOTEN_STARR]
+                ];
+                const i7checkedTables = this.filterTablesByAvailability(i7relevantTables);
+                const i7knotenBeziehungen = yield this.mysqlController.execQuery(integral_sql_1.getI7KnotenBeziehungenQuery(i7checkedTables, schaltfeldIDs));
+                const resultsNsgSchaltfeld = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_SCHALTFELD, schaltfeldIDs));
+                let filteredResultsNsgSchaltfeld = resultsNsgSchaltfeld.filter(elem => elem.variantennr === variantenNr);
+                if (onlyEingeblendet) {
+                    filteredResultsNsgSchaltfeld = filteredResultsNsgSchaltfeld.filter(elem => elem.eingeblendet === 1);
+                }
+                for (const i7Data of filteredResultsNsgSchaltfeld) {
+                    const nodePointMap = new Map();
+                    const schaltfeldLeftOffset = i7Data.slotnummer * constants_1.NsgConstants.HORIZONTAL_OFFSET;
+                    const schaltfeldDeltaausrichtung = i7Data.deltaausrichtung;
+                    const schaltfeldI7KnotenBeziehungen = i7knotenBeziehungen.filter(elem => elem.seliste === i7Data.schaltfeld);
+                    let shiftFromBusbar = false;
+                    if (schaltfeldI7KnotenBeziehungen.length == 1) {
+                        shiftFromBusbar = true;
+                    }
+                    const ssabs = integral7.integralSchaltfelder.get(i7Data.schaltfeld).saabschnitt.ssab;
+                    const maxSSabPos = Math.max(...ssabs.map(ssab => ssab.pos));
+                    const onSSabNodes = schaltfeldI7KnotenBeziehungen.filter(elem => ssabs.find(ssab => ssab.id === elem.aknoten) !== undefined);
+                    for (const node of onSSabNodes) {
+                        const ssabYPos = integral7.integralNSGSsab.get(node.aknoten).posSSAB * constants_1.NsgConstants.VERTICAL_OFFSET;
+                        let yStackPos = 1;
+                        let crtNode = node;
+                        while (crtNode) {
+                            if (nodePointMap.get(crtNode.id) === undefined) {
+                                let xPos = schaltfeldLeftOffset + (constants_1.NsgConstants.HORIZONTAL_OFFSET / 2);
+                                let yPos = ssabYPos;
+                                if (crtNode === node) {
+                                    yPos += shiftFromBusbar ? (schaltfeldDeltaausrichtung === 0 ? -1 : 1) * constants_1.NsgConstants.VERTICAL_OFFSET : 0;
+                                }
+                                else {
+                                    const ssabOffset = schaltfeldDeltaausrichtung === 0 ? 0 : maxSSabPos;
+                                    yPos = ((schaltfeldDeltaausrichtung === 0 ? -1 : 1) * (yStackPos) + ssabOffset) * constants_1.NsgConstants.VERTICAL_OFFSET;
+                                    yStackPos += 1;
+                                }
+                                nodePointMap.set(crtNode.id, new Point_1.Point(xPos, yPos));
+                            }
+                            crtNode = schaltfeldI7KnotenBeziehungen.find(elem => elem.aknoten === crtNode.eknoten);
+                        }
+                    }
+                    SsabNsg_1.DLUtilFunctions.rotateShiftAddBasedOnNsgSAA(cimModel, integral7, this.integralID2UUID, variantenNr, i7Data.nsgsaa, nodePointMap);
+                }
+            }
+        });
+    }
+    convertSchemaQuerkupplungen(cimModel, integral7, variantenNr, onlyEingeblendet = true) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_QUERKUPPLUNG) && integral7.querkupplungIDs.length > 0) {
+                const i7relevantTables = [
+                    integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.LEISTUNGSSCHALTER],
+                    integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.TRENNER_3P],
+                    integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.TRENNERFI_3P],
+                    integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.KNOTEN_STARR]
+                ];
+                const i7checkedTables = this.filterTablesByAvailability(i7relevantTables);
+                const i7knotenBeziehungen = yield this.mysqlController.execQuery(integral_sql_1.getI7KnotenBeziehungenQuery(i7checkedTables, integral7.querkupplungIDs));
+                const resultsNsgKpFeld = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_QUERKUPPLUNG, integral7.querkupplungIDs));
+                let filteredResultsNsgKpFeld = resultsNsgKpFeld.filter(elem => elem.variantennr === variantenNr);
+                if (onlyEingeblendet) {
+                    filteredResultsNsgKpFeld = filteredResultsNsgKpFeld.filter(elem => elem.eingeblendet === 1);
+                }
+                for (const i7Data of filteredResultsNsgKpFeld) {
+                    const nodePointMap = new Map();
+                    const kpFeldLeftOffset = i7Data.slotnummer * constants_1.NsgConstants.HORIZONTAL_OFFSET;
+                    const kpFeldDeltaausrichtung = i7Data.deltaausrichtung;
+                    const kpFeldI7KnotenBeziehungen = i7knotenBeziehungen.filter(elem => elem.seliste === i7Data.kpfeld);
+                    const ssabs = integral7.integralNSGSAAbschnitt.get(i7Data.nsgsaa).saabschnitt.ssab;
+                    const relevantSSabIDs = new Set();
+                    ssabs.forEach(ssab => relevantSSabIDs.add(ssab.id));
+                    SsabNsg_1.DLUtilFunctions.placeKupplung(kpFeldI7KnotenBeziehungen, nodePointMap, relevantSSabIDs, integral7.integralNSGSsab, kpFeldDeltaausrichtung, kpFeldLeftOffset, false);
+                    SsabNsg_1.DLUtilFunctions.rotateShiftAddBasedOnNsgSAA(cimModel, integral7, this.integralID2UUID, variantenNr, i7Data.nsgsaa, nodePointMap);
+                }
+            }
+        });
+    }
+    convertSchemaLaengskupplungen(cimModel, integral7, variantenNr, onlyEingeblendet = true) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_LAENGSKUPPLUNG) && integral7.laengskupplungIDs.length > 0) {
+                const i7relevantTables = [
+                    integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.LEISTUNGSSCHALTER],
+                    integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.TRENNER_3P],
+                    integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.TRENNERFI_3P],
+                    integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.KNOTEN_STARR]
+                ];
+                const i7checkedTables = this.filterTablesByAvailability(i7relevantTables);
+                const i7knotenBeziehungen = yield this.mysqlController.execQuery(integral_sql_1.getI7KnotenBeziehungenQuery(i7checkedTables, integral7.laengskupplungIDs));
+                const resultsNsgLKupplung = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_LAENGSKUPPLUNG, [...integral7.integralNSGSAAbschnitt.keys()]));
+                let filteredResultsNsgLKupplung = resultsNsgLKupplung.filter(elem => elem.variantennr === variantenNr);
+                if (onlyEingeblendet) {
+                    filteredResultsNsgLKupplung = filteredResultsNsgLKupplung.filter(elem => elem.eingeblendet === 1);
+                }
+                const nodePointMap = new Map();
+                for (const i7Data of filteredResultsNsgLKupplung) {
+                    const schaltanlagenID = integral7.integralNSGSAAbschnitt.get(i7Data.nsgsaa).nsgsa.schaltanlageid;
+                    const netzLaengskupplungsObjs = [...integral7.integralLaengskupplungen.values()].filter(elem => elem.schaltanlagenID === schaltanlagenID);
+                    for (const netzLaengskupplungObj of netzLaengskupplungsObjs) {
+                        const lKupplungI7KnotenBeziehungen = i7knotenBeziehungen.filter(elem => elem.seliste === netzLaengskupplungObj.id);
+                        const relevantSSabIDs = new Set();
+                        integral7.integralSchaltanlagen.get(schaltanlagenID).saab.forEach(netz_saab => netz_saab.ssab.forEach(ssab => relevantSSabIDs.add(ssab.id)));
+                        SsabNsg_1.DLUtilFunctions.placeKupplung(lKupplungI7KnotenBeziehungen, nodePointMap, relevantSSabIDs, integral7.integralNSGSsab, 0, 0, true);
+                    }
+                    SsabNsg_1.DLUtilFunctions.rotateShiftAddBasedOnNsgSAA(cimModel, integral7, this.integralID2UUID, variantenNr, i7Data.nsgsaa, nodePointMap);
+                }
+            }
+        });
+    }
     convertStandorte(cimModel, integral7, whereID, defaultValuesConfig) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.STANDORT)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.STANDORT, whereID));
                 for (const i7Data of result) {
-                    const i7Schluessel = integral_prefix_1.STANDORT_PRAEFIX +
-                        utils_2.ueberpruefeZeichenkette(i7Data.ukz) +
-                        integral_prefix_1.MITTIGER_PUNKT +
-                        utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
                     const i7name = util_create_1.createNotation([utils_2.getName(i7Data), "_", utils_2.ueberpruefeZeichenkette(i7Data.ukz)], 32);
-                    const substation = new AMPRIONSubstation_1.AMPRIONSubstation(utils_1.getUUID(i7Data.guid), i7name, i7Data.id + '', i7Schluessel, i7Data.stationsnummer, i7Data.ukz);
+                    const substation = new AMPRIONSubstation_1.AMPRIONSubstation(utils_1.getUUID(i7Data.guid), i7name, i7Data.kurzname, i7Data.kommentar, i7Data.stationsnummer, i7Data.ukz);
                     let subregion = cimModel.getSubGeographicalRegion(this.integralID2UUID.get(i7Data.subgeoregion));
                     if (!subregion) {
                         const region = utils_1.createIfNotExitsGeoregionByName(cimModel, defaultValuesConfig.GeographicalRegion.name);
@@ -531,7 +949,7 @@ class ConverterI7 {
             }
         });
     }
-    covertSchaltanlagen(cimModel, integral7, standortIDs, defaultValuesConfig) {
+    convertSchaltanlagen(cimModel, integral7, standortIDs, defaultValuesConfig) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.SCHALTANLAGE)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.SCHALTANLAGE, standortIDs));
@@ -550,7 +968,7 @@ class ConverterI7 {
                         i7Data.un +
                         integral_prefix_1.MITTIGER_PUNKT +
                         utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
-                    const vl = new VoltageLevel_1.VoltageLevel(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_VL", `_${cimModel.voltageLevels.size}`.toString()]), i7Data.kurzname, i7Schluessel);
+                    const vl = new VoltageLevel_1.VoltageLevel(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_", i7Data.un.toString(), "_VL"]), i7Data.kurzname, i7Schluessel);
                     const un = utils_2.getU(i7Data.un, defaultValuesConfig.DefaultVoltage);
                     const baseVoltage = util_create_1.createBaseVoltageIfNotExists(cimModel, un, this.exportFramesBoundary);
                     vl.baseVoltage = baseVoltage;
@@ -578,6 +996,9 @@ class ConverterI7 {
                         this.logger.warn(`Schaltanlagenabschnitt ${i7Data.id} ist keiner Schaltanlage zugeornet.`);
                         continue;
                     }
+                    else {
+                        voltageLevel.name = util_create_1.createNotation([voltageLevel.name, "_", i7Data.pos.toString()], 32, true);
+                    }
                     const schaltanlagenabschnitt = new Schaltanlagenabschnitt_1.SchaltanlagenabschnittImpl(i7Data);
                     schaltanlagenabschnitt.addSchaltanlage(integral7.integralSchaltanlagen.get(schaltanlagenabschnitt.schaltanlageid));
                     integral7.integralSchaltanlagenAbschnitte.set(i7Data.id, schaltanlagenabschnitt);
@@ -602,8 +1023,8 @@ class ConverterI7 {
                     const i7Schluessel = voltageLevel.description +
                         integral_prefix_1.SCHALTFELD_PRAEFIX +
                         utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
-                    const bay = new AMPRIONBay_1.AMPRIONBay(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_B", `_${cimModel.bays.size}`.toString()]), i7Data.kurzname, i7Schluessel);
-                    bay.number = i7Data.feldnummer + '';
+                    const bay = new AMPRIONBay_1.AMPRIONBay(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_B"], 32, true), i7Data.kurzname, i7Schluessel);
+                    bay.number = utils_2.isNumericI7(i7Data.feldnummer) ? utils_2.convertToNumberI7(i7Data.feldnummer).toString() : undefined;
                     bay.locationID = i7Data.ips_folder_id;
                     bay.voltageLevel = voltageLevel;
                     voltageLevel.addBay(bay);
@@ -629,8 +1050,8 @@ class ConverterI7 {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KNOTEN_SO, standortIDs));
                 for (const i7Data of result) {
                     const substation = cimModel.getSubstation(this.integralID2UUID.get(i7Data.standort));
-                    const vl = new VoltageLevel_1.VoltageLevel(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "_VL", `_${cimModel.voltageLevels.size}`.toString()]), i7Data.kurzname);
-                    const connectivityNode = new AMPRIONConnectivityNode_1.AMPRIONConnectivityNode(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_CN", `_${cimModel.connectivityNodes.size}`.toString()]), String(i7Data.id));
+                    const vl = new VoltageLevel_1.VoltageLevel(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), i7Data.un.toString(), "_VL"]), i7Data.kurzname);
+                    const connectivityNode = new AMPRIONConnectivityNode_1.AMPRIONConnectivityNode(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_CN"]), i7Data.kurzname, i7Data.kommentar);
                     connectivityNode.setConnectivityNodeContainer(vl);
                     vl.addConnectivityNode(connectivityNode);
                     connectivityNode.nodeNumber = i7Data.id_psse_cape;
@@ -677,11 +1098,11 @@ class ConverterI7 {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.SAMMELSCHIENE, schaltanlagenAbschnittIDs));
                 for (const i7Data of result) {
                     const i7Schaltanlagenabschnitt = integral7.integralSchaltanlagenAbschnitte.get(i7Data.saabschnitt);
-                    const busbarSection = new BusbarSection_1.BusbarSection(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Schaltanlagenabschnitt), "_BBS", `_${cimModel.busbarSections.size}`.toString()]), i7Schaltanlagenabschnitt.kurzname);
+                    const busbarSection = new BusbarSection_1.BusbarSection(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Schaltanlagenabschnitt), "_BBS"]), i7Schaltanlagenabschnitt.kurzname);
                     busbarSection.ipMax = i7Data.limit_ip;
                     busbarSection.aggregate = false;
-                    const connectivityNode = new AMPRIONConnectivityNode_1.AMPRIONConnectivityNode(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_CN", `_${cimModel.connectivityNodes.size}`.toString()]), i7Data.id.toString());
-                    const terminal = this.createConnection(cimModel, busbarSection, connectivityNode, PhaseCode_1.PhaseCode.ABC, true, 1);
+                    const connectivityNode = new AMPRIONConnectivityNode_1.AMPRIONConnectivityNode(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), i7Data.pos.toString(), "_CN"]), i7Data.kurzname);
+                    const terminal = this.createConnection(cimModel, busbarSection, connectivityNode, PhaseCode_1.PhaseCode.ABC, true);
                     const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Schaltanlagenabschnitt.id));
                     connectivityNode.nodeNumber = i7Data.id_psse_cape;
                     if (voltageLevel) {
@@ -720,7 +1141,7 @@ class ConverterI7 {
                 const result = yield this.queryDataInChuncks(integral_sql_1.I7Objects.KNOTEN_SF, schaltfeldIDs);
                 for (const i7Data of result) {
                     const bay = cimModel.getBay(this.integralID2UUID.get(i7Data.schaltfeld));
-                    const connectivityNode = new ConnectivityNode_1.ConnectivityNode(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_CN", `_${cimModel.connectivityNodes.size}`.toString()]), 'knotensf', `${bay.description}/${i7Data.bezeichner}`);
+                    const connectivityNode = new ConnectivityNode_1.ConnectivityNode(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_CN"]), 'knotensf', `${bay.description}/${i7Data.bezeichner}`);
                     if (bay) {
                         connectivityNode.connectivityNodeContainer = bay;
                         bay.addConnectivityNode(connectivityNode);
@@ -744,7 +1165,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KNOTEN_KF)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KNOTEN_KF, querkupplungIDs));
                 for (const i7Data of result) {
-                    const connectivityNode = new ConnectivityNode_1.ConnectivityNode(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_CN", `_${cimModel.connectivityNodes.size}`.toString()]), 'knotenkf');
+                    const connectivityNode = new ConnectivityNode_1.ConnectivityNode(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_CN"]), 'knotenkf');
                     const bay = cimModel.getBay(this.integralID2UUID.get(i7Data.kpfeld));
                     if (bay) {
                         connectivityNode.connectivityNodeContainer = bay;
@@ -767,7 +1188,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KNOTEN_LK)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KNOTEN_LK, laengskupplungIDs));
                 for (const i7Data of result) {
-                    const connectivityNode = new ConnectivityNode_1.ConnectivityNode(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "_CN", `_${cimModel.connectivityNodes.size}`.toString()]), 'KnotenLk');
+                    const connectivityNode = new ConnectivityNode_1.ConnectivityNode(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "_CN"]), 'KnotenLk');
                     const bay = cimModel.getBay(this.integralID2UUID.get(i7Data.lkupplung));
                     if (bay) {
                         connectivityNode.connectivityNodeContainer = bay;
@@ -790,7 +1211,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.SCHLAUFE)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.SCHLAUFE, knotenSoIDs));
                 for (const i7Data of result) {
-                    const terminal = new Terminal_1.Terminal(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "-Schlaufe_T", `_${cimModel.terminals.size}`.toString()]), String(i7Data.id));
+                    const terminal = new Terminal_1.Terminal(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), '_Schlaufe_T']), i7Data.kurzname, i7Data.kommentar);
                     terminal.connected = utils_2.convertToBooleanI7(i7Data.schaltzustand);
                     terminal.phases = PhaseCode_1.PhaseCode.ABC;
                     this.addIdMapping(i7Data.id, terminal.mrid, integral_sql_1.Integral7TableNames.SCHLAUFE);
@@ -802,6 +1223,7 @@ class ConverterI7 {
                     if (connectivityNode) {
                         connectivityNode.addTerminal(terminal);
                         terminal.setConnectivityNode(connectivityNode);
+                        terminal.name = util_create_1.createNotation([connectivityNode.name, "_Schlaufe_T"]);
                     }
                     else {
                         this.logger.debug(`Schlaufe ${i7Data.id} besitzt keinen anschluss.`);
@@ -818,9 +1240,14 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.BELASTUNG)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.BELASTUNG, knotenSfIDs));
                 for (const i7Data of result) {
-                    const load = targetClass === cim_class_names_1.CIM_CLASS_NAMES.ConformLoad ? new ConformLoad_1.ConformLoad(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_CL", `_${cimModel.energyConsumers.size}`.toString()])) : new EnergyConsumer_1.EnergyConsumer(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_EC", `_${cimModel.energyConsumers.size}`.toString()]));
+                    const load = targetClass === cim_class_names_1.CIM_CLASS_NAMES.ConformLoad ? new INTEGRALConformLoad_1.INTEGRALConformLoad(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_CL"])) : new EnergyConsumer_1.EnergyConsumer(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_EC"]));
                     this.setTopologyEnergySourceConsumerObject(cimModel, load, i7Data);
-                    const powerData = utils_2.getActiveReactivePower(i7Data);
+                    const mf = this.cimModelDefault.multiplierFactors.get(this.integralID2UUID.get(i7Data.multfaktor));
+                    if (mf && targetClass === cim_class_names_1.CIM_CLASS_NAMES.ConformLoad) {
+                        cimModel.addMultiplierFactor(mf);
+                        load.multiplierFactor = mf;
+                    }
+                    const powerData = utils_2.getActiveReactivePower(i7Data, mf);
                     load.p = powerData[0];
                     load.q = powerData[1];
                     if (targetClass === cim_class_names_1.CIM_CLASS_NAMES.ConformLoad) {
@@ -859,14 +1286,46 @@ class ConverterI7 {
             }
         });
     }
+    convertErsatzQuerZweige(cimModel, knotenSfIDs, targetClass) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.ERSATZQUERZWEIG)) {
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.ERSATZQUERZWEIG, knotenSfIDs));
+                switch (targetClass) {
+                    case cim_class_names_1.CIM_CLASS_NAMES.EquivalentInjection: {
+                        yield this.convertErsatzQuerZweige2EquivalentInjection(cimModel, result);
+                        break;
+                    }
+                    case cim_class_names_1.CIM_CLASS_NAMES.ExternalNetworkInjection: {
+                        yield this.convertErsatzQuerZweige2ExternalNetworkInjection(cimModel, result);
+                        break;
+                    }
+                    default: {
+                        yield this.convertErsatzQuerZweige2EquivalentInjection(cimModel, result);
+                    }
+                }
+            }
+            else {
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.ERSATZQUERZWEIG} ist nicht vorhanden.`);
+            }
+        });
+    }
     convertGeneratoren(cimModel, knotenSfIDs, energyTypesConfig) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.GENERATOR)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.GENERATOR, knotenSfIDs));
                 for (const i7Data of result) {
-                    const synchronousMachine = new SynchronousMachine_1.SynchronousMachine(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_SM", `_${cimModel.synchronousMachine.size}`.toString()]), i7Data.kurzname, i7Data.nameprimaertyp);
-                    synchronousMachine.type = SynchronousMachineKind_1.SynchronousMachineKind.generator;
-                    synchronousMachine.operatingMode = SynchronousMachineOperatingMode_1.SynchronousMachineOperatingMode.generator;
+                    const genType = this.generatorTypen.get(i7Data.nametyp);
+                    const synchronousMachine = new SynchronousMachine_1.SynchronousMachine(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_SM"]), i7Data.kurzname, i7Data.nameprimaertyp);
+                    const isRotatingPhaseShifter = utils_2.isBooleanI7(i7Data.flag_phasenschieber) ? utils_2.convertToBooleanI7(i7Data.flag_phasenschieber) : false;
+                    const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
+                    if (isRotatingPhaseShifter) {
+                        synchronousMachine.operatingMode = SynchronousMachineOperatingMode_1.SynchronousMachineOperatingMode.condenser;
+                        synchronousMachine.type = SynchronousMachineKind_1.SynchronousMachineKind.condenser;
+                    }
+                    else {
+                        synchronousMachine.operatingMode = SynchronousMachineOperatingMode_1.SynchronousMachineOperatingMode.generator;
+                        synchronousMachine.type = SynchronousMachineKind_1.SynchronousMachineKind.generator;
+                    }
                     if (utils_2.convertToNumberI7(i7Data.blocktrafo_1)) {
                         this.blocktransformatoren.push(utils_2.convertToNumberI7(i7Data.blocktrafo_1));
                     }
@@ -882,7 +1341,8 @@ class ConverterI7 {
                     if (utils_2.convertToNumberI7(i7Data.blocktrafo_5)) {
                         this.blocktransformatoren.push(utils_2.convertToNumberI7(i7Data.blocktrafo_5));
                     }
-                    synchronousMachine.referencePriority = utils_2.isNumericI7(i7Data.einspprio) ? utils_2.convertToNumberI7(i7Data.einspprio) : undefined;
+                    const prio = utils_2.isNumericI7(i7Data.einspprio) ? utils_2.convertToNumberI7(i7Data.einspprio) : undefined;
+                    synchronousMachine.referencePriority = prio;
                     const maxP = utils_2.isNumericI7(i7Data.p_max) ? utils_2.convertToNumberI7(i7Data.p_max) : 0;
                     const minP = utils_2.isNumericI7(i7Data.p_min) ? utils_2.convertToNumberI7(i7Data.p_min) : 0;
                     const maxQ = utils_2.isNumericI7(i7Data.q_max) ? utils_2.convertToNumberI7(i7Data.q_max) : undefined;
@@ -891,48 +1351,52 @@ class ConverterI7 {
                     const minQvonPmin = utils_2.isNumericI7(i7Data.qmin_von_pmin) ? utils_2.convertToNumberI7(i7Data.qmin_von_pmin) : undefined;
                     synchronousMachine.maxQ = maxQ ? maxQ : maxQvonPmax;
                     synchronousMachine.minQ = minQ ? minQ : minQvonPmin;
+                    const pType = (genType === null || genType === void 0 ? void 0 : genType.sr) * (genType === null || genType === void 0 ? void 0 : genType.cosphir);
+                    const qType = Math.sqrt(Math.pow(genType === null || genType === void 0 ? void 0 : genType.sr, 2) - Math.pow(pType, 2));
                     const powerData = utils_2.getActiveReactivePower(i7Data);
                     const p = powerData[0];
                     const q = powerData[1];
                     synchronousMachine.setActivePower(p * -1);
                     synchronousMachine.setReactivePower(q * -1);
-                    const sr = utils_2.isNumericI7(i7Data.sr) ? utils_2.convertToNumberI7(i7Data.sr) : undefined;
+                    const sr = utils_2.isNumericI7(i7Data.sr) ? utils_2.convertToNumberI7(i7Data.sr) : genType === null || genType === void 0 ? void 0 : genType.sr;
                     if (sr && sr >= 0) {
                         synchronousMachine.ratedS = sr;
                     }
                     else {
                         synchronousMachine.ratedS = Math.sqrt(Math.pow(maxP, 2) + Math.pow(maxQvonPmax, 2));
                     }
-                    const ur = utils_2.isNumericI7(i7Data.ur) ? utils_2.convertToNumberI7(i7Data.ur) : undefined;
+                    const ur = utils_2.isNumericI7(i7Data.ur) ? utils_2.convertToNumberI7(i7Data.ur) : genType.ur;
                     const usoll = utils_2.isNumericI7(i7Data.usoll) ? utils_2.convertToNumberI7(i7Data.usoll) : undefined;
+                    const cosphir = utils_2.isNumericI7(i7Data.cosphir) ? utils_2.convertToNumberI7(i7Data.cosphir) : genType.cosphir;
                     synchronousMachine.ratedU = usoll ? usoll : ur;
                     synchronousMachine.aggregate = true;
-                    synchronousMachine.ratedPowerFactor = utils_2.isNumericI7(i7Data.cosphir) ? utils_2.convertToNumberI7(i7Data.cosphir) : undefined;
+                    synchronousMachine.ratedPowerFactor = cosphir ? cosphir : undefined;
                     synchronousMachine.r = utils_2.isNumericI7(i7Data.rg) ? utils_2.convertToNumberI7(i7Data.rg) : undefined;
-                    const reactiveCapabilityCurve = new ReactiveCapabilityCurve_1.ReactiveCapabilityCurve(utils_1.generateUUID(), util_create_1.createNotation(['CurveData', "_RCC", `_${cimModel.reactiveCapabilityCurve.size}`.toString()]));
-                    reactiveCapabilityCurve.curveStyle = CurveStyle_1.CurveStyle.straightLineYValues;
-                    reactiveCapabilityCurve.xUnit = UnitSymbol_1.UnitSymbol.W;
-                    reactiveCapabilityCurve.y1Unit = UnitSymbol_1.UnitSymbol.VAr;
-                    reactiveCapabilityCurve.y2Unit = UnitSymbol_1.UnitSymbol.VAr;
-                    const curveData1 = new CurveData_1.CurveData(utils_1.generateUUID());
-                    curveData1.curve = reactiveCapabilityCurve;
-                    curveData1.xvalue = i7Data.p_min;
-                    curveData1.y1value = i7Data.qmin_von_pmin;
-                    curveData1.y2value = i7Data.qmax_von_pmin;
-                    cimModel.addCurveData(curveData1);
-                    const curveData2 = new CurveData_1.CurveData(utils_1.generateUUID());
-                    curveData2.curve = reactiveCapabilityCurve;
-                    curveData2.xvalue = i7Data.p_max;
-                    curveData2.y1value = i7Data.qmin_von_pmax;
-                    curveData2.y2value = i7Data.qmax_von_pmax;
-                    cimModel.addCurveData(curveData2);
-                    cimModel.addReactiveCapabilityCurve(reactiveCapabilityCurve);
-                    synchronousMachine.initialReactiveCapabilityCurveUUID = reactiveCapabilityCurve.mrid;
-                    const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
+                    if (!isRotatingPhaseShifter) {
+                        const reactiveCapabilityCurve = new ReactiveCapabilityCurve_1.ReactiveCapabilityCurve(utils_1.generateUUID(), util_create_1.createNotation(['CurveData', synchronousMachine.mrid, "_RCC"]));
+                        reactiveCapabilityCurve.curveStyle = CurveStyle_1.CurveStyle.straightLineYValues;
+                        reactiveCapabilityCurve.xUnit = UnitSymbol_1.UnitSymbol.W;
+                        reactiveCapabilityCurve.y1Unit = UnitSymbol_1.UnitSymbol.VAr;
+                        reactiveCapabilityCurve.y2Unit = UnitSymbol_1.UnitSymbol.VAr;
+                        const curveData1 = new CurveData_1.CurveData(utils_1.generateUUID());
+                        curveData1.curve = reactiveCapabilityCurve;
+                        curveData1.xvalue = i7Data.p_min;
+                        curveData1.y1value = i7Data.qmin_von_pmin;
+                        curveData1.y2value = i7Data.qmax_von_pmin;
+                        cimModel.addCurveData(curveData1);
+                        const curveData2 = new CurveData_1.CurveData(utils_1.generateUUID());
+                        curveData2.curve = reactiveCapabilityCurve;
+                        curveData2.xvalue = i7Data.p_max;
+                        curveData2.y1value = i7Data.qmin_von_pmax;
+                        curveData2.y2value = i7Data.qmax_von_pmax;
+                        cimModel.addCurveData(curveData2);
+                        cimModel.addReactiveCapabilityCurve(reactiveCapabilityCurve);
+                        synchronousMachine.initialReactiveCapabilityCurveUUID = reactiveCapabilityCurve.mrid;
+                    }
                     let regulatingControl = undefined;
                     switch (i7Data.spannungsgeregelt) {
                         case 1: {
-                            regulatingControl = new RegulatingControl_1.RegulatingControl(utils_1.generateUUID(), `RC_Gen_${i7Data.id}`);
+                            regulatingControl = new RegulatingControl_1.RegulatingControl(utils_1.generateUUID(), `RC_Gen_${synchronousMachine.getUUID().substring(0, 8)}`);
                             regulatingControl.targetValue = usoll;
                             regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
                             regulatingControl.discrete = false;
@@ -947,66 +1411,71 @@ class ConverterI7 {
                             synchronousMachine.controlEnabled = false;
                         }
                     }
-                    const generatingUnitConfig = energyTypesConfig[i7Data.nameprimaertyp];
                     let generatingUnit;
-                    if (generatingUnitConfig) {
-                        switch (generatingUnitConfig.class) {
-                            case 'ThermalGeneratingUnit': {
-                                generatingUnit = new ThermalGeneratingUnit_1.ThermalGeneratingUnit(utils_1.getUUID(''), util_create_1.createNotation([i7Data.bezeichner, "_TGU", `_${cimModel.generatingUnit.size}`.toString()]), i7Data.kurzname, i7Data.nameprimaertyp);
-                                if (generatingUnitConfig.fuelType) {
-                                    utils_2.generateFuelType(i7Data.nameprimaertyp, generatingUnitConfig.fuelType, generatingUnit, cimModel);
-                                }
-                                break;
-                            }
-                            case 'SolarGeneratingUnit': {
-                                generatingUnit = new SolarGeneratingUnit_1.SolarGeneratingUnit(utils_1.getUUID(''), util_create_1.createNotation([i7Data.bezeichner, "_SGU", `_${cimModel.generatingUnit.size}`.toString()]), i7Data.kurzname, i7Data.nameprimaertyp);
-                                break;
-                            }
-                            case 'WindGeneratingUnit': {
-                                generatingUnit = new WindGeneratingUnit_1.WindGeneratingUnit(utils_1.getUUID(''), util_create_1.createNotation([i7Data.bezeichner, "_WGU", `_${cimModel.generatingUnit.size}`.toString()]), i7Data.kurzname, i7Data.nameprimaertyp);
-                                switch (generatingUnitConfig.fuelType) {
-                                    case 'onshore': {
-                                        generatingUnit.windGenUnitType = WindGenUnitKind_1.WindGenUnitKind.onshore;
-                                        break;
-                                    }
-                                    case 'offshore': {
-                                        generatingUnit.windGenUnitType = WindGenUnitKind_1.WindGenUnitKind.offshore;
-                                        break;
+                    if (!isRotatingPhaseShifter) {
+                        const generatingUnitConfig = energyTypesConfig[i7Data.nameprimaertyp];
+                        if (generatingUnitConfig) {
+                            switch (generatingUnitConfig.class) {
+                                case 'ThermalGeneratingUnit': {
+                                    generatingUnit = new ThermalGeneratingUnit_1.ThermalGeneratingUnit(utils_1.getUUID(''), util_create_1.createNotation([i7Data.bezeichner, "_TGU"]), i7Data.kurzname, i7Data.nameprimaertyp);
+                                    if (generatingUnitConfig.fuelType) {
+                                        utils_2.generateFuelType(i7Data.nameprimaertyp, generatingUnitConfig.fuelType, generatingUnit, cimModel);
                                     }
-                                    default: {
-                                        generatingUnit.windGenUnitType = WindGenUnitKind_1.WindGenUnitKind.onshore;
-                                        break;
+                                    break;
+                                }
+                                case 'SolarGeneratingUnit': {
+                                    generatingUnit = new SolarGeneratingUnit_1.SolarGeneratingUnit(utils_1.getUUID(''), util_create_1.createNotation([i7Data.bezeichner, "_SGU"]), i7Data.kurzname, i7Data.nameprimaertyp);
+                                    break;
+                                }
+                                case 'WindGeneratingUnit': {
+                                    generatingUnit = new WindGeneratingUnit_1.WindGeneratingUnit(utils_1.getUUID(''), util_create_1.createNotation([i7Data.bezeichner, "_WGU"]), i7Data.kurzname, i7Data.nameprimaertyp);
+                                    switch (generatingUnitConfig.fuelType) {
+                                        case 'onshore': {
+                                            generatingUnit.windGenUnitType = WindGenUnitKind_1.WindGenUnitKind.onshore;
+                                            break;
+                                        }
+                                        case 'offshore': {
+                                            generatingUnit.windGenUnitType = WindGenUnitKind_1.WindGenUnitKind.offshore;
+                                            break;
+                                        }
+                                        default: {
+                                            generatingUnit.windGenUnitType = WindGenUnitKind_1.WindGenUnitKind.onshore;
+                                            break;
+                                        }
                                     }
+                                    break;
+                                }
+                                case 'NuclearGeneratingUnit': {
+                                    generatingUnit = new NuclearGeneratingUnit_1.NuclearGeneratingUnit(utils_1.getUUID(''), util_create_1.createNotation([i7Data.bezeichner, "_NGU"]), i7Data.kurzname);
+                                    break;
+                                }
+                                case 'HydroGeneratingUnit': {
+                                    generatingUnit = new HydroGeneratingUnit_1.HydroGeneratingUnit(utils_1.getUUID(''), util_create_1.createNotation([i7Data.bezeichner, "_HGU"]), i7Data.kurzname);
+                                    generatingUnit.energyConversionCapability = HydroEnergyConversionKind_1.HydroEnergyConversionKind.pumpAndGenerator;
+                                    break;
+                                }
+                                default: {
+                                    generatingUnit = new GeneratingUnit_1.GeneratingUnit(utils_1.getUUID(''), util_create_1.createNotation([i7Data.bezeichner, "_GU"]), i7Data.kurzname);
+                                    break;
                                 }
-                                break;
-                            }
-                            case 'NuclearGeneratingUnit': {
-                                generatingUnit = new NuclearGeneratingUnit_1.NuclearGeneratingUnit(utils_1.getUUID(''), util_create_1.createNotation([i7Data.bezeichner, "_NGU", `_${cimModel.generatingUnit.size}`.toString()]), i7Data.kurzname);
-                                break;
-                            }
-                            case 'HydroGeneratingUnit': {
-                                generatingUnit = new HydroGeneratingUnit_1.HydroGeneratingUnit(utils_1.getUUID(''), util_create_1.createNotation([i7Data.bezeichner, "_HGU", `_${cimModel.generatingUnit.size}`.toString()]), i7Data.kurzname);
-                                generatingUnit.energyConversionCapability = HydroEnergyConversionKind_1.HydroEnergyConversionKind.pumpAndGenerator;
-                                break;
                             }
                         }
+                        else {
+                            generatingUnit = new GeneratingUnit_1.GeneratingUnit(utils_1.getUUID(''), util_create_1.createNotation([i7Data.bezeichner, "_GU"]), i7Data.kurzname);
+                        }
+                        generatingUnit.initialP = utils_2.isNumericI7(i7Data.p0) ? utils_2.convertToNumberI7(i7Data.p0) : undefined;
+                        generatingUnit.maxOperatingP = utils_2.isNumericI7(i7Data.p_max) ? utils_2.convertToNumberI7(i7Data.p_max) : undefined;
+                        generatingUnit.minOperatingP = utils_2.isNumericI7(i7Data.p_min) ? utils_2.convertToNumberI7(i7Data.p_min) : undefined;
+                        generatingUnit.nominalP = utils_2.isNumericI7(cosphir) && utils_2.isNumericI7(sr) ? cosphir * sr : generatingUnit.maxOperatingP;
+                        const kr = utils_2.isNumericI7(i7Data.kr) ? utils_2.convertToNumberI7(i7Data.kr) : undefined;
+                        const fn = 50;
+                        generatingUnit.governorSCD = (utils_2.isNumericI7(kr) && utils_2.isNumericI7(generatingUnit.nominalP)) ? utils_2.calculateSigma(fn, generatingUnit.nominalP, kr) : undefined;
+                        generatingUnit.addRotatingMachine(synchronousMachine);
+                        synchronousMachine.generatingUnitUUID = generatingUnit.mrid;
                     }
-                    if (!generatingUnit) {
-                        generatingUnit = new GeneratingUnit_1.GeneratingUnit(utils_1.getUUID(''), util_create_1.createNotation([i7Data.bezeichner, "_GU", `_${cimModel.generatingUnit.size}`.toString()]), i7Data.kurzname);
-                    }
-                    generatingUnit.initialP = utils_2.isNumericI7(i7Data.p0) ? utils_2.convertToNumberI7(i7Data.p0) : undefined;
-                    generatingUnit.maxOperatingP = utils_2.isNumericI7(i7Data.p_max) ? utils_2.convertToNumberI7(i7Data.p_max) : undefined;
-                    generatingUnit.minOperatingP = utils_2.isNumericI7(i7Data.p_min) ? utils_2.convertToNumberI7(i7Data.p_min) : undefined;
-                    generatingUnit.nominalP = generatingUnit.maxOperatingP;
-                    const kr = utils_2.isNumericI7(i7Data.kr) ? utils_2.convertToNumberI7(i7Data.kr) : undefined;
-                    const fn = 50;
-                    const pn = generatingUnit.maxOperatingP;
-                    generatingUnit.governorSCD = (utils_2.isNumericI7(kr) && utils_2.isNumericI7(generatingUnit.nominalP)) ? utils_2.calculateSigma(fn, pn, kr) : undefined;
-                    generatingUnit.addRotatingMachine(synchronousMachine);
-                    synchronousMachine.generatingUnitUUID = generatingUnit.mrid;
                     this.setTopologyEnergySourceConsumerObject(cimModel, synchronousMachine, i7Data, regulatingControl, generatingUnit);
                     const smtcr = new SynchronousMachineTimeConstantReactance_1.SynchronousMachineTimeConstantReactance(utils_1.generateUUID(), `smtcr_${synchronousMachine.name}`);
-                    smtcr.enabled = utils_2.convertToBooleanI7(i7Data.betrieb);
+                    smtcr.enabled = inBetrieb;
                     smtcr.tpdo = utils_2.isNumericI7(i7Data.td1s) ? utils_2.convertToNumberI7(i7Data.td1s) : undefined;
                     smtcr.tppdo = utils_2.isNumericI7(i7Data.td2s) ? utils_2.convertToNumberI7(i7Data.td2s) : undefined;
                     smtcr.tpqo = utils_2.isNumericI7(i7Data.tq1s) ? utils_2.convertToNumberI7(i7Data.tq1s) : undefined;
@@ -1032,25 +1501,36 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.ASYNCHRONMOTOR)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.ASYNCHRONMOTOR, 0, 0, knotenSfIDs));
                 for (const i7Data of result) {
-                    const asynchronousMachine = new AsynchronousMachine_1.AsynchronousMachine(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_AM", `_${cimModel.asynchronousMachine.size}`.toString()]), i7Data.kurzname, 'SO-' + i7Data.ukz + integral_prefix_1.MITTIGER_PUNKT + i7Data.bezeichner);
+                    const assetType = this.asynchronmotorTypen.get(i7Data.nametyp);
+                    const asynchronousMachine = new INTEGRALAsynchronousMachine_1.INTEGRALAsynchronousMachine(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_AM"]), i7Data.kurzname, 'SO-' + i7Data.ukz + integral_prefix_1.MITTIGER_PUNKT + i7Data.bezeichner);
+                    let mf = this.cimModelDefault.multiplierFactors.get(this.integralID2UUID.get(i7Data.multfaktor));
+                    if (mf) {
+                        cimModel.addMultiplierFactor(mf);
+                        asynchronousMachine.multiplierFactorUUID = mf.getUUID();
+                    }
                     asynchronousMachine.efficiency = i7Data.wirkungsgrad * 100;
-                    asynchronousMachine.iaIrRatio = i7Data.ilr_ir;
-                    asynchronousMachine.polePairNumber = i7Data.polpaarz;
-                    asynchronousMachine.ratedMechanicalPower = i7Data.p_mech;
-                    asynchronousMachine.ratedPowerFactor = i7Data.cos_phir;
-                    asynchronousMachine.ratedS = i7Data.sr;
-                    asynchronousMachine.ratedU = i7Data.ur;
+                    asynchronousMachine.iaIrRatio = utils_2.isNumericI7(i7Data.ilr_ir) ? i7Data.ilr_ir : assetType === null || assetType === void 0 ? void 0 : assetType.ilr_ir;
+                    asynchronousMachine.polePairNumber = utils_2.isNumericI7(i7Data.polpaarz) ? i7Data.polpaarz : assetType === null || assetType === void 0 ? void 0 : assetType.polpaarz;
+                    asynchronousMachine.ratedMechanicalPower = utils_2.isNumericI7(i7Data.p_mech) ? i7Data.p_mech : assetType === null || assetType === void 0 ? void 0 : assetType.p_mech;
+                    asynchronousMachine.ratedPowerFactor = utils_2.isNumericI7(i7Data.cos_phir) ? i7Data.cos_phir : assetType === null || assetType === void 0 ? void 0 : assetType.cosphir;
+                    asynchronousMachine.ratedS = utils_2.isNumericI7(i7Data.sr) ? i7Data.sr : assetType === null || assetType === void 0 ? void 0 : assetType.sr;
+                    asynchronousMachine.ratedU = utils_2.isNumericI7(i7Data.ur) ? i7Data.ur : assetType === null || assetType === void 0 ? void 0 : assetType.ur;
+                    const s0 = i7Data.s0;
+                    const cosPhi = i7Data.cos_phi;
+                    const cosPhiR = utils_2.isNumericI7(i7Data.cos_phir) ? i7Data.cos_phir : assetType === null || assetType === void 0 ? void 0 : assetType.cosphir;
                     asynchronousMachine.setActivePower(i7Data.p0 * -1);
-                    asynchronousMachine.setReactivePower((i7Data.flag_ind === 1 ? i7Data.q0_ind : i7Data.q0_kap) * -1);
+                    const fag_ind = utils_2.isNumericI7(i7Data.flag_ind) ? i7Data.flag_ind : assetType === null || assetType === void 0 ? void 0 : assetType.flag_ind;
+                    asynchronousMachine.setReactivePower((fag_ind === 1 ? i7Data.q0_ind : i7Data.q0_kap) * -1);
                     asynchronousMachine.controlEnabled = false;
-                    const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
-                    util_create_1.createSvStatus(cimModel, inBetrieb, asynchronousMachine);
+                    const inBetrieb = utils_2.isBooleanI7(i7Data.betrieb) ? utils_2.convertToBooleanI7(i7Data.betrieb) : true;
+                    asynchronousMachine.normallyInService = inBetrieb;
                     const connectivityNode = cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss));
                     if (connectivityNode) {
                         util_create_1.createConnection(cimModel, asynchronousMachine, connectivityNode, PhaseCode_1.PhaseCode.ABC);
                         const equipmentContainer = this.determineEquipmentContainer('VoltageLevel', cimModel, cimModel.getObject(connectivityNode.getConnectivityNodeContainerUUID()));
                         if (equipmentContainer) {
-                            asynchronousMachine.equipmentContainerUUID = equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.mrid;
+                            equipmentContainer.addEquipment(asynchronousMachine);
+                            asynchronousMachine.equipmentContainer = equipmentContainer;
                             cimModel.addAsynchronousMachine(asynchronousMachine);
                             this.addIdMapping(i7Data.id, asynchronousMachine.mrid, integral_sql_1.Integral7TableNames.ASYNCHRONMOTOR);
                         }
@@ -1073,7 +1553,12 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KWBLOCK)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KWBLOCK, knotenSfIDs));
                 for (const i7Data of result) {
-                    const synchronousMachine = new SynchronousMachine_1.SynchronousMachine(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_SM", `_${cimModel.synchronousMachine.size}`.toString()]), i7Data.kurzname);
+                    const synchronousMachine = new INTEGRALSynchronousMachine_1.INTEGRALSynchronousMachine(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_SM"]), i7Data.kurzname);
+                    let mf = this.cimModelDefault.multiplierFactors.get(this.integralID2UUID.get(i7Data.multfaktor));
+                    if (mf) {
+                        cimModel.addMultiplierFactor(mf);
+                        synchronousMachine.multiplierFactorUUID = mf.getUUID();
+                    }
                     synchronousMachine.type = SynchronousMachineKind_1.SynchronousMachineKind.generator;
                     synchronousMachine.operatingMode = SynchronousMachineOperatingMode_1.SynchronousMachineOperatingMode.generator;
                     synchronousMachine.referencePriority = utils_2.isNumericI7(i7Data.einspprio) ? utils_2.convertToNumberI7(i7Data.einspprio) : undefined;
@@ -1086,6 +1571,7 @@ class ConverterI7 {
                     synchronousMachine.ratedS = sr;
                     const ur = utils_2.isNumericI7(i7Data.urg) ? utils_2.convertToNumberI7(i7Data.urg) : undefined;
                     synchronousMachine.ratedU = ur;
+                    const cosphir = utils_2.isNumericI7(i7Data.cosphir) ? utils_2.convertToNumberI7(i7Data.cosphir) : undefined;
                     synchronousMachine.aggregate = true;
                     const regulatingControl = new RegulatingControl_1.RegulatingControl(utils_1.generateUUID(), `RC_KWBlock ${i7Data.id}`);
                     switch (i7Data.spannungsgeregelt) {
@@ -1144,11 +1630,10 @@ class ConverterI7 {
                     generatingUnit.initialP = utils_2.isNumericI7(i7Data.p0) ? utils_2.convertToNumberI7(i7Data.p0) : undefined;
                     generatingUnit.maxOperatingP = utils_2.isNumericI7(i7Data.p_max) ? utils_2.convertToNumberI7(i7Data.p_max) : undefined;
                     generatingUnit.minOperatingP = utils_2.isNumericI7(i7Data.p_min) ? utils_2.convertToNumberI7(i7Data.p_min) : undefined;
-                    generatingUnit.nominalP = generatingUnit.maxOperatingP;
+                    generatingUnit.nominalP = utils_2.isNumericI7(cosphir) && utils_2.isNumericI7(sr) ? cosphir * sr : generatingUnit.maxOperatingP;
                     const kr = utils_2.isNumericI7(i7Data.kr) ? utils_2.convertToNumberI7(i7Data.kr) : undefined;
                     const fn = 50;
-                    const pn = generatingUnit.maxOperatingP;
-                    generatingUnit.governorSCD = (utils_2.isNumericI7(kr) && utils_2.isNumericI7(generatingUnit.nominalP)) ? utils_2.calculateSigma(fn, pn, kr) : undefined;
+                    generatingUnit.governorSCD = (utils_2.isNumericI7(kr) && utils_2.isNumericI7(generatingUnit.nominalP)) ? utils_2.calculateSigma(fn, generatingUnit.nominalP, kr) : undefined;
                     generatingUnit.addRotatingMachine(synchronousMachine);
                     synchronousMachine.generatingUnitUUID = generatingUnit.mrid;
                     this.setTopologyEnergySourceConsumerObject(cimModel, synchronousMachine, i7Data, regulatingControl, generatingUnit);
@@ -1160,26 +1645,50 @@ class ConverterI7 {
             }
         });
     }
-    convertErsatzQuerZweige(cimModel, knotenSfIDs) {
+    convertErsatzQuerZweige2ExternalNetworkInjection(cimModel, result) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.ERSATZQUERZWEIG)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.ERSATZQUERZWEIG, knotenSfIDs));
-                for (const i7Data of result) {
-                    const externalNetworkInjection = new ExternalNetworkInjection_1.ExternalNetworkInjection(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_ENI", `_${cimModel.externalNetworkInjections.size}`.toString()]), i7Data.kurzname);
-                    const usoll = utils_2.isNumericI7(i7Data.usoll) ? utils_2.convertToNumberI7(i7Data.usoll) : undefined;
-                    const kr = 0;
-                    externalNetworkInjection.governorSCD = kr;
-                    const prio = utils_2.isNumericI7(i7Data.einspprio) ? utils_2.convertToNumberI7(i7Data.einspprio) : undefined;
-                    externalNetworkInjection.referencePriority = prio;
-                    externalNetworkInjection.aggregate = true;
-                    externalNetworkInjection.ikSecond = true;
-                    this.setTopologyEnergySourceConsumerObject(cimModel, externalNetworkInjection, i7Data);
-                    cimModel.addExternalNetworkInjection(externalNetworkInjection);
-                    this.addIdMapping(i7Data.id, externalNetworkInjection.mrid, integral_sql_1.Integral7TableNames.ERSATZQUERZWEIG);
-                }
+            for (const i7Data of result) {
+                const externalNetworkInjection = new ExternalNetworkInjection_1.ExternalNetworkInjection(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_ENI"]), i7Data.kurzname);
+                const usoll = utils_2.isNumericI7(i7Data.usoll) ? utils_2.convertToNumberI7(i7Data.usoll) : undefined;
+                const governorscd = utils_2.isNumericI7(i7Data.kr) ? utils_2.convertToNumberI7(i7Data.kr) : undefined;
+                externalNetworkInjection.governorSCD = governorscd;
+                const prio = utils_2.isNumericI7(i7Data.einspprio) ? utils_2.convertToNumberI7(i7Data.einspprio) : undefined;
+                externalNetworkInjection.referencePriority = prio;
+                externalNetworkInjection.aggregate = true;
+                externalNetworkInjection.ikSecond = true;
+                this.setTopologyEnergySourceConsumerObject(cimModel, externalNetworkInjection, i7Data);
+                cimModel.addExternalNetworkInjection(externalNetworkInjection);
+                this.addIdMapping(i7Data.id, externalNetworkInjection.mrid, integral_sql_1.Integral7TableNames.ERSATZQUERZWEIG);
             }
-            else {
-                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.EINSPEISUNG} ist nicht vorhanden.`);
+        });
+    }
+    convertErsatzQuerZweige2EquivalentInjection(cimModel, result) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            for (const i7Data of result) {
+                const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
+                const einspeisePrio = utils_2.isNumericI7(i7Data.einspprio) ? utils_2.convertToNumberI7(i7Data.einspprio) : 1;
+                const flag_lfl = utils_2.convertToBooleanI7(i7Data.flag_lfl);
+                const flag_ks = utils_2.convertToBooleanI7(i7Data.flag_ks);
+                const usoll = utils_2.isNumericI7(i7Data.usoll) ? utils_2.convertToNumberI7(i7Data.usoll) : undefined;
+                const r_ext = utils_2.isNumericI7(i7Data.r_ext) ? utils_2.convertToNumberI7(i7Data.r_ext) : undefined;
+                const x_ext = utils_2.isNumericI7(i7Data.x_ext) ? utils_2.convertToNumberI7(i7Data.x_ext) : undefined;
+                const equivalentInjection = new EquivalentInjection_1.EquivalentInjection(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_EI"]), i7Data.kurzname);
+                equivalentInjection.normallyInService = inBetrieb;
+                if (flag_lfl && usoll && (r_ext || x_ext)) {
+                    equivalentInjection.regulationCapability = true;
+                    equivalentInjection.regulationStatus = true;
+                    equivalentInjection.regulationTarget = usoll;
+                    equivalentInjection.r = r_ext;
+                    equivalentInjection.r0 = 0;
+                    equivalentInjection.r2 = 0;
+                    equivalentInjection.x = x_ext;
+                    equivalentInjection.x0 = 0;
+                    equivalentInjection.x2 = 0;
+                }
+                equivalentInjection.aggregate = true;
+                this.setTopologyEnergySourceConsumerObject(cimModel, equivalentInjection, i7Data);
+                cimModel.addEquivalentInjection(equivalentInjection);
+                this.addIdMapping(i7Data.id, equivalentInjection.mrid, integral_sql_1.Integral7TableNames.ERSATZQUERZWEIG);
             }
         });
     }
@@ -1226,8 +1735,8 @@ class ConverterI7 {
             const einspeisePrio = utils_2.convertToNumberI7(i7Data.einspprio);
             externalNetworkInjection.p = utils_2.convertToNumberI7(i7Data.p_ersatznetz) + utils_2.convertToNumberI7(i7Data.p_restnetz);
             externalNetworkInjection.q = utils_2.convertToNumberI7(i7Data.q_ersatznetz) + utils_2.convertToNumberI7(i7Data.q_restnetz);
-            const kr = 0;
-            externalNetworkInjection.governorSCD = kr;
+            const governorscd = utils_2.isNumericI7(i7Data.kr) ? utils_2.convertToNumberI7(i7Data.kr) : undefined;
+            externalNetworkInjection.governorSCD = governorscd;
             externalNetworkInjection.referencePriority = einspeisePrio;
             externalNetworkInjection.maxZ0ToZ1Ratio = utils_2.convertToNumberI7(i7Data.z0_z1);
             const regulatingControl = new RegulatingControl_1.RegulatingControl(utils_1.generateUUID(), `RC_BI_${i7Data.id}`);
@@ -1242,11 +1751,12 @@ class ConverterI7 {
             this.addIdMapping(i7Data.id, externalNetworkInjection.mrid, integral_sql_1.Integral7TableNames.BOUNDARYINJECTION);
         }
     }
-    convertErsatzLaengszweige(frame, knotenSfIDs, defaultValuesConfig) {
+    convertErsatzLaengszweige(frame, integral7, defaultValuesConfig) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const cimModel = frame.cimModel;
-            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.ERSATZLAENGSZWEIG)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.ERSATZLAENGSZWEIG, knotenSfIDs));
+            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.ERSATZLAENGSZWEIG) && integral7.ersatzZweigAnschlussKnotenIDs.length) {
+                integral_sql_1.I7Objects.ERSATZLAENGSZWEIGDIFF;
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.ERSATZLAENGSZWEIG, integral7.ersatzZweigAnschlussKnotenIDs));
                 for (const i7Data of result) {
                     const i7Schluessel = integral_prefix_1.ERSATZLAENGSZWEIG_PRAEFIX +
                         utils_2.ueberpruefeZeichenkette(i7Data.ukz) +
@@ -1267,14 +1777,14 @@ class ConverterI7 {
                     else if (baseVoltageUr2) {
                         equivalentBranch.baseVoltage = baseVoltageUr2;
                     }
-                    this.createBoundaryConnection(frame, equivalentBranch, i7Data.aknoten, PhaseCode_1.PhaseCode.ABC, 1);
-                    this.createBoundaryConnection(frame, equivalentBranch, i7Data.eknoten, PhaseCode_1.PhaseCode.ABC, 2);
+                    this.createBoundaryConnection(frame, equivalentBranch, i7Data.aknoten, PhaseCode_1.PhaseCode.ABC);
+                    this.createBoundaryConnection(frame, equivalentBranch, i7Data.eknoten, PhaseCode_1.PhaseCode.ABC);
                     cimModel.addEquivalentBranch(equivalentBranch);
                     this.addIdMapping(i7Data.id, equivalentBranch.mrid, integral_sql_1.Integral7TableNames.ERSATZLAENGSZWEIG);
                 }
             }
             else {
-                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.ERSATZLAENGSZWEIG} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.ERSATZLAENGSZWEIG} ist nicht vorhanden, oder keine Ersatzlängszweige für diesen MAS Dataset definiert.`);
             }
         });
     }
@@ -1283,7 +1793,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KOMPENSATIONSDROSSEL)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KOMPENSATIONSDROSSEL, knotenSfIDs));
                 for (const i7Data of result) {
-                    const shunt = new LinearShuntCompensator_1.LinearShuntCompensator(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_LSC", `_${cimModel.linearShuntCompensators.size}`.toString()]), i7Data.kurzname);
+                    const shunt = new LinearShuntCompensator_1.LinearShuntCompensator(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_LSC"]), i7Data.kurzname);
                     shunt.normalSections = i7Data.aktstufe;
                     shunt.maximumSections = i7Data.maxstufe;
                     shunt.nomU = i7Data.ur;
@@ -1317,7 +1827,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KOMPENSATIONSKONDENSATOR)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KOMPENSATIONSKONDENSATOR, knotenSfIDs));
                 for (const i7Data of result) {
-                    const shunt = new LinearShuntCompensator_1.LinearShuntCompensator(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_LSC", `_${cimModel.linearShuntCompensators.size}`.toString()]), i7Data.kurzname);
+                    const shunt = new LinearShuntCompensator_1.LinearShuntCompensator(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_LSC"]), i7Data.kurzname);
                     shunt.normalSections = i7Data.aktstufe;
                     shunt.maximumSections = i7Data.maxstufe;
                     shunt.nomU = i7Data.ur;
@@ -1351,7 +1861,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.STATCOM)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.STATCOM, knotenSfIDs));
                 for (const i7Data of result) {
-                    const statVarCom = new StaticVarCompensator_1.StaticVarCompensator(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_SVC", `_${cimModel.staticVarCompensator.size}`.toString()]), i7Data.kurzname);
+                    const statVarCom = new StaticVarCompensator_1.StaticVarCompensator(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_SVC"]), i7Data.kurzname);
                     const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
                     const regulatingControl = utils_2.createRegulatingControl(`RC_Statcom_${i7Data.id}`, inBetrieb, UnitMultiplier_1.UnitMultiplier.k, RegulatingControlModeKind_1.RegulatingControlModeKind.voltage, cimModel, statVarCom);
                     this.setTopologyEnergySourceConsumerObject(cimModel, statVarCom, i7Data, regulatingControl);
@@ -1391,7 +1901,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.SVC)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.SVC, knotenSfIDs));
                 for (const i7Data of result) {
-                    const statVarCom = new StaticVarCompensator_1.StaticVarCompensator(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_SVC", `_${cimModel.staticVarCompensator.size}`.toString()]), i7Data.kurzname);
+                    const statVarCom = new StaticVarCompensator_1.StaticVarCompensator(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_SVC"]), i7Data.kurzname);
                     const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
                     const regulatingControl = utils_2.createRegulatingControl(`RC_SVC ${i7Data.id}`, inBetrieb, UnitMultiplier_1.UnitMultiplier.k, RegulatingControlModeKind_1.RegulatingControlModeKind.voltage, cimModel, statVarCom);
                     this.setTopologyEnergySourceConsumerObject(cimModel, statVarCom, i7Data, regulatingControl);
@@ -1431,7 +1941,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.HGUE_KOPFSTATION_KLASSISCH)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.HGUE_KOPFSTATION_KLASSISCH, knotenSfIDs));
                 for (const i7Data of result) {
-                    const dcConverterUnit = new DCConverterUnit_1.DCConverterUnit(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "_DCCU", `_${cimModel.dcConverterUnit.size}`.toString()]));
+                    const dcConverterUnit = new DCConverterUnit_1.DCConverterUnit(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "_DCCU"]));
                     const acConnectivityNode = cimModel.connectivityNodes.get(this.integralID2UUID.get(i7Data.anschluss));
                     if (acConnectivityNode) {
                         const equipmentContainer = this.determineEquipmentContainer('Substation', cimModel, acConnectivityNode.connectivityNodeContainer);
@@ -1445,7 +1955,7 @@ class ConverterI7 {
                     else {
                         this.logger.debug(`DCConverterUnit ${i7Data.id} besitzt keinen ConnectivityNode.`);
                     }
-                    const csConverter = new CsConverter_1.CsConverter(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_CSC", `_${cimModel.csConverter.size}`.toString()]), i7Data.kurzname);
+                    const csConverter = new CsConverter_1.CsConverter(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_CSC"]), i7Data.kurzname);
                     csConverter.equipmentContainer = dcConverterUnit;
                     csConverter.baseS = i7Data.pr;
                     csConverter.ratedUdc = i7Data.ur;
@@ -1467,18 +1977,17 @@ class ConverterI7 {
                         csConverter.operatingMode = CsOperatingModeKind_1.CsOperatingModeKind.rectifier;
                     }
                     const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
-                    util_create_1.createSvStatus(cimModel, inBetrieb, csConverter);
+                    csConverter.normallyInService = inBetrieb;
                     if (acConnectivityNode) {
-                        csConverter.pccTerminal = this.createConnection(cimModel, csConverter, acConnectivityNode, PhaseCode_1.PhaseCode.ABC, true, 1);
+                        csConverter.pccTerminal = this.createConnection(cimModel, csConverter, acConnectivityNode, PhaseCode_1.PhaseCode.ABC, true);
                     }
                     else {
                         this.logger.debug(`CsConverter ${i7Data.id} ${csConverter.mrid} besitzt keinen AC Anschluss.`);
                     }
-                    const dcNode = new DCNode_1.DCNode(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "_DCN", `_${cimModel.dcNodes.size}`.toString()]));
+                    const dcNode = new DCNode_1.DCNode(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "_DCN"]));
                     dcNode.dcEquipmentContainer = dcConverterUnit;
                     dcConverterUnit.dCNodes.set(dcNode.getUUID(), dcNode);
-                    const acDCConverterDCTerminal = new ACDCConverterDCTerminal_1.ACDCConverterDCTerminal(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "_ACDCC-DCT", `_${cimModel.acDCConverterDCTerminals.size}`.toString()]));
-                    acDCConverterDCTerminal.sequenceNumber = 1;
+                    const acDCConverterDCTerminal = new ACDCConverterDCTerminal_1.ACDCConverterDCTerminal(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "_ACDCC-DCT"]));
                     acDCConverterDCTerminal.dCConductingEquipment = csConverter;
                     csConverter.dCTerminals.set(acDCConverterDCTerminal.getUUID(), acDCConverterDCTerminal);
                     acDCConverterDCTerminal.dcNode = dcNode;
@@ -1498,7 +2007,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.HGUE_KOPFSTATION_VSC)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.HGUE_KOPFSTATION_VSC, knotenSfIDs));
                 for (const i7Data of result) {
-                    const dcConverterUnit = new DCConverterUnit_1.DCConverterUnit(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "_DCCU", `_${cimModel.dcConverterUnit.size}`.toString()]));
+                    const dcConverterUnit = new DCConverterUnit_1.DCConverterUnit(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "_DCCU"]));
                     const acConnectivityNode = cimModel.connectivityNodes.get(this.integralID2UUID.get(i7Data.anschluss));
                     if (acConnectivityNode) {
                         const equipmentContainer = this.determineEquipmentContainer('Substation', cimModel, acConnectivityNode.connectivityNodeContainer);
@@ -1512,7 +2021,7 @@ class ConverterI7 {
                     else {
                         this.logger.debug(`DCConverterUnit ${i7Data.id} besitzt keinen ConnectivityNode.`);
                     }
-                    const vsConverter = new VsConverter_1.VsConverter(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_VSC", `_${cimModel.vsConverter.size}`.toString()]), i7Data.kurzname);
+                    const vsConverter = new VsConverter_1.VsConverter(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_VSC"]), i7Data.kurzname);
                     vsConverter.equipmentContainer = dcConverterUnit;
                     vsConverter.baseS = i7Data.pr;
                     utils_2.isNumericI7(i7Data.udc) ? vsConverter.ratedUdc = i7Data.udc : vsConverter.ratedUdc = i7Data.ur;
@@ -1537,17 +2046,16 @@ class ConverterI7 {
                         vsConverter.qPccControl = VsQpccControlKind_1.VsQpccControlKind.powerFactorPcc;
                     }
                     const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
-                    util_create_1.createSvStatus(cimModel, inBetrieb, vsConverter);
+                    vsConverter.normallyInService = inBetrieb;
                     if (acConnectivityNode) {
                         vsConverter.pccTerminal = util_create_1.createConnection(cimModel, vsConverter, acConnectivityNode, PhaseCode_1.PhaseCode.ABC, 1);
                     }
                     else {
                         this.logger.debug(`VsConverter ${i7Data.id} ${vsConverter.mrid} besitzt keinen AC Anschluss.`);
                     }
-                    const dcNode = new DCNode_1.DCNode(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "_DCN", `_${cimModel.dcNodes.size}`.toString()]));
+                    const dcNode = new DCNode_1.DCNode(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "_DCN"]));
                     dcNode.dcEquipmentContainer = dcConverterUnit;
-                    const acDCConverterDCTerminal = new ACDCConverterDCTerminal_1.ACDCConverterDCTerminal(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "_ACDCC-DCT", `_${cimModel.acDCConverterDCTerminals.size}`.toString()]));
-                    acDCConverterDCTerminal.sequenceNumber = 1;
+                    const acDCConverterDCTerminal = new ACDCConverterDCTerminal_1.ACDCConverterDCTerminal(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "_ACDCC-DCT"]));
                     acDCConverterDCTerminal.dCConductingEquipmentUUID = vsConverter.mrid;
                     acDCConverterDCTerminal.dcNode = dcNode;
                     vsConverter.dCTerminals.set(acDCConverterDCTerminal.getUUID(), acDCConverterDCTerminal);
@@ -1567,7 +2075,7 @@ class ConverterI7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             for (const i7Data of result) {
                 try {
-                    const energySource = new EnergySource_1.EnergySource(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_ES", `_${cimModel.energySources.size}`.toString()]), i7Data.kurzname);
+                    const energySource = new EnergySource_1.EnergySource(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_ES"]), i7Data.kurzname);
                     this.setTopologyEnergySourceConsumerObject(cimModel, energySource, i7Data);
                     energySource.nominalVoltage = (_c = (_b = (_a = energySource.equipmentContainer) === null || _a === void 0 ? void 0 : _a.baseVoltage) === null || _b === void 0 ? void 0 : _b.nominalVoltage) === null || _c === void 0 ? void 0 : _c.value;
                     const prio = i7Data.einspprio;
@@ -1609,25 +2117,37 @@ class ConverterI7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             for (const i7Data of result) {
                 try {
-                    const externalNetworkInjection = new ExternalNetworkInjection_1.ExternalNetworkInjection(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_ENI", `_${cimModel.externalNetworkInjections.size}`.toString()]), i7Data.kurzname);
-                    const prio = i7Data.einspprio;
-                    externalNetworkInjection.referencePriority = prio;
-                    const usoll = i7Data.usoll;
-                    const powerData = utils_2.getActiveReactivePower(i7Data);
-                    externalNetworkInjection.p = powerData[0];
-                    externalNetworkInjection.q = powerData[1];
-                    const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
+                    const externalNetworkInjection = new INTEGRALExternalNetworkInjection_1.INTEGRALExternalNetworkInjection(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_ENI"]), i7Data.kurzname);
+                    let mf = undefined;
+                    mf = this.cimModelDefault.multiplierFactors.get(this.integralID2UUID.get(i7Data.multfaktor));
+                    if (mf) {
+                        cimModel.addMultiplierFactor(mf);
+                        externalNetworkInjection.multiplierFactorUUID = mf.getUUID();
+                    }
+                    const governorscd = utils_2.isNumericI7(i7Data.kr) ? utils_2.convertToNumberI7(i7Data.kr) : undefined;
+                    externalNetworkInjection.governorSCD = governorscd;
+                    const maxP = utils_2.isNumericI7(i7Data.p_max) ? utils_2.convertToNumberI7(i7Data.p_max) : undefined;
+                    externalNetworkInjection.maxP = maxP;
+                    const maxQ = utils_2.isNumericI7(i7Data.q_max) ? utils_2.convertToNumberI7(i7Data.q_max) : undefined;
+                    externalNetworkInjection.maxQ = maxQ;
+                    const minP = utils_2.isNumericI7(i7Data.p_min) ? utils_2.convertToNumberI7(i7Data.p_min) : undefined;
+                    externalNetworkInjection.minP = minP;
+                    const minQ = utils_2.isNumericI7(i7Data.q_min) ? utils_2.convertToNumberI7(i7Data.q_min) : undefined;
+                    externalNetworkInjection.minQ = minQ;
+                    const usoll = utils_2.isNumericI7(i7Data.usoll) ? utils_2.convertToNumberI7(i7Data.usoll) : undefined;
+                    const inBetrieb = utils_2.isBooleanI7(i7Data.betrieb) ? utils_2.convertToBooleanI7(i7Data.betrieb) : false;
                     let regulatingControl = undefined;
                     switch (i7Data.spannungsgeregelt) {
                         case 1: {
-                            regulatingControl = new RegulatingControl_1.RegulatingControl(utils_1.generateUUID(), `RC_ENI_${i7Data.id}`);
+                            regulatingControl = new RegulatingControl_1.RegulatingControl(utils_1.generateUUID(), `RC_ENI_${externalNetworkInjection.getUUID().substring(0, 8)}`);
                             regulatingControl.targetValue = usoll;
                             regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
                             regulatingControl.discrete = false;
                             regulatingControl.enabled = inBetrieb;
                             externalNetworkInjection.controlEnabled = inBetrieb;
                             regulatingControl.addRegulatingCondEq(externalNetworkInjection);
-                            externalNetworkInjection.regulatingControlUUID = regulatingControl.mrid;
+                            externalNetworkInjection.regulatingControl = regulatingControl;
+                            this.setTapChangerControl;
                             cimModel.addRegulatingControl(regulatingControl);
                             break;
                         }
@@ -1636,11 +2156,18 @@ class ConverterI7 {
                         }
                     }
                     this.setTopologyEnergySourceConsumerObject(cimModel, externalNetworkInjection, i7Data, regulatingControl);
+                    const prio = utils_2.isNumericI7(i7Data.einspprio) ? utils_2.convertToNumberI7(i7Data.einspprio) : undefined;
+                    if ((regulatingControl === null || regulatingControl === void 0 ? void 0 : regulatingControl.mode) === RegulatingControlModeKind_1.RegulatingControlModeKind.voltage) {
+                        externalNetworkInjection.referencePriority = prio;
+                    }
+                    const powerData = utils_2.getActiveReactivePower(i7Data);
+                    externalNetworkInjection.p = powerData[0];
+                    externalNetworkInjection.q = powerData[1];
                     cimModel.addExternalNetworkInjection(externalNetworkInjection);
                     this.addIdMapping(i7Data.id, externalNetworkInjection.mrid, integral_sql_1.I7Objects.EINSPEISUNG);
                 }
                 catch (err) {
-                    this.logger.error(`Err convertEinspeisungen2EquivalentInjection ${i7Data.id} ${err}`);
+                    this.logger.error(`Err convertEinspeisungen2ExternalNetworkInjection ${i7Data.id} ${err}`);
                 }
             }
         });
@@ -1648,7 +2175,7 @@ class ConverterI7 {
     setTopologyEnergySourceConsumerObject(cimModel, condEquip, i7Data, regulatingControl, generatingUnit) {
         var _a, _b;
         const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
-        util_create_1.createSvStatus(cimModel, inBetrieb, condEquip);
+        condEquip.normallyInService = inBetrieb;
         const connectivityNode = cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss));
         if (connectivityNode) {
             const terminal = this.createConnection(cimModel, condEquip, connectivityNode, PhaseCode_1.PhaseCode.ABC, true);
@@ -1658,9 +2185,24 @@ class ConverterI7 {
             if (equipmentContainer) {
                 condEquip.equipmentContainer = equipmentContainer;
                 equipmentContainer.addEquipment(condEquip);
-                const i7Schluesel = utils_2.getDescription(equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getSubstation()) +
-                    integral_prefix_1.EINSPEISUNG_PRAEFIX + i7Data.bezeichner;
-                condEquip.description = i7Schluesel;
+                let i7Schluessel = '';
+                if (condEquip instanceof EnergyConsumer_1.EnergyConsumer) {
+                    i7Schluessel = utils_2.getDescription(equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getSubstation()) +
+                        integral_prefix_1.BELASTUNG_PRAEFIX + i7Data.bezeichner;
+                }
+                else if (condEquip instanceof EquivalentInjection_1.EquivalentInjection) {
+                    i7Schluessel = utils_2.getDescription(equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getSubstation()) +
+                        integral_prefix_1.ERSATZQUERZWEIG_PRAEFIX + i7Data.bezeichner;
+                }
+                else if (condEquip instanceof StaticVarCompensator_1.StaticVarCompensator) {
+                    i7Schluessel = utils_2.getDescription(equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getSubstation()) +
+                        integral_prefix_1.STATCOM_PRAEFIX + i7Data.bezeichner;
+                }
+                else if (condEquip instanceof ExternalNetworkInjection_1.ExternalNetworkInjection) {
+                    i7Schluessel = utils_2.getDescription(equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getSubstation()) +
+                        integral_prefix_1.EINSPEISUNG_PRAEFIX + i7Data.bezeichner;
+                }
+                condEquip.description = i7Schluessel;
                 if (generatingUnit) {
                     const substation = this.determineEquipmentContainer('Substation', cimModel, equipmentContainer);
                     generatingUnit.equipmentContainer = substation;
@@ -1679,8 +2221,8 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.QUERKUPPLUNG)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.QUERKUPPLUNG, schaltanlagenAbschnittIDs));
                 for (const i7Data of result) {
-                    const bay = new AMPRIONBay_1.AMPRIONBay(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_B", `_${cimModel.bays.size}`.toString()]), 'Querkupplung');
-                    bay.number = i7Data.feldnummer + '';
+                    const bay = new AMPRIONBay_1.AMPRIONBay(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_B"]), 'Querkupplung');
+                    bay.number = utils_2.isNumericI7(i7Data.feldnummer) ? utils_2.convertToNumberI7(i7Data.feldnummer).toString() : undefined;
                     bay.locationID = i7Data.ips_folder_id;
                     const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Data.saabschnitt));
                     if (voltageLevel) {
@@ -1709,9 +2251,9 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSKUPPLUNG)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.LAENGSKUPPLUNG, schaltanlagenIDs));
                 for (const i7Data of result) {
-                    const bay = new AMPRIONBay_1.AMPRIONBay(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_B", `_${cimModel.bays.size}`.toString()]), i7Data.kurzname, 'Laengskupplung');
+                    const bay = new AMPRIONBay_1.AMPRIONBay(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_B"]), i7Data.kurzname, 'Laengskupplung');
                     const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Data.schaltanlage));
-                    bay.number = i7Data.feldnummer + '';
+                    bay.number = utils_2.isNumericI7(i7Data.feldnummer) ? utils_2.convertToNumberI7(i7Data.feldnummer).toString() : undefined;
                     bay.locationID = i7Data.ips_folder_id;
                     if (voltageLevel) {
                         bay.voltageLevel = voltageLevel;
@@ -1724,6 +2266,8 @@ class ConverterI7 {
                     else {
                         this.logger.debug(`Laengskupplung ${i7Data.id} besitzt keine Anlage.`);
                     }
+                    const lKupplungImpl = new Laengskupplung_1.LaengskupplungImpl(i7Data);
+                    integral7.integralLaengskupplungen.set(i7Data.id, lKupplungImpl);
                     integral7.laengskupplungIDs.push(i7Data.id);
                     this.addIdMapping(i7Data.id, bay.mrid, integral_sql_1.Integral7TableNames.LAENGSKUPPLUNG);
                     cimModel.addBay(bay);
@@ -1739,7 +2283,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KNOTEN_STARR)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KNOTEN_STARR, containerIDs));
                 for (const i7Data of result) {
-                    const breaker = new Breaker_1.Breaker(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_BR", `_${cimModel.breakers.size}`.toString()]), 'Breaker', 'starre Verbindung');
+                    const breaker = new Breaker_1.Breaker(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_BR"]), 'Breaker', 'starre Verbindung');
                     yield this.convertSwitch(breaker, cimModel, i7Data);
                     cimModel.addBreaker(breaker);
                     this.addIdMapping(i7Data.id, breaker.mrid, integral_sql_1.Integral7TableNames.LEISTUNGSSCHALTER);
@@ -1755,7 +2299,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TRENNERFI_3P)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TRENNERFI_3P, containerIDs));
                 for (const i7Data of result) {
-                    const disconnector = new Disconnector_1.Disconnector(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_D", `_${cimModel.disconnectors.size}`.toString()]));
+                    const disconnector = new Disconnector_1.Disconnector(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_D"]));
                     yield this.convertSwitch(disconnector, cimModel, i7Data);
                     cimModel.addDisconnector(disconnector);
                     this.addIdMapping(i7Data.id, disconnector.mrid, integral_sql_1.Integral7TableNames.TRENNERFI_3P);
@@ -1771,7 +2315,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TRENNER_3P)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TRENNER_3P, containerIDs));
                 for (const i7Data of result) {
-                    const disconnector = new Disconnector_1.Disconnector(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_D", `_${cimModel.disconnectors.size}`.toString()]));
+                    const disconnector = new Disconnector_1.Disconnector(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_D"]));
                     yield this.convertSwitch(disconnector, cimModel, i7Data);
                     cimModel.addDisconnector(disconnector);
                     this.addIdMapping(i7Data.id, disconnector.mrid, integral_sql_1.Integral7TableNames.TRENNER_3P);
@@ -1787,7 +2331,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LEISTUNGSSCHALTER)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.LEISTUNGSSCHALTER, containerIDs));
                 for (const i7Data of result) {
-                    const breaker = new Breaker_1.Breaker(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_BR", `_${cimModel.breakers.size}`.toString()]));
+                    const breaker = new Breaker_1.Breaker(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_BR"]));
                     yield this.convertSwitch(breaker, cimModel, i7Data);
                     cimModel.addBreaker(breaker);
                     this.addIdMapping(i7Data.id, breaker.mrid, integral_sql_1.Integral7TableNames.LEISTUNGSSCHALTER);
@@ -1814,13 +2358,13 @@ class ConverterI7 {
                 this.logger.debug(`Schalter ${i7Data.id} besitzt keinen EquipmentContainer.`);
             }
             if (cnStart) {
-                this.createConnection(cimModel, swtch, cnStart, PhaseCode_1.PhaseCode.ABC, true, 1);
+                this.createConnection(cimModel, swtch, cnStart, PhaseCode_1.PhaseCode.ABC, true);
             }
             else {
                 this.logger.debug(`Schalter ${i7Data.id} besitzt keinen Anfangsknoten.`);
             }
             if (cnZiel) {
-                this.createConnection(cimModel, swtch, cnZiel, PhaseCode_1.PhaseCode.ABC, true, 2);
+                this.createConnection(cimModel, swtch, cnZiel, PhaseCode_1.PhaseCode.ABC, true);
             }
             else {
                 this.logger.debug(`Schalter ${i7Data.id} besitzt keinen Zielknoten.`);
@@ -1840,7 +2384,7 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSDROSSEL)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.LAENGSDROSSEL, 0, 0, []));
                 for (const i7Data of result) {
-                    const seriesCompensator = new AMPRIONSeriesCompensator_1.AMPRIONSeriesCompensator(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_SC", `_${cimModel.seriesCompensators.size}`.toString()]), i7Data.id + '', 'LD-' + i7Data.bezeichner);
+                    const seriesCompensator = new AMPRIONSeriesCompensator_1.AMPRIONSeriesCompensator(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_SC"]), i7Data.kurzname, i7Data.kommentar + '; LD-' + i7Data.bezeichner);
                     const start = cimModel.objects.get(this.integralID2UUID.get(i7Data.aknoten));
                     let startTerminal;
                     if (start) {
@@ -1859,17 +2403,17 @@ class ConverterI7 {
                     }
                     const ur = utils_2.getU(i7Data.ur, defaultValuesConfig.DefaultVoltage);
                     const baseVoltage = util_create_1.createBaseVoltageIfNotExists(cimModel, ur, this.exportFramesBoundary);
-                    const i = utils_2.isNumericI7(i7Data.ir) ? utils_2.convertToNumberI7(i7Data.ir) : defaultValuesConfig.SeriesCompensator.varistorRatedCurrent;
+                    const ir = utils_2.isNumericI7(i7Data.ir) ? utils_2.convertToNumberI7(i7Data.ir) : defaultValuesConfig.SeriesCompensator.varistorRatedCurrent;
                     const ukr = utils_2.isNumericI7(i7Data.ukr) ? utils_2.convertToNumberI7(i7Data.ukr) : 0;
-                    if (i > 0 && ukr > 0) {
+                    if (ir > 0 && ukr > 0) {
                         const voltage = baseVoltage.nominalVoltage.value * 1000;
-                        const z = (ukr / 100) * Math.pow(voltage, 2) / (voltage * i * Math.sqrt(3));
+                        const z = (ukr / 100) * Math.pow(voltage, 2) / (voltage * ir * Math.sqrt(3));
                         seriesCompensator.x = z;
                     }
-                    seriesCompensator.varistorRatedCurrent = i;
+                    seriesCompensator.varistorRatedCurrent = ir;
                     const terminal = startTerminal;
                     if (terminal) {
-                        this.setConductingEquipmentCurrentLimit(cimModel, 'Rating ' + seriesCompensator.name, terminal.mrid, i);
+                        this.setConductingEquipmentCurrentLimit(cimModel, 'Rating ' + seriesCompensator.name, terminal.mrid, ir);
                     }
                     else {
                         this.logger.debug(`Längsdrossel ${i7Data.id} ${seriesCompensator.mrid} besitzt keine Terminalinstanz.`);
@@ -1915,8 +2459,8 @@ class ConverterI7 {
                     for (const i7DataSchiene of stpSchiene) {
                         try {
                             stpSchieneIDs.push(i7DataSchiene.id);
-                            const connectivityNode = new ConnectivityNode_1.ConnectivityNode(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7DataSchiene), "_CN", `_${cimModel.connectivityNodes.size}`.toString()]), `StpSchiene_${i7DataSchiene.id}`);
-                            const junction = new Junction_1.Junction(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7DataSchiene), "_J", `_${cimModel.junctions.size}`.toString()]), `StpSchiene/${i7DataSchiene.id}`);
+                            const connectivityNode = new ConnectivityNode_1.ConnectivityNode(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7DataSchiene), "_CN"]), `StpSchiene_${i7DataSchiene.id}`);
+                            const junction = new Junction_1.Junction(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7DataSchiene), "_J"]), `StpSchiene/${i7DataSchiene.id}`);
                             const equipmentContainer = this.determineEquipmentContainer('VoltageLevel', cimModel, cimModel.getObject(this.integralID2UUID.get(i7DataSchiene.id)));
                             if (equipmentContainer) {
                                 equipmentContainer.addEquipment(junction);
@@ -1959,14 +2503,14 @@ class ConverterI7 {
                                 const junctionUUID = integral7.sternPunktImpModel.stpSchieneJunctionUUIDs.get((i7Data.anschluss));
                                 let conductingEquip;
                                 if (imax && imin) {
-                                    const petersenCoil = new PetersenCoil_1.PetersenCoil(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_PC", `_${cimModel.petersenCoils.size}`.toString()]), i7Data.id + '');
+                                    const petersenCoil = new PetersenCoil_1.PetersenCoil(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_PC"]), i7Data.kurzname);
                                     integral7.sternPunktImpModel.petersenCoils.set(petersenCoil.mrid, petersenCoil);
                                     integral7.sternPunktImpModel.junctionUUIDstpImp.set(junctionUUID, petersenCoil);
                                     this.addIdMapping(i7Data.id, petersenCoil.mrid, integral_sql_1.Integral7TableNames.STERNPUNKT_IMPEDANZ);
                                     conductingEquip = petersenCoil;
                                 }
                                 else {
-                                    const groundingImpedance = new GroundingImpedance_1.GroundingImpedance(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_GI", `_${cimModel.groundingImpedances.size}`.toString()]), i7Data.id + '');
+                                    const groundingImpedance = new GroundingImpedance_1.GroundingImpedance(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_GI"]), i7Data.kurzname);
                                     groundingImpedance.r = utils_2.isNumericI7(i7Data.rne) ? i7Data.rne : (utils_2.isNumericI7(kdType === null || kdType === void 0 ? void 0 : kdType.rne) ? kdType === null || kdType === void 0 ? void 0 : kdType.rne : undefined);
                                     groundingImpedance.x = utils_2.isNumericI7(i7Data.xne) ? i7Data.xne : (utils_2.isNumericI7(kdType === null || kdType === void 0 ? void 0 : kdType.xne) ? kdType === null || kdType === void 0 ? void 0 : kdType.xne : undefined);
                                     integral7.sternPunktImpModel.groundingImpedances.set(groundingImpedance.mrid, groundingImpedance);
@@ -2034,9 +2578,9 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSKUPPLUNG)) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.LAENGSKUPPLUNG, schaltanlagenIDs));
                 for (const i7Data of result) {
-                    const bay = new AMPRIONBay_1.AMPRIONBay(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_B", `_${cimModel.bays.size}`.toString()]), i7Data.kurzname, 'Laengskupplung');
+                    const bay = new AMPRIONBay_1.AMPRIONBay(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_B"]), i7Data.kurzname, 'Laengskupplung');
                     const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Data.schaltanlage));
-                    bay.number = i7Data.feldnummer + '';
+                    bay.number = utils_2.isNumericI7(i7Data.feldnummer) ? utils_2.convertToNumberI7(i7Data.feldnummer).toString() : undefined;
                     bay.locationID = i7Data.ips_folder_id;
                     if (voltageLevel) {
                         bay.voltageLevel = voltageLevel;
@@ -2049,6 +2593,8 @@ class ConverterI7 {
                     else {
                         this.logger.debug(`Laengskupplung ${i7Data.id} besitzt keine Anlage.`);
                     }
+                    const lKupplungImpl = new Laengskupplung_1.LaengskupplungImpl(i7Data);
+                    integral7.integralLaengskupplungen.set(i7Data.id, lKupplungImpl);
                     integral7.laengskupplungIDs.push(i7Data.id);
                     this.addIdMapping(i7Data.id, bay.mrid, integral_sql_1.Integral7TableNames.LAENGSKUPPLUNG);
                     cimModel.addBay(bay);
@@ -2136,7 +2682,7 @@ class ConverterI7 {
                         utils_2.ueberpruefeZeichenkette(i7Data.bezeichner) +
                         '-' +
                         utils_2.ueberpruefeZeichenkette(i7Data.stkabname);
-                    const line = new AMPRIONLine_1.AMPRIONLine(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([name, "_L", `_${cimModel.lines.size}`.toString()]), i7Data.stkabname, i7Schluessel);
+                    const line = new AMPRIONLine_1.AMPRIONLine(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([name, "_L"]), i7Data.stkabname, i7Schluessel);
                     line.ukz = i7Data.ukz;
                     let acLineSegments = [];
                     for (const stk of stromkreisabschnitte) {
@@ -2146,18 +2692,21 @@ class ConverterI7 {
                             utils_2.ueberpruefeZeichenkette(i7Data.bezeichner) +
                             '-' +
                             utils_2.ueberpruefeZeichenkette(stk.bezeichner);
-                        const acLineSegment = new ACLineSegment_1.ACLineSegment(utils_1.generateUUID(), util_create_1.createNotation([name, "_ACLS", `_${cimModel.acLineSegments.size}`.toString(), `_${acLineSegments.length}`.toString()]), i7Data.stkabname, i7Schluessel);
+                        const acLineSegment = new INTEGRALACLineSegment_1.INTEGRALACLineSegment(utils_1.getUUID(stk.custom_guid_0120 + stk.custom_guid_2137), util_create_1.createNotation([name, stk.pos.toString(), "_ACLS"]), i7Data.stkabname, i7Schluessel);
+                        let mf = this.cimModelDefault.multiplierFactors.get(this.integralID2UUID.get(stk.multfaktor));
+                        if (mf) {
+                            cimModel.addMultiplierFactor(mf);
+                            acLineSegment.multiplierFactorUUID = mf.getUUID();
+                        }
                         acLineSegment.equipmentContainer = line;
                         line.addEquipment(acLineSegment);
                         acLineSegments.push(acLineSegment);
                         this.addIdMapping(stk.id, acLineSegment.mrid, integral_sql_1.Integral7TableNames.LEITUNG);
                     }
-                    let tmp_sequence_number = 1;
                     const acLineSegmentStart = acLineSegments[0];
-                    const startTerminal = this.createBoundaryConnection(frame, acLineSegmentStart, i7Data.aknoten, PhaseCode_1.PhaseCode.ABC, tmp_sequence_number);
+                    const startTerminal = this.createBoundaryConnection(frame, acLineSegmentStart, i7Data.aknoten, PhaseCode_1.PhaseCode.ABC);
                     let equivalentInjection = undefined;
                     if (startTerminal) {
-                        tmp_sequence_number++;
                         let bdf = this.getConnectedBoundaryModel(this.integralID2UUID.get(i7Data.aknoten));
                         let tmp_cn = bdf === null || bdf === void 0 ? void 0 : bdf.cimModel.getConnectivityNode(startTerminal.getConnectivityNodeUUID());
                         if (tmp_cn && tmp_cn.boundaryPoint) {
@@ -2175,31 +2724,29 @@ class ConverterI7 {
                         this.logger.debug(`Leitung ${i7Data.id} ${acLineSegmentStart.mrid} besitzt keinen Anfangsknoten. ${i7Data.aknoten} ${this.integralID2UUID.get(i7Data.aknoten)}`);
                     }
                     cimModel.addACLineSegment(acLineSegmentStart);
-                    this.setACLineSegmentProperties(cimModel, acLineSegments[0], stromkreisabschnitte[0], defaultValuesConfig);
+                    this.setACLineSegmentProperties(this.cimModelDefault, acLineSegments[0], stromkreisabschnitte[0], defaultValuesConfig);
                     const anzahl = acLineSegments.length;
                     let tmp_terminal = undefined;
                     for (let i = 0; i < anzahl - 1; i++) {
-                        const cn = new ConnectivityNode_1.ConnectivityNode(utils_1.generateUUID(), util_create_1.createNotation([name, "_CN", `_${cimModel.connectivityNodes.size}`.toString()]));
+                        const cn = new ConnectivityNode_1.ConnectivityNode(utils_1.generateUUID(), util_create_1.createNotation([name, "_CN"]));
                         const acLineSegment1 = acLineSegments[i];
-                        tmp_terminal = this.createConnection(cimModel, acLineSegment1, cn, PhaseCode_1.PhaseCode.ABC, true, tmp_sequence_number);
+                        tmp_terminal = this.createConnection(cimModel, acLineSegment1, cn, PhaseCode_1.PhaseCode.ABC, true);
                         cimModel.addACLineSegment(acLineSegment1);
                         if (tmp_terminal) {
-                            tmp_sequence_number++;
                             tmp_terminal = undefined;
                         }
-                        this.setACLineSegmentProperties(cimModel, acLineSegments[i], stromkreisabschnitte[i], defaultValuesConfig);
+                        this.setACLineSegmentProperties(this.cimModelDefault, acLineSegments[i], stromkreisabschnitte[i], defaultValuesConfig);
                         const acLineSegment2 = acLineSegments[i + 1];
-                        tmp_terminal = this.createConnection(cimModel, acLineSegment2, cn, PhaseCode_1.PhaseCode.ABC, true, tmp_sequence_number);
+                        tmp_terminal = this.createConnection(cimModel, acLineSegment2, cn, PhaseCode_1.PhaseCode.ABC, true);
                         cimModel.addACLineSegment(acLineSegment1);
                         if (tmp_terminal) {
-                            tmp_sequence_number++;
                             tmp_terminal = undefined;
                         }
                         cn.connectivityNodeContainer = acLineSegment1.equipmentContainer;
                         cimModel.addConnectivityNode(cn);
                     }
                     const acLineSegmentZiel = acLineSegments[anzahl - 1];
-                    const targetTerminal = this.createBoundaryConnection(frame, acLineSegmentZiel, i7Data.eknoten, PhaseCode_1.PhaseCode.ABC, tmp_sequence_number);
+                    const targetTerminal = this.createBoundaryConnection(frame, acLineSegmentZiel, i7Data.eknoten, PhaseCode_1.PhaseCode.ABC);
                     if (targetTerminal) {
                         let bdf = this.getConnectedBoundaryModel(this.integralID2UUID.get(i7Data.eknoten));
                         let tmp_cn = bdf === null || bdf === void 0 ? void 0 : bdf.cimModel.getConnectivityNode(targetTerminal.getConnectivityNodeUUID());
@@ -2225,9 +2772,6 @@ class ConverterI7 {
                         for (const acLineSegment of acLineSegments) {
                             acLineSegment.baseVoltage = stkBaseVoltage.baseVoltage;
                         }
-                        if (equivalentInjection) {
-                            equivalentInjection.baseVoltage = stkBaseVoltage.baseVoltage;
-                        }
                     }
                     let idx = 0;
                     while (idx < acLineSegments.length && !(line.subGeographicalRegion)) {
@@ -2269,11 +2813,11 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSKONDENSATOR) && integral7.lKondensatorAnschlussKnotenIDs) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.LAENGSKONDENSATOR, integral7.lKondensatorAnschlussKnotenIDs));
                 for (const i7Data of result) {
-                    const seriesCompensator = new AMPRIONSeriesCompensator_1.AMPRIONSeriesCompensator(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_SC", `_${cimModel.seriesCompensators.size}`.toString()]), i7Data.id + '', i7Data.bezeichner);
+                    const seriesCompensator = new AMPRIONSeriesCompensator_1.AMPRIONSeriesCompensator(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_SC"]), i7Data.kurzname);
                     const start = cimModel.getObject(this.integralID2UUID.get(i7Data.aknoten));
                     let startTerminal;
                     if (start) {
-                        startTerminal = this.createConnection(cimModel, seriesCompensator, start, PhaseCode_1.PhaseCode.ABC, true, 1);
+                        startTerminal = this.createConnection(cimModel, seriesCompensator, start, PhaseCode_1.PhaseCode.ABC, true);
                     }
                     else {
                         this.logger.debug(`Längskondensator ${i7Data.id} ${seriesCompensator.mrid} besitzt keinen Anfangsknoten.`);
@@ -2281,7 +2825,7 @@ class ConverterI7 {
                     const target = cimModel.getObject(this.integralID2UUID.get(i7Data.eknoten));
                     let targetTerminal;
                     if (target) {
-                        targetTerminal = this.createConnection(cimModel, seriesCompensator, target, PhaseCode_1.PhaseCode.ABC, true, 1);
+                        targetTerminal = this.createConnection(cimModel, seriesCompensator, target, PhaseCode_1.PhaseCode.ABC, true);
                     }
                     else {
                         this.logger.debug(`Längskondensator ${i7Data.id} ${seriesCompensator.mrid} besitzt keinen Zielknoten.`);
@@ -2332,10 +2876,10 @@ class ConverterI7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.HGUE_LEITUNG) && integral7.hgueAnschlussKnotenIDs.length) {
                 const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.HGUE_LEITUNG, integral7.hgueAnschlussKnotenIDs));
                 for (const i7Data of result) {
-                    const dcLine = new DCLine_1.DCLine(utils_1.getUUID(i7Data['guid_dcline']), util_create_1.createNotation([utils_2.getName(i7Data), "_DCL", `_${cimModel.dcLines.size}`.toString()]));
+                    const dcLine = new DCLine_1.DCLine(utils_1.getUUID(i7Data.guid_dcline), util_create_1.createNotation([utils_2.getName(i7Data), "_DCL"]));
                     const i7Schluessel = integral_prefix_1.HGUELEITUNG_PRAEFIX +
                         utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
-                    const dcLineSegment = new DCLineSegment_1.DCLineSegment(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "_DCLS", `_${cimModel.dcLineSegment.size}`.toString()]), i7Data.id.toString(), i7Schluessel);
+                    const dcLineSegment = new DCLineSegment_1.DCLineSegment(utils_1.getUUID(i7Data.guidp), util_create_1.createNotation([utils_2.getName(i7Data), "_DCLS"]), i7Data.kurzname, i7Schluessel);
                     dcLineSegment.resistance = i7Data.rdc;
                     dcLineSegment.equipmentContainer = dcLine;
                     const bipol = utils_2.convertToBooleanI7(i7Data.bipol);
@@ -2361,9 +2905,8 @@ class ConverterI7 {
                     }
                     const startDCNode = getDCNodeFromConverter(acDCConverterStart);
                     if (startDCNode) {
-                        const dcTerminal = new DCTerminal_1.DCTerminal(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "_DCT", `_${cimModel.dcTerminals.size}`.toString()]));
+                        const dcTerminal = new DCTerminal_1.DCTerminal(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "_DCT"]));
                         dcTerminal.connected = true;
-                        dcTerminal.sequenceNumber = 1;
                         dcTerminal.dCConductingEquipment = dcLineSegment;
                         dcTerminal.dcNode = startDCNode;
                         startDCNode.dcTerminals.set(dcTerminal.getUUID(), dcTerminal);
@@ -2374,9 +2917,8 @@ class ConverterI7 {
                     }
                     const targetDCNode = getDCNodeFromConverter(acDCConverterTarget);
                     if (targetDCNode) {
-                        const dcTerminal = new DCTerminal_1.DCTerminal(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "_DCT", `_${cimModel.dcTerminals.size}`.toString()]));
+                        const dcTerminal = new DCTerminal_1.DCTerminal(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), "_DCT"]));
                         dcTerminal.connected = true;
-                        dcTerminal.sequenceNumber = 2;
                         dcTerminal.dCConductingEquipment = dcLineSegment;
                         dcTerminal.dcNode = targetDCNode;
                         targetDCNode.dcTerminals.set(dcTerminal.getUUID(), dcTerminal);
@@ -2461,6 +3003,52 @@ class ConverterI7 {
             }
         });
     }
+    convertBetriebsmitteltypenGenerator() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TYP_GENERATOR)) {
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TYP_GENERATOR, []));
+                for (const i7Data of result) {
+                    this.generatorTypen.set(i7Data.name, i7Data);
+                }
+            }
+            else {
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.TYP_GENERATOR} ist nicht vorhanden.`);
+            }
+        });
+    }
+    convertBetriebsmitteltypenAsynchronmotor() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TYP_ASYNCHRONMOTOR)) {
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TYP_ASYNCHRONMOTOR, []));
+                for (const i7Data of result) {
+                    this.asynchronmotorTypen.set(i7Data.name, i7Data);
+                }
+            }
+            else {
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.TYP_ASYNCHRONMOTOR} ist nicht vorhanden.`);
+            }
+        });
+    }
+    convertMultiplikationsfaktoren() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.MULTIPLIKATIONSFAKTOR)) {
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.MULTIPLIKATIONSFAKTOR, []));
+                for (const i7Data of result) {
+                    const multFaktor = new INTEGRALMultiplierFactor_1.INTEGRALMultiplierFactor(utils_1.getUUID(undefined), utils_2.getName(i7Data), i7Data.kurzname, i7Data.kommentar);
+                    multFaktor.p = utils_2.isNumericI7(i7Data.p) ? utils_2.convertToNumberI7(i7Data.p) : 1;
+                    multFaktor.qInd = utils_2.isNumericI7(i7Data.q_ind) ? utils_2.convertToNumberI7(i7Data.q_ind) : 1;
+                    multFaktor.qKap = utils_2.isNumericI7(i7Data.q_kap) ? utils_2.convertToNumberI7(i7Data.q_kap) : 1;
+                    multFaktor.cosPhiInd = utils_2.isNumericI7(i7Data.cos_phi_ind) ? utils_2.convertToNumberI7(i7Data.cos_phi_ind) : 1;
+                    multFaktor.cosPhiKap = utils_2.isNumericI7(i7Data.cos_phi_kap) ? utils_2.convertToNumberI7(i7Data.cos_phi_kap) : 1;
+                    this.cimModelDefault.addMultiplierFactor(multFaktor);
+                    this.addIdMapping(i7Data.id, multFaktor.mrid, integral_sql_1.Integral7TableNames.MULTIPLIKATIONSFAKTOR);
+                }
+            }
+            else {
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.MULTIPLIKATIONSFAKTOR} ist nicht vorhanden.`);
+            }
+        });
+    }
     convertTrafo2W(frame, integral7, defaultValuesConfig, standortIDs) {
         var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -2479,7 +3067,7 @@ class ConverterI7 {
                     }
                 }
                 for (const i7Data of result) {
-                    const powerTransformer = new PowerTransformer_1.PowerTransformer(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_PT", `_${cimModel.powerTransformer.size}`.toString()]), i7Data.id + '', i7Data.bezeichner);
+                    const powerTransformer = new PowerTransformer_1.PowerTransformer(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_PT"]), i7Data.kurzname, i7Data.kommentar);
                     const substation = cimModel.getSubstation(this.integralID2UUID.get(i7Data.standort));
                     if (substation) {
                         powerTransformer.equipmentContainer = substation;
@@ -2502,15 +3090,15 @@ class ConverterI7 {
                     const sr = utils_2.getSrTrafo(i7Data, powerTransformerInfo, powerTransformerEnd1.endNumber, false);
                     const ur = utils_2.getUrTrafo(i7Data, powerTransformerInfo, powerTransformerEnd1.endNumber);
                     const ir1 = sr * 1000000 / (ur * 1000 * Math.sqrt(3));
-                    const p0 = utils_2.isNumericI7(i7Data.p_leer) ? utils_2.convertToNumberI7(i7Data.p_leer) : 0;
-                    const iLeer = utils_2.isNumericI7(i7Data.i_leer) ? utils_2.convertToNumberI7(i7Data.i_leer) : 0;
+                    const pLeer = utils_2.isNumericI7(i7Data.p_leer) ? utils_2.getTrafoPleer(i7Data, powerTransformerInfo) : 0;
+                    const iLeer = utils_2.isNumericI7(i7Data.i_leer) ? utils_2.getTrafoIleer(i7Data, powerTransformerInfo) : 0;
                     powerTransformerEnd1.r = utils_2.calculateR(ur, pkr, sr);
                     powerTransformerEnd1.x = utils_2.calculateX(ur, ukr, sr, powerTransformerEnd1.r);
-                    powerTransformerEnd1.g = utils_2.calculateG(ur, p0);
-                    powerTransformerEnd1.b = utils_2.calculateB(ur, sr, iLeer, p0);
+                    powerTransformerEnd1.g = utils_2.calculateG(ur, pLeer);
+                    powerTransformerEnd1.b = utils_2.calculateB(ur, sr, iLeer, pLeer);
                     powerTransformerEnd1.ratedU = ur;
                     powerTransformerEnd1.ratedS = sr;
-                    const startTerminal = this.createBoundaryConnection(frame, powerTransformer, i7Data.aknoten, PhaseCode_1.PhaseCode.ABC, 1);
+                    const startTerminal = this.createBoundaryConnection(frame, powerTransformer, i7Data.aknoten, PhaseCode_1.PhaseCode.ABC);
                     if (!startTerminal)
                         this.logger.debug(`PowerTransformer2W ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Anfangsknoten.`);
                     this.setPowerTransformerEndProperties(frame, powerTransformerEnd1, powerTransformer, startTerminal, sternpunktKnotenMap, integral7, ir1, i7Data, defaultValuesConfig);
@@ -2520,8 +3108,6 @@ class ConverterI7 {
                         let tmp_cn = bdf === null || bdf === void 0 ? void 0 : bdf.cimModel.getConnectivityNode(startTerminal.getConnectivityNodeUUID());
                         if (tmp_cn && tmp_cn.boundaryPoint) {
                             equivalentInjection = this.createBoundaryEquivalentInjection(frame, tmp_cn);
-                            let baseVoltage = powerTransformerEnd1.getBaseVoltage();
-                            equivalentInjection.baseVoltage = baseVoltage;
                         }
                     }
                     const powerTransformerEnd2 = new PowerTransformerEnd_1.PowerTransformerEnd(utils_1.getUUID(i7Data.guid_w2), `W2${powerTransformer.name}`);
@@ -2533,7 +3119,7 @@ class ConverterI7 {
                     powerTransformerEnd2.ratedS = sr2;
                     powerTransformerEnd2.ratedU = ur2;
                     const ir2 = (sr * Math.pow(10, 6) / ur2 * 1000) / Math.sqrt(3);
-                    const zielTerminal = this.createBoundaryConnection(frame, powerTransformer, i7Data.eknoten, PhaseCode_1.PhaseCode.ABC, 2);
+                    const zielTerminal = this.createBoundaryConnection(frame, powerTransformer, i7Data.eknoten, PhaseCode_1.PhaseCode.ABC);
                     if (!zielTerminal)
                         this.logger.debug(`PowerTransformer2W ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Zielknoten.`);
                     this.setPowerTransformerEndProperties(frame, powerTransformerEnd2, powerTransformer, zielTerminal, sternpunktKnotenMap, integral7, ir2, i7Data, defaultValuesConfig);
@@ -2542,8 +3128,6 @@ class ConverterI7 {
                         let tmp_cn = bdf === null || bdf === void 0 ? void 0 : bdf.cimModel.getConnectivityNode(zielTerminal.getConnectivityNodeUUID());
                         if (tmp_cn && tmp_cn.boundaryPoint) {
                             equivalentInjection = this.createBoundaryEquivalentInjection(frame, tmp_cn);
-                            let baseVoltage = powerTransformerEnd2.getBaseVoltage();
-                            equivalentInjection.baseVoltage = baseVoltage;
                         }
                     }
                     powerTransformerEnd1.connectionKind = utils_2.getSchaltgruppe(schaltgruppe, powerTransformerEnd1.endNumber, powerTransformerEnd1.grounded);
@@ -2552,20 +3136,11 @@ class ConverterI7 {
                     powerTransformerEnd2.phaseAngleClock = utils_2.getSchaltgruppeAngleClock(schaltgruppe, powerTransformerEnd2.endNumber);
                     this.sortTransformerEnd(powerTransformer, 'ratedU', 'desc');
                     const powerTransformerEnds = [powerTransformerEnd1, powerTransformerEnd2];
-                    const terminals = [startTerminal, zielTerminal];
                     const spRegKnoten = yield this.getSpannungsbandTrafo2W(i7Data);
                     const spannungsband = integral7.targetVoltages.get(spRegKnoten.id);
                     const cnUUID = this.integralID2UUID.get(spRegKnoten.id);
                     const connectivityNode = cimModel.getObject(cnUUID);
-                    for (const powerTransformerEnd of powerTransformerEnds) {
-                        const winkel = utils_2.convertToNumberI7(i7Data[`uzus_winkel_s${powerTransformerEnd.endNumber}`]);
-                        if (winkel > 0) {
-                            this.createPhaseTapChanger(i7Data, powerTransformerEnd, cimModel, powerTransformerEnd.ratedU, connectivityNode, spannungsband, false);
-                        }
-                        else {
-                            this.createRatioTapChanger(i7Data, powerTransformerEnd, cimModel, powerTransformerEnd.ratedU, connectivityNode, spannungsband);
-                        }
-                    }
+                    this.convertTapChangers(i7Data, powerTransformerEnds, cimModel, connectivityNode, spannungsband);
                     cimModel.addPowerTransformerEnd(powerTransformerEnd1);
                     cimModel.addPowerTransformerEnd(powerTransformerEnd2);
                     cimModel.addPowerTransformer(powerTransformer);
@@ -2607,7 +3182,7 @@ class ConverterI7 {
                     }
                 }
                 for (const i7Data of result) {
-                    const powerTransformer = new PowerTransformer_1.PowerTransformer(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_PT", `_${cimModel.powerTransformer.size}`.toString()]), i7Data.id + '', i7Data.bezeichner);
+                    const powerTransformer = new PowerTransformer_1.PowerTransformer(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), "_PT"]), i7Data.kurzname, i7Data.kommentar);
                     const substation = cimModel.getSubstation(this.integralID2UUID.get(i7Data.standort));
                     if (substation) {
                         powerTransformer.equipmentContainer = substation;
@@ -2646,7 +3221,7 @@ class ConverterI7 {
                     const powerTransformerEnd1 = new PowerTransformerEnd_1.PowerTransformerEnd(utils_1.getUUID(i7Data.guid_w1), `W1 ${powerTransformer.name}`);
                     powerTransformerEnd1.endNumber = 1;
                     const wicklung1 = trafoWicklungen.get(i7Data.trafowicklung3w1);
-                    const terminal1 = this.createBoundaryConnection(frame, powerTransformer, wicklung1.aknoten, PhaseCode_1.PhaseCode.ABC, 1);
+                    const terminal1 = this.createBoundaryConnection(frame, powerTransformer, wicklung1.aknoten, PhaseCode_1.PhaseCode.ABC);
                     if (!terminal1)
                         this.logger.debug(`PowerTransformer3W ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Anfangsknoten.`);
                     powerTransformerEnd1.r = impedanzW1.r;
@@ -2662,14 +3237,12 @@ class ConverterI7 {
                         let tmp_cn = bdf === null || bdf === void 0 ? void 0 : bdf.cimModel.getConnectivityNode(terminal1.getConnectivityNodeUUID());
                         if (tmp_cn && tmp_cn.boundaryPoint) {
                             equivalentInjection = this.createBoundaryEquivalentInjection(frame, tmp_cn);
-                            let baseVoltage = powerTransformerEnd1.getBaseVoltage();
-                            equivalentInjection.baseVoltage = baseVoltage;
                         }
                     }
                     powerTransformerEnd1.connectionKind = utils_2.getSchaltgruppe(schaltgruppe, powerTransformerEnd1.endNumber, powerTransformerEnd1.grounded);
                     powerTransformerEnd1.phaseAngleClock = utils_2.getSchaltgruppeAngleClock(schaltgruppe, powerTransformerEnd1.endNumber);
                     const wicklung2 = trafoWicklungen.get(i7Data.trafowicklung3w2);
-                    const terminal2 = this.createBoundaryConnection(frame, powerTransformer, wicklung2.aknoten, PhaseCode_1.PhaseCode.ABC, 2);
+                    const terminal2 = this.createBoundaryConnection(frame, powerTransformer, wicklung2.aknoten, PhaseCode_1.PhaseCode.ABC);
                     if (!terminal2)
                         this.logger.debug(`PowerTransformer3W ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Anfangsknoten.`);
                     const powerTransformerEnd2 = new PowerTransformerEnd_1.PowerTransformerEnd(utils_1.getUUID(i7Data.guid_w2), `W2 ${powerTransformer.name}`);
@@ -2688,14 +3261,12 @@ class ConverterI7 {
                         let tmp_cn = bdf === null || bdf === void 0 ? void 0 : bdf.cimModel.getConnectivityNode(terminal2.getConnectivityNodeUUID());
                         if (tmp_cn && tmp_cn.boundaryPoint) {
                             equivalentInjection = this.createBoundaryEquivalentInjection(frame, tmp_cn);
-                            let baseVoltage = powerTransformerEnd2.getBaseVoltage();
-                            equivalentInjection.baseVoltage = baseVoltage;
                         }
                     }
                     powerTransformerEnd2.connectionKind = utils_2.getSchaltgruppe(schaltgruppe, powerTransformerEnd2.endNumber, powerTransformerEnd2.grounded);
                     powerTransformerEnd2.phaseAngleClock = utils_2.getSchaltgruppeAngleClock(schaltgruppe, powerTransformerEnd2.endNumber);
                     const wicklung3 = trafoWicklungen.get(i7Data.trafowicklung3w3);
-                    const terminal3 = this.createBoundaryConnection(frame, powerTransformer, wicklung3.aknoten, PhaseCode_1.PhaseCode.ABC, 3);
+                    const terminal3 = this.createBoundaryConnection(frame, powerTransformer, wicklung3.aknoten, PhaseCode_1.PhaseCode.ABC);
                     if (!terminal3)
                         this.logger.debug(`PowerTransformer3W ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Anfangsknoten.`);
                     const powerTransformerEnd3 = new PowerTransformerEnd_1.PowerTransformerEnd(utils_1.getUUID(i7Data.guid_w3), `Wicklung 3 ${powerTransformer.name}`);
@@ -2714,8 +3285,6 @@ class ConverterI7 {
                         let tmp_cn = bdf === null || bdf === void 0 ? void 0 : bdf.cimModel.getConnectivityNode(terminal3.getConnectivityNodeUUID());
                         if (tmp_cn && tmp_cn.boundaryPoint) {
                             equivalentInjection = this.createBoundaryEquivalentInjection(frame, tmp_cn);
-                            let baseVoltage = powerTransformerEnd3.getBaseVoltage();
-                            equivalentInjection.baseVoltage = baseVoltage;
                         }
                     }
                     powerTransformerEnd3.connectionKind = utils_2.getSchaltgruppe(schaltgruppe, powerTransformerEnd3.endNumber, powerTransformerEnd3.grounded);
@@ -2727,15 +3296,7 @@ class ConverterI7 {
                     const spannungsband = integral7.targetVoltages.get(spRegKnoten.id);
                     const cnUUID = this.integralID2UUID.get(spRegKnoten.id);
                     const connectivityNode = cimModel.getObject(cnUUID);
-                    for (const powerTransformerEnd of powerTransformerEnds) {
-                        const winkel = utils_2.convertToNumberI7(i7Data[`uzus_winkel_s${powerTransformerEnd.endNumber}`]);
-                        if (winkel > 0) {
-                            this.createPhaseTapChanger(i7Data, powerTransformerEnd, cimModel, powerTransformerEnd.ratedU, connectivityNode, spannungsband, true);
-                        }
-                        else {
-                            this.createRatioTapChanger(i7Data, powerTransformerEnd, cimModel, powerTransformerEnd.ratedU, connectivityNode, spannungsband);
-                        }
-                    }
+                    this.convertTapChangers(i7Data, powerTransformerEnds, cimModel, connectivityNode, spannungsband);
                     cimModel.addPowerTransformer(powerTransformer);
                     cimModel.addPowerTransformerEnd(powerTransformerEnd1);
                     cimModel.addPowerTransformerEnd(powerTransformerEnd2);
@@ -2748,7 +3309,7 @@ class ConverterI7 {
             }
         });
     }
-    setTransformerEndInfoProperties(wicklung, data, endNumber) {
+    setTransformerEndInfoProperties(powerTransformerEndInfo, data, endNumber) {
         const minstufe = `minstufe_s${endNumber}`;
         const neutralstufe = `mittelstufe_s${endNumber}`;
         const maxstufe = `maxstufe_s${endNumber}`;
@@ -2756,15 +3317,17 @@ class ConverterI7 {
         const umin = `umin_s${endNumber}`;
         const gestufte_seite = `gestufte_seite_s${endNumber}`;
         const ur = `ur${endNumber}`;
-        wicklung.endNumber = endNumber;
-        wicklung.ratedU = new Voltage_1.Voltage(data[ur], UnitMultiplier_1.UnitMultiplier.k, UnitSymbol_1.UnitSymbol.V);
-        wicklung.tapActive = utils_2.convertToBooleanI7(data[gestufte_seite]);
-        const tapChangerInfo = new TapChangerInfo_1.TapChangerInfo(utils_1.generateUUID(), `TapChangerInfo_${data['id']}`);
+        powerTransformerEndInfo.endNumber = endNumber;
+        powerTransformerEndInfo.ratedU = new Voltage_1.Voltage(data[ur], UnitMultiplier_1.UnitMultiplier.k, UnitSymbol_1.UnitSymbol.V);
+        powerTransformerEndInfo.tapActive = utils_2.convertToBooleanI7(data[gestufte_seite]);
+        const tapChangerInfo = new EVTapChangerInfo_1.EVTapChangerInfo(utils_1.generateUUID(), `TapChangerInfo_${data['id']}`);
         tapChangerInfo.highStep = utils_2.convertToNumberI7(data[maxstufe]);
         tapChangerInfo.lowStep = utils_2.convertToNumberI7(data[minstufe]);
         tapChangerInfo.neutralStep = utils_2.convertToNumberI7(data[neutralstufe]);
-        wicklung.uMax = data[umax];
-        wicklung.uMin = data[umin];
+        powerTransformerEndInfo.uMax = data[umax];
+        powerTransformerEndInfo.uMin = data[umin];
+        tapChangerInfo.setPowerTransfomerEndInfo(powerTransformerEndInfo);
+        powerTransformerEndInfo.setTapChangerInfo(tapChangerInfo);
     }
     transformBoundaryModel(frame, masFrames) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -2824,7 +3387,7 @@ class ConverterI7 {
                     line.addConnectivityNode(connectivityNode);
                     const junction = new Junction_1.Junction(utils_1.generateUUID(), `${line.name}_BD-J`, `Junction`, 'Junction for Geo');
                     junction.equipmentContainer = line;
-                    const terminal = new Terminal_1.Terminal(utils_1.generateUUID(), util_create_1.createNotation([`${line.name}_BD-T`, `_${cimModel.terminals.size}`.toString()]), 'bd_jct_lab', 'terminal to connect junction to associated boundary ConnectivityNode', 1);
+                    let terminal = new Terminal_1.Terminal(utils_1.generateUUID(), util_create_1.createNotation([line.name, '_BD-T']), 'bd_jct_lab', 'terminal to connect junction to associated boundary ConnectivityNode', 1);
                     junction.terminals.set(terminal.getUUID(), terminal);
                     terminal.conductingEquipment = junction;
                     line.addEquipment(junction);
@@ -2887,7 +3450,7 @@ class ConverterI7 {
             }
         }
     }
-    setACLineSegmentProperties(cimModel, acLineSegment, data, defaultValuesConfig) {
+    setACLineSegmentProperties(defaultModel, acLineSegment, data, defaultValuesConfig) {
         if (utils_2.isNumericI7(data.laenge) && data.laenge <= 0) {
             data.flag_impedanzlos = 1;
         }
@@ -2897,7 +3460,7 @@ class ConverterI7 {
         else {
             acLineSegment.length = 1;
         }
-        const assetType = cimModel.getWireInfoByName(data.nametyp);
+        const assetType = defaultModel.getWireInfoByName(data.nametyp);
         if (utils_2.isNumericI7(data.r0) && data.r0 > 0 && !data.flag_impedanzlos) {
             acLineSegment.r0 = data.r0;
         }
@@ -2963,12 +3526,12 @@ class ConverterI7 {
         }
         for (const terminal of acLineSegment.terminals.values()) {
             if (utils_2.isNumericI7(data.ir) && data.ir > 0) {
-                this.setConductingEquipmentCurrentLimit(cimModel, acLineSegment.name, terminal, data.ir);
+                this.setConductingEquipmentCurrentLimit(defaultModel, acLineSegment.name, terminal, data.ir);
             }
             else if (assetType && assetType.ratedCurrent && assetType.ratedCurrent !== 0) {
-                this.setConductingEquipmentCurrentLimit(cimModel, acLineSegment.name, terminal, assetType.ratedCurrent);
+                this.setConductingEquipmentCurrentLimit(defaultModel, acLineSegment.name, terminal, assetType.ratedCurrent);
             }
-            const psrType = utils_1.createIfNotExitsPSRType(cimModel, data.typ);
+            const psrType = utils_1.createIfNotExitsPSRType(defaultModel, data.typ);
             acLineSegment.psrTypeUUID = psrType.mrid;
         }
     }
@@ -3014,11 +3577,11 @@ class ConverterI7 {
         }
         return operationalLimitType;
     }
-    createConnection(cimModel, conductingEquipment, object, phase, connected, sequenceNumber) {
+    createConnection(cimModel, conductingEquipment, object, phase, connected) {
         let terminal;
         if (object instanceof ConnectivityNode_1.ConnectivityNode) {
             const cn = object;
-            terminal = new Terminal_1.Terminal(utils_1.generateUUID(), util_create_1.createNotation(['Terminal_T', `_${cimModel.terminals.size}`.toString()]));
+            terminal = new Terminal_1.Terminal(utils_1.generateUUID(), util_create_1.createNotation([cn.name, '_T']));
             terminal.setConnectivityNode(cn);
             cn.addTerminal(terminal);
             cimModel.addTerminal(terminal);
@@ -3029,18 +3592,19 @@ class ConverterI7 {
         if (terminal) {
             terminal.phases = phase;
             terminal.conductingEquipment = conductingEquipment;
-            terminal.sequenceNumber = sequenceNumber ? sequenceNumber : 1;
             conductingEquipment.addTerminal(terminal);
             terminal.connected = connected;
+            terminal.name = util_create_1.createNotation([conductingEquipment.name, terminal.name], 32, true);
         }
         return terminal;
     }
-    createBoundaryConnection(frame, conductingEquipment, i7ObjectID, phase, sequenceNumber) {
+    createBoundaryConnection(frame, conductingEquipment, i7ObjectID, phase) {
         const cimModel = frame.cimModel;
         const anschlussUUID = this.integralID2UUID.get(i7ObjectID);
         let terminal;
+        let cn = undefined;
         if (cimModel.objects.has(anschlussUUID)) {
-            terminal = this.createConnection(cimModel, conductingEquipment, cimModel.getObject(anschlussUUID), phase, true, sequenceNumber);
+            terminal = this.createConnection(cimModel, conductingEquipment, cimModel.getObject(anschlussUUID), phase, true);
         }
         else {
             const frameBD = this.getConnectedBoundaryModel(anschlussUUID);
@@ -3048,21 +3612,19 @@ class ConverterI7 {
                 const cimModelBD = frameBD.cimModel;
                 frame.addDependentModel(rdf_xml_1.RDF_XML.PROFILE_EQ, frameBD.getModelUUID(rdf_xml_1.RDF_XML.PROFILE_EQ_BD));
                 const object = cimModelBD.getObject(anschlussUUID);
-                let cn;
                 if (object instanceof ConnectivityNode_1.ConnectivityNode) {
                     cn = object;
-                    terminal = new Terminal_1.Terminal(utils_1.generateUUID(), util_create_1.createNotation(['Terminal_T', `_${cimModel.terminals.size}`.toString()]));
+                    terminal = new Terminal_1.Terminal(utils_1.generateUUID(), util_create_1.createNotation([cn.name, '_T']));
                     terminal.connectivityNodeUUID = cn.mrid;
                     terminal.phases = phase;
                     terminal.connected = true;
-                    terminal.sequenceNumber = sequenceNumber ? sequenceNumber : 1;
                     cimModel.addTerminal(terminal);
                 }
                 else if (object instanceof Terminal_1.Terminal) {
                     terminal = object;
                     cn = terminal.getConnectivityNode();
                     if (cn === undefined) {
-                        frameBD.cimModel.getConnectivityNode(terminal.getConnectivityNodeUUID());
+                        cn = frameBD.cimModel.getConnectivityNode(terminal.getConnectivityNodeUUID());
                     }
                     if (cn !== undefined) {
                         cn.terminals.delete(terminal.mrid);
@@ -3107,25 +3669,24 @@ class ConverterI7 {
             }
         });
         if (!equivinj_exists) {
-            let tmp_terminal = new Terminal_1.Terminal(utils_1.generateUUID(), util_create_1.createNotation(['Terminal_BD-T', `_${frame.cimModel.equivalentInjections.size}`.toString()]));
+            let tmp_terminal = new Terminal_1.Terminal(utils_1.generateUUID());
             tmp_terminal.setConnectivityNodeUUID(cn.mrid);
             tmp_terminal.phases = PhaseCode_1.PhaseCode.ABC;
             tmp_terminal.connected = true;
             tmp_terminal.sequenceNumber = 1;
-            equivalentInjection = new EquivalentInjection_1.EquivalentInjection(utils_1.generateUUID(), util_create_1.createNotation([cn.name, '', '_BD-EI', `_${frame.cimModel.equivalentInjections.size}`.toString()]));
+            equivalentInjection = new EquivalentInjection_1.EquivalentInjection(utils_1.generateUUID(), util_create_1.createNotation([frame.tsoName, '_BD-EI', cn.mrid], 32, true));
             equivalentInjection.p = 0;
             equivalentInjection.q = 0;
             equivalentInjection.regulationStatus = false;
             equivalentInjection.addTerminal(tmp_terminal);
+            equivalentInjection.baseVoltage = cn.getBaseVoltage();
             tmp_terminal.setConductingEquipment(equivalentInjection);
+            tmp_terminal.name = util_create_1.createNotation([cn.name, '_', equivalentInjection.name, '_BD-T'], 32, true);
             cn.addTerminal(tmp_terminal);
             frame.cimModel.addEquivalentInjection(equivalentInjection);
             if (tmp_terminal.getConductingEquipmentUUID() !== undefined) {
                 frame.cimModel.addTerminal(tmp_terminal);
             }
-            else {
-                let stop = true;
-            }
         }
         return equivalentInjection;
     }
@@ -3186,10 +3747,10 @@ class ConverterI7 {
                         const tabName_NetzSSAB = integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.SAMMELSCHIENE];
                         const tabName_NetzSchaltfeld = integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.SCHALTFELD];
                         const tabName_NetzKnotenSf = integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.KNOTEN_SF];
-                        const sqlStatement = `SELECT ${tabName_NetzSSAB}.id, ${tabName_NetzSSAB}.umin, ${tabName_NetzSSAB}.umax, ${tabName_NetzSSAB}.usoll
-                                          FROM  ${tabName_NetzSSAB}
-                                          LEFT JOIN ${tabName_NetzSchaltfeld} ON ${tabName_NetzSSAB}.saabschnitt = ${tabName_NetzSchaltfeld}.saabschnitt
-                                          LEFT JOIN ${tabName_NetzKnotenSf} ON  ${tabName_NetzKnotenSf}.schaltfeld = ${tabName_NetzSchaltfeld}.id
+                        const sqlStatement = `SELECT ${tabName_NetzSSAB}.id, ${tabName_NetzSSAB}.umin, ${tabName_NetzSSAB}.umax, ${tabName_NetzSSAB}.usoll
+                                          FROM  ${tabName_NetzSSAB}
+                                          LEFT JOIN ${tabName_NetzSchaltfeld} ON ${tabName_NetzSSAB}.saabschnitt = ${tabName_NetzSchaltfeld}.saabschnitt
+                                          LEFT JOIN ${tabName_NetzKnotenSf} ON  ${tabName_NetzKnotenSf}.schaltfeld = ${tabName_NetzSchaltfeld}.id
                                           WHERE ${tabName_NetzKnotenSf}.id = ${tempKnotenId}`;
                         minMaxSollResult = yield this.mysqlController.execQuery(sqlStatement);
                     }
@@ -3199,12 +3760,12 @@ class ConverterI7 {
                             const tabName_NetzSo = integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.KNOTEN_SO];
                             const tabName_NetzSchlaufe = integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.SCHLAUFE];
                             const tabName_NetzKnotenZw = integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.KNOTEN_ZW];
-                            minMaxSollResult = yield this.mysqlController.execQuery(`SELECT ${tabName_NetzSo}.id, ${tabName_NetzSo}.umin, ${tabName_NetzSo}.umax, ${tabName_NetzSo}.usoll 
-                                       FROM ${tabName_NetzKnotenZw} 
-                                       LEFT JOIN ${tabName_NetzSchlaufe} ON 
-                                             ${tabName_NetzSchlaufe}.id = ${tabName_NetzKnotenZw}.schlaufe
-                                       LEFT JOIN ${tabName_NetzSo} ON 
-                                             ${tabName_NetzSchlaufe}.eknoten = ${tabName_NetzSo}.id 
+                            minMaxSollResult = yield this.mysqlController.execQuery(`SELECT ${tabName_NetzSo}.id, ${tabName_NetzSo}.umin, ${tabName_NetzSo}.umax, ${tabName_NetzSo}.usoll 
+                                       FROM ${tabName_NetzKnotenZw} 
+                                       LEFT JOIN ${tabName_NetzSchlaufe} ON 
+                                             ${tabName_NetzSchlaufe}.id = ${tabName_NetzKnotenZw}.schlaufe
+                                       LEFT JOIN ${tabName_NetzSo} ON 
+                                             ${tabName_NetzSchlaufe}.eknoten = ${tabName_NetzSo}.id 
                                        WHERE ${tabName_NetzKnotenZw}.id = ${tempKnotenId};`);
                         }
                         else {
@@ -3215,10 +3776,10 @@ class ConverterI7 {
                 else if (spgKnotenId !== undefined) {
                     const tabName_NetzSo = integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.KNOTEN_SO];
                     const tabName_NetzSSAB = integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.SAMMELSCHIENE];
-                    const query = ` SELECT Voltage.id, Voltage.umin,  Voltage.umax,  Voltage.usoll
-                                FROM (
-                                SELECT id, umin, umax, usoll FROM ${tabName_NetzSo} WHERE ${tabName_NetzSo}.id = ${spgKnotenId}
-                                UNION
+                    const query = ` SELECT Voltage.id, Voltage.umin,  Voltage.umax,  Voltage.usoll
+                                FROM (
+                                SELECT id, umin, umax, usoll FROM ${tabName_NetzSo} WHERE ${tabName_NetzSo}.id = ${spgKnotenId}
+                                UNION
                                 SELECT id, umin, umax, usoll FROM ${tabName_NetzSSAB} WHERE ${tabName_NetzSSAB}.id = ${spgKnotenId}) as Voltage`;
                     minMaxSollResult = yield this.mysqlController.execQuery(query);
                 }
@@ -3272,15 +3833,16 @@ class ConverterI7 {
             for (const frame of boundaryFrames) {
                 this.addDefaultObjectsLoadModel(frame.cimModel, defaultValuesConfig);
                 this.addDefaultObjectsGeo(frame.cimModel, defaultValuesConfig);
-                frame.initProfileXmlSerializers([rdf_xml_1.RDF_XML.PROFILE_GL, rdf_xml_1.RDF_XML.PROFILE_EQ_BD], tempDirPath);
+                frame.initProfileXmlSerializers([rdf_xml_1.RDF_XML.PROFILE_GL, rdf_xml_1.RDF_XML.PROFILE_EQ_BD, rdf_xml_1.RDF_XML.PROFILE_DL], tempDirPath);
                 frame.addDependentModel(rdf_xml_1.RDF_XML.PROFILE_GL, frame.getModelUUID(rdf_xml_1.RDF_XML.PROFILE_EQ_BD));
+                frame.addDependentModel(rdf_xml_1.RDF_XML.PROFILE_DL, frame.getModelUUID(rdf_xml_1.RDF_XML.PROFILE_EQ_BD));
             }
             this.exportFramesBoundary = this.associateGeoRegionsToExportFrames(boundaryFrames);
             const gridFrames = this.initExportFrames(gridExports, geoRegions, allSubGeoRegions);
             for (const frame of gridFrames) {
                 this.addDefaultObjectsLoadModel(frame.cimModel, defaultValuesConfig);
                 this.addDefaultObjectsGeo(frame.cimModel, defaultValuesConfig);
-                frame.initProfileXmlSerializers([rdf_xml_1.RDF_XML.PROFILE_EQ, rdf_xml_1.RDF_XML.PROFILE_SSH, rdf_xml_1.RDF_XML.PROFILE_GL, rdf_xml_1.RDF_XML.PROFILE_AMPI7, rdf_xml_1.RDF_XML.PROFILE_DY, rdf_xml_1.RDF_XML.PROFILE_SV], tempDirPath);
+                frame.initProfileXmlSerializers([rdf_xml_1.RDF_XML.PROFILE_DL, rdf_xml_1.RDF_XML.PROFILE_EQ, rdf_xml_1.RDF_XML.PROFILE_SSH, rdf_xml_1.RDF_XML.PROFILE_GL, rdf_xml_1.RDF_XML.PROFILE_AMPI7, rdf_xml_1.RDF_XML.PROFILE_DY, rdf_xml_1.RDF_XML.PROFILE_SV], tempDirPath);
             }
             this.exportFrames = this.associateGeoRegionsToExportFrames(gridFrames);
         });
@@ -3295,7 +3857,7 @@ class ConverterI7 {
             for (const exportObject of exportEntry.objects) {
                 switch (exportEntry.objectType) {
                     case data_structures_i7_1.ExportObjectType.georegion: {
-                        const geoRegion = geoRegions.find(elem => elem.name.match(exportObject.name));
+                        const geoRegion = geoRegions.find(elem => elem.name.substring(0, exportObject.name.length).match(exportObject.name));
                         if (!geoRegion) {
                             this.logger.error(`Kein ${exportEntry.objectType} mit dem Namen ${exportObject.name} gefunden.`);
                             continue;
@@ -3480,205 +4042,165 @@ class ConverterI7 {
         powerTransformerEnd.powerTransformer = powerTransformer;
         powerTransformer.addPowerTransformerEnd(powerTransformerEnd);
     }
-    createRatioTapChanger(i7Data, transformerEnd, cimModel, neutralU, connectivityNode, spannungsband) {
-        var _a, _b;
-        const wicklungsnummer = transformerEnd.endNumber;
-        const gestufteSeite = i7Data[`gestufte_seite_s${wicklungsnummer}`] === 0 ? 1 : i7Data[`gestufte_seite_s${wicklungsnummer}`];
-        if (gestufteSeite === wicklungsnummer) {
-            const lowStep = i7Data[`minstufe_s${transformerEnd.endNumber}`];
-            const highStep = i7Data[`maxstufe_s${transformerEnd.endNumber}`];
-            const neutralStep = i7Data[`mittelstufe_s${transformerEnd.endNumber}`];
-            const currentStep = i7Data[`aktstufe_s${transformerEnd.endNumber}`];
-            const i7TapArray = utils_2.getTapChangerStepArray(lowStep, highStep);
-            const mappedCurrentStep = i7TapArray.indexOf(currentStep) + 1;
-            const lowerVoltageStepCount = utils_2.getTapChangerStepCount(lowStep, neutralStep);
-            const increaseVoltageStepCount = utils_2.getTapChangerStepCount(neutralStep, highStep);
-            const lowerVoltageStepIncrement = Math.abs(i7Data[`umin_s${transformerEnd.endNumber}`]) / lowerVoltageStepCount * -1;
-            let increaseVoltageStepIncrement = Math.abs(i7Data[`umax_s${transformerEnd.endNumber}`]) / lowerVoltageStepCount;
-            increaseVoltageStepIncrement = isNaN(increaseVoltageStepIncrement) ? 1 : increaseVoltageStepIncrement;
-            const ratioTapChangerTable = new RatioTapChangerTable_1.RatioTapChangerTable(utils_1.generateUUID(), `${transformerEnd.name} W${transformerEnd.endNumber}`);
-            for (let i = 0; i < lowerVoltageStepCount; i++) {
-                util_create_1.createRatioTapChangerTablePoint(ratioTapChangerTable, i + 1, 1 + (lowerVoltageStepIncrement * (lowerVoltageStepCount - i)));
-            }
-            util_create_1.createRatioTapChangerTablePoint(ratioTapChangerTable, lowerVoltageStepCount + 1, 1);
-            for (let i = 0; i < increaseVoltageStepCount; i++) {
-                const step = (lowerVoltageStepCount + 1) + (i + 1);
-                util_create_1.createRatioTapChangerTablePoint(ratioTapChangerTable, step, 1 + (increaseVoltageStepIncrement * (i + 1)));
-            }
-            const ratioTapChanger = new RatioTapChanger_1.RatioTapChanger(utils_1.generateUUID(), `${transformerEnd.name} W${transformerEnd.endNumber}`);
-            ratioTapChanger.stepVoltageIncrement = increaseVoltageStepIncrement;
-            ratioTapChanger.tculControlMode = TransformerControlMode_1.TransformerControlMode.volt;
-            ratioTapChanger.ltcFlag = false;
-            ratioTapChanger.lowStep = 1;
-            ratioTapChanger.highStep = ratioTapChangerTable.ratioTapChangerTablePoints.length;
-            ratioTapChanger.neutralStep = i7TapArray.indexOf(neutralStep) + 1;
-            ratioTapChanger.normalStep = ratioTapChanger.neutralStep;
-            ratioTapChanger.step = mappedCurrentStep;
-            ratioTapChanger.transformerEnd = transformerEnd;
-            transformerEnd.ratioTapChanger = ratioTapChanger;
-            ratioTapChanger.neutralU = neutralU;
-            ratioTapChanger.ratioTapChangerTableUUID = ratioTapChangerTable.mrid;
-            ratioTapChangerTable.ratioTapChanger = ratioTapChanger;
-            const regelung = +i7Data[`regelung_s${transformerEnd.endNumber}`];
-            if (regelung > 0) {
-                const tapChangerControl = new TapChangerControl_1.TapChangerControl(utils_1.generateUUID(), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
-                tapChangerControl.discrete = true;
-                const umax = utils_2.getSpannungsband('umax', spannungsband, neutralU);
-                const umin = utils_2.getSpannungsband('umin', spannungsband, neutralU);
-                const usoll = utils_2.getSpannungsband('usoll', spannungsband, (umax + umin) / 2);
-                const pVorgabe = utils_2.isNumericI7(i7Data[`p_vorgabe`]) ? +i7Data[`p_vorgabe`] : undefined;
-                switch (regelung) {
-                    case 1: {
-                        ratioTapChanger.controlEnabled = true;
-                        tapChangerControl.enabled = true;
-                        tapChangerControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
-                        tapChangerControl.targetValue = usoll;
-                        tapChangerControl.targetDeadband = umax - usoll;
-                        tapChangerControl.targetValueUnitMultiplier = UnitMultiplier_1.UnitMultiplier.k;
-                        break;
-                    }
-                    case 2: {
-                        ratioTapChanger.controlEnabled = true;
-                        tapChangerControl.enabled = true;
-                        tapChangerControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.activePower;
-                        tapChangerControl.targetValue = pVorgabe;
-                        tapChangerControl.targetValueUnitMultiplier = UnitMultiplier_1.UnitMultiplier.M;
-                        break;
-                    }
-                    case 3: {
-                        ratioTapChanger.controlEnabled = true;
-                        tapChangerControl.enabled = true;
-                        tapChangerControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.currentFlow;
-                        break;
-                    }
-                    case 4: {
-                        ratioTapChanger.controlEnabled = true;
-                        tapChangerControl.enabled = true;
-                        tapChangerControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.reactivePower;
-                        tapChangerControl.targetValueUnitMultiplier = UnitMultiplier_1.UnitMultiplier.M;
-                        break;
-                    }
-                }
-                ratioTapChanger.tapChangerControl = tapChangerControl;
-                tapChangerControl.addTapChanger(ratioTapChanger);
-                cimModel.addTapChangerControl(tapChangerControl);
+    convertTapChangers(i7Data, transformerEnds, cimModel, connectivityNode, spannungsband) {
+        for (let tapChangerNumber = 1; tapChangerNumber <= 2; tapChangerNumber++) {
+            const gestufteSeite = i7Data[`gestufte_seite_s${tapChangerNumber}`] === 0 ? 1 : i7Data[`gestufte_seite_s${tapChangerNumber}`];
+            const transformerEnd = transformerEnds.find(elem => elem.endNumber === gestufteSeite);
+            if (!transformerEnd) {
+                this.logger.error(`Trafo ${i7Data.id}: Zum Stufenschalter ${gestufteSeite} keine Wicklung gefunden.`);
+                continue;
+            }
+            const angle = utils_2.convertToNumberI7(i7Data[`uzus_winkel_s${tapChangerNumber}`]);
+            const neutralU = transformerEnd.ratedU;
+            let tapChanger;
+            if (isFinite(angle) && angle !== 0) {
+                tapChanger = this.createPhaseTapChanger(i7Data, transformerEnds, cimModel, tapChangerNumber);
             }
             else {
-                ratioTapChanger.controlEnabled = false;
+                tapChanger = this.createRatioTapChanger(i7Data, transformerEnd, cimModel, connectivityNode, tapChangerNumber, spannungsband);
             }
-            if ((_a = connectivityNode === null || connectivityNode === void 0 ? void 0 : connectivityNode.terminals) === null || _a === void 0 ? void 0 : _a.size) {
-                const terminal = [...connectivityNode.terminals.values()].find(elem => elem.connected);
-                if (terminal)
-                    this.setTapChangerControl(ratioTapChanger, terminal);
-            }
-            if (!((_b = ratioTapChanger.tapChangerControl) === null || _b === void 0 ? void 0 : _b.terminal)) {
-                this.logger.error(`Trafo ${i7Data.trafo3w}: Kein Terminal für TapChangerControl`);
-                if (transformerEnd.phaseTapChanger) {
-                    transformerEnd.phaseTapChanger.tapChangerControl = undefined;
-                    transformerEnd.phaseTapChanger.tapChangerControlUUID = undefined;
+            this.setTapChangerVoltageProperties(i7Data, cimModel, tapChanger, tapChangerNumber);
+            tapChanger.transformerEnd = transformerEnd;
+            tapChanger.neutralU = neutralU;
+        }
+    }
+    setTapChangerVoltageProperties(i7Data, cimModel, tapChanger, tapChangerNumber) {
+        let lowStep = i7Data[`minstufe_s${tapChangerNumber}`];
+        let highStep = i7Data[`maxstufe_s${tapChangerNumber}`];
+        let neutralStep = i7Data[`mittelstufe_s${tapChangerNumber}`];
+        let currentStep = i7Data[`aktstufe_s${tapChangerNumber}`];
+        const i7TapArray = utils_2.getTapChangerStepArray(lowStep, highStep);
+        const tapStepCount = i7TapArray.length;
+        const neutralStepIndex = i7TapArray.indexOf(neutralStep);
+        const lowerVoltageStepCount = utils_2.getTapChangerStepCount(lowStep, neutralStep);
+        const increaseVoltageStepCount = utils_2.getTapChangerStepCount(neutralStep, highStep);
+        const lowerVoltageStepIncrement = Math.abs(i7Data[`umin_s${tapChangerNumber}`]) / lowerVoltageStepCount * -1;
+        let increaseVoltageStepIncrement = Math.abs(i7Data[`umax_s${tapChangerNumber}`]) / increaseVoltageStepCount;
+        increaseVoltageStepIncrement = isNaN(increaseVoltageStepIncrement) ? 1 : increaseVoltageStepIncrement;
+        if (tapChanger instanceof RatioTapChanger_1.RatioTapChanger) {
+            const ratioTapChanger = tapChanger;
+            if (Math.abs(lowerVoltageStepIncrement) !== Math.abs(increaseVoltageStepIncrement)) {
+                const ratioTapChangerTable = new RatioTapChangerTable_1.RatioTapChangerTable(utils_1.generateUUID(), `${i7Data.bezeichner} W_${tapChangerNumber}`);
+                for (let i = 0; i < lowerVoltageStepCount; i++) {
+                    util_create_1.createRatioTapChangerTablePoint(ratioTapChangerTable, i + 1, (lowerVoltageStepIncrement * (lowerVoltageStepCount - i)));
                 }
+                util_create_1.createRatioTapChangerTablePoint(ratioTapChangerTable, lowerVoltageStepCount + 1, 1);
+                for (let i = 0; i < increaseVoltageStepCount; i++) {
+                    const step = (lowerVoltageStepCount + 1) + (i + 1);
+                    util_create_1.createRatioTapChangerTablePoint(ratioTapChangerTable, step, (increaseVoltageStepIncrement * (i + 1)));
+                }
+                lowStep = 1;
+                highStep = ratioTapChangerTable.ratioTapChangerTablePoints.length;
+                neutralStep = i7TapArray.indexOf(neutralStep) + 1;
+                currentStep = neutralStep;
+                tapChanger.ratioTapChangerTable = ratioTapChangerTable;
+                ratioTapChangerTable.ratioTapChanger = tapChanger;
+                ratioTapChanger.stepVoltageIncrement = Math.abs(Math.round(lowerVoltageStepIncrement)) + Math.abs(Math.round(increaseVoltageStepIncrement)) / 2;
+                cimModel.addRatioTapChangerTable(ratioTapChangerTable);
             }
-            cimModel.addRatioTapChanger(ratioTapChanger);
-            cimModel.addRatioTapChangerTable(ratioTapChangerTable);
+            ratioTapChanger.stepVoltageIncrement = increaseVoltageStepIncrement;
+        }
+        if (tapChanger instanceof PhaseTapChangerNonLinear_1.PhaseTapChangerNonLinear)
+            tapChanger.voltageStepIncrement = increaseVoltageStepIncrement;
+        tapChanger.lowStep = lowStep;
+        tapChanger.highStep = highStep;
+        tapChanger.neutralStep = neutralStep;
+        tapChanger.normalStep = neutralStep;
+        tapChanger.step = currentStep;
+        if (Math.abs(lowerVoltageStepIncrement) !== Math.abs(increaseVoltageStepIncrement)) {
+            this.logger.error(`Trafo ${i7Data.id}: Zusatzspannung Min/Max sind nicht symmetrisch  MIN ${lowerVoltageStepIncrement} MAX ${increaseVoltageStepIncrement}. Das Attribut voltageStepIncrement i.H.v ${increaseVoltageStepIncrement} könnte inkorrekt sein.`);
         }
     }
-    createPhaseTapChanger(i7Data, transformerEnd, cimModel, neutralU, connectivityNode, spannungsband, is3WTransformer) {
+    createRatioTapChanger(i7Data, transformerEnd, cimModel, regulatingConnectivityNode, tapChangerNumber, spannungsband) {
         var _a, _b;
-        const wicklungsnummer = transformerEnd.endNumber;
-        const gestufteSeite = i7Data[`gestufte_seite_s${wicklungsnummer}`] === 0 ? 1 : i7Data[`gestufte_seite_s${wicklungsnummer}`];
-        if (gestufteSeite === wicklungsnummer) {
-            let phaseTapChanger;
-            const spezialregelung = i7Data.trafo_spezial ? i7Data.trafo_spezial : (is3WTransformer ? 2 : undefined);
-            switch (spezialregelung) {
-                case (1): {
-                    const phaseTapChangerSync = new PhaseTapChangerSymmetrical_1.PhaseTapChangerSymmetrical(utils_1.generateUUID(), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
-                    phaseTapChanger = phaseTapChangerSync;
-                    cimModel.addPhaseTapChangerSymmetrical(phaseTapChangerSync);
-                    break;
-                }
-                case (2): {
-                    const phaseTapChangerAsync = new PhaseTapChangerAsymmetrical_1.PhaseTapChangerAsymmetrical(utils_1.generateUUID(), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
-                    phaseTapChangerAsync.windingConnectionAngle = utils_2.convertToNumberI7(i7Data[`uzus_winkel_s${transformerEnd.endNumber}`]);
-                    phaseTapChanger = phaseTapChangerAsync;
-                    cimModel.addPhaseTapChangerAsymmetrical(phaseTapChangerAsync);
-                    break;
-                }
-                default: {
-                    const phaseTapChangerLinear = new PhaseTapChangerLinear_1.PhaseTapChangerLinear(utils_1.generateUUID(), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
-                    phaseTapChangerLinear.stepPhaseShiftIncrement = utils_2.convertToNumberI7(i7Data[`uzus_winkel_s${transformerEnd.endNumber}`]);
-                    cimModel.addPhaseTapChangerLinear(phaseTapChangerLinear);
-                    phaseTapChanger = phaseTapChangerLinear;
-                }
-            }
-            phaseTapChanger.ltcFlag = false;
-            phaseTapChanger.lowStep = utils_2.convertToNumberI7(i7Data[`minstufe_s${transformerEnd.endNumber}`]);
-            phaseTapChanger.highStep = utils_2.convertToNumberI7(i7Data[`maxstufe_s${transformerEnd.endNumber}`]);
-            phaseTapChanger.neutralStep = utils_2.convertToNumberI7(i7Data[`mittelstufe_s${transformerEnd.endNumber}`]);
-            phaseTapChanger.normalStep = utils_2.convertToNumberI7(phaseTapChanger.neutralStep);
-            phaseTapChanger.step = utils_2.convertToNumberI7(i7Data[`aktstufe_s${transformerEnd.endNumber}`]);
-            phaseTapChanger.neutralU = neutralU;
-            transformerEnd.phaseTapChanger = phaseTapChanger;
-            phaseTapChanger.transformerEndUUID = transformerEnd.mrid;
-            const regelung = +i7Data[`regelung_s${transformerEnd.endNumber}`];
-            if (regelung > 0) {
-                const tapChangerControl = new TapChangerControl_1.TapChangerControl(utils_1.generateUUID(), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
-                tapChangerControl.discrete = true;
-                const umax = utils_2.getSpannungsband('umax', spannungsband, neutralU);
-                const umin = utils_2.getSpannungsband('umin', spannungsband, neutralU);
-                const usoll = utils_2.getSpannungsband('usoll', spannungsband, (umax + umin) / 2);
-                const pVorgabe = utils_2.isNumericI7(i7Data[`p_vorgabe`]) ? +i7Data[`p_vorgabe`] : undefined;
-                switch (regelung) {
-                    case 1: {
-                        phaseTapChanger.controlEnabled = true;
-                        tapChangerControl.enabled = true;
-                        tapChangerControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
-                        tapChangerControl.targetValue = usoll;
-                        tapChangerControl.targetDeadband = umax - usoll;
-                        tapChangerControl.targetValueUnitMultiplier = UnitMultiplier_1.UnitMultiplier.k;
-                        break;
-                    }
-                    case 2: {
-                        phaseTapChanger.controlEnabled = true;
-                        tapChangerControl.enabled = true;
-                        tapChangerControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.activePower;
-                        tapChangerControl.targetValue = pVorgabe;
-                        tapChangerControl.targetValueUnitMultiplier = UnitMultiplier_1.UnitMultiplier.M;
-                        break;
-                    }
-                    case 3: {
-                        phaseTapChanger.controlEnabled = true;
-                        tapChangerControl.enabled = true;
-                        tapChangerControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.currentFlow;
-                        break;
-                    }
-                    case 4: {
-                        phaseTapChanger.controlEnabled = true;
-                        tapChangerControl.enabled = true;
-                        tapChangerControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.reactivePower;
-                        tapChangerControl.targetValueUnitMultiplier = UnitMultiplier_1.UnitMultiplier.M;
-                        break;
-                    }
-                }
-                phaseTapChanger.tapChangerControl = tapChangerControl;
-                tapChangerControl.addTapChanger(phaseTapChanger);
-                cimModel.addTapChangerControl(tapChangerControl);
-            }
-            else {
-                phaseTapChanger.controlEnabled = false;
+        const gestufteSeite = i7Data[`gestufte_seite_s${tapChangerNumber}`] === 0 ? 1 : i7Data[`gestufte_seite_s${tapChangerNumber}`];
+        const ratioTapChanger = new RatioTapChanger_1.RatioTapChanger(utils_1.generateUUID(), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
+        ratioTapChanger.ltcFlag = false;
+        ratioTapChanger.transformerEnd = transformerEnd;
+        transformerEnd.ratioTapChanger = ratioTapChanger;
+        ratioTapChanger.neutralU = transformerEnd.ratedU;
+        ratioTapChanger.tculControlMode = TransformerControlMode_1.TransformerControlMode.volt;
+        const regelung = +i7Data[`regelung_s${gestufteSeite}`];
+        const regulatingTerminal = ((_a = regulatingConnectivityNode === null || regulatingConnectivityNode === void 0 ? void 0 : regulatingConnectivityNode.terminals) === null || _a === void 0 ? void 0 : _a.size) ? [...(_b = regulatingConnectivityNode === null || regulatingConnectivityNode === void 0 ? void 0 : regulatingConnectivityNode.terminals) === null || _b === void 0 ? void 0 : _b.values()].find(elem => elem.connected) : undefined;
+        if (isFinite(spannungsband === null || spannungsband === void 0 ? void 0 : spannungsband.usoll) && regulatingTerminal) {
+            const tapChangerControl = new TapChangerControl_1.TapChangerControl(utils_1.generateUUID(), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
+            tapChangerControl.discrete = true;
+            const regulatingControlEnabled = regelung === 0 ? false : true;
+            tapChangerControl.enabled = regulatingControlEnabled;
+            ratioTapChanger.controlEnabled = regulatingControlEnabled;
+            tapChangerControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
+            tapChangerControl.targetValue = spannungsband.usoll;
+            tapChangerControl.targetDeadband = spannungsband.umax - spannungsband.usoll;
+            tapChangerControl.targetValueUnitMultiplier = UnitMultiplier_1.UnitMultiplier.k;
+            ratioTapChanger.tapChangerControl = tapChangerControl;
+            this.setTapChangerControl(ratioTapChanger, regulatingTerminal);
+            tapChangerControl.addTapChanger(ratioTapChanger);
+            cimModel.addTapChangerControl(tapChangerControl);
+        }
+        else {
+            this.logger.error(`Trafo ${i7Data.id}: TapChangerControl konnte nicht erstellt werden.`);
+        }
+        cimModel.addRatioTapChanger(ratioTapChanger);
+        return ratioTapChanger;
+    }
+    createPhaseTapChanger(i7Data, transformerEnds, cimModel, tapChangerNumber) {
+        const gestufteSeite = i7Data[`gestufte_seite_s${tapChangerNumber}`] === 0 ? 1 : i7Data[`gestufte_seite_s${tapChangerNumber}`];
+        const transformerEnd = transformerEnds.find(elem => elem.endNumber === gestufteSeite);
+        const is3WTransformer = transformerEnds.length > 2 ? true : false;
+        let phaseTapChanger;
+        const spezialregelung = i7Data.trafo_spezial ? i7Data.trafo_spezial : (is3WTransformer ? 2 : undefined);
+        switch (spezialregelung) {
+            case (1): {
+                const phaseTapChangerSync = new PhaseTapChangerSymmetrical_1.PhaseTapChangerSymmetrical(utils_1.generateUUID(), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
+                phaseTapChanger = phaseTapChangerSync;
+                cimModel.addPhaseTapChangerSymmetrical(phaseTapChangerSync);
+                break;
             }
-            if ((_a = connectivityNode === null || connectivityNode === void 0 ? void 0 : connectivityNode.terminals) === null || _a === void 0 ? void 0 : _a.size) {
-                const terminal = [...connectivityNode.terminals.values()].find(elem => elem.connected);
-                if (terminal)
-                    this.setTapChangerControl(phaseTapChanger, terminal);
+            case (2): {
+                const phaseTapChangerAsync = new PhaseTapChangerAsymmetrical_1.PhaseTapChangerAsymmetrical(utils_1.generateUUID(), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
+                phaseTapChangerAsync.windingConnectionAngle = utils_2.convertToNumberI7(i7Data[`uzus_winkel_s${tapChangerNumber}`]);
+                phaseTapChanger = phaseTapChangerAsync;
+                cimModel.addPhaseTapChangerAsymmetrical(phaseTapChangerAsync);
+                break;
             }
-            if (!((_b = phaseTapChanger.tapChangerControl) === null || _b === void 0 ? void 0 : _b.terminal)) {
-                this.logger.error(`Trafo ${i7Data.id}: Kein Terminal für TapChangerControl`);
-                if (transformerEnd.phaseTapChanger) {
-                    transformerEnd.phaseTapChanger.tapChangerControl = undefined;
-                    transformerEnd.phaseTapChanger.tapChangerControlUUID = undefined;
-                }
+            default: {
+                const phaseTapChangerAsync = new PhaseTapChangerAsymmetrical_1.PhaseTapChangerAsymmetrical(utils_1.generateUUID(), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
+                phaseTapChangerAsync.windingConnectionAngle = utils_2.convertToNumberI7(i7Data[`uzus_winkel_s${tapChangerNumber}`]);
+                phaseTapChanger = phaseTapChangerAsync;
+                cimModel.addPhaseTapChangerAsymmetrical(phaseTapChangerAsync);
+                break;
             }
         }
+        phaseTapChanger.ltcFlag = false;
+        transformerEnd.phaseTapChanger = phaseTapChanger;
+        const pRegulationFromNode = i7Data.von_a_nr;
+        const pRegulationToNode = i7Data.nach_a_nr;
+        const regulatingTransformerEnd = transformerEnds.find(elem => elem.endNumber === pRegulationToNode);
+        let pVorgabe = utils_2.isNumericI7(i7Data[`p_vorgabe`]) ? +i7Data[`p_vorgabe`] : undefined;
+        if (is3WTransformer && tapChangerNumber > 1) {
+            pVorgabe = utils_2.isNumericI7(i7Data[`p_vorgabe_2`]) ? +i7Data[`p_vorgabe_2`] : undefined;
+        }
+        if (isFinite(pVorgabe) && regulatingTransformerEnd) {
+            const regulatingTerminal = regulatingTransformerEnd === null || regulatingTransformerEnd === void 0 ? void 0 : regulatingTransformerEnd.terminal;
+            const regelung = +i7Data[`regelung_s${tapChangerNumber}`];
+            const tapChangerControl = new TapChangerControl_1.TapChangerControl(utils_1.generateUUID(), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
+            tapChangerControl.discrete = true;
+            const regulatingControlEnabled = regelung === 0 ? false : true;
+            tapChangerControl.enabled = regulatingControlEnabled;
+            phaseTapChanger.controlEnabled = regulatingControlEnabled;
+            tapChangerControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.activePower;
+            tapChangerControl.targetValue = pVorgabe;
+            tapChangerControl.targetValueUnitMultiplier = UnitMultiplier_1.UnitMultiplier.M;
+            phaseTapChanger.tapChangerControl = tapChangerControl;
+            phaseTapChanger.transformerEnd = transformerEnd;
+            this.setTapChangerControl(phaseTapChanger, regulatingTerminal);
+            tapChangerControl.addTapChanger(phaseTapChanger);
+            cimModel.addTapChangerControl(tapChangerControl);
+        }
+        else {
+            this.logger.error(`Trafo ${i7Data.id}: Trafo ${i7Data.id}: TapChangerControl konnte nicht erstellt werden.`);
+        }
+        return phaseTapChanger;
     }
     setTapChangerControl(tapChanger, terminal) {
         if ((tapChanger === null || tapChanger === void 0 ? void 0 : tapChanger.tapChangerControl) && terminal) {
@@ -3700,10 +4222,10 @@ class ConverterI7 {
                 let terminal;
                 if (!((_a = powerTransformerEnd.terminal) === null || _a === void 0 ? void 0 : _a.connectivityNode) && this.UUID2Integral7ID.has((_b = powerTransformerEnd.terminal) === null || _b === void 0 ? void 0 : _b.connectivityNodeUUID)) {
                     const i7ObjectID = (_d = this.UUID2Integral7ID.get((_c = powerTransformerEnd.terminal) === null || _c === void 0 ? void 0 : _c.connectivityNodeUUID)) === null || _d === void 0 ? void 0 : _d.find(elem => elem);
-                    terminal = this.createBoundaryConnection(frame, junction, i7ObjectID, PhaseCode_1.PhaseCode.ABC, 1);
+                    terminal = this.createBoundaryConnection(frame, junction, i7ObjectID, PhaseCode_1.PhaseCode.ABC);
                 }
                 else {
-                    terminal = this.createConnection(cimModel, junction, (_e = powerTransformerEnd.terminal) === null || _e === void 0 ? void 0 : _e.connectivityNode, PhaseCode_1.PhaseCode.ABC, true, 1);
+                    terminal = this.createConnection(cimModel, junction, (_e = powerTransformerEnd.terminal) === null || _e === void 0 ? void 0 : _e.connectivityNode, PhaseCode_1.PhaseCode.ABC, true);
                 }
                 if (terminal) {
                     terminal.name = 't_stp_trafo';
@@ -3748,13 +4270,13 @@ class ConverterI7 {
     }
     queryTrafosAnschlussIDs() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            let results = this.isTableAvailable(integral_sql_1.Integral7TableNames.TRAFO2W) ? yield this.mysqlController.execQuery(`SELECT DISTINCT aknoten, eknoten
+            let results = this.isTableAvailable(integral_sql_1.Integral7TableNames.TRAFO2W) ? yield this.mysqlController.execQuery(`SELECT DISTINCT aknoten, eknoten
                                                                                                             FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.TRAFO2W]}`) : [];
             for (const result of results) {
                 this.trafo2wAnschlussKnotenIDs.add(result[`aknoten`]);
                 this.trafo2wAnschlussKnotenIDs.add(result[`eknoten`]);
             }
-            results = this.isTableAvailable(integral_sql_1.Integral7TableNames.TRAFO3_WICKLUNG) ? yield this.mysqlController.execQuery(`SELECT DISTINCT aknoten, eknoten
+            results = this.isTableAvailable(integral_sql_1.Integral7TableNames.TRAFO3_WICKLUNG) ? yield this.mysqlController.execQuery(`SELECT DISTINCT aknoten, eknoten
                                                                                                                     FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.TRAFO3_WICKLUNG]}`) : [];
             for (const result of results) {
                 this.trafo3wAnschlussKnotenIDs.add(result[`aknoten`]);
@@ -3853,6 +4375,15 @@ class ConverterI7 {
             integral7.lKondensatorAnschlussKnotenIDs.push(i7ID);
         }
     }
+    filterTablesByAvailability(relevantTables) {
+        let filteredRelevantTables = [];
+        for (const relevantTable of relevantTables) {
+            if (this.isTableAvailable(relevantTable)) {
+                filteredRelevantTables.push(relevantTable);
+            }
+        }
+        return filteredRelevantTables;
+    }
     isTableAvailable(tableName) {
         return this.availableTableNames.indexOf(tableName) > -1 ? true : false;
     }
@@ -3885,15 +4416,15 @@ class ConverterI7 {
             connectivityNode.toEndNameTso = tsoName;
         }
         else {
-            this.logger.error(`Grenzknoten ${connectivityNode.name} mit der UUID ${connectivityNode.mrid} ist bereits belegt:
-                         fromEndName ${connectivityNode.fromEndName} 
-                         fromEndIsoCode ${connectivityNode.fromEndIsoCode} 
-                         fromEndNameTso ${connectivityNode.fromEndNameTso} 
-                         toEndName ${connectivityNode.toEndName} 
-                         toEndIsoCode ${connectivityNode.toEndIsoCode} 
-                         toEndNameTso ${connectivityNode.toEndNameTso} 
-                         name ${name} 
-                         isoCode ${isoCode} 
+            this.logger.error(`Grenzknoten ${connectivityNode.name} mit der UUID ${connectivityNode.mrid} ist bereits belegt:
+                         fromEndName ${connectivityNode.fromEndName} 
+                         fromEndIsoCode ${connectivityNode.fromEndIsoCode} 
+                         fromEndNameTso ${connectivityNode.fromEndNameTso} 
+                         toEndName ${connectivityNode.toEndName} 
+                         toEndIsoCode ${connectivityNode.toEndIsoCode} 
+                         toEndNameTso ${connectivityNode.toEndNameTso} 
+                         name ${name} 
+                         isoCode ${isoCode} 
                          tsoName ${tsoName}`);
         }
     }