@enervance/insight-cim-model 0.0.24 → 0.0.26

package/dist/converter/integral7/ConverterIntegral7.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateInMemoryObjects = exports.getValidTerminals = exports.getGeoCoordinates = exports.getVoltageLevelByVoltage = exports.ConverterIntegral7 = void 0;
+exports.validateInMemoryObjects = exports.getValidTapChangerControls = exports.getValidTerminals = exports.getGeoCoordinates = exports.getVoltageLevelByVoltage = exports.ConverterIntegral7 = void 0;
 const tslib_1 = require("tslib");
 const __1 = require("../..");
 const mysql = tslib_1.__importStar(require("mysql"));
@@ -15,20 +15,14 @@ const jszip_1 = tslib_1.__importDefault(require("jszip"));
 const Standort_1 = require("./model/integral/Standort");
 const Schaltanlage_1 = require("./model/integral/Schaltanlage");
 const Schaltanlagenabschnitt_1 = require("./model/integral/Schaltanlagenabschnitt");
-const StandortNsg_1 = require("./model/integral/StandortNsg");
-const SchaltanlageNSG_1 = require("./model/integral/SchaltanlageNSG");
-const SchaltanlagenabschnittNsg_1 = require("./model/integral/SchaltanlagenabschnittNsg");
-const Point_1 = require("./model/integral/Point");
-const utils_schema_1 = require("./utils-schema");
 const Schaltfeld_1 = require("./model/integral/Schaltfeld");
-const SchaltfeldNsg_1 = require("./model/integral/SchaltfeldNsg");
 const KnotenSo_1 = require("./model/integral/KnotenSo");
-const KnotenSoNsg_1 = require("./model/integral/KnotenSoNsg");
 const Leitung_1 = require("./model/integral/Leitung");
 const TapChangerInfo_1 = require("../../model/assetinfo/TapChangerInfo");
 const AMPRIONBay_1 = require("../../model/extensions/amprion/core/AMPRIONBay");
 const AMPRIONConnectivityNode_1 = require("../../model/extensions/amprion/core/AMPRIONConnectivityNode");
 const AMPRIONSeriesCompensator_1 = require("../../model/extensions/amprion/wires/AMPRIONSeriesCompensator");
+const AMPRIONSubstation_1 = require("../../model/extensions/amprion/core/AMPRIONSubstation");
 const CsConverter_1 = require("../../model/dc/CsConverter");
 const DCConverterUnit_1 = require("../../model/dc/DCConverterUnit");
 const DCNode_1 = require("../../model/dc/DCNode");
@@ -55,12 +49,17 @@ const EVPowerTransformerEndInfo_1 = require("../../model/extensions/enervance/as
 const util_create_1 = require("../../util/util-create");
 const EVPowerTransformerInfo_1 = require("../../model/extensions/enervance/assetinfo/EVPowerTransformerInfo");
 const EVWireInfo_1 = require("../../model/extensions/enervance/assetinfo/EVWireInfo");
+const SynchronousMachineTimeConstantReactance_1 = require("../../model/dynamics/standard-models/synchronous-machine-dynamics/SynchronousMachineTimeConstantReactance");
+const EquivalentInjection_1 = require("../../model/equivalents/EquivalentInjection");
+const I7Schema_1 = require("./interface-i7/I7Schema");
 class ConverterIntegral7 {
     constructor() {
         this.limit = 100;
+        this.i7SchemaID2UUID = new Map();
         this.integralID2UUID = new Map();
-        this.UUID2IntegralID = new Map();
+        this.UUID2Integral7ID_ = new Map();
         this.statcomRegulatingControls = new Map();
+        this.integralID2Type = new Map();
         this.schaltfeldIDs = [];
         this.querkupplungIDs = [];
         this.laengskupplungIDs = [];
@@ -68,6 +67,9 @@ class ConverterIntegral7 {
         this.knotenSfIDs = [];
         this.leitungsIDs = [];
         this.kdrosseltypen = new Map();
+        this.schemaIDSchemastandort = new Map();
+        this.schemaIDSchaltanlage = new Map();
+        this.schemaIDSchaltanlagenabschnitt = new Map();
         this.integralStandorte = new Map();
         this.integralSchaltanlagen = new Map();
         this.integralSchaltanlagenAbschnitte = new Map();
@@ -91,6 +93,7 @@ class ConverterIntegral7 {
             connectivityNodes: new Map(),
             terminals: new Map()
         };
+        this.knotenSpannungsband = new Map();
         this.knotenSpannung = new Map();
         this.substationVoltagelevels = new Map();
         this.eqSpannungsBander = new Map();
@@ -116,6 +119,7 @@ class ConverterIntegral7 {
                     this.trafo2WAnzahl = yield this.queryObjectCount(integral_sql_1.Integral7TableNames.TRAFO2W);
                     this.trafo3WAnzahl = yield this.queryObjectCount(integral_sql_1.Integral7TableNames.TRAFO3W);
                     yield this.queryAnschlussIDs();
+                    yield this.querySpGeregelteKnoten();
                     resolve({ status: 'successful', message: 'ok' });
                 }
                 catch (e) {
@@ -124,7 +128,7 @@ class ConverterIntegral7 {
             }));
         });
     }
-    convert(defaultValuesConfig, energyTypesConfig, tempDirPath, gridName) {
+    convert(objectMappingConfig, defaultValuesConfig, energyTypesConfig, tempDirPath, gridName) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => tslib_1.__awaiter(this, void 0, void 0, function* () {
                 try {
@@ -148,6 +152,11 @@ class ConverterIntegral7 {
                     const modelSSHUUID = __1.generateUUID();
                     const profilesSSH = [__1.RDF_XML.SSH_OPER_PROFILE_URI];
                     this.cimModel.toCIMXML(sshProfileExportObjects.xmlWriter, modelSSHUUID, profilesSSH, [modelEQUUID], __1.RDF_XML.AMP_MAS);
+                    const dyProfileExportObjects = utils_1.createProfileExportObjects(tempDirPath, `${gridName}_dy.xml`);
+                    this.writeHeaderStart(dyProfileExportObjects.xmlWriter);
+                    const modelDYUUID = __1.generateUUID();
+                    const profilesDY = [__1.RDF_XML.DY_PROFILE_URI];
+                    this.cimModel.toCIMXML(dyProfileExportObjects.xmlWriter, modelDYUUID, profilesDY, [modelEQUUID], __1.RDF_XML.AMP_MAS);
                     const svProfileExportObjects = utils_1.createProfileExportObjects(tempDirPath, `${gridName}_sv.xml`);
                     this.writeHeaderStart(svProfileExportObjects.xmlWriter);
                     const modelSVUUID = __1.generateUUID();
@@ -161,7 +170,6 @@ class ConverterIntegral7 {
                     this.addDefaultObjects(defaultValuesConfig);
                     yield this.convertGeoRegionen(defaultValuesConfig);
                     yield this.convertSubGeoRegionen(defaultValuesConfig);
-                    yield this.convertStromkreise();
                     yield this.convertBetriebsmitteltypenLeitung();
                     yield this.convertBetriebsmitteltypenTrafo();
                     yield this.convertBetriebsmitteltypenKdrossel();
@@ -169,18 +177,18 @@ class ConverterIntegral7 {
                     this.objectToCIMXML(glProfileExportObjects.xmlWriter, this.cimModel.coordinateSystems, __1.RDF_XML.PROFILE_GL, defaultValuesConfig);
                     this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.geographicalRegions, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                     this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.subgeographicalRegions, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
-                    this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.lines, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                     this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.loadAreas, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                     this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.subLoadAreas, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                     this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.conformLoadGroups, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
-                    this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.diagrams, __1.RDF_XML.PROFILE_DL, defaultValuesConfig);
-                    this.objectArrayToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.diagramStyles, __1.RDF_XML.PROFILE_DL);
+                    this.objectToCIMXML(dlProfileExportObjects.xmlWriter, this.cimModel.diagrams, __1.RDF_XML.PROFILE_DL, defaultValuesConfig);
+                    this.objectArrayToCIMXML(dlProfileExportObjects.xmlWriter, this.cimModel.diagramStyles, __1.RDF_XML.PROFILE_DL);
                     const restCount = this.standortAnzahl < this.limit ? this.standortAnzahl : (this.standortAnzahl % this.limit);
                     const intervalCount = (this.standortAnzahl - restCount) / this.limit;
                     const numberOfIntervals = restCount > 0 ? intervalCount + 1 : intervalCount;
                     for (let i = 0; i < numberOfIntervals; i++) {
                         const offset = i * this.limit;
                         const currentLimit = (i + 1 === numberOfIntervals && restCount > 0) ? restCount : this.limit;
+                        this.logger.debug(`offset ${offset} currentLimit ${currentLimit}`);
                         yield this.convertStandorte(currentLimit, offset, defaultValuesConfig);
                         const standortIDs = [...this.integralStandorte.keys()];
                         yield this.covertSchaltanlagen(standortIDs, defaultValuesConfig);
@@ -220,13 +228,13 @@ class ConverterIntegral7 {
                             yield this.convertSammelschienenAbschnitte(schaltanlagenAbschnittIDs);
                         }
                         if (knotenSoIDs.length > 0 || this.knotenSfIDs.length > 0) {
-                            const querZweigID2ErgebnisLflID = yield this.convertBelastungen([...knotenSoIDs, ...this.knotenSfIDs], defaultValuesConfig, false);
+                            const querZweigID2ErgebnisLflID = yield this.convertBelastungen([...knotenSoIDs, ...this.knotenSfIDs], defaultValuesConfig, objectMappingConfig.Belastung.class);
                             yield this.convertQuerzweigErgebnisData(querZweigID2ErgebnisLflID, 1, 0);
                         }
                         if (knotenSoIDs.length > 0 || this.knotenSfIDs.length > 0) {
-                            yield this.convertEinspeisungen([...knotenSoIDs, ...this.knotenSfIDs]);
+                            yield this.convertEinspeisungen([...knotenSoIDs, ...this.knotenSfIDs], objectMappingConfig.Einspeisung.class);
                         }
-                        if (knotenSoIDs.length > 0 || this.knotenSfIDs.length > 0) {
+                        if (knotenSoIDs.length || this.knotenSfIDs.length > 0) {
                             yield this.convertGeneratoren([...knotenSoIDs, ...this.knotenSfIDs], energyTypesConfig);
                         }
                         if (knotenSoIDs.length > 0 || this.knotenSfIDs.length > 0) {
@@ -282,10 +290,8 @@ class ConverterIntegral7 {
                         if (schaltanlagenAbschnittIDs.length > 0) {
                             yield this.convertSchemaSchaltanlagenAbschnitte(schaltanlagenAbschnittIDs);
                         }
-                        yield this.convertSchemaSammelschienenAbschnitte();
-                        if (this.schaltfeldIDs.length > 0) {
-                            yield this.convertSchemaSchaltfelder(this.schaltfeldIDs);
-                        }
+                        const validTerminals = getValidTerminals(this.cimModel.terminals, this.inmemoryObjects);
+                        this.checkRegelungsknotenTerminals([...validTerminals.values()]);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.substations, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.voltageLevels, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.bays, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
@@ -294,6 +300,7 @@ class ConverterIntegral7 {
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.energyConsumers, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.conformLoads, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.energySources, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
+                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.equivalentInjections, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.externalNetworkInjections, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.disconnectors, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.breakers, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
@@ -315,23 +322,27 @@ class ConverterIntegral7 {
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.operationalLimitSets, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.currentLimits, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.connectivityNodes, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
-                        const validTerminals = getValidTerminals(this.cimModel.terminals, this.inmemoryObjects);
-                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, validTerminals, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
-                        this.objectToCIMXML(sshProfileExportObjects.xmlWriter, validTerminals, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
+                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, validTerminals, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig, this.logger);
+                        this.objectToCIMXML(sshProfileExportObjects.xmlWriter, validTerminals, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig, this.logger);
                         this.objectToCIMXML(dlProfileExportObjects.xmlWriter, this.cimModel.diagramObjects, __1.RDF_XML.PROFILE_DL, defaultValuesConfig);
                         this.objectToCIMXML(glProfileExportObjects.xmlWriter, this.cimModel.locations, __1.RDF_XML.PROFILE_GL, defaultValuesConfig);
                         this.objectToCIMXML(sshProfileExportObjects.xmlWriter, this.cimModel.energyConsumers, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
                         this.objectToCIMXML(sshProfileExportObjects.xmlWriter, this.cimModel.conformLoads, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
                         this.objectToCIMXML(sshProfileExportObjects.xmlWriter, this.cimModel.energySources, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
+                        this.objectToCIMXML(sshProfileExportObjects.xmlWriter, this.cimModel.equivalentInjections, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
                         this.objectToCIMXML(sshProfileExportObjects.xmlWriter, this.cimModel.disconnectors, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
                         this.objectToCIMXML(sshProfileExportObjects.xmlWriter, this.cimModel.breakers, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
+                        this.objectToCIMXML(sshProfileExportObjects.xmlWriter, this.cimModel.synchronousMachine, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
+                        this.objectToCIMXML(sshProfileExportObjects.xmlWriter, this.cimModel.asynchronousMachine, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
                         this.objectToCIMXML(sshProfileExportObjects.xmlWriter, this.cimModel.staticVarCompensator, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
                         this.objectToCIMXML(sshProfileExportObjects.xmlWriter, this.cimModel.regulatingControl, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
                         this.objectArrayToCIMXML(svProfileExportObjects.xmlWriter, this.cimModel.svStatus, __1.RDF_XML.PROFILE_SV);
                         this.objectArrayToCIMXML(svProfileExportObjects.xmlWriter, this.cimModel.svPowerFlow, __1.RDF_XML.PROFILE_SV);
                         this.objectArrayToCIMXML(svProfileExportObjects.xmlWriter, this.cimModel.svTapSteps, __1.RDF_XML.PROFILE_SV);
+                        this.objectToCIMXML(dyProfileExportObjects.xmlWriter, this.cimModel.synchronousMachineTimeConstantReactance, __1.RDF_XML.PROFILE_DY, defaultValuesConfig);
                         this.objectToCIMXML(ampI7ProfileExportObjects.xmlWriter, this.cimModel.bays, __1.RDF_XML.PROFILE_AMPI7, defaultValuesConfig);
                         this.objectToCIMXML(ampI7ProfileExportObjects.xmlWriter, this.cimModel.connectivityNodes, __1.RDF_XML.PROFILE_AMPI7, defaultValuesConfig);
+                        this.objectToCIMXML(ampI7ProfileExportObjects.xmlWriter, this.cimModel.substations, __1.RDF_XML.PROFILE_AMPI7, defaultValuesConfig);
                         this.cimModel.substations.clear();
                         this.cimModel.voltageLevels.clear();
                         this.cimModel.bays.clear();
@@ -341,8 +352,10 @@ class ConverterIntegral7 {
                         this.cimModel.energyConsumers.clear();
                         this.cimModel.conformLoads.clear();
                         this.cimModel.energySources.clear();
+                        this.cimModel.equivalentInjections.clear();
                         this.cimModel.externalNetworkInjections.clear();
                         this.cimModel.synchronousMachine.clear();
+                        this.cimModel.synchronousMachineTimeConstantReactance.clear();
                         this.cimModel.asynchronousMachine.clear();
                         this.cimModel.generatingUnit.clear();
                         this.cimModel.thermalGeneratingUnit.clear();
@@ -380,20 +393,21 @@ class ConverterIntegral7 {
                         this.integralNsgSchaltfelder.clear();
                         this.integralNsgKnotenSo.clear();
                         this.eqSpannungsBander.clear();
-                        this.logger.info(`Offset ${offset} done`);
+                        this.logger.debug(`Offset ${offset} done`);
                     }
                     const restCountELZ = this.ersatzlaengszweigAnzahl < this.limit ? this.ersatzlaengszweigAnzahl : (this.ersatzlaengszweigAnzahl % this.limit);
                     const intervalCountELZ = (this.ersatzlaengszweigAnzahl - restCountELZ) / this.limit;
                     const numberOfIntervalsELZ = restCountELZ > 0 ? intervalCountELZ + 1 : intervalCountELZ;
-                    this.logger.info('Convert Ersatzlaengszweige ' + this.ersatzlaengszweigAnzahl);
+                    this.logger.debug('Convert Ersatzlaengszweige ' + this.ersatzlaengszweigAnzahl);
                     for (let i = 0; i < numberOfIntervalsELZ; i++) {
                         const offset = i * this.limit;
                         const currentLimit = (i + 1 === numberOfIntervalsELZ && restCountELZ > 0) ? restCountELZ : this.limit;
                         yield this.convertErsatzLaengszweige(currentLimit, offset, defaultValuesConfig);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.equivalentBranches, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         const validTerminals = getValidTerminals(this.cimModel.terminals, this.inmemoryObjects);
-                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, validTerminals, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
-                        this.objectToCIMXML(sshProfileExportObjects.xmlWriter, validTerminals, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
+                        this.checkRegelungsknotenTerminals([...validTerminals.values()]);
+                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, validTerminals, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig, this.logger);
+                        this.objectToCIMXML(sshProfileExportObjects.xmlWriter, validTerminals, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig, this.logger);
                         this.cimModel.equivalentBranches.clear();
                         this.cimModel.connectivityNodes.clear();
                         this.cimModel.terminals.clear();
@@ -402,20 +416,20 @@ class ConverterIntegral7 {
                     const restCountLeitung = this.leitungsAnzahl < this.limit ? this.leitungsAnzahl : (this.leitungsAnzahl % this.limit);
                     const intervalCountLeitung = (this.leitungsAnzahl - restCountLeitung) / this.limit;
                     const numberOfIntervalsLeitung = restCountLeitung > 0 ? intervalCountLeitung + 1 : intervalCountLeitung;
-                    this.logger.info('Convert ACLineSegments ' + this.leitungsAnzahl);
+                    this.logger.debug('Convert ACLineSegments ' + this.leitungsAnzahl);
                     for (let i = 0; i < numberOfIntervalsLeitung; i++) {
                         const offset = i * this.limit;
                         const currentLimit = (i + 1 === numberOfIntervalsLeitung && restCountLeitung > 0) ? restCountLeitung : this.limit;
-                        yield this.convertLeitungen(currentLimit, offset);
-                        this.leitungsIDs = [...this.integralLeitungen.keys()];
-                        if (this.leitungsIDs.length > 0)
-                            yield this.determineLeitungsTypen(this.leitungsIDs, defaultValuesConfig);
+                        yield this.convertLeitungen(currentLimit, offset, defaultValuesConfig);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.acLineSegments, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
+                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.lines, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         const validTerminals = getValidTerminals(this.cimModel.terminals, this.inmemoryObjects);
-                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, validTerminals, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
-                        this.objectToCIMXML(sshProfileExportObjects.xmlWriter, validTerminals, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
+                        this.checkRegelungsknotenTerminals([...validTerminals.values()]);
+                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, validTerminals, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig, this.logger);
+                        this.objectToCIMXML(sshProfileExportObjects.xmlWriter, validTerminals, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig, this.logger);
                         this.objectToCIMXML(ampI7ProfileExportObjects.xmlWriter, this.cimModel.acLineSegments, __1.RDF_XML.PROFILE_AMPI7, defaultValuesConfig);
                         this.cimModel.acLineSegments.clear();
+                        this.cimModel.lines.clear();
                         this.cimModel.connectivityNodes.clear();
                         this.cimModel.terminals.clear();
                         this.cimModel.diagramObjects.clear();
@@ -426,7 +440,7 @@ class ConverterIntegral7 {
                     const restCountHgueLeitung = this.hgueLeitungsAnzahl < this.limit ? this.hgueLeitungsAnzahl : (this.hgueLeitungsAnzahl % this.limit);
                     const intervalCountHgueLeitung = (this.hgueLeitungsAnzahl - restCountHgueLeitung) / this.limit;
                     const numberOfIntervalsHgueLeitung = restCountHgueLeitung > 0 ? intervalCountHgueLeitung + 1 : intervalCountHgueLeitung;
-                    this.logger.info('Convert ACLineSegments ' + this.hgueLeitungsAnzahl);
+                    this.logger.debug('Convert ACLineSegments ' + this.hgueLeitungsAnzahl);
                     for (let i = 0; i < numberOfIntervalsHgueLeitung; i++) {
                         const offset = i * this.limit;
                         const currentLimit = (i + 1 === numberOfIntervalsHgueLeitung && restCountHgueLeitung > 0) ? restCountHgueLeitung : this.limit;
@@ -434,6 +448,7 @@ class ConverterIntegral7 {
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.dcLines, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.dcLineSegment, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.dcTerminals, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
+                        this.objectToCIMXML(sshProfileExportObjects.xmlWriter, this.cimModel.dcTerminals, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
                         this.cimModel.dcLines.clear();
                         this.cimModel.dcLineSegment.clear();
                         this.cimModel.dcTerminals.clear();
@@ -441,18 +456,19 @@ class ConverterIntegral7 {
                     const restCountLD = this.laengsdrosselAnzahl < this.limit ? this.laengsdrosselAnzahl : (this.laengsdrosselAnzahl % this.limit);
                     const intervalCountLD = (this.laengsdrosselAnzahl - restCountLD) / this.limit;
                     const numberOfIntervalsLD = restCountLD > 0 ? intervalCountLD + 1 : intervalCountLD;
-                    this.logger.info('Convert Längsdrossel ' + this.laengsdrosselAnzahl);
+                    this.logger.debug('Convert Längsdrossel ' + this.laengsdrosselAnzahl);
                     for (let i = 0; i < numberOfIntervalsLD; i++) {
                         const offset = i * this.limit;
                         const currentLimit = (i + 1 === numberOfIntervalsLD && restCountLD > 0) ? restCountLD : this.limit;
                         yield this.convertLaengsdrosseln(currentLimit, offset, defaultValuesConfig);
-                        this.logger.info('Export Längsdrossel ' + this.cimModel.seriesCompensators.size);
+                        this.logger.debug('Export Längsdrossel ' + this.cimModel.seriesCompensators.size);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.seriesCompensators, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.operationalLimitSets, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.currentLimits, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         const validTerminals = getValidTerminals(this.cimModel.terminals, this.inmemoryObjects);
-                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, validTerminals, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
-                        this.objectToCIMXML(sshProfileExportObjects.xmlWriter, validTerminals, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
+                        this.checkRegelungsknotenTerminals([...validTerminals.values()]);
+                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, validTerminals, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig, this.logger);
+                        this.objectToCIMXML(sshProfileExportObjects.xmlWriter, validTerminals, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig, this.logger);
                         this.objectToCIMXML(ampI7ProfileExportObjects.xmlWriter, this.cimModel.seriesCompensators, __1.RDF_XML.PROFILE_AMPI7, defaultValuesConfig);
                         this.cimModel.seriesCompensators.clear();
                         this.cimModel.operationalLimitSets.clear();
@@ -463,7 +479,7 @@ class ConverterIntegral7 {
                     const restCountLK = this.laengskondensatorAnzahl < this.limit ? this.laengskondensatorAnzahl : (this.laengskondensatorAnzahl % this.limit);
                     const intervalCountLK = (this.laengskondensatorAnzahl - restCountLK) / this.limit;
                     const numberOfIntervalsLK = restCountLK > 0 ? intervalCountLK + 1 : intervalCountLK;
-                    this.logger.info('Convert Längskondensator ' + this.laengskondensatorAnzahl);
+                    this.logger.debug('Convert Längskondensator ' + this.laengskondensatorAnzahl);
                     for (let i = 0; i < numberOfIntervalsLK; i++) {
                         const offset = i * this.limit;
                         const currentLimit = (i + 1 === numberOfIntervalsLK && restCountLK > 0) ? restCountLK : this.limit;
@@ -472,8 +488,9 @@ class ConverterIntegral7 {
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.operationalLimitSets, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.currentLimits, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         const validTerminals = getValidTerminals(this.cimModel.terminals, this.inmemoryObjects);
-                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, validTerminals, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
-                        this.objectToCIMXML(sshProfileExportObjects.xmlWriter, validTerminals, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
+                        this.checkRegelungsknotenTerminals([...validTerminals.values()]);
+                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, validTerminals, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig, this.logger);
+                        this.objectToCIMXML(sshProfileExportObjects.xmlWriter, validTerminals, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig, this.logger);
                         this.objectToCIMXML(ampI7ProfileExportObjects.xmlWriter, this.cimModel.seriesCompensators, __1.RDF_XML.PROFILE_AMPI7, defaultValuesConfig);
                         this.cimModel.seriesCompensators.clear();
                         this.cimModel.operationalLimitSets.clear();
@@ -484,23 +501,32 @@ class ConverterIntegral7 {
                     const restCountTrafo2W = this.trafo2WAnzahl < this.limit ? this.trafo2WAnzahl : (this.trafo2WAnzahl % this.limit);
                     const intervalCountTrafo2W = (this.trafo2WAnzahl - restCountTrafo2W) / this.limit;
                     const numberOfIntervalsTrafo2W = restCountTrafo2W > 0 ? intervalCountTrafo2W + 1 : intervalCountTrafo2W;
-                    this.logger.info('Convert Transformers');
+                    this.logger.debug('Convert Transformers');
                     for (let i = 0; i < numberOfIntervalsTrafo2W; i++) {
                         const offset = i * this.limit;
                         const currentLimit = (i + 1 === numberOfIntervalsTrafo2W && restCountTrafo2W > 0) ? restCountTrafo2W : this.limit;
-                        yield this.convertTrafo2W(currentLimit, offset);
+                        yield this.convertTrafo2W(currentLimit, offset, defaultValuesConfig);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.powerTransformer, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.powerTransformerEnds, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         const validTerminals = getValidTerminals(this.cimModel.terminals, this.inmemoryObjects);
-                        this.objectToCIMXML(sshProfileExportObjects.xmlWriter, validTerminals, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
-                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, validTerminals, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
-                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.tapChangerControls, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
+                        this.checkRegelungsknotenTerminals([...validTerminals.values()]);
+                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, validTerminals, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig, this.logger);
+                        this.objectToCIMXML(sshProfileExportObjects.xmlWriter, validTerminals, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig, this.logger);
+                        const validTapChangerControls = getValidTapChangerControls(this.cimModel.tapChangerControls);
+                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, validTapChangerControls, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
+                        this.objectToCIMXML(sshProfileExportObjects.xmlWriter, validTapChangerControls, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.ratioTapChangers, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
-                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.ratioTapChangerTables, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
-                        validateRegulatingControls(this.cimModel.regulatingControl, this.logger, '2W Trafo');
-                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.regulatingControl, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
+                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.phaseTapChangerLinear, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
+                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.phaseTapChangerSymmetrical, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
+                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.phaseTapChangerAsymmetrical, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
+                        this.objectToCIMXML(sshProfileExportObjects.xmlWriter, this.cimModel.ratioTapChangers, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
+                        this.objectToCIMXML(sshProfileExportObjects.xmlWriter, this.cimModel.phaseTapChangerLinear, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
+                        this.objectToCIMXML(sshProfileExportObjects.xmlWriter, this.cimModel.phaseTapChangerSymmetrical, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
+                        this.objectToCIMXML(sshProfileExportObjects.xmlWriter, this.cimModel.phaseTapChangerAsymmetrical, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.operationalLimitSets, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.currentLimits, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
+                        validateRegulatingControls(this.cimModel.regulatingControl, this.logger, '2W Trafo');
+                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.regulatingControl, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         this.objectToCIMXML(sshProfileExportObjects.xmlWriter, this.cimModel.regulatingControl, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
                         this.cimModel.powerTransformer.clear();
                         this.cimModel.powerTransformerEnds.clear();
@@ -509,6 +535,9 @@ class ConverterIntegral7 {
                         this.cimModel.regulatingControl.clear();
                         this.cimModel.tapChangerControls.clear();
                         this.cimModel.ratioTapChangers.clear();
+                        this.cimModel.phaseTapChangerLinear.clear();
+                        this.cimModel.phaseTapChangerSymmetrical.clear();
+                        this.cimModel.phaseTapChangerAsymmetrical.clear();
                         for (const table of this.cimModel.ratioTapChangerTables.values()) {
                             table.ratioTapChangerTablePoints = [];
                         }
@@ -517,14 +546,14 @@ class ConverterIntegral7 {
                         this.cimModel.terminals.clear();
                         this.cimModel.objects.clear();
                     }
-                    const restCountTrafo3W = this.trafo2WAnzahl < this.limit ? this.trafo3WAnzahl : (this.trafo3WAnzahl % this.limit);
+                    const restCountTrafo3W = this.trafo3WAnzahl < this.limit ? this.trafo3WAnzahl : (this.trafo3WAnzahl % this.limit);
                     const intervalCountTrafo3W = (this.trafo3WAnzahl - restCountTrafo3W) / this.limit;
                     const numberOfIntervalsTrafo3W = restCountTrafo3W > 0 ? intervalCountTrafo3W + 1 : intervalCountTrafo3W;
-                    this.logger.info('Convert Transformers3W');
+                    this.logger.debug('Convert Transformers3W');
                     for (let i = 0; i < numberOfIntervalsTrafo3W; i++) {
                         const offset = i * this.limit;
                         const currentLimit = (i + 1 === numberOfIntervalsTrafo3W && restCountTrafo3W > 0) ? restCountTrafo3W : this.limit;
-                        yield this.convertTrafo3W(currentLimit, offset);
+                        yield this.convertTrafo3W(currentLimit, offset, defaultValuesConfig);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.powerTransformer, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         this.cimModel.powerTransformer.clear();
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.powerTransformerEnds, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
@@ -532,28 +561,38 @@ class ConverterIntegral7 {
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.currentLimits, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         this.cimModel.currentLimits.clear();
                         const validTerminals = getValidTerminals(this.cimModel.terminals, this.inmemoryObjects);
-                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, validTerminals, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
-                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, validTerminals, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
+                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, validTerminals, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig, this.logger);
+                        this.objectToCIMXML(sshProfileExportObjects.xmlWriter, validTerminals, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig, this.logger);
                         this.cimModel.terminals.clear();
-                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.tapChangerControls, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
+                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, getValidTapChangerControls(this.cimModel.tapChangerControls), __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         this.cimModel.tapChangerControls.clear();
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.ratioTapChangers, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
+                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.phaseTapChangerLinear, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
+                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.phaseTapChangerSymmetrical, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
+                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.phaseTapChangerAsymmetrical, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
+                        this.objectToCIMXML(sshProfileExportObjects.xmlWriter, this.cimModel.ratioTapChangers, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
+                        this.objectToCIMXML(sshProfileExportObjects.xmlWriter, this.cimModel.phaseTapChangerLinear, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
+                        this.objectToCIMXML(sshProfileExportObjects.xmlWriter, this.cimModel.phaseTapChangerSymmetrical, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
+                        this.objectToCIMXML(sshProfileExportObjects.xmlWriter, this.cimModel.phaseTapChangerAsymmetrical, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
                         this.cimModel.ratioTapChangers.clear();
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.ratioTapChangerTables, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.operationalLimitSets, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                         validateRegulatingControls(this.cimModel.regulatingControl, this.logger, '3W Trafo');
                         this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.regulatingControl, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
-                        this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.regulatingControl, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
+                        this.objectToCIMXML(sshProfileExportObjects.xmlWriter, this.cimModel.regulatingControl, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
                         this.cimModel.regulatingControl.clear();
                         this.cimModel.operationalLimitSets.clear();
                         for (const table of this.cimModel.ratioTapChangerTables.values()) {
                             table.ratioTapChangerTablePoints = [];
                         }
                         this.cimModel.ratioTapChangerTables.clear();
+                        this.cimModel.phaseTapChangerLinear.clear();
+                        this.cimModel.phaseTapChangerSymmetrical.clear();
+                        this.cimModel.phaseTapChangerAsymmetrical.clear();
                         this.cimModel.svTapSteps.length = 0;
                         this.cimModel.objects.clear();
                     }
-                    const memoryTerminals = validateInMemoryObjects(this.inmemoryObjects);
+                    const memoryTerminals = validateInMemoryObjects(this.inmemoryObjects, this.logger);
                     this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.operationalLimitTypes, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                     this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.baseVoltages, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                     this.objectToCIMXML(eqProfileExportObjects.xmlWriter, memoryTerminals, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
@@ -562,6 +601,7 @@ class ConverterIntegral7 {
                     this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.vsConverter, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                     this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.csConverter, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                     this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.acDCConverterDCTerminals, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
+                    this.objectToCIMXML(sshProfileExportObjects.xmlWriter, this.cimModel.acDCConverterDCTerminals, __1.RDF_XML.PROFILE_SSH, defaultValuesConfig);
                     this.objectToCIMXML(eqProfileExportObjects.xmlWriter, this.cimModel.dcNodes, __1.RDF_XML.PROFILE_EQ, defaultValuesConfig);
                     for (const junction of this.stpImpModel.junctions.values()) {
                         if (junction.baseVoltageUUID && junction.equipmentContainerUUID) {
@@ -608,6 +648,7 @@ class ConverterIntegral7 {
                     this.writeHeaderEnd(dlProfileExportObjects.xmlWriter);
                     this.writeHeaderEnd(glProfileExportObjects.xmlWriter);
                     this.writeHeaderEnd(sshProfileExportObjects.xmlWriter);
+                    this.writeHeaderEnd(dyProfileExportObjects.xmlWriter);
                     this.writeHeaderEnd(svProfileExportObjects.xmlWriter);
                     this.writeHeaderEnd(ampI7ProfileExportObjects.xmlWriter);
                     yield Promise.all([
@@ -616,6 +657,7 @@ class ConverterIntegral7 {
                         utils_2.createWriteStreamPromise(glProfileExportObjects.writeStream),
                         utils_2.createWriteStreamPromise(sshProfileExportObjects.writeStream),
                         utils_2.createWriteStreamPromise(svProfileExportObjects.writeStream),
+                        utils_2.createWriteStreamPromise(dyProfileExportObjects.writeStream),
                         utils_2.createWriteStreamPromise(ampI7ProfileExportObjects.writeStream),
                     ]);
                     const zip = new jszip_1.default();
@@ -627,6 +669,8 @@ class ConverterIntegral7 {
                     zip.file(`${gridName}_gl.xml`, readStreamGl);
                     const readStreamSSH = fs_1.default.createReadStream(sshProfileExportObjects.filePath);
                     zip.file(`${gridName}_ssh.xml`, readStreamSSH);
+                    const readStreamDY = fs_1.default.createReadStream(dyProfileExportObjects.filePath);
+                    zip.file(`${gridName}_dy.xml`, readStreamDY);
                     const readStreamSV = fs_1.default.createReadStream(svProfileExportObjects.filePath);
                     zip.file(`${gridName}_sv.xml`, readStreamSV);
                     const readStreamAmpI7 = fs_1.default.createReadStream(ampI7ProfileExportObjects.filePath);
@@ -634,6 +678,7 @@ class ConverterIntegral7 {
                     resolve(yield utils_2.generateNodeStream(zip));
                 }
                 catch (e) {
+                    console.log(e);
                     reject({ status: 'error', message: e.toString() });
                 }
             }));
@@ -648,7 +693,7 @@ class ConverterIntegral7 {
                     if (tempDirPath) {
                         try {
                             fs_1.default.rmdirSync(tempDirPath, { recursive: true });
-                            this.logger.info(`${path_1.default} is deleted!`);
+                            this.logger.debug(`${path_1.default} is deleted!`);
                         }
                         catch (err) {
                             console.error(`Error while deleting ${path_1.default}.`);
@@ -679,7 +724,8 @@ class ConverterIntegral7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => {
                 if (this.isTableAvailable(tableName)) {
-                    this.queryFunctionWrapper(`SELECT COUNT(id) FROM ${tableName}`).then(results => {
+                    this.queryFunctionWrapper(`SELECT COUNT(id)
+                                           FROM ${tableName}`).then(results => {
                         try {
                             for (const result of results) {
                                 return resolve(Number(result[`COUNT(id)`]));
@@ -699,37 +745,44 @@ class ConverterIntegral7 {
     queryAnschlussIDs() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             try {
-                let results = this.isTableAvailable(integral_sql_1.Integral7TableNames.LEITUNG) ? yield this.queryFunctionWrapper(`SELECT DISTINCT aknoten, eknoten FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.LEITUNG]}`) : [];
+                let results = this.isTableAvailable(integral_sql_1.Integral7TableNames.LEITUNG) ? yield this.queryFunctionWrapper(`SELECT DISTINCT aknoten, eknoten
+                                                                                                                FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.LEITUNG]}`) : [];
                 for (const result of results) {
                     this.leitungAnschlussKnotenIDs.add(result[`aknoten`]);
                     this.leitungAnschlussKnotenIDs.add(result[`eknoten`]);
                 }
-                results = this.isTableAvailable(integral_sql_1.Integral7TableNames.HGUE_LEITUNG) ? yield this.queryFunctionWrapper(`SELECT DISTINCT anetzobjekt, enetzobjekt FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.HGUE_LEITUNG]}`) : [];
+                results = this.isTableAvailable(integral_sql_1.Integral7TableNames.HGUE_LEITUNG) ? yield this.queryFunctionWrapper(`SELECT DISTINCT anetzobjekt, enetzobjekt
+                                                                                                                 FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.HGUE_LEITUNG]}`) : [];
                 for (const result of results) {
                     this.leitungAnschlussKnotenIDs.add(result[`anetzobjekt`]);
                     this.leitungAnschlussKnotenIDs.add(result[`enetzobjekt`]);
                 }
-                results = this.isTableAvailable(integral_sql_1.Integral7TableNames.TRAFO2W) ? yield this.queryFunctionWrapper(`SELECT DISTINCT aknoten, eknoten FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.TRAFO2W]}`) : [];
+                results = this.isTableAvailable(integral_sql_1.Integral7TableNames.TRAFO2W) ? yield this.queryFunctionWrapper(`SELECT DISTINCT aknoten, eknoten
+                                                                                                            FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.TRAFO2W]}`) : [];
                 for (const result of results) {
                     this.leitungAnschlussKnotenIDs.add(result[`aknoten`]);
                     this.leitungAnschlussKnotenIDs.add(result[`eknoten`]);
                 }
-                results = this.isTableAvailable(integral_sql_1.Integral7TableNames.TRAFO3_WICKLUNG) ? yield this.queryFunctionWrapper(`SELECT DISTINCT aknoten, eknoten FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.TRAFO3_WICKLUNG]}`) : [];
+                results = this.isTableAvailable(integral_sql_1.Integral7TableNames.TRAFO3_WICKLUNG) ? yield this.queryFunctionWrapper(`SELECT DISTINCT aknoten, eknoten
+                                                                                                                    FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.TRAFO3_WICKLUNG]}`) : [];
                 for (const result of results) {
                     this.leitungAnschlussKnotenIDs.add(result[`aknoten`]);
                     this.leitungAnschlussKnotenIDs.add(result[`eknoten`]);
                 }
-                results = this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSDROSSEL) ? yield this.queryFunctionWrapper(`SELECT DISTINCT aknoten, eknoten FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.LAENGSDROSSEL]}`) : [];
+                results = this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSDROSSEL) ? yield this.queryFunctionWrapper(`SELECT DISTINCT aknoten, eknoten
+                                                                                                                  FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.LAENGSDROSSEL]}`) : [];
                 for (const result of results) {
                     this.leitungAnschlussKnotenIDs.add(result[`aknoten`]);
                     this.leitungAnschlussKnotenIDs.add(result[`eknoten`]);
                 }
-                results = this.isTableAvailable(integral_sql_1.Integral7TableNames.ERSATZLAENGSZWEIG) ? yield this.queryFunctionWrapper(`SELECT DISTINCT aknoten, eknoten FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.ERSATZLAENGSZWEIG]}`) : [];
+                results = this.isTableAvailable(integral_sql_1.Integral7TableNames.ERSATZLAENGSZWEIG) ? yield this.queryFunctionWrapper(`SELECT DISTINCT aknoten, eknoten
+                                                                                                                      FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.ERSATZLAENGSZWEIG]}`) : [];
                 for (const result of results) {
                     this.leitungAnschlussKnotenIDs.add(result[`aknoten`]);
                     this.leitungAnschlussKnotenIDs.add(result[`eknoten`]);
                 }
-                results = this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSKONDENSATOR) ? yield this.queryFunctionWrapper(`SELECT DISTINCT aknoten, eknoten FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.LAENGSKONDENSATOR]}`) : [];
+                results = this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSKONDENSATOR) ? yield this.queryFunctionWrapper(`SELECT DISTINCT aknoten, eknoten
+                                                                                                                      FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.LAENGSKONDENSATOR]}`) : [];
                 for (const result of results) {
                     this.leitungAnschlussKnotenIDs.add(result[`aknoten`]);
                     this.leitungAnschlussKnotenIDs.add(result[`eknoten`]);
@@ -740,6 +793,17 @@ class ConverterIntegral7 {
             }
         });
     }
+    querySpGeregelteKnoten() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            try {
+                let results = this.isTableAvailable(integral_sql_1.Integral7TableNames.TRAFO2W) ? yield this.queryFunctionWrapper(`SELECT DISTINCT spgreg_knoten
+                                                                                                                FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.TRAFO2W]}`) : [];
+            }
+            catch (e) {
+                console.error("ERROR:" + e);
+            }
+        });
+    }
     convertGeoRegionen(defaultValuesConfig) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.REGION)) {
@@ -747,12 +811,12 @@ class ConverterIntegral7 {
                 for (const i7Data of result) {
                     const region = new __1.GeographicalRegion(__1.getUUID(i7Data.guid), i7Data.bezeichner, i7Data.kurzname);
                     this.cimModel.addGeographicalRegion(region);
-                    this.integralID2UUID.set(i7Data.id, region.mrid);
+                    this.addIdMapping(i7Data.id, region.mrid, integral_sql_1.Integral7TableNames.REGION);
                 }
             }
             else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.REGION} ist nicht vorhanden.`);
-                this.logger.info(`Erstelle Standard Georegion ${defaultValuesConfig.GeographicalRegion.name} .`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.REGION} ist nicht vorhanden.`);
+                this.logger.debug(`Erstelle Standard Georegion ${defaultValuesConfig.GeographicalRegion.name} .`);
                 __1.createGeoregion(__1.generateUUID(), defaultValuesConfig.GeographicalRegion.name, undefined, defaultValuesConfig.GeographicalRegion.description, this.cimModel);
             }
         });
@@ -770,12 +834,12 @@ class ConverterIntegral7 {
                     subregion.region = region;
                     region.addSubGeographicalRegion(subregion);
                     this.cimModel.addSubGeographicalRegion(subregion);
-                    this.integralID2UUID.set(i7Data.id, subregion.mrid);
+                    this.addIdMapping(i7Data.id, subregion.mrid, integral_sql_1.Integral7TableNames.SUBREGION);
                 }
             }
             else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.SUBREGION} ist nicht vorhanden.`);
-                this.logger.info(`Erstelle Standard SubGeographicalRegion ${defaultValuesConfig.SubGeographicalRegion.name}.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.SUBREGION} ist nicht vorhanden.`);
+                this.logger.debug(`Erstelle Standard SubGeographicalRegion ${defaultValuesConfig.SubGeographicalRegion.name}.`);
                 const region = utils_1.createIfNotExitsGeoregionByName(this.cimModel, defaultValuesConfig.GeographicalRegion.name);
                 const subRegion = utils_1.createIfNotExitsSubGeoregionByName(this.cimModel, defaultValuesConfig.SubGeographicalRegion.name, region);
                 subRegion.shortName = defaultValuesConfig.SubGeographicalRegion.shortName;
@@ -792,7 +856,7 @@ class ConverterIntegral7 {
                         utils_2.ueberpruefeZeichenkette(i7Data.ukz) +
                         integral_prefix_1.MITTIGER_PUNKT +
                         utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
-                    const substation = new __1.Substation(__1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.id + '', i7Schluessel);
+                    const substation = new AMPRIONSubstation_1.AMPRIONSubstation(__1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.id + '', i7Schluessel, i7Data.stationsnummer);
                     this.substationNames.set(substation.mrid, substation.name);
                     let subregion = this.cimModel.getSubGeographicalRegion(this.integralID2UUID.get(i7Data.subgeoregion));
                     if (!subregion) {
@@ -816,14 +880,14 @@ class ConverterIntegral7 {
                     }
                     this.substationVoltagelevels.set(i7Data.id, []);
                     this.cimModel.addSubstation(substation);
-                    this.integralID2UUID.set(i7Data.id, substation.mrid);
-                    utils_2.putUUIDtoI7Ids(substation.mrid, i7Data.id, this.UUID2IntegralID);
+                    this.addIdMapping(i7Data.id, substation.mrid, integral_sql_1.Integral7TableNames.STANDORT);
+                    this.addUUIDMapping(i7Data.id, substation.mrid);
                     const standort = new Standort_1.StandortImpl(i7Data);
                     this.integralStandorte.set(i7Data.id, standort);
                 }
             }
             else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.STANDORT} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.STANDORT} ist nicht vorhanden.`);
             }
         });
     }
@@ -845,6 +909,15 @@ class ConverterIntegral7 {
                     const un = utils_2.getU(i7Data.un, defaultValuesConfig.DefaultVoltage);
                     const baseVoltage = __1.createBaseVoltageIfNotExists(this.cimModel, un);
                     vl.baseVoltage = baseVoltage;
+                    if (utils_2.isNumericI7(i7Data.usoll) || (utils_2.isNumericI7(i7Data.umin)) && utils_2.isNumericI7(i7Data.umax)) {
+                        this.knotenSpannungsband.set(i7Data.id, {
+                            usoll: i7Data.usoll,
+                            umin: i7Data.umin,
+                            umax: i7Data.umax,
+                            cnUUID: connectivityNode.mrid,
+                            terminals: []
+                        });
+                    }
                     this.eqSpannungsBander.set(vl.mrid, [
                         {
                             usoll: i7Data.usoll,
@@ -864,11 +937,12 @@ class ConverterIntegral7 {
                         connectivityNode.description = i7Schluessel;
                     }
                     else {
-                        this.logger.info(`KnotenSo ${i7Data.id} ${vl.mrid} besitzt keine Substation.`);
+                        this.logger.debug(`KnotenSo ${i7Data.id} ${vl.mrid} besitzt keine Substation.`);
                     }
                     const psrType = utils_2.getPSRType(this.cimModel, 'Abzweigmast');
                     vl.psrTypeUUID = psrType === null || psrType === void 0 ? void 0 : psrType.mrid;
-                    this.integralID2UUID.set(i7Data.id, connectivityNode.mrid);
+                    this.addIdMapping(i7Data.id, connectivityNode.mrid, integral_sql_1.Integral7TableNames.KNOTEN_SO);
+                    this.addUUIDMapping(i7Data.id, connectivityNode.mrid);
                     this.knotenSoIDs.push(i7Data.id);
                     this.cimModel.addVoltageLevel(vl);
                     this.cimModel.addConnectivityNode(connectivityNode);
@@ -877,7 +951,7 @@ class ConverterIntegral7 {
                 }
             }
             else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.KNOTEN_SO} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.KNOTEN_SO} ist nicht vorhanden.`);
             }
         });
     }
@@ -895,16 +969,16 @@ class ConverterIntegral7 {
                         this.stpImpModel.connectivityNodes.set(connectivityNode.mrid, connectivityNode);
                         this.stpImpModel.junctions.set(junction.mrid, junction);
                         this.stpImpModel.stpSchieneJunctionUUIDs.set(i7DataSchiene.id, junction.mrid);
-                        this.integralID2UUID.set(i7DataSchiene.id, connectivityNode.mrid);
+                        this.addIdMapping(i7DataSchiene.id, connectivityNode.mrid, integral_sql_1.Integral7TableNames.STERNPUNKT_SCHIENE);
                         this.stpImpModel.stpSchieneTerminal.set(i7DataSchiene.id, terminal);
                     }
                     catch (e) {
-                        this.logger.info(e);
+                        this.logger.debug(e);
                     }
                 }
             }
             else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.STERNPUNKT_SCHIENE} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.STERNPUNKT_SCHIENE} ist nicht vorhanden.`);
             }
             resolve(stpSchieneIDs);
         }));
@@ -928,6 +1002,7 @@ class ConverterIntegral7 {
                                         __1.createConnection(this.cimModel, petersenCoil, connectivityNode, __1.PhaseCode.N);
                                     this.stpImpModel.petersenCoils.set(petersenCoil.mrid, petersenCoil);
                                     this.stpImpModel.junctionUUIDstpImp.set(junctionUUID, petersenCoil);
+                                    this.addIdMapping(i7Data.id, petersenCoil.mrid, integral_sql_1.Integral7TableNames.STERNPUNKT_IMPEDANZ);
                                 }
                                 else {
                                     const groundingImpedance = new GroundingImpedance_1.GroundingImpedance(__1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.id + '');
@@ -937,19 +1012,20 @@ class ConverterIntegral7 {
                                         __1.createConnection(this.cimModel, groundingImpedance, connectivityNode, __1.PhaseCode.N);
                                     this.stpImpModel.groundingImpedances.set(groundingImpedance.mrid, groundingImpedance);
                                     this.stpImpModel.junctionUUIDstpImp.set(junctionUUID, groundingImpedance);
+                                    this.addIdMapping(i7Data.id, groundingImpedance.mrid, integral_sql_1.Integral7TableNames.STERNPUNKT_IMPEDANZ);
                                 }
                             }
                         }
                         else {
-                            this.logger.info(`Kdrossel Keine Sternpunktschienen vorhanden.`);
+                            this.logger.debug(`Kdrossel Keine Sternpunktschienen vorhanden.`);
                         }
                     }
                     else {
-                        this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.STERNPUNKT_IMPEDANZ} ist nicht vorhanden.`);
+                        this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.STERNPUNKT_IMPEDANZ} ist nicht vorhanden.`);
                     }
                 }
                 catch (e) {
-                    this.logger.info(e);
+                    this.logger.debug(e);
                 }
                 finally {
                     resolve('');
@@ -973,15 +1049,15 @@ class ConverterIntegral7 {
                         }
                     }
                     else {
-                        this.logger.info(`StpSchaltelemente Keine Sternpunktschienen vorhanden.`);
+                        this.logger.debug(`StpSchaltelemente Keine Sternpunktschienen vorhanden.`);
                     }
                 }
                 else {
-                    this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.STERNPUNKT_SCHALTER} ist nicht vorhanden.`);
+                    this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.STERNPUNKT_SCHALTER} ist nicht vorhanden.`);
                 }
             }
             catch (e) {
-                this.logger.info(e);
+                this.logger.debug(e);
             }
             finally {
                 resolve('');
@@ -1000,8 +1076,8 @@ class ConverterIntegral7 {
                     const baseVoltage = __1.createBaseVoltageIfNotExists(this.cimModel, un);
                     vl.baseVoltageUUID = baseVoltage.mrid;
                     this.cimModel.addVoltageLevel(vl);
-                    this.integralID2UUID.set(i7Data.id, vl.mrid);
-                    utils_2.putUUIDtoI7Ids(vl.mrid, i7Data.id, this.UUID2IntegralID);
+                    this.addIdMapping(i7Data.id, vl.mrid, integral_sql_1.Integral7TableNames.SCHALTANLAGE);
+                    this.addUUIDMapping(i7Data.id, vl.mrid);
                     this.eqSpannungsBander.set(vl.mrid, []);
                     if (substation) {
                         vl.substationUUID = substation.mrid;
@@ -1022,12 +1098,12 @@ class ConverterIntegral7 {
                         });
                     }
                     else {
-                        this.logger.info(`VoltageLevel ${i7Data.id} ${vl.mrid} besitzt keine Umspannanlage.`);
+                        this.logger.debug(`VoltageLevel ${i7Data.id} ${vl.mrid} besitzt keine Umspannanlage.`);
                     }
                 }
             }
             else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.SCHALTANLAGE} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.SCHALTANLAGE} ist nicht vorhanden.`);
             }
         });
     }
@@ -1037,15 +1113,15 @@ class ConverterIntegral7 {
                 const result = yield this.queryFunctionWrapper(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.SCHALTANLAGENABSCHNITT, 0, 0, schaltanlagenIDs));
                 for (const i7Data of result) {
                     const voltageLevel = this.cimModel.getVoltageLevel(this.integralID2UUID.get(i7Data.schaltanlage));
-                    this.integralID2UUID.set(i7Data.id, voltageLevel.mrid);
-                    utils_2.putUUIDtoI7Ids(voltageLevel.mrid, i7Data.id, this.UUID2IntegralID);
+                    this.addIdMapping(i7Data.id, voltageLevel.mrid, integral_sql_1.Integral7TableNames.SCHALTANLAGENABSCHNITT);
+                    this.addUUIDMapping(i7Data.id, voltageLevel.mrid);
                     const schaltanlagenabschnitt = new Schaltanlagenabschnitt_1.SchaltanlagenabschnittImpl(i7Data);
                     schaltanlagenabschnitt.addSchaltanlage(this.integralSchaltanlagen.get(schaltanlagenabschnitt.schaltanlageid));
                     this.integralSchaltanlagenAbschnitte.set(i7Data.id, schaltanlagenabschnitt);
                 }
             }
             else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.SCHALTANLAGENABSCHNITT} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.SCHALTANLAGENABSCHNITT} ist nicht vorhanden.`);
             }
         });
     }
@@ -1058,7 +1134,7 @@ class ConverterIntegral7 {
                     busbarSection.ipMax = i7Data.limit_ip;
                     busbarSection.aggregate = false;
                     const connectivityNode = new AMPRIONConnectivityNode_1.AMPRIONConnectivityNode(__1.generateUUID(), 'ssab cn');
-                    __1.createConnection(this.cimModel, busbarSection, connectivityNode, __1.PhaseCode.ABC, 1);
+                    const terminal = __1.createConnection(this.cimModel, busbarSection, connectivityNode, __1.PhaseCode.ABC, 1);
                     const voltageLevel = this.cimModel.getVoltageLevel(this.integralID2UUID.get(i7Data.saabschnitt));
                     connectivityNode.nodeNumber = i7Data.id_psse_cape;
                     if (voltageLevel) {
@@ -1073,6 +1149,15 @@ class ConverterIntegral7 {
                             utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
                         busbarSection.description = i7Schluessel;
                         connectivityNode.description = i7Schluessel;
+                        if (utils_2.isNumericI7(i7Data.usoll) || (utils_2.isNumericI7(i7Data.umin)) && utils_2.isNumericI7(i7Data.umax)) {
+                            this.knotenSpannungsband.set(i7Data.id, {
+                                usoll: i7Data.usoll,
+                                umin: i7Data.umin,
+                                umax: i7Data.umax,
+                                cnUUID: connectivityNode.mrid,
+                                terminals: [{ uuid: terminal.mrid, connected: terminal.connected }]
+                            });
+                        }
                         const usollValues = this.eqSpannungsBander.get(voltageLevel.mrid);
                         if (usollValues) {
                             usollValues.push({
@@ -1082,14 +1167,14 @@ class ConverterIntegral7 {
                             });
                         }
                         else {
-                            this.logger.info('Sammelschiene ' + i7Data.id + ' besitzt kein Objekt für Sollspannungen.');
+                            this.logger.debug('Sammelschiene ' + i7Data.id + ' besitzt kein Objekt für Sollspannungen.');
                         }
                     }
                     else {
-                        this.logger.info('Sammelschiene ' + i7Data.id + ' besitzt keine Schaltanlage.');
+                        this.logger.debug('Sammelschiene ' + i7Data.id + ' besitzt keine Schaltanlage.');
                     }
-                    this.integralID2UUID.set(i7Data.id, connectivityNode.mrid);
-                    utils_2.putUUIDtoI7Ids(busbarSection.mrid, i7Data.id, this.UUID2IntegralID);
+                    this.addIdMapping(i7Data.id, connectivityNode.mrid, integral_sql_1.Integral7TableNames.SAMMELSCHIENE);
+                    this.addUUIDMapping(i7Data.id, busbarSection.mrid);
                     this.cimModel.addConnectivityNode(connectivityNode);
                     this.cimModel.addBusbarSection(busbarSection);
                     if (this.integralSchaltanlagenAbschnitte.has(i7Data.saabschnitt)) {
@@ -1098,7 +1183,7 @@ class ConverterIntegral7 {
                 }
             }
             else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.SAMMELSCHIENE} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.SAMMELSCHIENE} ist nicht vorhanden.`);
             }
         });
     }
@@ -1117,7 +1202,7 @@ class ConverterIntegral7 {
                         sfImpl.saabschnitt.schaltfelder.push(sfImpl);
                     }
                     else {
-                        this.logger.info(`Schaltfeld ${i7Data.id} besitzt keine Anlage.`);
+                        this.logger.debug(`Schaltfeld ${i7Data.id} besitzt keine Anlage.`);
                     }
                     const voltageLevel = this.cimModel.getVoltageLevel(this.integralID2UUID.get(i7Data.saabschnitt));
                     if (voltageLevel) {
@@ -1128,14 +1213,14 @@ class ConverterIntegral7 {
                         bay.description = i7Schluessel;
                     }
                     else {
-                        this.logger.info(`Schaltfeld ${i7Data.id} besitzt keine Anlage.`);
+                        this.logger.debug(`Schaltfeld ${i7Data.id} besitzt keine Anlage.`);
                     }
                     this.cimModel.addBay(bay);
-                    this.integralID2UUID.set(i7Data.id, bay.mrid);
+                    this.addIdMapping(i7Data.id, bay.mrid, integral_sql_1.Integral7TableNames.SCHALTFELD);
                 }
             }
             else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.SCHALTFELD} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.SCHALTFELD} ist nicht vorhanden.`);
             }
         });
     }
@@ -1156,15 +1241,15 @@ class ConverterIntegral7 {
                         bay.description = i7Schluessel;
                     }
                     else {
-                        this.logger.info(`Querkupplung ${i7Data.id} besitzt keine Anlage.`);
+                        this.logger.debug(`Querkupplung ${i7Data.id} besitzt keine Anlage.`);
                     }
                     this.querkupplungIDs.push(i7Data.id);
                     this.cimModel.addBay(bay);
-                    this.integralID2UUID.set(i7Data.id, bay.mrid);
+                    this.addIdMapping(i7Data.id, bay.mrid, integral_sql_1.Integral7TableNames.QUERKUPPLUNG);
                 }
             }
             else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.QUERKUPPLUNG} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.QUERKUPPLUNG} ist nicht vorhanden.`);
             }
         });
     }
@@ -1185,26 +1270,26 @@ class ConverterIntegral7 {
                         bay.description = i7Schluessel;
                     }
                     else {
-                        this.logger.info(`Laengskupplung ${i7Data.id} besitzt keine Anlage.`);
+                        this.logger.debug(`Laengskupplung ${i7Data.id} besitzt keine Anlage.`);
                     }
                     this.laengskupplungIDs.push(i7Data.id);
-                    this.integralID2UUID.set(i7Data.id, bay.mrid);
+                    this.addIdMapping(i7Data.id, bay.mrid, integral_sql_1.Integral7TableNames.LAENGSKUPPLUNG);
                     this.cimModel.addBay(bay);
                 }
             }
             else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.LAENGSKUPPLUNG} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.LAENGSKUPPLUNG} ist nicht vorhanden.`);
             }
         });
     }
-    convertBelastungen(knotenSfIDs, defaultValuesConfig, conformLoadMapping) {
+    convertBelastungen(knotenSfIDs, defaultValuesConfig, targetClass) {
         return new Promise((resolve) => {
             const querZweigID2LflID = new Map();
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.BELASTUNG)) {
                 this.queryFunctionWrapper(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.BELASTUNG, 0, 0, knotenSfIDs)).then((result) => {
                     for (const i7Data of result) {
-                        const conformLoad = conformLoadMapping ? new ConformLoad_1.ConformLoad(__1.getUUID(i7Data.guid), utils_2.getName(i7Data)) : new __1.EnergyConsumer(__1.getUUID(i7Data.guid), utils_2.getName(i7Data));
-                        if (conformLoadMapping) {
+                        const conformLoad = targetClass === __1.CIM_CLASS_NAMES.ConformLoad ? new ConformLoad_1.ConformLoad(__1.getUUID(i7Data.guid), utils_2.getName(i7Data)) : new __1.EnergyConsumer(__1.getUUID(i7Data.guid), utils_2.getName(i7Data));
+                        if (targetClass === __1.CIM_CLASS_NAMES.ConformLoad) {
                             const conformLoadGroup = this.cimModel.getObjectByName(defaultValuesConfig.ConformLoadGroup.name, __1.CIM_CLASS_NAMES.ConformLoadGroup);
                             conformLoad.loadGroupUUID = conformLoadGroup.mrid;
                         }
@@ -1215,7 +1300,7 @@ class ConverterIntegral7 {
                         conformLoad.q = powerData[1];
                         const connectivityNode = this.cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss));
                         if (connectivityNode) {
-                            __1.createConnection(this.cimModel, conformLoad, connectivityNode, __1.PhaseCode.ABC);
+                            const terminal = __1.createConnection(this.cimModel, conformLoad, connectivityNode, __1.PhaseCode.ABC);
                             const equipmentContainer = utils_2.determineEquipmentContainer('VoltageLevel', this.cimModel, this.cimModel.getObject(connectivityNode.getConnectivityNodeContainerUUID()));
                             if (equipmentContainer) {
                                 conformLoad.equipmentContainerUUID = equipmentContainer.mrid;
@@ -1224,19 +1309,19 @@ class ConverterIntegral7 {
                                 conformLoad.description = i7Schluesel;
                             }
                             else {
-                                this.logger.info(`EnergyConsumer ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                                this.logger.debug(`EnergyConsumer ${i7Data.id} besitzt keinen EquipmentContainer.`);
                             }
                         }
                         else {
-                            this.logger.info(`EnergyConsumer ${i7Data.id} besitzt keinen ConnectivityNode.`);
+                            this.logger.debug(`EnergyConsumer ${i7Data.id} besitzt keinen ConnectivityNode.`);
                         }
-                        if (conformLoadMapping) {
+                        if (targetClass === __1.CIM_CLASS_NAMES.ConformLoad) {
                             this.cimModel.addConformLoad(conformLoad);
                         }
                         else {
                             this.cimModel.addEnergyConsumer(conformLoad);
                         }
-                        this.integralID2UUID.set(i7Data.id, conformLoad.mrid);
+                        this.addIdMapping(i7Data.id, conformLoad.mrid, integral_sql_1.Integral7TableNames.BELASTUNG);
                         querZweigID2LflID.set(i7Data.flussinfo3p, i7Data.id);
                     }
                     resolve(querZweigID2LflID);
@@ -1266,45 +1351,151 @@ class ConverterIntegral7 {
             resolve();
         });
     }
-    convertEinspeisungen(knotenSfIDs) {
-        var _a, _b, _c;
+    convertEinspeisungen(knotenSfIDs, targetClass) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.EINSPEISUNG)) {
                 const result = yield this.queryFunctionWrapper(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.EINSPEISUNG, 0, 0, knotenSfIDs));
+                switch (targetClass) {
+                    case __1.CIM_CLASS_NAMES.EquivalentInjection: {
+                        yield this.convertEinspeisungen2EquivalentInjection(result);
+                        break;
+                    }
+                    case __1.CIM_CLASS_NAMES.ExternalNetworkInjection: {
+                        yield this.convertEinspeisungen2ExternalNetworkInjection(result);
+                        break;
+                    }
+                    default: {
+                        yield this.convertEinspeisungen2EnergySource(result);
+                    }
+                }
+            }
+            else {
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.EINSPEISUNG} ist nicht vorhanden.`);
+            }
+        });
+    }
+    convertEinspeisungen2EnergySource(result) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            return new Promise((resolve) => {
+                var _a, _b, _c;
                 for (const i7Data of result) {
-                    const energySource = new __1.EnergySource(__1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname);
-                    const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
-                    const prio = i7Data.einspprio;
-                    const usoll = i7Data.usoll;
-                    __1.createSvStatus(this.cimModel, inBetrieb, energySource);
-                    const spannungsgeregelt = utils_2.convertToBooleanI7(i7Data.spannungsgeregelt);
-                    const powerData = utils_2.getActiveReactivePower(i7Data);
-                    energySource.activePower = powerData[0];
-                    energySource.reactivePower = powerData[1];
-                    const connectivityNode = this.cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss));
-                    if (connectivityNode) {
-                        __1.createConnection(this.cimModel, energySource, connectivityNode, __1.PhaseCode.ABC);
-                        const equipmentContainer = utils_2.determineEquipmentContainer('VoltageLevel', this.cimModel, this.cimModel.getObject(connectivityNode.getConnectivityNodeContainerUUID()));
-                        if (equipmentContainer) {
-                            energySource.nominalVoltage = (_c = (_b = (_a = 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;
-                            energySource.equipmentContainerUUID = equipmentContainer.mrid;
-                            const i7Schluesel = integral_prefix_1.EINSPEISUNG_PRAEFIX + i7Data.bezeichner;
-                            energySource.description = i7Schluesel;
+                    try {
+                        const energySource = new __1.EnergySource(__1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname);
+                        const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
+                        const prio = i7Data.einspprio;
+                        const usoll = i7Data.usoll;
+                        __1.createSvStatus(this.cimModel, inBetrieb, energySource);
+                        const spannungsgeregelt = utils_2.convertToBooleanI7(i7Data.spannungsgeregelt);
+                        const powerData = utils_2.getActiveReactivePower(i7Data);
+                        energySource.activePower = powerData[0];
+                        energySource.reactivePower = powerData[1];
+                        const connectivityNode = this.cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss));
+                        if (connectivityNode) {
+                            __1.createConnection(this.cimModel, energySource, connectivityNode, __1.PhaseCode.ABC);
+                            const equipmentContainer = utils_2.determineEquipmentContainer('VoltageLevel', this.cimModel, this.cimModel.getObject(connectivityNode.getConnectivityNodeContainerUUID()));
+                            if (equipmentContainer) {
+                                energySource.nominalVoltage = (_c = (_b = (_a = 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;
+                                energySource.equipmentContainerUUID = equipmentContainer.mrid;
+                                const i7Schluesel = integral_prefix_1.EINSPEISUNG_PRAEFIX + i7Data.bezeichner;
+                                energySource.description = i7Schluesel;
+                            }
+                            else {
+                                this.logger.debug(`EnergySource ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                            }
                         }
                         else {
-                            this.logger.info(`EnergySource ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                            this.logger.debug(`EnergySource ${i7Data.id} besitzt keinen ConnectivityNode.`);
                         }
+                        this.cimModel.addEnergySource(energySource);
+                        this.addIdMapping(i7Data.id, energySource.mrid, integral_sql_1.Integral7TableNames.EINSPEISUNG);
                     }
-                    else {
-                        this.logger.info(`EnergySource ${i7Data.id} besitzt keinen ConnectivityNode.`);
+                    catch (err) {
+                        this.logger.error(`Err convertEinspeisungen2EnergySource ${i7Data.id} ${err}`);
                     }
-                    this.cimModel.addEnergySource(energySource);
-                    this.integralID2UUID.set(i7Data.id, energySource.mrid);
                 }
-            }
-            else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.EINSPEISUNG} ist nicht vorhanden.`);
-            }
+                resolve();
+            });
+        });
+    }
+    convertEinspeisungen2EquivalentInjection(result) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            return new Promise((resolve) => {
+                for (const i7Data of result) {
+                    try {
+                        const equivalentInjection = new EquivalentInjection_1.EquivalentInjection(__1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname);
+                        const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
+                        const prio = i7Data.einspprio;
+                        const usoll = i7Data.usoll;
+                        __1.createSvStatus(this.cimModel, inBetrieb, equivalentInjection);
+                        const powerData = utils_2.getActiveReactivePower(i7Data);
+                        equivalentInjection.p = powerData[0];
+                        equivalentInjection.q = powerData[1];
+                        const connectivityNode = this.cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss));
+                        if (connectivityNode) {
+                            __1.createConnection(this.cimModel, equivalentInjection, connectivityNode, __1.PhaseCode.ABC);
+                            const equipmentContainer = utils_2.determineEquipmentContainer('VoltageLevel', this.cimModel, this.cimModel.getObject(connectivityNode.getConnectivityNodeContainerUUID()));
+                            if (equipmentContainer) {
+                                equivalentInjection.equipmentContainerUUID = equipmentContainer.mrid;
+                                const i7Schluesel = integral_prefix_1.EINSPEISUNG_PRAEFIX + i7Data.bezeichner;
+                                equivalentInjection.description = i7Schluesel;
+                            }
+                            else {
+                                this.logger.debug(`EquivalentInjection ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                            }
+                        }
+                        else {
+                            this.logger.debug(`EquivalentInjection ${i7Data.id} besitzt keinen ConnectivityNode.`);
+                        }
+                        this.cimModel.addEquivalentInjection(equivalentInjection);
+                        this.addIdMapping(i7Data.id, equivalentInjection.mrid, integral_sql_1.Integral7TableNames.EINSPEISUNG);
+                    }
+                    catch (err) {
+                        this.logger.error(`Err convertEinspeisungen2EquivalentInjection ${i7Data.id} ${err}`);
+                    }
+                }
+                resolve();
+            });
+        });
+    }
+    convertEinspeisungen2ExternalNetworkInjection(result) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            return new Promise((resolve) => {
+                for (const i7Data of result) {
+                    try {
+                        const externalNetworkInjection = new __1.ExternalNetworkInjection(__1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname);
+                        const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
+                        const prio = i7Data.einspprio;
+                        externalNetworkInjection.referencePriority = prio;
+                        const usoll = i7Data.usoll;
+                        __1.createSvStatus(this.cimModel, inBetrieb, externalNetworkInjection);
+                        const powerData = utils_2.getActiveReactivePower(i7Data);
+                        externalNetworkInjection.p = powerData[0];
+                        externalNetworkInjection.q = powerData[1];
+                        const connectivityNode = this.cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss));
+                        if (connectivityNode) {
+                            __1.createConnection(this.cimModel, externalNetworkInjection, connectivityNode, __1.PhaseCode.ABC);
+                            const equipmentContainer = utils_2.determineEquipmentContainer('VoltageLevel', this.cimModel, this.cimModel.getObject(connectivityNode.getConnectivityNodeContainerUUID()));
+                            if (equipmentContainer) {
+                                externalNetworkInjection.equipmentContainerUUID = equipmentContainer.mrid;
+                                const i7Schluesel = integral_prefix_1.EINSPEISUNG_PRAEFIX + i7Data.bezeichner;
+                                externalNetworkInjection.description = i7Schluesel;
+                            }
+                            else {
+                                this.logger.debug(`EquivalentInjection ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                            }
+                        }
+                        else {
+                            this.logger.debug(`EquivalentInjection ${i7Data.id} besitzt keinen ConnectivityNode.`);
+                        }
+                        this.cimModel.addExternalNetworkInjection(externalNetworkInjection);
+                        this.addIdMapping(i7Data.id, externalNetworkInjection.mrid, integral_sql_1.I7Objects.EINSPEISUNG);
+                    }
+                    catch (err) {
+                        this.logger.error(`Err convertEinspeisungen2EquivalentInjection ${i7Data.id} ${err}`);
+                    }
+                }
+                resolve();
+            });
         });
     }
     convertGeneratoren(knotenSfIDs, energyTypesConfig) {
@@ -1312,21 +1503,38 @@ class ConverterIntegral7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.GENERATOR)) {
                 const result = yield this.queryFunctionWrapper(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.GENERATOR, 0, 0, knotenSfIDs));
                 for (const i7Data of result) {
-                    const synchronousMachine = new __1.SynchronousMachine(__1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname);
+                    const synchronousMachine = new __1.SynchronousMachine(__1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname, i7Data.nameprimaertyp);
                     synchronousMachine.type = __1.SynchronousMachineKind.generator;
                     synchronousMachine.operatingMode = SynchronousMachineOperatingMode_1.SynchronousMachineOperatingMode.generator;
                     synchronousMachine.referencePriority = utils_2.isNumericI7(i7Data.einspprio) ? utils_2.convertToNumberI7(i7Data.einspprio) : undefined;
+                    const maxP = utils_2.isNumericI7(i7Data.p_max) ? utils_2.convertToNumberI7(i7Data.p_max) : 0;
                     const maxQ = utils_2.isNumericI7(i7Data.q_max) ? utils_2.convertToNumberI7(i7Data.q_max) : undefined;
                     const minQ = utils_2.isNumericI7(i7Data.q_min) ? utils_2.convertToNumberI7(i7Data.q_min) : undefined;
                     const maxQvonPmax = utils_2.isNumericI7(i7Data.qmax_von_pmax) ? utils_2.convertToNumberI7(i7Data.qmax_von_pmax) : undefined;
                     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 powerData = utils_2.getActiveReactivePower(i7Data);
+                    const p = powerData[0];
+                    const q = powerData[1];
+                    synchronousMachine.p = p;
+                    synchronousMachine.q = q;
                     const sr = utils_2.isNumericI7(i7Data.sr) ? utils_2.convertToNumberI7(i7Data.sr) : undefined;
-                    synchronousMachine.ratedS = sr;
+                    if (sr && sr >= 0) {
+                        synchronousMachine.ratedS = sr;
+                    }
+                    else {
+                        synchronousMachine.ratedS = Math.sqrt(Math.pow(maxP, 2) + Math.pow(maxQvonPmax, 2));
+                    }
+                    if (!utils_2.isNumericI7(synchronousMachine.ratedS)) {
+                        console.log();
+                    }
                     const ur = utils_2.isNumericI7(i7Data.ur) ? utils_2.convertToNumberI7(i7Data.ur) : undefined;
-                    synchronousMachine.ratedU = ur;
+                    const usoll = utils_2.isNumericI7(i7Data.usoll) ? utils_2.convertToNumberI7(i7Data.usoll) : undefined;
+                    synchronousMachine.ratedU = usoll ? usoll : ur;
                     synchronousMachine.aggregate = true;
+                    synchronousMachine.ratedPowerFactor = utils_2.isNumericI7(i7Data.cosphir) ? utils_2.convertToNumberI7(i7Data.cosphir) : undefined;
+                    synchronousMachine.r = utils_2.isNumericI7(i7Data.rg) ? utils_2.convertToNumberI7(i7Data.rg) : undefined;
                     const reactiveCapabilityCurve = new __1.ReactiveCapabilityCurve(__1.generateUUID(), 'CurveData');
                     reactiveCapabilityCurve.curveStyle = __1.CurveStyle.straightLineYValues;
                     reactiveCapabilityCurve.xUnit = __1.UnitSymbol.W;
@@ -1348,14 +1556,16 @@ class ConverterIntegral7 {
                     synchronousMachine.initialReactiveCapabilityCurveUUID = reactiveCapabilityCurve.mrid;
                     const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
                     __1.createSvStatus(this.cimModel, inBetrieb, synchronousMachine);
-                    const regulatingControl = new __1.RegulatingControl(__1.generateUUID(), `RG_Gen ${i7Data.id}`);
+                    const regulatingControl = new __1.RegulatingControl(__1.generateUUID(), `RG_Gen_${i7Data.id}`);
+                    regulatingControl.enabled = inBetrieb;
+                    regulatingControl.targetValue = usoll;
                     switch (i7Data.spannungsgeregelt) {
                         case 1: {
                             regulatingControl.mode = __1.RegulatingControlModeKind.voltage;
                             break;
                         }
                         default: {
-                            regulatingControl.mode = __1.RegulatingControlModeKind.timeScheduled;
+                            regulatingControl.mode = __1.RegulatingControlModeKind.voltage;
                         }
                     }
                     synchronousMachine.regulatingControlUUID = regulatingControl.mrid;
@@ -1396,6 +1606,11 @@ class ConverterIntegral7 {
                                 generatingUnit = new __1.NuclearGeneratingUnit(__1.getUUID(''), 'Generator_' + i7Data.bezeichner, i7Data.kurzname);
                                 break;
                             }
+                            case 'HydroGeneratingUnit': {
+                                generatingUnit = new __1.HydroGeneratingUnit(__1.getUUID(''), 'Generator_' + i7Data.bezeichner, i7Data.kurzname);
+                                generatingUnit.energyConversionCapability = __1.HydroEnergyConversionKind.pumpAndGenerator;
+                                break;
+                            }
                         }
                     }
                     if (!generatingUnit) {
@@ -1405,7 +1620,11 @@ class ConverterIntegral7 {
                     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 = synchronousMachine.ratedS;
+                    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;
                     const connectivityNode = this.cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss));
@@ -1423,20 +1642,35 @@ class ConverterIntegral7 {
                                 generatingUnit.equipmentContainerUUID = equipmentContainergenUnitUUID;
                             }
                             else {
-                                this.logger.info(`GeneratingUnit ${i7Data.id} besitzt keinen EquipmentContainer/Substation.`);
+                                this.logger.debug(`GeneratingUnit ${i7Data.id} besitzt keinen EquipmentContainer/Substation.`);
                             }
                         }
                         else {
-                            this.logger.info(`SynchronousMachine ${i7Data.id} besitzt keinen EquipmentContainer.`);
-                        }
-                    }
-                    else {
-                        this.logger.info(`Generator ${i7Data.id} besitzt keinen ConnectivityNode/Terminal Instanz.`);
-                    }
+                            this.logger.debug(`SynchronousMachine ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                        }
+                    }
+                    else {
+                        this.logger.debug(`Generator ${i7Data.id} besitzt keinen ConnectivityNode/Terminal Instanz.`);
+                    }
+                    const smtcr = new SynchronousMachineTimeConstantReactance_1.SynchronousMachineTimeConstantReactance(__1.generateUUID(), `smtcr_${synchronousMachine.name}`);
+                    smtcr.enabled = utils_2.convertToBooleanI7(i7Data.betrieb);
+                    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;
+                    smtcr.tppqo = utils_2.isNumericI7(i7Data.tq2s) ? utils_2.convertToNumberI7(i7Data.tq2s) : undefined;
+                    smtcr.xDirectSync = utils_2.isNumericI7(i7Data.xdu) ? utils_2.convertToNumberI7(i7Data.xdu) : undefined;
+                    smtcr.xDirectTrans = utils_2.isNumericI7(i7Data.xdu1s) ? utils_2.convertToNumberI7(i7Data.xdu1s) : undefined;
+                    smtcr.xDirectSubtrans = utils_2.isNumericI7(i7Data.xdu2s) ? utils_2.convertToNumberI7(i7Data.xdu2s) : undefined;
+                    smtcr.xQuadSync = utils_2.isNumericI7(i7Data.xqu) ? utils_2.convertToNumberI7(i7Data.xqu) : undefined;
+                    smtcr.xQuadTrans = utils_2.isNumericI7(i7Data.xqu1s) ? utils_2.convertToNumberI7(i7Data.xqu1s) : undefined;
+                    smtcr.xQuadSubtrans = utils_2.isNumericI7(i7Data.xqu2s) ? utils_2.convertToNumberI7(i7Data.xqu2s) : undefined;
+                    smtcr.synchronousMachine = synchronousMachine;
+                    synchronousMachine.synchronousMachineDynamics = smtcr;
                     this.cimModel.addRegulatingControl(regulatingControl);
                     this.cimModel.addGeneratingUnit(generatingUnit);
                     this.cimModel.addSynchronousMachine(synchronousMachine);
-                    this.integralID2UUID.set(i7Data.id, synchronousMachine.mrid);
+                    this.cimModel.addSynchronousMachineTimeConstantReactance(smtcr);
+                    this.addIdMapping(i7Data.id, synchronousMachine.mrid, integral_sql_1.Integral7TableNames.GENERATOR);
                 }
             }
         });
@@ -1450,6 +1684,7 @@ class ConverterIntegral7 {
                     synchronousMachine.type = __1.SynchronousMachineKind.generator;
                     synchronousMachine.operatingMode = SynchronousMachineOperatingMode_1.SynchronousMachineOperatingMode.generator;
                     synchronousMachine.referencePriority = utils_2.isNumericI7(i7Data.einspprio) ? utils_2.convertToNumberI7(i7Data.einspprio) : undefined;
+                    const maxP = utils_2.isNumericI7(i7Data.p_max) ? utils_2.convertToNumberI7(i7Data.p_max) : 0;
                     const maxQ = utils_2.isNumericI7(i7Data.q_max) ? utils_2.convertToNumberI7(i7Data.q_max) : undefined;
                     const minQ = utils_2.isNumericI7(i7Data.q_min) ? utils_2.convertToNumberI7(i7Data.q_min) : undefined;
                     synchronousMachine.maxQ = maxQ;
@@ -1518,7 +1753,11 @@ class ConverterIntegral7 {
                     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 = synchronousMachine.ratedS;
+                    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;
                     const connectivityNode = this.cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss));
@@ -1536,20 +1775,20 @@ class ConverterIntegral7 {
                                 generatingUnit.equipmentContainerUUID = equipmentContainergenUnitUUID;
                             }
                             else {
-                                this.logger.info(`GeneratingUnit ${i7Data.id} besitzt keinen EquipmentContainer/Substation.`);
+                                this.logger.debug(`GeneratingUnit ${i7Data.id} besitzt keinen EquipmentContainer/Substation.`);
                             }
                         }
                         else {
-                            this.logger.info(`SynchronousMachine ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                            this.logger.debug(`SynchronousMachine ${i7Data.id} besitzt keinen EquipmentContainer.`);
                         }
                     }
                     else {
-                        this.logger.info(`Kraftwerksblock/SynchronousMachine ${i7Data.id} besitzt keinen ConnectivityNode/Terminal`);
+                        this.logger.debug(`Kraftwerksblock/SynchronousMachine ${i7Data.id} besitzt keinen ConnectivityNode/Terminal`);
                     }
                     this.cimModel.addRegulatingControl(regulatingControl);
                     this.cimModel.addGeneratingUnit(generatingUnit);
                     this.cimModel.addSynchronousMachine(synchronousMachine);
-                    this.integralID2UUID.set(i7Data.id, synchronousMachine.mrid);
+                    this.addIdMapping(i7Data.id, synchronousMachine.mrid, integral_sql_1.Integral7TableNames.KWBLOCK);
                 }
             }
         });
@@ -1561,7 +1800,7 @@ class ConverterIntegral7 {
                 for (const i7Data of result) {
                     const externalNetworkInjection = new __1.ExternalNetworkInjection(__1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname);
                     const usoll = utils_2.isNumericI7(i7Data.usoll) ? utils_2.convertToNumberI7(i7Data.usoll) : undefined;
-                    const kr = utils_2.isNumericI7(i7Data.kr) ? utils_2.convertToNumberI7(i7Data.kr) : undefined;
+                    const kr = 0;
                     externalNetworkInjection.governorSCD = kr;
                     const prio = utils_2.isNumericI7(i7Data.einspprio) ? utils_2.convertToNumberI7(i7Data.einspprio) : undefined;
                     externalNetworkInjection.referencePriority = prio;
@@ -1579,18 +1818,18 @@ class ConverterIntegral7 {
                             externalNetworkInjection.description = i7Schluesel;
                         }
                         else {
-                            this.logger.info(`ExternalNetworkInjection ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                            this.logger.debug(`ExternalNetworkInjection ${i7Data.id} besitzt keinen EquipmentContainer.`);
                         }
                     }
                     else {
-                        this.logger.info(`ExternalNetworkInjection ${i7Data.id} besitzt keinen ConnectivityNode.`);
+                        this.logger.debug(`ExternalNetworkInjection ${i7Data.id} besitzt keinen ConnectivityNode.`);
                     }
                     this.cimModel.addExternalNetworkInjection(externalNetworkInjection);
-                    this.integralID2UUID.set(i7Data.id, externalNetworkInjection.mrid);
+                    this.addIdMapping(i7Data.id, externalNetworkInjection.mrid, integral_sql_1.Integral7TableNames.ERSATZQUERZWEIG);
                 }
             }
             else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.EINSPEISUNG} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.EINSPEISUNG} ist nicht vorhanden.`);
             }
         });
     }
@@ -1611,11 +1850,11 @@ class ConverterIntegral7 {
                             statVarCom.equipmentContainerUUID = equipmentContainer.mrid;
                         }
                         else {
-                            this.logger.info(`Statcom ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                            this.logger.debug(`Statcom ${i7Data.id} besitzt keinen EquipmentContainer.`);
                         }
                     }
                     else {
-                        this.logger.info(`Statcom ${i7Data.id} besitzt keinen ConnectivityNode.`);
+                        this.logger.debug(`Statcom ${i7Data.id} besitzt keinen ConnectivityNode.`);
                     }
                     const regulatingControl = utils_2.createRegulatingControl(`RG_Statcom ${i7Data.id}`, inBetrieb, __1.UnitMultiplier.k, __1.RegulatingControlModeKind.voltage, this.cimModel, statVarCom);
                     const uref = utils_2.isNumericI7(i7Data.uref) ? utils_2.convertToNumberI7(i7Data.uref) : undefined;
@@ -1630,15 +1869,15 @@ class ConverterIntegral7 {
                         regulatingControl.terminalUUID = terminal.mrid;
                     }
                     else {
-                        this.logger.info(`Statcom RegulatingControl ${i7Data.id} besitzt keinen Anschluss.`);
-                        this.logger.info(`Statcom RegulatingControl ${i7Data.id} besitzt keinen Anschluss.`);
+                        this.logger.debug(`Statcom RegulatingControl ${i7Data.id} besitzt keinen Anschluss.`);
+                        this.logger.debug(`Statcom RegulatingControl ${i7Data.id} besitzt keinen Anschluss.`);
                     }
                     this.cimModel.addStaticVarCompensator(statVarCom);
-                    this.integralID2UUID.set(i7Data.id, statVarCom.mrid);
+                    this.addIdMapping(i7Data.id, statVarCom.mrid, integral_sql_1.Integral7TableNames.STATCOM);
                 }
             }
             else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.STATCOM} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.STATCOM} ist nicht vorhanden.`);
             }
         });
     }
@@ -1659,11 +1898,11 @@ class ConverterIntegral7 {
                             statVarCom.equipmentContainerUUID = equipmentContainer.mrid;
                         }
                         else {
-                            this.logger.info(`SVC ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                            this.logger.debug(`SVC ${i7Data.id} besitzt keinen EquipmentContainer.`);
                         }
                     }
                     else {
-                        this.logger.info(`SVC ${i7Data.id} besitzt keinen ConnectivityNode.`);
+                        this.logger.debug(`SVC ${i7Data.id} besitzt keinen ConnectivityNode.`);
                     }
                     const regulatingControl = utils_2.createRegulatingControl(`RG_SVC ${i7Data.id}`, inBetrieb, __1.UnitMultiplier.k, __1.RegulatingControlModeKind.voltage, this.cimModel, statVarCom);
                     const uref = utils_2.isNumericI7(i7Data.uref) ? utils_2.convertToNumberI7(i7Data.uref) : undefined;
@@ -1678,35 +1917,35 @@ class ConverterIntegral7 {
                         regulatingControl.terminalUUID = terminal.mrid;
                     }
                     else {
-                        this.logger.info(`SVC RegulatingControl ${i7Data.id} besitzt keinen Anschluss.`);
+                        this.logger.debug(`SVC RegulatingControl ${i7Data.id} besitzt keinen Anschluss.`);
                     }
                     this.cimModel.addStaticVarCompensator(statVarCom);
-                    this.integralID2UUID.set(i7Data.id, statVarCom.mrid);
+                    this.addIdMapping(i7Data.id, statVarCom.mrid, integral_sql_1.Integral7TableNames.SVC);
                 }
             }
             else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.STATCOM} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.STATCOM} ist nicht vorhanden.`);
             }
         });
     }
     addTerminal2StatcomRegulatingControl(i7TrafoID, powerTransformer) {
-        var _a;
+        var _a, _b;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.statcomRegulatingControls.has(i7TrafoID)) {
-                if (powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.powerTransformerEnds.length) {
+                if ((_a = powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.powerTransformerEnds) === null || _a === void 0 ? void 0 : _a.length) {
                     let voltage = 0;
                     let powertransfomerEnd = powerTransformer.powerTransformerEnds[0];
                     for (const pEnd of powerTransformer.powerTransformerEnds) {
                         const baseVoltage = this.cimModel.baseVoltages.get(pEnd.getBaseVoltageUUID());
                         if (!baseVoltage)
                             continue;
-                        const v = (_a = baseVoltage.nominalVoltage) === null || _a === void 0 ? void 0 : _a.value;
+                        const v = (_b = baseVoltage.nominalVoltage) === null || _b === void 0 ? void 0 : _b.value;
                         if (v > voltage) {
                             voltage = v;
                             powertransfomerEnd = pEnd;
                         }
                     }
-                    const terminalUUID = powertransfomerEnd.terminalUUID;
+                    const terminalUUID = powertransfomerEnd.getTerminalUUID();
                     const regulatingControl = this.statcomRegulatingControls.get(i7TrafoID);
                     regulatingControl.terminalUUID = terminalUUID;
                     this.statcomRegulatingControls.delete(i7TrafoID);
@@ -1732,11 +1971,11 @@ class ConverterIntegral7 {
                         }
                     }
                     else {
-                        this.logger.info(`KnotenSf ${i7Data.id} besitzt kein Schaltfeld.`);
+                        this.logger.debug(`KnotenSf ${i7Data.id} besitzt kein Schaltfeld.`);
                     }
                     this.knotenSfIDs.push(i7Data.id);
                     this.cimModel.addConnectivityNode(connectivityNode);
-                    this.integralID2UUID.set(i7Data.id, connectivityNode.mrid);
+                    this.addIdMapping(i7Data.id, connectivityNode.mrid, integral_sql_1.Integral7TableNames.KNOTEN_SF);
                     const connectivityNodeContainer = this.cimModel.getObject(connectivityNode.connectivityNodeContainerUUID);
                     if (connectivityNodeContainer) {
                         let baseVoltage;
@@ -1752,7 +1991,7 @@ class ConverterIntegral7 {
                 }
             }
             else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.KNOTEN_SF} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.KNOTEN_SF} ist nicht vorhanden.`);
             }
         });
     }
@@ -1767,14 +2006,14 @@ class ConverterIntegral7 {
                         connectivityNode.connectivityNodeContainerUUID = bay.mrid;
                     }
                     else {
-                        this.logger.info(`KnotenKf ${i7Data.id} besitzt kein Schaltfeld.`);
+                        this.logger.debug(`KnotenKf ${i7Data.id} besitzt kein Schaltfeld.`);
                     }
-                    this.integralID2UUID.set(i7Data.id, connectivityNode.mrid);
+                    this.addIdMapping(i7Data.id, connectivityNode.mrid, integral_sql_1.Integral7TableNames.KNOTEN_KF);
                     this.cimModel.addConnectivityNode(connectivityNode);
                 }
             }
             else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.KNOTEN_KF} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.KNOTEN_KF} ist nicht vorhanden.`);
             }
         });
     }
@@ -1789,14 +2028,14 @@ class ConverterIntegral7 {
                         connectivityNode.connectivityNodeContainerUUID = bay.mrid;
                     }
                     else {
-                        this.logger.info(`KnotenLk ${i7Data.id} besitzt kein Schaltfeld.`);
+                        this.logger.debug(`KnotenLk ${i7Data.id} besitzt kein Schaltfeld.`);
                     }
-                    this.integralID2UUID.set(i7Data.id, connectivityNode.mrid);
+                    this.addIdMapping(i7Data.id, connectivityNode.mrid, integral_sql_1.Integral7TableNames.KNOTEN_LK);
                     this.cimModel.addConnectivityNode(connectivityNode);
                 }
             }
             else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.KNOTEN_LK} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.KNOTEN_LK} ist nicht vorhanden.`);
             }
         });
     }
@@ -1808,8 +2047,8 @@ class ConverterIntegral7 {
                     const terminal = new __1.Terminal(__1.generateUUID(), 'T_Schlaufe', String(i7Data.id));
                     terminal.connected = utils_2.convertToBooleanI7(i7Data.schaltzustand);
                     terminal.phases = __1.PhaseCode.ABC;
-                    this.integralID2UUID.set(i7Data.id, terminal.mrid);
-                    this.integralID2UUID.set(i7Data.knotenzw, terminal.mrid);
+                    this.addIdMapping(i7Data.id, terminal.mrid, integral_sql_1.Integral7TableNames.SCHLAUFE);
+                    this.addIdMapping(i7Data.knotenzw, terminal.mrid, integral_sql_1.Integral7TableNames.SCHLAUFE);
                     this.inmemoryObjects.set(i7Data.id, terminal);
                     this.inmemoryObjects.set(i7Data.knotenzw, terminal);
                     const eknotenUUID = this.integralID2UUID.get(i7Data.eknoten);
@@ -1819,12 +2058,12 @@ class ConverterIntegral7 {
                         this.knotenSpannung.set(connectivityNode === null || connectivityNode === void 0 ? void 0 : connectivityNode.mrid, connectivityNode === null || connectivityNode === void 0 ? void 0 : connectivityNode.getBaseVoltage());
                     }
                     else {
-                        this.logger.info(`Schlaufe ${i7Data.id} besitzt kein KnotenSO).`);
+                        this.logger.debug(`Schlaufe ${i7Data.id} besitzt kein KnotenSO).`);
                     }
                 }
             }
             else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.SCHLAUFE} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.SCHLAUFE} ist nicht vorhanden.`);
             }
         });
     }
@@ -1833,19 +2072,19 @@ class ConverterIntegral7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_STANDORT)) {
                 const result = yield this.queryFunctionWrapper(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.NSG_STANDORT, 0, 0, standortIDs));
                 for (const i7Data of result) {
-                    const standortNsgImpl = new StandortNsg_1.StandortNsgImpl(i7Data);
-                    this.integralNsgStandort.set(i7Data.id, standortNsgImpl);
-                    if (this.integralStandorte.has(standortNsgImpl.standortid)) {
-                        standortNsgImpl.standort = this.integralStandorte.get(standortNsgImpl.standortid);
-                        standortNsgImpl.standort.standortNsg = standortNsgImpl;
-                    }
-                    else {
-                        this.logger.info(`standortNsg/DiagramObject ${standortNsgImpl.id} hat keine Standort-Instanz.`);
-                    }
+                    const schema = {
+                        netzId: i7Data.standort,
+                        variantenNr: i7Data.variantennr,
+                        schemaId: i7Data.id,
+                        schemaIdParent: undefined,
+                        x: i7Data.xrel,
+                        y: i7Data.yrel
+                    };
+                    this.schemaIDSchemastandort.set({ variantenNr: i7Data.variantennr, schemaId: i7Data.id }, schema);
                 }
             }
             else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_STANDORT} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_STANDORT} ist nicht vorhanden.`);
             }
         });
     }
@@ -1854,42 +2093,36 @@ class ConverterIntegral7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_KNOTEN_SO)) {
                 const result = yield this.queryFunctionWrapper(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.NSG_KNOTEN_SO, 0, 0, knotenSoIDs));
                 for (const i7Data of result) {
-                    const knotenSoNsgImpl = new KnotenSoNsg_1.KnotenSoNsg(i7Data);
-                    this.integralNsgKnotenSo.set(i7Data.id, knotenSoNsgImpl);
-                    if (this.integralKnotenSo.has(knotenSoNsgImpl.knotensoid)) {
-                        knotenSoNsgImpl.knotenso = this.integralKnotenSo.get(knotenSoNsgImpl.knotensoid);
-                        knotenSoNsgImpl.knotenso.knotenSoNsg = knotenSoNsgImpl;
-                    }
-                    const diagramObject = new __1.DiagramObject(__1.getUUID(i7Data.guid), 'Abzweig');
+                    const diagramUUID = this.i7SchemaID2UUID.get(i7Data.variantennr);
+                    const schemaStandordObject = I7Schema_1.getSchemaValue(i7Data.variantennr, i7Data.nsgso, this.schemaIDSchemastandort);
+                    if (!diagramUUID || !schemaStandordObject) {
+                        continue;
+                    }
+                    const diagramObject = new __1.DiagramObject(__1.generateUUID(), 'Abzweig');
+                    diagramObject.diagramUUID = diagramUUID;
+                    if (!this.cimModel.diagrams.has(diagramUUID)) {
+                        const d = this.cimModel.getObject(diagramUUID);
+                        console.log();
+                    }
+                    diagramObject.setDiagram(this.cimModel.getDiagram(diagramUUID));
+                    const diagramObjectPoint = new __1.DiagramObjectPoint(schemaStandordObject.x + i7Data.xrel, schemaStandordObject.y + i7Data.yrel);
+                    diagramObjectPoint.mrid = __1.generateUUID();
+                    diagramObjectPoint.diagramObject = diagramObject;
+                    diagramObject.addDiagramObjectPoint(diagramObjectPoint);
                     this.cimModel.addDiagramObject(diagramObject);
-                    const nsgStandortData = this.integralNsgStandort.get(i7Data.nsgso);
-                    if (nsgStandortData) {
-                        const diagramObjectPoint = new __1.DiagramObjectPoint(nsgStandortData.xrel + i7Data.xrel, nsgStandortData.yrel + i7Data.yrel);
-                        diagramObjectPoint.mrid = __1.generateUUID();
-                        diagramObjectPoint.diagramObject = diagramObject;
-                        diagramObject.addDiagramObjectPoint(diagramObjectPoint);
-                        const cnUUID = this.integralID2UUID.get(i7Data.knotenso);
-                        const cn = this.cimModel.getObject(cnUUID);
-                        if (cn) {
-                            diagramObject.identifiedObjectUUID = cn.mrid;
-                        }
-                        else {
-                            this.logger.info(`KnotenSo/DiagramObject ${diagramObject.mrid} hat kein PSR-Objekt.`);
-                        }
-                        const diagramUUID = this.integralID2UUID.get(i7Data.variantennr);
-                        const diagram = this.cimModel.getDiagram(diagramUUID);
-                        if (diagram) {
-                            diagramObject.diagramUUID = diagram.mrid;
-                        }
-                        else {
-                        }
+                    this.cimModel.addDiagramObjectPoint(diagramObjectPoint);
+                    const cnUUID = this.integralID2UUID.get(i7Data.knotenso);
+                    const cn = this.cimModel.getObject(cnUUID);
+                    if (cn) {
+                        diagramObject.identifiedObjectUUID = cn.mrid;
                     }
                     else {
+                        this.logger.debug(`KnotenSo/DiagramObject ${diagramObject.mrid} hat kein PSR-Objekt.`);
                     }
                 }
             }
             else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_KNOTEN_SO} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_KNOTEN_SO} ist nicht vorhanden.`);
             }
         });
     }
@@ -1898,26 +2131,19 @@ class ConverterIntegral7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_SCHALTANLAGE)) {
                 const result = yield this.queryFunctionWrapper(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.NSG_SCHALTANLAGE, 0, 0, saIDs));
                 for (const i7Data of result) {
-                    const saNsgImpl = new SchaltanlageNSG_1.SchaltanlageNsgImpl(i7Data);
-                    this.integralNsgSchaltanlage.set(i7Data.id, saNsgImpl);
-                    if (this.integralSchaltanlagen.has(saNsgImpl.schaltanlageid)) {
-                        saNsgImpl.schaltanlage = this.integralSchaltanlagen.get(saNsgImpl.schaltanlageid);
-                        saNsgImpl.schaltanlage.schaltanlageNsg = saNsgImpl;
-                    }
-                    else {
-                        this.logger.info(`SchaltanlageNSG  ${i7Data.id} hat keine PSR Instanz.`);
-                    }
-                    if (this.integralNsgStandort.has(saNsgImpl.nsgsoid)) {
-                        saNsgImpl.nsgso = this.integralNsgStandort.get(saNsgImpl.nsgsoid);
-                        saNsgImpl.nsgso.schaltanlagenNsg.push(saNsgImpl);
-                    }
-                    else {
-                        this.logger.info(`SchaltanlageNSG  ${i7Data.id} hat keine standortNsg Instanz.`);
-                    }
+                    const schema = {
+                        netzId: i7Data.schaltanlage,
+                        variantenNr: i7Data.variantennr,
+                        schemaId: i7Data.id,
+                        schemaIdParent: i7Data.nsgso,
+                        x: i7Data.xrel,
+                        y: i7Data.yrel
+                    };
+                    this.schemaIDSchaltanlage.set({ variantenNr: i7Data.variantennr, schemaId: i7Data.id }, schema);
                 }
             }
             else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_KNOTEN_SO} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_SCHALTANLAGE} ist nicht vorhanden.`);
             }
         });
     }
@@ -1926,160 +2152,19 @@ class ConverterIntegral7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_SCHALTANLAGENABSCHNITT)) {
                 const result = yield this.queryFunctionWrapper(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.NSG_SCHALTANLAGENABSCHNITT, 0, 0, schaltanlagenabschnittIDs));
                 for (const i7Data of result) {
-                    const saabNsgImpl = new SchaltanlagenabschnittNsg_1.SchaltanlagenabschnittNsg(i7Data);
-                    this.integralNsgSchaltanlagenabschnitt.set(i7Data.id, saabNsgImpl);
-                    if (this.integralSchaltanlagenAbschnitte.has(saabNsgImpl.saabschnittid)) {
-                        saabNsgImpl.saabschnitt = this.integralSchaltanlagenAbschnitte.get(saabNsgImpl.saabschnittid);
-                        saabNsgImpl.saabschnitt.schaltanlagenabschnittNsg = saabNsgImpl;
-                    }
-                    else {
-                        this.logger.info(`NSG Schaltanlagenabschnitt hat keinen PSR-Abschnitt`);
-                    }
-                    if (saabNsgImpl.saabschnitt && saabNsgImpl.saabschnitt.schaltanlage) {
-                        if (saabNsgImpl.saabschnitt.schaltanlage.schaltanlageNsg) {
-                            saabNsgImpl.saabschnitt.schaltanlage.schaltanlageNsg.saabNsg.push(saabNsgImpl);
-                            saabNsgImpl.nsgsa = saabNsgImpl.saabschnitt.schaltanlage.schaltanlageNsg;
-                        }
-                    }
-                }
-            }
-            else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_KNOTEN_SO} ist nicht vorhanden.`);
-            }
-        });
-    }
-    convertSchemaSammelschienenAbschnitte() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            for (const sa of this.integralSchaltanlagen.values()) {
-                const totalSlots = sa.getTotalSlots();
-                if (sa.schaltanlageNsg) {
-                    const saAusrichtung = sa.schaltanlageNsg.ausrichtung;
-                    for (const saab of sa.saab) {
-                        for (const ssab of saab.ssab) {
-                            const cnUUID = this.integralID2UUID.get(ssab.id);
-                            const connectivityNode = this.cimModel.getConnectivityNode(cnUUID);
-                            const standortPoint = sa.standort.getPoint();
-                            const saPoint = sa.getPoint();
-                            const ssabPoint = standortPoint.translate(saPoint.x, saPoint.y);
-                            const offset = saab.schaltanlagenabschnittNsg.nslots;
-                            const laenge = saab.schaltanlagenabschnittNsg.laenge;
-                            const delta = sa.getDelta(saab);
-                            const hoehe = saab.ssab.length * 8;
-                            const diagramObject = new __1.DiagramObject(__1.getUUID(''), 'SSAB Diagram');
-                            const points = [];
-                            if (saAusrichtung === 0) {
-                                points.push(new Point_1.Point(ssabPoint.x - 8 + (offset * 16), ssabPoint.y + 4 - hoehe + ssab.pos * 8 + delta));
-                                points.push(new Point_1.Point(ssabPoint.x - 8 + (offset * 16) + (laenge * 16), ssabPoint.y + 4 - hoehe + ssab.pos * 8 + delta));
-                            }
-                            else if (saAusrichtung === 1) {
-                                points.push(new Point_1.Point(ssabPoint.x + 4 - hoehe + ssab.pos * 8 + delta, ssabPoint.y - 8 + (offset * 16)));
-                                points.push(new Point_1.Point(ssabPoint.x + 4 - hoehe + ssab.pos * 8 + delta, ssabPoint.y - 8 + (offset * 16) + (laenge * 16)));
-                            }
-                            else if (saAusrichtung === 2) {
-                                points.push(new Point_1.Point(ssabPoint.x - 8 + (offset * 16), ssabPoint.y + 4 - hoehe + ssab.pos * 8 + delta));
-                                points.push(new Point_1.Point(ssabPoint.x - 8 + (offset * 16) + (laenge * 16), ssabPoint.y + 4 - hoehe + ssab.pos * 8 + delta));
-                            }
-                            else if (saAusrichtung === 3) {
-                                points.push(new Point_1.Point(ssabPoint.x + 4 - hoehe + ssab.pos * 8 + delta, ssabPoint.y - 8 + (totalSlots * 16) - (offset * 16)));
-                                points.push(new Point_1.Point(ssabPoint.x + 4 - hoehe + ssab.pos * 8 + delta, ssabPoint.y - 8 + (totalSlots * 16) - (offset * 16 + laenge * 16)));
-                            }
-                            utils_schema_1.createDiagramObjectPoints(diagramObject, points);
-                            diagramObject.identifiedObjectUUID = connectivityNode.mrid;
-                            this.cimModel.addDiagramObject(diagramObject);
-                            const diagramUUID = this.integralID2UUID.get(sa.schaltanlageNsg.variantennr);
-                            const diagram = this.cimModel.getDiagram(diagramUUID);
-                            if (diagram) {
-                                diagramObject.diagramUUID = diagram.mrid;
-                            }
-                            else {
-                            }
-                        }
-                    }
-                }
-            }
-        });
-    }
-    convertSchemaSchaltfelder(schaltfeldIDs) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_SCHALTFELD)) {
-                const result = yield this.queryFunctionWrapper(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.NSG_SCHALTFELD, 0, 0, schaltfeldIDs));
-                for (const i7Data of result) {
-                    const sfNSG = new SchaltfeldNsg_1.SchaltfeldNsgImpl(i7Data);
-                    sfNSG.schaltfeld = this.integralSchaltfelder.get(sfNSG.schaltfeldid);
-                    if (sfNSG.schaltfeld) {
-                        sfNSG.schaltfeld.schaltfeldNsg = sfNSG;
-                    }
-                    sfNSG.nsgsaa = this.integralNsgSchaltanlagenabschnitt.get(sfNSG.nsgsaaid);
-                    this.integralNsgSchaltfelder.set(i7Data.id, sfNSG);
-                    const sf = sfNSG.schaltfeld;
-                    if (sf) {
-                        const standort = sf.getStandort();
-                        const sa = sf.getSA();
-                        const saab = sf.getSAAB();
-                        if (standort && sa && saab) {
-                            const pointSt = standort.getPoint();
-                            const pointSaRel = sa.getPoint();
-                            const pointSa = pointSt.translate(pointSaRel.x, pointSaRel.y);
-                            const slotOffset = saab.getSlotOffset();
-                            const saAusrichtung = sa.schaltanlageNsg.ausrichtung;
-                            const deltaAusrichtung = sfNSG.deltaausrichtung;
-                            const slotnummer = sfNSG.slotnummer;
-                            const d = 4;
-                            const deltaSSAB = sa.getDelta(saab);
-                            const posSSAB = sfNSG.schaltfeld.getPosSSAB(saAusrichtung, deltaAusrichtung);
-                            let pointLinksOben, pointRechtsUnten;
-                            if (saAusrichtung === 0) {
-                                const pointSf = pointSa.translate(16 * (slotnummer + slotOffset) - 16, 0);
-                                if (deltaAusrichtung === 1) {
-                                    pointSf.y = pointSf.y + 65 + deltaSSAB;
-                                    pointRechtsUnten = pointSf.translate(32, 0);
-                                    pointLinksOben = pointSf.translate(0, -sfNSG.hoehe);
-                                }
-                                else {
-                                    pointSf.y = pointSf.y - sfNSG.hoehe + deltaSSAB;
-                                    pointLinksOben = pointSf.translate(0, 0);
-                                    pointRechtsUnten = pointSf.translate(32, sfNSG.hoehe);
-                                }
-                            }
-                            else if (saAusrichtung === 1) {
-                            }
-                            else if (saAusrichtung === 2) {
-                            }
-                            else if (saAusrichtung === 3) {
-                            }
-                            if (pointLinksOben && pointRechtsUnten) {
-                                const points = [];
-                                points.push(new Point_1.Point(pointLinksOben.x, pointLinksOben.y));
-                                points.push(new Point_1.Point(pointRechtsUnten.x, pointLinksOben.y));
-                                points.push(new Point_1.Point(pointRechtsUnten.x, pointRechtsUnten.y));
-                                points.push(new Point_1.Point(pointLinksOben.x, pointRechtsUnten.y));
-                                points.push(new Point_1.Point(pointLinksOben.x, pointLinksOben.y));
-                                points.push(new Point_1.Point(pointLinksOben.x + 16, pointLinksOben.y));
-                                points.push(new Point_1.Point(pointLinksOben.x + 16, pointRechtsUnten.y));
-                                const diagramObject = new __1.DiagramObject(__1.getUUID(''), 'Schaltfeld');
-                                const bayUUID = this.integralID2UUID.get(sf.id);
-                                const bay = this.cimModel.getBay(bayUUID);
-                                if (bay) {
-                                    utils_schema_1.createDiagramObjectPoints(diagramObject, points);
-                                    diagramObject.identifiedObjectUUID = bay.mrid;
-                                    const diagramUUID = this.integralID2UUID.get(sa.schaltanlageNsg.variantennr);
-                                    const diagram = this.cimModel.getDiagram(diagramUUID);
-                                    if (diagram) {
-                                        diagramObject.diagramUUID = diagram.mrid;
-                                    }
-                                    else {
-                                    }
-                                }
-                                else {
-                                    this.logger.info(`DiagramObject Schaltfeld ${diagramObject.mrid} mit der VariantenNr ${sa.schaltanlageNsg.variantennr} hat kein CIM Schaltfeld ${sf.id} ${bayUUID}.`);
-                                }
-                            }
-                        }
-                    }
+                    const schema = {
+                        netzId: i7Data.saabschnitt,
+                        variantenNr: i7Data.variantennr,
+                        schemaId: i7Data.id,
+                        schemaIdParent: i7Data.nsgsa,
+                        x: i7Data.xrel,
+                        y: i7Data.yrel
+                    };
+                    this.schemaIDSchaltanlagenabschnitt.set({ variantenNr: i7Data.variantennr, schemaId: i7Data.id }, schema);
                 }
             }
             else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_KNOTEN_SO} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_SCHALTANLAGENABSCHNITT} ist nicht vorhanden.`);
             }
         });
     }
@@ -2097,7 +2182,7 @@ class ConverterIntegral7 {
                         junction.equipmentContainerUUID = equipmentContainer.mrid;
                     }
                     else {
-                        this.logger.info(`Starre verbindung ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                        this.logger.debug(`Starre verbindung ${i7Data.id} besitzt keinen EquipmentContainer.`);
                     }
                     if (cnStart) {
                         const terminal = __1.createConnection(this.cimModel, junction, cnStart, __1.PhaseCode.ABC, 1);
@@ -2106,7 +2191,7 @@ class ConverterIntegral7 {
                         }
                     }
                     else {
-                        this.logger.info(`Starre verbindung ${i7Data.id} besitzt keinen Anfangsknoten.`);
+                        this.logger.debug(`Starre verbindung ${i7Data.id} besitzt keinen Anfangsknoten.`);
                     }
                     if (cnZiel) {
                         const terminal = __1.createConnection(this.cimModel, junction, cnZiel, __1.PhaseCode.ABC, 2);
@@ -2115,18 +2200,18 @@ class ConverterIntegral7 {
                         }
                     }
                     else {
-                        this.logger.info(`Starre verbindung ${i7Data.id} besitzt keinen Zielknoten.`);
+                        this.logger.debug(`Starre verbindung ${i7Data.id} besitzt keinen Zielknoten.`);
                     }
                     const baseVoltage = utils_2.getTerminalUn(this.cimModel, junction);
                     if (baseVoltage) {
                         junction.baseVoltageUUID = baseVoltage.mrid;
                     }
-                    this.integralID2UUID.set(i7Data.id, junction.mrid);
+                    this.addIdMapping(i7Data.id, junction.mrid, integral_sql_1.Integral7TableNames.KNOTEN_STARR);
                     this.cimModel.addJunction(junction);
                 }
             }
             else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.KNOTEN_STARR} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.KNOTEN_STARR} ist nicht vorhanden.`);
             }
         });
     }
@@ -2159,50 +2244,21 @@ class ConverterIntegral7 {
                         __1.createConnection(this.cimModel, equivalentBranch, start, __1.PhaseCode.ABC, 1);
                     }
                     else {
-                        this.logger.info(`Leitung ${i7Data.id} ${equivalentBranch.mrid} besitzt keinen Anfangsknoten. ${i7Data.aknoten} ${this.integralID2UUID.get(i7Data.aknoten)}`);
+                        this.logger.debug(`Leitung ${i7Data.id} ${equivalentBranch.mrid} besitzt keinen Anfangsknoten. ${i7Data.aknoten} ${this.integralID2UUID.get(i7Data.aknoten)}`);
                     }
                     const target = this.inmemoryObjects.get(i7Data.eknoten);
                     if (target) {
                         __1.createConnection(this.cimModel, equivalentBranch, target, __1.PhaseCode.ABC, 2);
                     }
                     else {
-                        this.logger.info(`Leitung ${i7Data.id} ${equivalentBranch.mrid} besitzt keinen Zielknoten.`);
+                        this.logger.debug(`Leitung ${i7Data.id} ${equivalentBranch.mrid} besitzt keinen Zielknoten.`);
                     }
                     this.cimModel.addEquivalentBranch(equivalentBranch);
-                    this.integralID2UUID.set(i7Data.id, equivalentBranch.mrid);
+                    this.addIdMapping(i7Data.id, equivalentBranch.mrid, integral_sql_1.Integral7TableNames.ERSATZLAENGSZWEIG);
                 }
             }
             else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.ERSATZLAENGSZWEIG} ist nicht vorhanden.`);
-            }
-        });
-    }
-    convertStromkreise() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LEITUNG)) {
-                const result = yield this.queryFunctionWrapper(`SELECT DISTINCT kurzname, bezeichner FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.LEITUNG]}`);
-                for (const i7Data of result) {
-                    let line = utils_2.getLineByAttribute(this.cimModel, 'name', i7Data.bezeichner);
-                    if (!line) {
-                        line = new __1.Line(__1.generateUUID());
-                        line.name = i7Data.bezeichner ? i7Data.bezeichner : 'Stromkreis_' + i7Data.kurzname;
-                        line.shortName = i7Data.kurzname;
-                        const region = utils_1.createIfNotExitsGeoregionByName(this.cimModel, 'ENTSO-E');
-                        const subregion = utils_1.createIfNotExitsSubGeoregionByName(this.cimModel, 'Deutschland', region);
-                        line.regionUUID = subregion.mrid;
-                        const i7Schluessel = integral_prefix_1.LEITUNG_PRAEFIX +
-                            utils_2.ueberpruefeZeichenkette(i7Data.ukz) +
-                            integral_prefix_1.MITTIGER_PUNKT +
-                            utils_2.ueberpruefeZeichenkette(i7Data.kurzname) +
-                            integral_prefix_1.MITTIGER_PUNKT +
-                            utils_2.ueberpruefeZeichenkette(i7Data.bezeichner);
-                        line.description = i7Schluessel;
-                        this.cimModel.addLine(line);
-                    }
-                }
-            }
-            else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.LEITUNG} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.ERSATZLAENGSZWEIG} ist nicht vorhanden.`);
             }
         });
     }
@@ -2217,7 +2273,7 @@ class ConverterIntegral7 {
                 }
             }
             else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.TYP_FREILEITUNG} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.TYP_FREILEITUNG} ist nicht vorhanden.`);
             }
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TYP_KABEL)) {
                 const result = yield this.queryFunctionWrapper(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.TYP_KABEL, 0, 0, []));
@@ -2228,15 +2284,20 @@ class ConverterIntegral7 {
                 }
             }
             else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.TYP_KABEL} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.TYP_KABEL} ist nicht vorhanden.`);
             }
         });
     }
-    convertLeitungen(limit, offset) {
+    convertLeitungen(limit, offset, defaultValuesConfig) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LEITUNG)) {
                 const result = yield this.queryFunctionWrapper(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.LEITUNG, limit, offset, []));
+                const leitungIDs = result.map(elem => elem.id);
+                const leitungStromkreisabschnitt = yield this.queryFunctionWrapper(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.STROMKREISABSCHNITT, limit, offset, leitungIDs));
                 for (const i7Data of result) {
+                    const stromkreisabschnitte = leitungStromkreisabschnitt.filter(elem => elem.leitung === i7Data.id);
+                    if (!(stromkreisabschnitte === null || stromkreisabschnitte === void 0 ? void 0 : stromkreisabschnitte.length))
+                        continue;
                     const leitung = new Leitung_1.LeitungImpl(i7Data);
                     this.integralLeitungen.set(i7Data.id, leitung);
                     const i7Schluessel = integral_prefix_1.LEITUNG_PRAEFIX +
@@ -2253,42 +2314,79 @@ class ConverterIntegral7 {
                         utils_2.ueberpruefeZeichenkette(i7Data.bezeichner) +
                         integral_prefix_1.MITTIGER_PUNKT +
                         utils_2.ueberpruefeZeichenkette(i7Data.stkabname);
-                    const acLineSegment = new __1.ACLineSegment(__1.getUUID(i7Data.guid), name, i7Data.stkabname, i7Schluessel);
-                    this.cimModel.addACLineSegment(acLineSegment);
-                    this.integralID2UUID.set(i7Data.id, acLineSegment.mrid);
-                    const line = utils_2.getLine(this.cimModel, i7Data.bezeichner, i7Data.kurzname);
-                    if (line) {
+                    const line = new __1.Line(__1.getUUID(i7Data.guid), name);
+                    const region = utils_1.createIfNotExitsGeoregionByName(this.cimModel, defaultValuesConfig.GeographicalRegion.name);
+                    const subregion = utils_1.createIfNotExitsSubGeoregionByName(this.cimModel, defaultValuesConfig.SubGeographicalRegion.name, region);
+                    line.regionUUID = subregion.mrid;
+                    const acLineSegments = [];
+                    for (const stk of stromkreisabschnitte) {
+                        const acLineSegment = new __1.ACLineSegment(__1.generateUUID(), name, i7Data.stkabname, i7Schluessel);
+                        this.setACLineSegmentProperties(acLineSegment, stk, stk.typ, defaultValuesConfig);
+                        acLineSegment.description = stk.nametyp;
                         acLineSegment.equipmentContainerUUID = line.mrid;
-                    }
-                    else {
-                        this.logger.info(`Leitung  ${i7Data.id} besitzt keinen Stromkreis.`);
+                        line.equipmentsUUIDS.push(acLineSegment.mrid);
+                        acLineSegments.push(acLineSegment);
+                        this.addIdMapping(stk.id, acLineSegment.mrid, integral_sql_1.Integral7TableNames.LEITUNG);
+                        this.cimModel.addACLineSegment(acLineSegment);
+                    }
+                    this.cimModel.addLine(line);
+                    const anzahl = acLineSegments.length;
+                    for (let i = 0; i < anzahl - 1; i++) {
+                        const cn = new __1.ConnectivityNode(__1.generateUUID(), 'CN_Lt');
+                        const acLineSegment1 = acLineSegments[i];
+                        const t1 = __1.createConnection(this.cimModel, acLineSegment1, cn, __1.PhaseCode.ABC);
+                        this.setACLineSegmentCurrentLimt(acLineSegment1, acLineSegment1.description, t1.mrid);
+                        const acLineSegment2 = acLineSegments[i + 1];
+                        const t2 = __1.createConnection(this.cimModel, acLineSegment2, cn, __1.PhaseCode.ABC);
+                        this.setACLineSegmentCurrentLimt(acLineSegment2, acLineSegment2.description, t2.mrid);
+                        cn.connectivityNodeContainerUUID = acLineSegment1.equipmentContainerUUID;
+                        this.cimModel.addConnectivityNode(cn);
                     }
                     const start = this.inmemoryObjects.get(i7Data.aknoten);
+                    const acLineSegmentStart = acLineSegments[0];
                     if (start) {
-                        const terminal = __1.createConnection(this.cimModel, acLineSegment, start, __1.PhaseCode.ABC, 1);
-                        if (!acLineSegment.baseVoltage) {
+                        const terminal = __1.createConnection(this.cimModel, acLineSegmentStart, start, __1.PhaseCode.ABC, acLineSegmentStart.terminalsUUIDs.length + 1);
+                        this.setACLineSegmentCurrentLimt(acLineSegmentStart, acLineSegmentStart.description, terminal.mrid);
+                        if (!acLineSegmentStart.baseVoltage) {
                             const baseVoltage = this.knotenSpannung.get(terminal.connectivityNodeUUID);
-                            acLineSegment.baseVoltage = baseVoltage;
+                            acLineSegmentStart.baseVoltage = baseVoltage;
                         }
                     }
                     else {
-                        this.logger.info(`Leitung ${i7Data.id} ${acLineSegment.mrid} besitzt keinen Anfangsknoten. ${i7Data.aknoten} ${this.integralID2UUID.get(i7Data.aknoten)}`);
+                        this.logger.debug(`Leitung ${i7Data.id} ${acLineSegmentStart.mrid} besitzt keinen Anfangsknoten. ${i7Data.aknoten} ${this.integralID2UUID.get(i7Data.aknoten)}`);
                     }
                     const target = this.inmemoryObjects.get(i7Data.eknoten);
+                    const acLineSegmentZiel = acLineSegments[anzahl - 1];
                     if (target) {
-                        const terminal = __1.createConnection(this.cimModel, acLineSegment, target, __1.PhaseCode.ABC, 2);
-                        if (!acLineSegment.baseVoltage) {
+                        const terminal = __1.createConnection(this.cimModel, acLineSegmentZiel, target, __1.PhaseCode.ABC, acLineSegmentStart.terminalsUUIDs.length + 2);
+                        this.setACLineSegmentCurrentLimt(acLineSegmentZiel, acLineSegmentZiel.description, terminal.mrid);
+                        if (!acLineSegmentZiel.baseVoltage) {
                             const baseVoltage = this.knotenSpannung.get(terminal.connectivityNodeUUID);
-                            acLineSegment.baseVoltage = baseVoltage;
+                            acLineSegmentZiel.baseVoltage = baseVoltage;
                         }
                     }
                     else {
-                        this.logger.info(`Leitung ${i7Data.id} ${acLineSegment.mrid} besitzt keinen Zielknoten.`);
+                        this.logger.debug(`Leitung ${i7Data.id} ${acLineSegmentZiel.mrid} besitzt keinen Zielknoten.`);
+                    }
+                    const stkBaseVoltage = acLineSegments.find(elem => elem.baseVoltage !== undefined);
+                    if (!stkBaseVoltage) {
+                        this.logger.error(`Leitung ${i7Data.id}: Spannung konnte nicht bestimmt werden.`);
+                        continue;
+                    }
+                    for (const acLineSegment of acLineSegments) {
+                        acLineSegment.baseVoltage = stkBaseVoltage.baseVoltage;
+                        for (let i = 0; i < acLineSegment.terminalsUUIDs.length; i++) {
+                            let terminal = this.cimModel.getTerminal(acLineSegment.terminalsUUIDs[i]);
+                            if (!terminal)
+                                terminal = this.inmemoryObjects.get(i7Data.aknoten);
+                            if (terminal)
+                                terminal.sequenceNumber = i + 1;
+                        }
                     }
                 }
             }
             else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.LEITUNG} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.LEITUNG} ist nicht vorhanden.`);
             }
         });
     }
@@ -2302,12 +2400,12 @@ class ConverterIntegral7 {
                         this.setACLineSegmentProperties(acLineSegment, i7Data, 'Freileitung', defaultValuesConfig);
                     }
                     else {
-                        this.logger.info(`Freileitung ${i7Data.id} besitzt kein Leitungsobjekt.`);
+                        this.logger.debug(`Freileitung ${i7Data.id} besitzt kein Leitungsobjekt.`);
                     }
                 }
             }
             else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.TYP_FREILEITUNG} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.TYP_FREILEITUNG} ist nicht vorhanden.`);
             }
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KABEL)) {
                 const result = yield this.queryFunctionWrapper(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.KABEL, 0, 0, leitungsIDs));
@@ -2317,12 +2415,12 @@ class ConverterIntegral7 {
                         this.setACLineSegmentProperties(acLineSegment, i7Data, 'Kabel', defaultValuesConfig);
                     }
                     else {
-                        this.logger.info(`Kabel ${i7Data.id} besitzt kein Leitungsobjekt.`);
+                        this.logger.debug(`Kabel ${i7Data.id} besitzt kein Leitungsobjekt.`);
                     }
                 }
             }
             else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.TYP_FREILEITUNG} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.TYP_FREILEITUNG} ist nicht vorhanden.`);
             }
         });
     }
@@ -2352,7 +2450,7 @@ class ConverterIntegral7 {
                 }
             }
             else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.TYP_TRAFO2W} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.TYP_TRAFO2W} ist nicht vorhanden.`);
             }
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TYP_TRAFO3W)) {
                 const result = yield this.queryFunctionWrapper(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.TYP_TRAFO3W, 0, 0, []));
@@ -2388,11 +2486,11 @@ class ConverterIntegral7 {
                 }
             }
             else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.TYP_TRAFO3W} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.TYP_TRAFO3W} ist nicht vorhanden.`);
             }
         });
     }
-    convertTrafo2W(limit, offset) {
+    convertTrafo2W(limit, offset, defaultValuesConfig) {
         var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TRAFO2W)) {
@@ -2412,32 +2510,20 @@ class ConverterIntegral7 {
                     const substationName = this.substationNames.get(this.integralID2UUID.get(i7Data.standort));
                     const powerTransformer = new __1.PowerTransformer(__1.getUUID(i7Data.guid), substationName + "/" + utils_2.getName(i7Data), i7Data.id + '', i7Data.bezeichner);
                     const powerTransformerInfo = this.cimModel.getPowerTransformerInfoByName(i7Data.nametyp);
-                    const start = this.inmemoryObjects.get(i7Data.aknoten);
-                    let startTerminal;
-                    if (start) {
-                        startTerminal = __1.createConnection(this.cimModel, powerTransformer, start, __1.PhaseCode.ABC, 1);
-                    }
-                    else {
-                        this.logger.info(`PowerTransformer2W ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Anfangsknoten.`);
-                    }
-                    const target = this.inmemoryObjects.get(i7Data.eknoten);
-                    let targetTerminal;
-                    if (target) {
-                        targetTerminal = __1.createConnection(this.cimModel, powerTransformer, target, __1.PhaseCode.ABC, 2);
-                    }
-                    else {
-                        this.logger.info(`PowerTransformer2W ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Zielknoten.`);
-                    }
+                    const startTerminal = util_create_1.getConnectedTerminal(this.cimModel, powerTransformer, this.inmemoryObjects.get(i7Data.aknoten), __1.PhaseCode.ABC, 1);
+                    if (!startTerminal)
+                        this.logger.debug(`PowerTransformer2W ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Anfangsknoten.`);
+                    const targetTerminal = util_create_1.getConnectedTerminal(this.cimModel, powerTransformer, this.inmemoryObjects.get(i7Data.eknoten), __1.PhaseCode.ABC, 2);
+                    if (!targetTerminal)
+                        this.logger.debug(`PowerTransformer2W ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Zielknoten.`);
                     const schaltgruppe = i7Data.schaltgr;
                     const powerTransformerEnd1 = new __1.PowerTransformerEnd(__1.getUUID(i7Data.guid_w1), `W1${powerTransformer.name}`);
                     powerTransformerEnd1.endNumber = 1;
-                    powerTransformerEnd1.connectionKind = utils_2.getSchaltgruppe(schaltgruppe, powerTransformerEnd1.endNumber);
-                    powerTransformerEnd1.phaseAngleClock = utils_2.getSchaltgruppeAngleClock(schaltgruppe, powerTransformerEnd1.endNumber);
                     const pkr = utils_2.getPkrTrafo(i7Data, powerTransformerInfo, '');
                     const ukr = utils_2.getUkrTrafo(i7Data, powerTransformerInfo, '') / 100;
                     const sr = utils_2.getSrTrafo(i7Data, powerTransformerInfo, powerTransformerEnd1.endNumber, false);
                     const ur = utils_2.getUrTrafo(i7Data, powerTransformerInfo, powerTransformerEnd1.endNumber);
-                    const ir1 = (sr * Math.pow(10, 6) / ur * 1000) / Math.sqrt(3);
+                    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;
                     powerTransformerEnd1.r = utils_2.calculateR(ur, pkr, sr);
@@ -2447,36 +2533,30 @@ class ConverterIntegral7 {
                     powerTransformerEnd1.ratedU = ur;
                     powerTransformerEnd1.ratedS = sr;
                     if (powerTransformerEnd1.ratedU) {
-                        let baseVoltage = this.cimModel.getBaseVoltage(powerTransformerEnd1.ratedU);
-                        if (!baseVoltage) {
-                            baseVoltage = __1.createBaseVoltageIfNotExists(this.cimModel, powerTransformerEnd1.ratedU);
-                        }
+                        const baseVoltage = __1.createBaseVoltageIfNotExists(this.cimModel, powerTransformerEnd1.ratedU);
                         powerTransformerEnd1.baseVoltageUUID = baseVoltage.mrid;
                     }
                     else {
-                        this.logger.info(`Wicklung2W ${i7Data.id} ${powerTransformerEnd1.endNumber} ${powerTransformerEnd1.mrid} besitzt keine Spannungsangabe.`);
+                        this.logger.debug(`Wicklung2W ${i7Data.id} ${powerTransformerEnd1.endNumber} ${powerTransformerEnd1.mrid} besitzt keine Spannungsangabe.`);
                     }
                     const terminal = startTerminal;
-                    if (terminal) {
-                        powerTransformerEnd1.terminalUUID = terminal.mrid;
-                        this.setConductingEquipmentCurrentLimit('W1 ' + powerTransformer.name, terminal.mrid, ir1);
+                    if (startTerminal) {
+                        powerTransformerEnd1.terminalUUID = startTerminal.mrid;
+                        this.setConductingEquipmentCurrentLimit('W1 ' + powerTransformer.name, startTerminal.mrid, ir1);
                         if (sternpunktKnotenMap.has(i7Data.id)) {
                             if (sternpunktKnotenMap.get(i7Data.id).has(i7Data.aknknoten1p)) {
-                                this.convertTrafoGrounding(i7Data.id, powerTransformerEnd1, terminal.connectivityNodeUUID, sternpunktKnotenMap.get(i7Data.id).get(i7Data.aknknoten1p), i7Data.standort);
+                                this.convertTrafoGrounding(i7Data.id, powerTransformerEnd1, startTerminal.connectivityNodeUUID, sternpunktKnotenMap.get(i7Data.id).get(i7Data.aknknoten1p), i7Data.standort, defaultValuesConfig);
                             }
                         }
                     }
                     else {
-                        this.logger.info(`Wicklung2W ${i7Data.id} ${powerTransformerEnd1.endNumber} ${powerTransformerEnd1.mrid} besitzt keine Terminalinstanz.`);
+                        this.logger.debug(`Wicklung2W ${i7Data.id} ${powerTransformerEnd1.endNumber} ${powerTransformerEnd1.mrid} besitzt keine Terminalinstanz.`);
                     }
                     powerTransformerEnd1.powerTransformerUUID = powerTransformer.mrid;
                     powerTransformer.addPowerTransformerEnd(powerTransformerEnd1);
                     this.cimModel.addPowerTransformerEnd(powerTransformerEnd1);
-                    utils_2.createTapChanger(i7Data, powerTransformerEnd1, this.cimModel, powerTransformerEnd1.ratedU);
                     const powerTransformerEnd2 = new __1.PowerTransformerEnd(__1.getUUID(i7Data.guid_w2), `W2${powerTransformer.name}`);
                     powerTransformerEnd2.endNumber = 2;
-                    powerTransformerEnd2.connectionKind = utils_2.getSchaltgruppe(schaltgruppe, powerTransformerEnd2.endNumber);
-                    powerTransformerEnd2.phaseAngleClock = utils_2.getSchaltgruppeAngleClock(schaltgruppe, powerTransformerEnd2.endNumber);
                     const sr2 = utils_2.getSrTrafo(i7Data, powerTransformerInfo, powerTransformerEnd2.endNumber, false);
                     const ur2 = utils_2.getUrTrafo(i7Data, powerTransformerInfo, powerTransformerEnd2.endNumber);
                     powerTransformerEnd2.r = 0;
@@ -2485,55 +2565,80 @@ class ConverterIntegral7 {
                     powerTransformerEnd2.ratedU = ur2;
                     const ir2 = (sr * Math.pow(10, 6) / ur * 1000) / Math.sqrt(3);
                     if (powerTransformerEnd2.ratedU) {
-                        let baseVoltage = this.cimModel.getBaseVoltage(powerTransformerEnd2.ratedU);
-                        if (!baseVoltage) {
-                            baseVoltage = __1.createBaseVoltageIfNotExists(this.cimModel, powerTransformerEnd2.ratedU);
-                        }
+                        const baseVoltage = __1.createBaseVoltageIfNotExists(this.cimModel, powerTransformerEnd2.ratedU);
                         powerTransformerEnd2.baseVoltageUUID = baseVoltage.mrid;
                     }
                     else {
-                        this.logger.info(`Wicklung ${i7Data.id} ${powerTransformerEnd2.endNumber} ${powerTransformerEnd2.mrid} besitzt keine Spannungsangabe.`);
+                        this.logger.debug(`Wicklung ${i7Data.id} ${powerTransformerEnd2.endNumber} ${powerTransformerEnd2.mrid} besitzt keine Spannungsangabe.`);
                     }
-                    const terminal2 = targetTerminal;
-                    if (terminal2) {
-                        powerTransformerEnd2.terminalUUID = terminal2.mrid;
-                        this.setConductingEquipmentCurrentLimit('W2 ' + powerTransformer.name, terminal.mrid, ir2);
+                    if (targetTerminal) {
+                        powerTransformerEnd2.terminalUUID = targetTerminal.mrid;
+                        this.setConductingEquipmentCurrentLimit('W2 ' + powerTransformer.name, targetTerminal.mrid, ir2);
                         if (sternpunktKnotenMap.has(i7Data.id)) {
                             if (sternpunktKnotenMap.get(i7Data.id).has(i7Data.eknknoten1p)) {
-                                this.convertTrafoGrounding(i7Data.id, powerTransformerEnd2, terminal2.connectivityNodeUUID, sternpunktKnotenMap.get(i7Data.id).get(i7Data.eknknoten1p), i7Data.standort);
+                                this.convertTrafoGrounding(i7Data.id, powerTransformerEnd2, targetTerminal.connectivityNodeUUID, sternpunktKnotenMap.get(i7Data.id).get(i7Data.eknknoten1p), i7Data.standort, defaultValuesConfig);
                             }
                         }
                     }
                     else {
-                        this.logger.info(`Wicklung2W ${i7Data.id} ${powerTransformerEnd2.endNumber} ${powerTransformerEnd2.mrid} besitzt keine Terminalinstanz.`);
-                        this.logger.info(`TargetTerminal created ` + (targetTerminal === undefined));
+                        this.logger.debug(`Wicklung2W ${i7Data.id} ${powerTransformerEnd2.endNumber} ${powerTransformerEnd2.mrid} besitzt keine Terminalinstanz.`);
                     }
                     powerTransformerEnd2.powerTransformerUUID = powerTransformer.mrid;
                     powerTransformer.addPowerTransformerEnd(powerTransformerEnd2);
                     this.cimModel.addPowerTransformerEnd(powerTransformerEnd2);
+                    powerTransformerEnd1.connectionKind = utils_2.getSchaltgruppe(schaltgruppe, powerTransformerEnd1.endNumber, [powerTransformerEnd1.ratedU, powerTransformerEnd2.ratedU]);
+                    powerTransformerEnd1.phaseAngleClock = utils_2.getSchaltgruppeAngleClock(schaltgruppe, powerTransformerEnd1.endNumber, [powerTransformerEnd1.ratedU, powerTransformerEnd2.ratedU]);
+                    powerTransformerEnd2.connectionKind = utils_2.getSchaltgruppe(schaltgruppe, powerTransformerEnd1.endNumber, [powerTransformerEnd1.ratedU, powerTransformerEnd2.ratedU]);
+                    powerTransformerEnd2.phaseAngleClock = utils_2.getSchaltgruppeAngleClock(schaltgruppe, powerTransformerEnd1.endNumber, [powerTransformerEnd1.ratedU, powerTransformerEnd2.ratedU]);
                     powerTransformer.sortTransformerEnd('ratedU', 'desc');
+                    const wicklungen = [1, 2];
+                    const terminals = [startTerminal, targetTerminal];
+                    const spannungsband = yield this.getSpannungsbandTrafo2W(i7Data);
+                    for (const wicklung of wicklungen) {
+                        const powerTransformerEnd = powerTransformer.powerTransformerEnds[wicklung - 1];
+                        const winkel = utils_2.convertToNumberI7(i7Data[`uzus_winkel_s${wicklung}`]);
+                        switch (i7Data.trafo_spezial) {
+                            case (1): {
+                                utils_2.createPhaseTapChanger(i7Data, powerTransformerEnd, this.cimModel, powerTransformerEnd.ratedU, terminals, this.knotenSpannungsband.get(spannungsband === null || spannungsband === void 0 ? void 0 : spannungsband.id));
+                                break;
+                            }
+                            case (2): {
+                                utils_2.createPhaseTapChanger(i7Data, powerTransformerEnd, this.cimModel, powerTransformerEnd.ratedU, terminals, this.knotenSpannungsband.get(spannungsband === null || spannungsband === void 0 ? void 0 : spannungsband.id));
+                                break;
+                            }
+                            default: {
+                                if (winkel !== 0) {
+                                    utils_2.createPhaseTapChanger(i7Data, powerTransformerEnd, this.cimModel, powerTransformerEnd.ratedU, terminals, this.knotenSpannungsband.get(spannungsband === null || spannungsband === void 0 ? void 0 : spannungsband.id));
+                                }
+                                else {
+                                    utils_2.createRatioTapChanger(i7Data, powerTransformerEnd, this.cimModel, powerTransformerEnd.ratedU, terminals, this.knotenSpannungsband.get(spannungsband === null || spannungsband === void 0 ? void 0 : spannungsband.id));
+                                }
+                                break;
+                            }
+                        }
+                    }
                     for (let i = 0; i < powerTransformer.powerTransformerEnds.length; i++) {
-                        powerTransformer.powerTransformerEnds[i].endNumber = i + 1;
+                        const powerTransformerEnd = powerTransformer.powerTransformerEnds[i];
+                        powerTransformerEnd.endNumber = i + 1;
                     }
-                    utils_2.createTapChanger(i7Data, powerTransformerEnd2, this.cimModel, powerTransformerEnd2.ratedU);
                     const substationUUID = this.integralID2UUID.get(i7Data.standort);
                     if (substationUUID) {
                         powerTransformer.equipmentContainerUUID = substationUUID;
                     }
                     else {
-                        this.logger.info(`Trafo2W ${i7Data.id} besitzt keine Umspannanlage.`);
+                        this.logger.debug(`Trafo2W ${i7Data.id} besitzt keine Umspannanlage.`);
                     }
                     this.cimModel.addPowerTransformer(powerTransformer);
-                    this.integralID2UUID.set(i7Data.id, powerTransformer.mrid);
+                    this.addIdMapping(i7Data.id, powerTransformer.mrid, integral_sql_1.Integral7TableNames.TRAFO2W);
                     this.addTerminal2StatcomRegulatingControl(+i7Data.id, powerTransformer);
                 }
             }
             else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.TRAFO2W} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.TRAFO2W} ist nicht vorhanden.`);
             }
         });
     }
-    convertTrafo3W(limit, offset) {
+    convertTrafo3W(limit, offset, defaultValuesConfig) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TRAFO3W)) {
                 const result = yield this.queryFunctionWrapper(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.TRAFO3W, limit, offset, []));
@@ -2548,7 +2653,7 @@ class ConverterIntegral7 {
                     }
                 }
                 else {
-                    this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.TRAFO3_WICKLUNG} ist nicht vorhanden.`);
+                    this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.TRAFO3_WICKLUNG} ist nicht vorhanden.`);
                 }
                 const sternpunktKnotenMap = new Map();
                 if (this.isTableAvailable(integral_sql_1.Integral7TableNames.STERNPUNKT_KNOTEN) && trafoWicklungIDs.length) {
@@ -2574,9 +2679,9 @@ class ConverterIntegral7 {
                     const ur1 = utils_2.getUrTrafo(i7Data, powerTransformerInfo, 1);
                     const ur2 = utils_2.getUrTrafo(i7Data, powerTransformerInfo, 2);
                     const ur3 = utils_2.getUrTrafo(i7Data, powerTransformerInfo, 3);
-                    const ir1 = (sr1 * Math.pow(10, 6) / ur1 * 1000) / Math.sqrt(3);
-                    const ir2 = (sr2 * Math.pow(10, 6) / ur2 * 1000) / Math.sqrt(3);
-                    const ir3 = (sr3 * Math.pow(10, 6) / ur3 * 1000) / Math.sqrt(3);
+                    const ir1 = sr1 * 1000000 / ((ur1 * 1000) * Math.sqrt(3));
+                    const ir2 = sr2 * 1000000 / ((ur2 * 1000) * Math.sqrt(3));
+                    const ir3 = sr3 * 1000000 / ((ur3 * 1000) * Math.sqrt(3));
                     const pLeer = utils_2.getTrafoPleer(i7Data, powerTransformerInfo);
                     const iLeer = utils_2.getTrafoIleer(i7Data, powerTransformerInfo);
                     const impedanzW1 = utils_trafo3w_1.calculateImpedanzenTrafo3W(1, ur1, ur2, ur3, sr1, sr2, sr3, pkr12, pkr13, pkr23, ukr12, ukr13, ukr23, pLeer, iLeer);
@@ -2590,16 +2695,14 @@ class ConverterIntegral7 {
                             terminal1 = __1.createConnection(this.cimModel, powerTransformer, start, __1.PhaseCode.ABC, 1);
                         }
                         else {
-                            this.logger.info(`PowerTransformer ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Anfangsknoten.`);
+                            this.logger.debug(`PowerTransformer ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Anfangsknoten.`);
                         }
                     }
                     else {
-                        this.logger.info(`Trafo ${i7Data.id} Wicklung 1 ${i7Data.trafowicklung3w1} ist nicht vorhanden.`);
+                        this.logger.debug(`Trafo ${i7Data.id} Wicklung 1 ${i7Data.trafowicklung3w1} ist nicht vorhanden.`);
                     }
                     const powerTransformerEnd1 = new __1.PowerTransformerEnd(__1.getUUID(i7Data.guid_w1), `W1 ${powerTransformer.name}`);
                     powerTransformerEnd1.endNumber = 1;
-                    powerTransformerEnd1.connectionKind = utils_2.getSchaltgruppe(schaltgruppe, powerTransformerEnd1.endNumber);
-                    powerTransformerEnd1.phaseAngleClock = utils_2.getSchaltgruppeAngleClock(schaltgruppe, powerTransformerEnd1.endNumber);
                     powerTransformerEnd1.r = impedanzW1.r;
                     powerTransformerEnd1.x = impedanzW1.x;
                     powerTransformerEnd1.g = impedanzW1.g * 1000000;
@@ -2614,7 +2717,7 @@ class ConverterIntegral7 {
                         powerTransformerEnd1.baseVoltageUUID = baseVoltage.mrid;
                     }
                     else {
-                        this.logger.info(`Wicklung ${i7Data.id} ${powerTransformerEnd1.endNumber} ${powerTransformerEnd1.mrid} besitzt keine Spannungsangabe.`);
+                        this.logger.debug(`Wicklung ${i7Data.id} ${powerTransformerEnd1.endNumber} ${powerTransformerEnd1.mrid} besitzt keine Spannungsangabe.`);
                     }
                     powerTransformerEnd1.powerTransformerUUID = powerTransformer.mrid;
                     powerTransformer.addPowerTransformerEnd(powerTransformerEnd1);
@@ -2623,11 +2726,11 @@ class ConverterIntegral7 {
                         powerTransformerEnd1.terminalUUID = terminal1.mrid;
                         this.setConductingEquipmentCurrentLimit('W1 ' + powerTransformer.name, terminal1.mrid, ir1);
                         if (sternpunktKnotenMap.has(wicklung1.id)) {
-                            this.convertTrafoGrounding(wicklung1.id, powerTransformerEnd1, terminal1.connectivityNodeUUID, sternpunktKnotenMap.get(wicklung1.id), i7Data.standort);
+                            this.convertTrafoGrounding(wicklung1.id, powerTransformerEnd1, terminal1.connectivityNodeUUID, sternpunktKnotenMap.get(wicklung1.id), i7Data.standort, defaultValuesConfig);
                         }
                     }
                     else {
-                        this.logger.info(`Wicklung3W ${i7Data.id} ${powerTransformerEnd1.endNumber} ${powerTransformerEnd1.mrid} besitzt keine Terminalinstanz.`);
+                        this.logger.debug(`Wicklung3W ${i7Data.id} ${powerTransformerEnd1.endNumber} ${powerTransformerEnd1.mrid} besitzt keine Terminalinstanz.`);
                     }
                     const wicklung2 = trafoWicklungen.get(i7Data.trafowicklung3w2);
                     if (wicklung2) {
@@ -2636,16 +2739,14 @@ class ConverterIntegral7 {
                             terminal2 = __1.createConnection(this.cimModel, powerTransformer, start, __1.PhaseCode.ABC, 2);
                         }
                         else {
-                            this.logger.info(`PowerTransformer ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Anfangsknoten.`);
+                            this.logger.debug(`PowerTransformer ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Anfangsknoten.`);
                         }
                     }
                     else {
-                        this.logger.info(`Trafo ${i7Data.id} Wicklung 2 ${i7Data.trafowicklung3w2} ist nicht vorhanden.`);
+                        this.logger.debug(`Trafo ${i7Data.id} Wicklung 2 ${i7Data.trafowicklung3w2} ist nicht vorhanden.`);
                     }
                     const powerTransformerEnd2 = new __1.PowerTransformerEnd(__1.getUUID(i7Data.guid_w2), `W2 ${powerTransformer.name}`);
                     powerTransformerEnd2.endNumber = 2;
-                    powerTransformerEnd2.connectionKind = utils_2.getSchaltgruppe(schaltgruppe, powerTransformerEnd2.endNumber);
-                    powerTransformerEnd2.phaseAngleClock = utils_2.getSchaltgruppeAngleClock(schaltgruppe, powerTransformerEnd2.endNumber);
                     powerTransformerEnd2.r = impedanzW2.r;
                     powerTransformerEnd2.x = impedanzW2.x;
                     powerTransformerEnd2.g = impedanzW2.g * 1000000;
@@ -2660,7 +2761,7 @@ class ConverterIntegral7 {
                         powerTransformerEnd2.baseVoltageUUID = baseVoltage.mrid;
                     }
                     else {
-                        this.logger.info(`Wicklung ${i7Data.id} ${powerTransformerEnd2.endNumber} ${powerTransformerEnd2.mrid} besitzt keine Spannungsangabe.`);
+                        this.logger.debug(`Wicklung ${i7Data.id} ${powerTransformerEnd2.endNumber} ${powerTransformerEnd2.mrid} besitzt keine Spannungsangabe.`);
                     }
                     powerTransformerEnd2.powerTransformerUUID = powerTransformer.mrid;
                     powerTransformer.addPowerTransformerEnd(powerTransformerEnd2);
@@ -2669,11 +2770,11 @@ class ConverterIntegral7 {
                         powerTransformerEnd2.terminalUUID = terminal2.mrid;
                         this.setConductingEquipmentCurrentLimit('W2 ' + powerTransformer.name, terminal2.mrid, ir2);
                         if (sternpunktKnotenMap.has(wicklung2.id)) {
-                            this.convertTrafoGrounding(wicklung2.id, powerTransformerEnd2, terminal2.connectivityNodeUUID, sternpunktKnotenMap.get(wicklung2.id), i7Data.standort);
+                            this.convertTrafoGrounding(wicklung2.id, powerTransformerEnd2, terminal2.connectivityNodeUUID, sternpunktKnotenMap.get(wicklung2.id), i7Data.standort, defaultValuesConfig);
                         }
                     }
                     else {
-                        this.logger.info(`Wicklung3W ${i7Data.id} ${powerTransformerEnd2.endNumber} ${powerTransformerEnd2.mrid} besitzt keine Terminalinstanz.`);
+                        this.logger.debug(`Wicklung3W ${i7Data.id} ${powerTransformerEnd2.endNumber} ${powerTransformerEnd2.mrid} besitzt keine Terminalinstanz.`);
                     }
                     const wicklung3 = trafoWicklungen.get(i7Data.trafowicklung3w3);
                     if (wicklung3) {
@@ -2682,22 +2783,18 @@ class ConverterIntegral7 {
                             terminal3 = __1.createConnection(this.cimModel, powerTransformer, start, __1.PhaseCode.ABC, 3);
                         }
                         else {
-                            this.logger.info(`PowerTransformer ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Anfangsknoten.`);
+                            this.logger.debug(`PowerTransformer ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Anfangsknoten.`);
                         }
                     }
                     else {
-                        this.logger.info(`Trafo ${i7Data.id} Wicklung 3 ${i7Data.trafowicklung3w2} ist nicht vorhanden.`);
+                        this.logger.debug(`Trafo ${i7Data.id} Wicklung 3 ${i7Data.trafowicklung3w2} ist nicht vorhanden.`);
                     }
                     const powerTransformerEnd3 = new __1.PowerTransformerEnd(__1.getUUID(i7Data.guid_w3), `Wicklung 3 ${powerTransformer.name}`);
                     powerTransformerEnd3.endNumber = 3;
-                    powerTransformerEnd3.connectionKind = utils_2.getSchaltgruppe(schaltgruppe, powerTransformerEnd3.endNumber);
-                    powerTransformerEnd3.phaseAngleClock = utils_2.getSchaltgruppeAngleClock(schaltgruppe, powerTransformerEnd3.endNumber);
                     powerTransformerEnd3.r = impedanzW3.r;
                     powerTransformerEnd3.x = impedanzW3.x;
                     powerTransformerEnd2.g = impedanzW3.g * 1000000;
-                    ;
                     powerTransformerEnd2.b = impedanzW3.b * 1000000;
-                    ;
                     powerTransformerEnd3.ratedS = sr3;
                     powerTransformerEnd3.ratedU = ur3;
                     if (powerTransformerEnd3.ratedU) {
@@ -2708,7 +2805,7 @@ class ConverterIntegral7 {
                         powerTransformerEnd3.baseVoltageUUID = baseVoltage.mrid;
                     }
                     else {
-                        this.logger.info(`Wicklung3W ${i7Data.id} ${powerTransformerEnd3.endNumber} ${powerTransformerEnd3.mrid} besitzt keine Spannungsangabe.`);
+                        this.logger.debug(`Wicklung3W ${i7Data.id} ${powerTransformerEnd3.endNumber} ${powerTransformerEnd3.mrid} besitzt keine Spannungsangabe.`);
                     }
                     powerTransformerEnd3.powerTransformerUUID = powerTransformer.mrid;
                     powerTransformer.addPowerTransformerEnd(powerTransformerEnd3);
@@ -2717,13 +2814,45 @@ class ConverterIntegral7 {
                         powerTransformerEnd3.terminalUUID = terminal3.mrid;
                         this.setConductingEquipmentCurrentLimit('W3 ' + powerTransformer.name, terminal3.mrid, ir3);
                         if (sternpunktKnotenMap.has(wicklung3.id)) {
-                            this.convertTrafoGrounding(wicklung3.id, powerTransformerEnd3, terminal3.connectivityNodeUUID, sternpunktKnotenMap.get(wicklung3.id), i7Data.standort);
+                            this.convertTrafoGrounding(wicklung3.id, powerTransformerEnd3, terminal3.connectivityNodeUUID, sternpunktKnotenMap.get(wicklung3.id), i7Data.standort, defaultValuesConfig);
                         }
                     }
                     else {
-                        this.logger.info(`Wicklung ${i7Data.id} ${powerTransformerEnd3.endNumber} ${powerTransformerEnd3.mrid} besitzt keine Terminalinstanz.`);
+                        this.logger.debug(`Wicklung ${i7Data.id} ${powerTransformerEnd3.endNumber} ${powerTransformerEnd3.mrid} besitzt keine Terminalinstanz.`);
                     }
+                    powerTransformerEnd1.connectionKind = utils_2.getSchaltgruppe(schaltgruppe, powerTransformerEnd1.endNumber, [powerTransformerEnd1.ratedU, powerTransformerEnd2.ratedU, powerTransformerEnd3.ratedU]);
+                    powerTransformerEnd1.phaseAngleClock = utils_2.getSchaltgruppeAngleClock(schaltgruppe, powerTransformerEnd1.endNumber, [powerTransformerEnd1.ratedU, powerTransformerEnd2.ratedU, powerTransformerEnd3.ratedU]);
+                    powerTransformerEnd2.connectionKind = utils_2.getSchaltgruppe(schaltgruppe, powerTransformerEnd1.endNumber, [powerTransformerEnd1.ratedU, powerTransformerEnd2.ratedU, powerTransformerEnd3.ratedU]);
+                    powerTransformerEnd2.phaseAngleClock = utils_2.getSchaltgruppeAngleClock(schaltgruppe, powerTransformerEnd1.endNumber, [powerTransformerEnd1.ratedU, powerTransformerEnd2.ratedU, powerTransformerEnd3.ratedU]);
+                    powerTransformerEnd3.connectionKind = utils_2.getSchaltgruppe(schaltgruppe, powerTransformerEnd1.endNumber, [powerTransformerEnd1.ratedU, powerTransformerEnd2.ratedU, powerTransformerEnd3.ratedU]);
+                    powerTransformerEnd3.phaseAngleClock = utils_2.getSchaltgruppeAngleClock(schaltgruppe, powerTransformerEnd1.endNumber, [powerTransformerEnd1.ratedU, powerTransformerEnd2.ratedU, powerTransformerEnd3.ratedU]);
                     powerTransformer.sortTransformerEnd('ratedU', 'desc');
+                    const wicklungen = powerTransformer.powerTransformerEnds.map(elem => elem.endNumber);
+                    const terminals = [terminal1, terminal2, terminal3];
+                    const spannungsband = yield this.getSpannungsbandTrafo2W(i7Data);
+                    for (const wicklung of wicklungen) {
+                        const powerTransformerEnd = powerTransformer.powerTransformerEnds[wicklung - 1];
+                        const winkel = utils_2.convertToNumberI7(i7Data[`uzus_winkel_s${wicklung}`]);
+                        switch (i7Data.trafo_spezial) {
+                            case (1): {
+                                utils_2.createPhaseTapChanger(i7Data, powerTransformerEnd, this.cimModel, powerTransformerEnd.ratedU, terminals, this.knotenSpannungsband.get(spannungsband === null || spannungsband === void 0 ? void 0 : spannungsband.id));
+                                break;
+                            }
+                            case (2): {
+                                utils_2.createPhaseTapChanger(i7Data, powerTransformerEnd, this.cimModel, powerTransformerEnd.ratedU, terminals, this.knotenSpannungsband.get(spannungsband === null || spannungsband === void 0 ? void 0 : spannungsband.id));
+                                break;
+                            }
+                            default: {
+                                if (winkel !== 0) {
+                                    utils_2.createPhaseTapChanger(i7Data, powerTransformerEnd, this.cimModel, powerTransformerEnd.ratedU, terminals, this.knotenSpannungsband.get(spannungsband === null || spannungsband === void 0 ? void 0 : spannungsband.id));
+                                }
+                                else {
+                                    utils_2.createRatioTapChanger(i7Data, powerTransformerEnd, this.cimModel, powerTransformerEnd.ratedU, terminals, this.knotenSpannungsband.get(spannungsband === null || spannungsband === void 0 ? void 0 : spannungsband.id));
+                                }
+                                break;
+                            }
+                        }
+                    }
                     for (let i = 0; i < powerTransformer.powerTransformerEnds.length; i++) {
                         powerTransformer.powerTransformerEnds[i].endNumber = i + 1;
                     }
@@ -2735,22 +2864,81 @@ class ConverterIntegral7 {
                         powerTransformer.description = i7Schluessel;
                     }
                     else {
-                        this.logger.info(`Trafo2W ${i7Data.id} besitzt keine Umspannanlage.`);
+                        this.logger.debug(`Trafo2W ${i7Data.id} besitzt keine Umspannanlage.`);
                     }
                     this.cimModel.addPowerTransformer(powerTransformer);
-                    this.integralID2UUID.set(i7Data.id, powerTransformer.mrid);
+                    this.addIdMapping(i7Data.id, powerTransformer.mrid, integral_sql_1.Integral7TableNames.TRAFO3W);
                     this.addTerminal2StatcomRegulatingControl(+i7Data.id, powerTransformer);
                 }
             }
             else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.TRAFO3W} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.TRAFO3W} ist nicht vorhanden.`);
             }
         });
     }
-    convertTrafoGrounding(trafoObjektID, powerTransformerEnd, cnUUID, stpKnoten, standortID) {
+    getSpannungsbandTrafo2W(i7Data) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            return new Promise((resolve) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                let minMaxSollResult;
+                const spgKnotenId = i7Data.spgreg_knoten;
+                let tempKnotenId = i7Data.spgreg_anschluss === 0 ? i7Data.aknoten :
+                    (i7Data.spgreg_anschluss === 1 ? i7Data.eknoten : undefined);
+                if (tempKnotenId !== undefined) {
+                    let queryResult = yield this.queryFunctionWrapper(`SELECT id FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.KNOTEN_SF]} WHERE id = ${tempKnotenId};`);
+                    if (queryResult.length === 1) {
+                        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
+                                          WHERE ${tabName_NetzKnotenSf}.id = ${tempKnotenId}`;
+                        minMaxSollResult = yield this.queryFunctionWrapper(sqlStatement);
+                    }
+                    else {
+                        queryResult = yield this.queryFunctionWrapper(`SELECT id FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.KNOTEN_ZW]} WHERE id = ${tempKnotenId};`);
+                        if (queryResult.length === 1) {
+                            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.queryFunctionWrapper(`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 {
+                            minMaxSollResult = yield this.queryFunctionWrapper(`SELECT id, umin, umax, usoll FROM ${integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.KNOTEN_SO]} where id = ${tempKnotenId};`);
+                        }
+                    }
+                }
+                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
+                                SELECT id, umin, umax, usoll FROM ${tabName_NetzSSAB} WHERE ${tabName_NetzSSAB}.id = ${spgKnotenId}) as Voltage`;
+                    minMaxSollResult = yield this.queryFunctionWrapper(query);
+                }
+                if (minMaxSollResult && minMaxSollResult.length) {
+                    resolve(minMaxSollResult[0]);
+                }
+                else {
+                    resolve({ id: 0, usoll: 0, umin: 0, umax: 0 });
+                }
+            }));
+        });
+    }
+    convertTrafoGrounding(trafoObjektID, powerTransformerEnd, cnUUID, stpKnoten, standortID, defaultValuesConfig) {
         if (stpKnoten) {
             const junctionUUID = this.stpImpModel.stpSchieneJunctionUUIDs.get(stpKnoten.schaltelement1pelem);
             powerTransformerEnd.grounded = true;
+            powerTransformerEnd.rground = defaultValuesConfig.TransformerEnd.rground;
             if (!junctionUUID) {
             }
             else {
@@ -2767,21 +2955,21 @@ class ConverterIntegral7 {
                 const subVlData = this.substationVoltagelevels.get(standortID);
                 const vlObject = getVoltageLevelByVoltage(subVlData, powerTransformerEnd.ratedU);
                 if (!vlObject) {
-                    this.logger.info(`TrafoObjektID ${trafoObjektID} hat kein EquipmentContainer`);
+                    this.logger.debug(`TrafoObjektID ${trafoObjektID} hat kein EquipmentContainer`);
                 }
                 if (junction) {
                     junction.baseVoltageUUID = (vlObject === null || vlObject === void 0 ? void 0 : vlObject.baseVoltageUUID) ? vlObject === null || vlObject === void 0 ? void 0 : vlObject.baseVoltageUUID : powerTransformerEnd.baseVoltageUUID;
                     junction.equipmentContainerUUID = vlObject === null || vlObject === void 0 ? void 0 : vlObject.vlUUID;
                 }
                 else {
-                    this.logger.info(`TrafoObjektID ${trafoObjektID} hat keine Junction ${junctionUUID}`);
+                    this.logger.debug(`TrafoObjektID ${trafoObjektID} hat keine Junction ${junctionUUID}`);
                 }
                 if (pSpuleGroundImpedance) {
                     pSpuleGroundImpedance.baseVoltageUUID = (vlObject === null || vlObject === void 0 ? void 0 : vlObject.baseVoltageUUID) ? vlObject === null || vlObject === void 0 ? void 0 : vlObject.baseVoltageUUID : powerTransformerEnd.baseVoltageUUID;
                     pSpuleGroundImpedance.equipmentContainerUUID = vlObject === null || vlObject === void 0 ? void 0 : vlObject.vlUUID;
                 }
                 else {
-                    this.logger.info(`TrafoObjektID ${trafoObjektID} hat keine pSpuleGroundImpedance`);
+                    this.logger.debug(`TrafoObjektID ${trafoObjektID} hat keine pSpuleGroundImpedance`);
                 }
             }
         }
@@ -2795,7 +2983,7 @@ class ConverterIntegral7 {
                 }
             }
             else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.TYP_KDROSSEL} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.TYP_KDROSSEL} ist nicht vorhanden.`);
             }
         });
     }
@@ -2811,7 +2999,7 @@ class ConverterIntegral7 {
                         startTerminal = __1.createConnection(this.cimModel, seriesCompensator, start, __1.PhaseCode.ABC, 1);
                     }
                     else {
-                        this.logger.info(`Längsdrossel ${i7Data.id} ${seriesCompensator.mrid} besitzt keinen Anfangsknoten.`);
+                        this.logger.debug(`Längsdrossel ${i7Data.id} ${seriesCompensator.mrid} besitzt keinen Anfangsknoten.`);
                     }
                     const target = this.inmemoryObjects.get(i7Data.eknoten);
                     let targetTerminal;
@@ -2819,7 +3007,7 @@ class ConverterIntegral7 {
                         targetTerminal = __1.createConnection(this.cimModel, seriesCompensator, target, __1.PhaseCode.ABC, 2);
                     }
                     else {
-                        this.logger.info(`Längsdrossel ${i7Data.id} ${seriesCompensator.mrid} besitzt keinen Zielknoten.`);
+                        this.logger.debug(`Längsdrossel ${i7Data.id} ${seriesCompensator.mrid} besitzt keinen Zielknoten.`);
                     }
                     const ur = utils_2.getU(i7Data.ur, defaultValuesConfig.DefaultVoltage);
                     const baseVoltage = __1.createBaseVoltageIfNotExists(this.cimModel, ur);
@@ -2836,7 +3024,7 @@ class ConverterIntegral7 {
                         this.setConductingEquipmentCurrentLimit('Rating ' + seriesCompensator.name, terminal.mrid, i);
                     }
                     else {
-                        this.logger.info(`Längsdrossel ${i7Data.id} ${seriesCompensator.mrid} besitzt keine Terminalinstanz.`);
+                        this.logger.debug(`Längsdrossel ${i7Data.id} ${seriesCompensator.mrid} besitzt keine Terminalinstanz.`);
                     }
                     const subVlData = this.substationVoltagelevels.get(i7Data.standort);
                     const vlObject = getVoltageLevelByVoltage(subVlData, ur);
@@ -2845,16 +3033,16 @@ class ConverterIntegral7 {
                         seriesCompensator.baseVoltageUUID = vlObject.baseVoltageUUID;
                     }
                     else {
-                        this.logger.info(`Längsdrossel ${i7Data.id} besitzt kein VoltageLevel Ur ${i7Data.ur}.`);
+                        this.logger.debug(`Längsdrossel ${i7Data.id} besitzt kein VoltageLevel Ur ${i7Data.ur}.`);
                     }
                     const psrType = utils_1.createIfNotExitsPSRType(this.cimModel, 'Längsdrossel');
                     seriesCompensator.psrTypeUUID = psrType.mrid;
                     this.cimModel.addSeriesCompensator(seriesCompensator);
-                    this.integralID2UUID.set(i7Data.id, seriesCompensator.mrid);
+                    this.addIdMapping(i7Data.id, seriesCompensator.mrid, integral_sql_1.Integral7TableNames.LAENGSDROSSEL);
                 }
             }
             else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.LAENGSDROSSEL} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.LAENGSDROSSEL} ist nicht vorhanden.`);
             }
         });
     }
@@ -2870,7 +3058,7 @@ class ConverterIntegral7 {
                         startTerminal = __1.createConnection(this.cimModel, seriesCompensator, start, __1.PhaseCode.ABC, 1);
                     }
                     else {
-                        this.logger.info(`Längskondensator ${i7Data.id} ${seriesCompensator.mrid} besitzt keinen Anfangsknoten.`);
+                        this.logger.debug(`Längskondensator ${i7Data.id} ${seriesCompensator.mrid} besitzt keinen Anfangsknoten.`);
                     }
                     const target = this.inmemoryObjects.get(i7Data.eknoten);
                     let targetTerminal;
@@ -2878,7 +3066,7 @@ class ConverterIntegral7 {
                         targetTerminal = __1.createConnection(this.cimModel, seriesCompensator, target, __1.PhaseCode.ABC, 2);
                     }
                     else {
-                        this.logger.info(`Längskondensator ${i7Data.id} ${seriesCompensator.mrid} besitzt keinen Zielknoten.`);
+                        this.logger.debug(`Längskondensator ${i7Data.id} ${seriesCompensator.mrid} besitzt keinen Zielknoten.`);
                     }
                     const ur = utils_2.getU(i7Data.ur, defaultValuesConfig.DefaultVoltage);
                     const baseVoltage = __1.createBaseVoltageIfNotExists(this.cimModel, ur);
@@ -2895,7 +3083,7 @@ class ConverterIntegral7 {
                         this.setConductingEquipmentCurrentLimit('Rating ' + seriesCompensator.name, terminal.mrid, i);
                     }
                     else {
-                        this.logger.info(`Längsdrossel ${i7Data.id} ${seriesCompensator.mrid} besitzt keine Terminalinstanz.`);
+                        this.logger.debug(`Längsdrossel ${i7Data.id} ${seriesCompensator.mrid} besitzt keine Terminalinstanz.`);
                     }
                     const substationUUID = this.integralID2UUID.get(i7Data.standort);
                     const subVlData = this.substationVoltagelevels.get(i7Data.standort);
@@ -2905,16 +3093,16 @@ class ConverterIntegral7 {
                         seriesCompensator.baseVoltageUUID = vlObject.baseVoltageUUID;
                     }
                     else {
-                        this.logger.info(`Längskondensator ${i7Data.id} besitzt kein VoltageLevel Ur ${i7Data.ur}.`);
+                        this.logger.debug(`Längskondensator ${i7Data.id} besitzt kein VoltageLevel Ur ${i7Data.ur}.`);
                     }
                     const psrType = utils_1.createIfNotExitsPSRType(this.cimModel, 'Längskondensator');
                     seriesCompensator.psrTypeUUID = psrType.mrid;
                     this.cimModel.addSeriesCompensator(seriesCompensator);
-                    this.integralID2UUID.set(i7Data.id, seriesCompensator.mrid);
+                    this.addIdMapping(i7Data.id, seriesCompensator.mrid, integral_sql_1.Integral7TableNames.LAENGSKONDENSATOR);
                 }
             }
             else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.LAENGSKONDENSATOR} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.LAENGSKONDENSATOR} ist nicht vorhanden.`);
             }
         });
     }
@@ -2934,19 +3122,19 @@ class ConverterIntegral7 {
                         disconnector.equipmentContainerUUID = equipmentContainer.mrid;
                     }
                     else {
-                        this.logger.info(`Disconnector ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                        this.logger.debug(`Disconnector ${i7Data.id} besitzt keinen EquipmentContainer.`);
                     }
                     if (cnStart) {
                         __1.createConnection(this.cimModel, disconnector, cnStart, __1.PhaseCode.ABC, 1);
                     }
                     else {
-                        this.logger.info(`Disconnector ${i7Data.id} besitzt keinen Anfangsknoten.`);
+                        this.logger.debug(`Disconnector ${i7Data.id} besitzt keinen Anfangsknoten.`);
                     }
                     if (cnZiel) {
                         __1.createConnection(this.cimModel, disconnector, cnZiel, __1.PhaseCode.ABC, 2);
                     }
                     else {
-                        this.logger.info(`Disconnector ${i7Data.id} besitzt keinen Zielknoten.`);
+                        this.logger.debug(`Disconnector ${i7Data.id} besitzt keinen Zielknoten.`);
                     }
                     const vl = this.cimModel.objects.get((_a = equipmentContainer) === null || _a === void 0 ? void 0 : _a.voltageLevelUUID);
                     const baseVoltage = this.cimModel.getBaseVoltageByUUID(vl === null || vl === void 0 ? void 0 : vl.baseVoltageUUID);
@@ -2954,11 +3142,11 @@ class ConverterIntegral7 {
                         disconnector.baseVoltageUUID = baseVoltage.mrid;
                     }
                     this.cimModel.addDisconnector(disconnector);
-                    this.integralID2UUID.set(i7Data.id, disconnector.mrid);
+                    this.addIdMapping(i7Data.id, disconnector.mrid, integral_sql_1.Integral7TableNames.TRENNER_3P);
                 }
             }
             else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.TRENNER_3P} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.TRENNER_3P} ist nicht vorhanden.`);
             }
         });
     }
@@ -2978,19 +3166,19 @@ class ConverterIntegral7 {
                         disconnector.equipmentContainerUUID = equipmentContainer.mrid;
                     }
                     else {
-                        this.logger.info(`Disconnector Fi3 ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                        this.logger.debug(`Disconnector Fi3 ${i7Data.id} besitzt keinen EquipmentContainer.`);
                     }
                     if (cnStart) {
                         __1.createConnection(this.cimModel, disconnector, cnStart, __1.PhaseCode.ABC, 1);
                     }
                     else {
-                        this.logger.info(`Disconnector Fi3 ${i7Data.id} besitzt keinen Anfangsknoten.`);
+                        this.logger.debug(`Disconnector Fi3 ${i7Data.id} besitzt keinen Anfangsknoten.`);
                     }
                     if (cnZiel) {
                         __1.createConnection(this.cimModel, disconnector, cnZiel, __1.PhaseCode.ABC, 2);
                     }
                     else {
-                        this.logger.info(`Disconnector Fi3 ${i7Data.id} besitzt keinen Zielknoten.`);
+                        this.logger.debug(`Disconnector Fi3 ${i7Data.id} besitzt keinen Zielknoten.`);
                     }
                     const vl = this.cimModel.objects.get((_a = equipmentContainer) === null || _a === void 0 ? void 0 : _a.voltageLevelUUID);
                     const baseVoltage = this.cimModel.getBaseVoltageByUUID(vl === null || vl === void 0 ? void 0 : vl.baseVoltageUUID);
@@ -2998,11 +3186,11 @@ class ConverterIntegral7 {
                         disconnector.baseVoltageUUID = baseVoltage.mrid;
                     }
                     this.cimModel.addDisconnector(disconnector);
-                    this.integralID2UUID.set(i7Data.id, disconnector.mrid);
+                    this.addIdMapping(i7Data.id, disconnector.mrid, integral_sql_1.Integral7TableNames.TRENNERFI_3P);
                 }
             }
             else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.TRENNERFI_3P} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.TRENNERFI_3P} ist nicht vorhanden.`);
             }
         });
     }
@@ -3022,19 +3210,19 @@ class ConverterIntegral7 {
                         breaker.equipmentContainerUUID = equipmentContainer.mrid;
                     }
                     else {
-                        this.logger.info(`LS ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                        this.logger.debug(`LS ${i7Data.id} besitzt keinen EquipmentContainer.`);
                     }
                     if (cnStart) {
                         __1.createConnection(this.cimModel, breaker, cnStart, __1.PhaseCode.ABC, 1);
                     }
                     else {
-                        this.logger.info(`LS ${i7Data.id} besitzt keinen Anfangsknoten.`);
+                        this.logger.debug(`LS ${i7Data.id} besitzt keinen Anfangsknoten.`);
                     }
                     if (cnZiel) {
                         __1.createConnection(this.cimModel, breaker, cnZiel, __1.PhaseCode.ABC, 2);
                     }
                     else {
-                        this.logger.info(`LS ${i7Data.id} besitzt keinen Zielknoten.`);
+                        this.logger.debug(`LS ${i7Data.id} besitzt keinen Zielknoten.`);
                     }
                     const vl = this.cimModel.objects.get((_a = equipmentContainer) === null || _a === void 0 ? void 0 : _a.voltageLevelUUID);
                     const baseVoltage = this.cimModel.getBaseVoltageByUUID(vl === null || vl === void 0 ? void 0 : vl.baseVoltageUUID);
@@ -3042,11 +3230,11 @@ class ConverterIntegral7 {
                         breaker.baseVoltageUUID = baseVoltage.mrid;
                     }
                     this.cimModel.addBreaker(breaker);
-                    this.integralID2UUID.set(i7Data.id, breaker.mrid);
+                    this.addIdMapping(i7Data.id, breaker.mrid, integral_sql_1.Integral7TableNames.LEISTUNGSSCHALTER);
                 }
             }
             else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.LEISTUNGSSCHALTER} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.LEISTUNGSSCHALTER} ist nicht vorhanden.`);
             }
         });
     }
@@ -3064,11 +3252,11 @@ class ConverterIntegral7 {
                             dcConverterUnit.setSubstation(equipmentContainer);
                         }
                         else {
-                            this.logger.info(`DCConverterUnit ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                            this.logger.debug(`DCConverterUnit ${i7Data.id} besitzt keinen EquipmentContainer.`);
                         }
                     }
                     else {
-                        this.logger.info(`DCConverterUnit ${i7Data.id} besitzt keinen ConnectivityNode.`);
+                        this.logger.debug(`DCConverterUnit ${i7Data.id} besitzt keinen ConnectivityNode.`);
                     }
                     const csConverter = new CsConverter_1.CsConverter(__1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname);
                     csConverter.equipmentContainer = dcConverterUnit;
@@ -3097,7 +3285,7 @@ class ConverterIntegral7 {
                         __1.createConnection(this.cimModel, csConverter, acConnectivityNode, __1.PhaseCode.ABC, 1);
                     }
                     else {
-                        this.logger.info(`CsConverter ${i7Data.id} ${csConverter.mrid} besitzt keinen AC Anschluss.`);
+                        this.logger.debug(`CsConverter ${i7Data.id} ${csConverter.mrid} besitzt keinen AC Anschluss.`);
                     }
                     const dcNode = new DCNode_1.DCNode(__1.generateUUID(), 'DCNode');
                     dcNode.dcEquipmentContainerUUID = dcConverterUnit.mrid;
@@ -3110,7 +3298,7 @@ class ConverterIntegral7 {
                     this.cimModel.addCSConverter(csConverter);
                     this.cimModel.addDCNode(dcNode);
                     this.cimModel.addACDCConverterDCTerminal(acDCConverterDCTerminal);
-                    this.integralID2UUID.set(i7Data.id, csConverter.mrid);
+                    this.addIdMapping(i7Data.id, csConverter.mrid, integral_sql_1.Integral7TableNames.HGUE_KOPFSTATION_KLASSISCH);
                 }
             }
         });
@@ -3129,11 +3317,11 @@ class ConverterIntegral7 {
                             dcConverterUnit.setSubstation(equipmentContainer);
                         }
                         else {
-                            this.logger.info(`DCConverterUnit ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                            this.logger.debug(`DCConverterUnit ${i7Data.id} besitzt keinen EquipmentContainer.`);
                         }
                     }
                     else {
-                        this.logger.info(`DCConverterUnit ${i7Data.id} besitzt keinen ConnectivityNode.`);
+                        this.logger.debug(`DCConverterUnit ${i7Data.id} besitzt keinen ConnectivityNode.`);
                     }
                     const vsConverter = new VsConverter_1.VsConverter(__1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname);
                     vsConverter.equipmentContainer = dcConverterUnit;
@@ -3165,7 +3353,7 @@ class ConverterIntegral7 {
                         __1.createConnection(this.cimModel, vsConverter, acConnectivityNode, __1.PhaseCode.ABC, 1);
                     }
                     else {
-                        this.logger.info(`VsConverter ${i7Data.id} ${vsConverter.mrid} besitzt keinen AC Anschluss.`);
+                        this.logger.debug(`VsConverter ${i7Data.id} ${vsConverter.mrid} besitzt keinen AC Anschluss.`);
                     }
                     const dcNode = new DCNode_1.DCNode(__1.generateUUID(), 'DCNode');
                     dcNode.dcEquipmentContainerUUID = dcConverterUnit.mrid;
@@ -3178,7 +3366,7 @@ class ConverterIntegral7 {
                     this.cimModel.addVSConverter(vsConverter);
                     this.cimModel.addDCNode(dcNode);
                     this.cimModel.addACDCConverterDCTerminal(acDCConverterDCTerminal);
-                    this.integralID2UUID.set(i7Data.id, vsConverter.mrid);
+                    this.addIdMapping(i7Data.id, vsConverter.mrid, integral_sql_1.Integral7TableNames.HGUE_KOPFSTATION_VSC);
                 }
             }
         });
@@ -3217,32 +3405,34 @@ class ConverterIntegral7 {
                     const startDCNode = this.inmemoryObjects.get(i7Data.anetzobjekt);
                     if (startDCNode) {
                         const dcTerminal = new DCTerminal_1.DCTerminal(__1.generateUUID(), 'DCTerminal_HGÜ_Leitung');
-                        dcTerminal.sequenceNumber = 2;
+                        dcTerminal.connected = true;
+                        dcTerminal.sequenceNumber = 1;
                         dcTerminal.dCConductingEquipmentUUID = dcLineSegment.mrid;
                         dcTerminal.dcNodeUUID = startDCNode.mrid;
                         this.cimModel.addDCTerminal(dcTerminal);
                     }
                     else {
-                        this.logger.info(`HGÜ-Leitung ${i7Data.id} ${dcLineSegment.mrid} besitzt keinen Anfangsknoten. ${i7Data.anetzobjekt} ${this.integralID2UUID.get(i7Data.anetzobjekt)}`);
+                        this.logger.debug(`HGÜ-Leitung ${i7Data.id} ${dcLineSegment.mrid} besitzt keinen Anfangsknoten. ${i7Data.anetzobjekt} ${this.integralID2UUID.get(i7Data.anetzobjekt)}`);
                     }
                     const tartgetDCNode = this.inmemoryObjects.get(i7Data.enetzobjekt);
                     if (tartgetDCNode) {
                         const dcTerminal = new DCTerminal_1.DCTerminal(__1.generateUUID(), 'DCTerminal_HGÜ_Leitung');
+                        dcTerminal.connected = true;
                         dcTerminal.sequenceNumber = 2;
                         dcTerminal.dCConductingEquipmentUUID = dcLineSegment.mrid;
                         dcTerminal.dcNodeUUID = tartgetDCNode.mrid;
                         this.cimModel.addDCTerminal(dcTerminal);
                     }
                     else {
-                        this.logger.info(`HGÜ-Leitung ${i7Data.id} ${dcLineSegment.mrid} besitzt keinen Zielknoten. ${i7Data.enetzobjekt} ${this.integralID2UUID.get(i7Data.enetzobjekt)}`);
+                        this.logger.debug(`HGÜ-Leitung ${i7Data.id} ${dcLineSegment.mrid} besitzt keinen Zielknoten. ${i7Data.enetzobjekt} ${this.integralID2UUID.get(i7Data.enetzobjekt)}`);
                     }
                     this.cimModel.addDCLine(dcLine);
                     this.cimModel.addDCLineSegment(dcLineSegment);
-                    this.integralID2UUID.set(i7Data.id, dcLineSegment.mrid);
+                    this.addIdMapping(i7Data.id, dcLineSegment.mrid, integral_sql_1.Integral7TableNames.HGUE_LEITUNG);
                 }
             }
             else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.HGUE_LEITUNG} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.HGUE_LEITUNG} ist nicht vorhanden.`);
             }
         });
     }
@@ -3257,7 +3447,8 @@ class ConverterIntegral7 {
                     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);
-                    externalNetworkInjection.governorSCD = utils_2.convertToNumberI7(i7Data.kr);
+                    const kr = 0;
+                    externalNetworkInjection.governorSCD = kr;
                     externalNetworkInjection.referencePriority = einspeisePrio;
                     externalNetworkInjection.maxZ0ToZ1Ratio = utils_2.convertToNumberI7(i7Data.z0_z1);
                     const regulatingControl = new __1.RegulatingControl(__1.generateUUID(), `RG_BI_${i7Data.id}`);
@@ -3289,19 +3480,19 @@ class ConverterIntegral7 {
                             }
                         }
                         else {
-                            this.logger.info(`BoundaryInjection ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                            this.logger.debug(`BoundaryInjection ${i7Data.id} besitzt keinen EquipmentContainer.`);
                         }
                     }
                     else {
-                        this.logger.info(`BoundaryInjection ${i7Data.id} besitzt keinen ConnectivityNode.`);
+                        this.logger.debug(`BoundaryInjection ${i7Data.id} besitzt keinen ConnectivityNode.`);
                     }
                     this.cimModel.addExternalNetworkInjection(externalNetworkInjection);
                     this.cimModel.addRegulatingControl(regulatingControl);
-                    this.integralID2UUID.set(i7Data.id, externalNetworkInjection.mrid);
+                    this.addIdMapping(i7Data.id, externalNetworkInjection.mrid, integral_sql_1.Integral7TableNames.BOUNDARYINJECTION);
                 }
             }
             else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.EINSPEISUNG} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.EINSPEISUNG} ist nicht vorhanden.`);
             }
         });
     }
@@ -3330,19 +3521,19 @@ class ConverterIntegral7 {
                         if (equipmentContainer) {
                             asynchronousMachine.equipmentContainerUUID = equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.mrid;
                             this.cimModel.addAsynchronousMachine(asynchronousMachine);
-                            this.integralID2UUID.set(i7Data.id, asynchronousMachine.mrid);
+                            this.addIdMapping(i7Data.id, asynchronousMachine.mrid, integral_sql_1.Integral7TableNames.ASYNCHRONMOTOR);
                         }
                         else {
-                            this.logger.info(`AsynchronousMachine ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                            this.logger.debug(`AsynchronousMachine ${i7Data.id} besitzt keinen EquipmentContainer.`);
                         }
                     }
                     else {
-                        this.logger.info(`AsynchronousMachine ${i7Data.id} besitzt keinen ConnectivityNode.`);
+                        this.logger.debug(`AsynchronousMachine ${i7Data.id} besitzt keinen ConnectivityNode.`);
                     }
                 }
             }
             else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.ASYNCHRONMOTOR} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.ASYNCHRONMOTOR} ist nicht vorhanden.`);
             }
         });
     }
@@ -3352,9 +3543,15 @@ class ConverterIntegral7 {
                 const result = yield this.queryFunctionWrapper(integral_sql_1.getNetzQuery(integral_sql_1.I7Objects.KOMPENSATIONSDROSSEL, 0, 0, knotenIDs));
                 for (const i7Data of result) {
                     const shunt = new LinearShuntCompensator_1.LinearShuntCompensator(__1.getUUID(i7Data.guid), utils_2.getName(i7Data), i7Data.kurzname, i7Data.kommentar);
+                    if (shunt.mrid === '2e35adfe3cd04707b24e4c1df705c086') {
+                        console.log();
+                    }
                     shunt.normalSections = i7Data.aktstufe;
                     shunt.maximumSections = i7Data.maxstufe;
                     shunt.nomU = i7Data.ur;
+                    shunt.gPerSection = i7Data.pr / Math.pow(i7Data.ur, 2);
+                    const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
+                    __1.createSvStatus(this.cimModel, inBetrieb, shunt);
                     const spannungsregelungLokal = utils_2.isBooleanI7(i7Data.flag_lf) ? utils_2.convertToBooleanI7(i7Data.flag_lf) : false;
                     const spannungsregelungRemote = utils_2.isBooleanI7(i7Data.rpv_geregelt) ? utils_2.convertToBooleanI7(i7Data.rpv_geregelt) : false;
                     if (spannungsregelungLokal || spannungsregelungRemote) {
@@ -3363,10 +3560,9 @@ class ConverterIntegral7 {
                         regulatingControl.discrete = true;
                         regulatingControl.targetDeadband = i7Data.uband;
                         regulatingControl.targetValueUnitMultiplier = __1.UnitMultiplier.k;
+                        regulatingControl.enabled = inBetrieb;
                         shunt.regulatingControl = regulatingControl;
                     }
-                    const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
-                    __1.createSvStatus(this.cimModel, inBetrieb, shunt);
                     const connectivityNode = this.cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss));
                     if (connectivityNode) {
                         const terminal = __1.createConnection(this.cimModel, shunt, connectivityNode, __1.PhaseCode.ABC);
@@ -3378,19 +3574,19 @@ class ConverterIntegral7 {
                         if (equipmentContainer) {
                             shunt.equipmentContainerUUID = equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.mrid;
                             this.cimModel.addLinearShuntCompensator(shunt);
-                            this.integralID2UUID.set(i7Data.id, shunt.mrid);
+                            this.addIdMapping(i7Data.id, shunt.mrid, integral_sql_1.Integral7TableNames.KOMPENSATIONSDROSSEL);
                         }
                         else {
-                            this.logger.info(`LinearShuntCompensator ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                            this.logger.debug(`LinearShuntCompensator ${i7Data.id} besitzt keinen EquipmentContainer.`);
                         }
                     }
                     else {
-                        this.logger.info(`LinearShuntCompensator ${i7Data.id} besitzt keinen ConnectivityNode.`);
+                        this.logger.debug(`LinearShuntCompensator ${i7Data.id} besitzt keinen ConnectivityNode.`);
                     }
                 }
             }
             else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.KOMPENSATIONSDROSSEL} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.KOMPENSATIONSDROSSEL} ist nicht vorhanden.`);
             }
         });
     }
@@ -3403,16 +3599,21 @@ class ConverterIntegral7 {
                     shunt.normalSections = i7Data.aktstufe;
                     shunt.maximumSections = i7Data.maxstufe;
                     shunt.nomU = i7Data.ur;
+                    shunt.gPerSection = i7Data.pr / Math.pow(i7Data.ur, 2);
+                    const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
+                    __1.createSvStatus(this.cimModel, inBetrieb, shunt);
                     const spannungsregelungLokal = utils_2.isBooleanI7(i7Data.flag_lf) ? utils_2.convertToBooleanI7(i7Data.flag_lf) : false;
                     const spannungsregelungRemote = utils_2.isBooleanI7(i7Data.rpv_geregelt) ? utils_2.convertToBooleanI7(i7Data.rpv_geregelt) : false;
                     if (spannungsregelungLokal || spannungsregelungRemote) {
-                        const regulatingControl = new __1.RegulatingControl(__1.generateUUID(), `RG_Kompkons ${i7Data.id}`);
+                        const regulatingControl = new __1.RegulatingControl(__1.generateUUID(), `RG_Kompkond ${i7Data.id}`);
                         regulatingControl.mode = __1.RegulatingControlModeKind.voltage;
+                        regulatingControl.discrete = true;
+                        regulatingControl.enabled = inBetrieb;
+                        regulatingControl.targetDeadband = i7Data.uband;
+                        regulatingControl.targetValueUnitMultiplier = __1.UnitMultiplier.k;
                         shunt.regulatingControl = regulatingControl;
                         this.cimModel.addRegulatingControl(shunt.regulatingControl);
                     }
-                    const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
-                    __1.createSvStatus(this.cimModel, inBetrieb, shunt);
                     const connectivityNode = this.cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss));
                     if (connectivityNode) {
                         const terminal = __1.createConnection(this.cimModel, shunt, connectivityNode, __1.PhaseCode.ABC);
@@ -3423,19 +3624,19 @@ class ConverterIntegral7 {
                         if (equipmentContainer) {
                             shunt.equipmentContainerUUID = equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.mrid;
                             this.cimModel.addLinearShuntCompensator(shunt);
-                            this.integralID2UUID.set(i7Data.id, shunt.mrid);
+                            this.addIdMapping(i7Data.id, shunt.mrid, integral_sql_1.Integral7TableNames.KOMPENSATIONSDROSSEL);
                         }
                         else {
-                            this.logger.info(`LinearShuntCompensator ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                            this.logger.debug(`LinearShuntCompensator ${i7Data.id} besitzt keinen EquipmentContainer.`);
                         }
                     }
                     else {
-                        this.logger.info(`LinearShuntCompensator ${i7Data.id} besitzt keinen ConnectivityNode.`);
+                        this.logger.debug(`LinearShuntCompensator ${i7Data.id} besitzt keinen ConnectivityNode.`);
                     }
                 }
             }
             else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.KOMPENSATIONSDROSSEL} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.KOMPENSATIONSDROSSEL} ist nicht vorhanden.`);
             }
         });
     }
@@ -3449,12 +3650,12 @@ class ConverterIntegral7 {
                         diagram.orientation = __1.OrientationKind.negative;
                         diagram.diagramStyle = this.cimModel.getDiagramStyle(__1.DIAGRAM_LAYOUT_TYPES.NODE_BREAKER);
                         this.cimModel.addDiagram(diagram);
-                        this.integralID2UUID.set(i7Data.id, diagram.mrid);
+                        this.i7SchemaID2UUID.set(i7Data.id, diagram.mrid);
                     }
                 }
             }
             else {
-                this.logger.info(`Tabelle ${integral_sql_1.Integral7TableNames.NETZVARIANTEN} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.NETZVARIANTEN} ist nicht vorhanden.`);
             }
         });
     }
@@ -3470,6 +3671,15 @@ class ConverterIntegral7 {
         object.c0 = +data.c0;
         object.ratedCurrent = +data.ir;
     }
+    queryFunctionWrapper(query) {
+        return new Promise((resolve, reject) => {
+            this.queryFunction(query, (successResponse) => {
+                resolve(successResponse);
+            }, (errorResponse) => {
+                reject(errorResponse);
+            });
+        });
+    }
     setACLineSegmentProperties(acLineSegment, data, psrTypeName, defaultValuesConfig) {
         if (!acLineSegment.baseVoltage) {
             const un = utils_2.getU(data.un, defaultValuesConfig.DefaultVoltage);
@@ -3479,8 +3689,6 @@ class ConverterIntegral7 {
         if (data.laenge) {
             acLineSegment.length = data.laenge;
         }
-        else {
-        }
         const assetType = this.cimModel.getWireInfoByName(data.nametyp);
         if (data.r0 && data.r0 !== 0) {
             acLineSegment.r0 = data.laenge <= 0 ? data.r0 : data.r0;
@@ -3524,9 +3732,15 @@ class ConverterIntegral7 {
             else {
             }
         }
-        const psrType = utils_1.createIfNotExitsPSRType(this.cimModel, psrTypeName);
+        const psrType = utils_1.createIfNotExitsPSRType(this.cimModel, data.typ);
         acLineSegment.psrTypeUUID = psrType.mrid;
     }
+    setACLineSegmentCurrentLimt(acLineSegment, nametyp, terminalUUID) {
+        const assetType = this.cimModel.getWireInfoByName(nametyp);
+        if (assetType && assetType.ratedCurrent && assetType.ratedCurrent !== 0) {
+            this.setConductingEquipmentCurrentLimit(acLineSegment.name, terminalUUID, assetType.ratedCurrent);
+        }
+    }
     setConductingEquipmentCurrentLimit(name, terminalUUID, ir) {
         const currentLimit = new __1.CurrentLimit(__1.generateUUID(), `${name}`);
         this.cimModel.addCurrentLimit(currentLimit);
@@ -3566,37 +3780,6 @@ class ConverterIntegral7 {
         wicklung.uMax = data[umax];
         wicklung.uMin = data[umin];
     }
-    convertSchemaBayElements(bay, diagram, saAusrichtung, deltaAusrichtung) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            for (const eqiup of bay.equipments) {
-                if (eqiup instanceof __1.Disconnector) {
-                    const disconnector = eqiup;
-                    for (const terminal of disconnector.terminals.values()) {
-                        const connectedCE = utils_schema_1.isConnectedTo(terminal.connectivityNode, 'BusbarSection');
-                        if (connectedCE && terminal.connectivityNode.diagramObjects.length > 0) {
-                            const diagramObjectSSAB = utils_schema_1.getDiagramObjectBelonginToDiagram(terminal.connectivityNode.diagramObjects, diagram.mrid);
-                            const diagramObjectBay = utils_schema_1.getDiagramObjectBelonginToDiagram(bay.diagramObjects, diagram.mrid);
-                            if (diagramObjectSSAB && diagramObjectBay) {
-                                const diagramObject = new __1.DiagramObject(__1.getUUID(''), 'SSAB Trenner');
-                                if (saAusrichtung === 0) {
-                                    const x = diagramObjectBay.diagramObjectPoints[0].xPosition + 16;
-                                    const y = diagramObjectSSAB.diagramObjectPoints[0].yPosition + 0.5;
-                                    const points = [new Point_1.Point(x, y)];
-                                    utils_schema_1.createDiagramObjectPoints(diagramObject, points);
-                                    eqiup.addDiagramObject(diagramObject);
-                                    diagramObject.identifiedObject = eqiup;
-                                    diagram.addDiagramObject(diagramObject);
-                                    diagramObject.diagram = diagram;
-                                }
-                            }
-                        }
-                        else {
-                        }
-                    }
-                }
-            }
-        });
-    }
     writeHeaderStart(xmlWriter, profileURI) {
         xmlWriter.startDocument('1.0', 'UTF-8');
         xmlWriter.startElementNS(__1.RDF_XML.RDF_NS_PREFIX, 'RDF', __1.RDF_XML.RDF_NS);
@@ -3615,10 +3798,10 @@ class ConverterIntegral7 {
         xmlWriter.endElement();
         xmlWriter.endDocument();
     }
-    objectToCIMXML(xmlWriter, values, profileName, defaultValuesConfig) {
+    objectToCIMXML(xmlWriter, values, profileName, defaultValuesConfig, logger) {
         cgmes_validator_1.validateCGMESData(values, defaultValuesConfig);
         for (const object of values.values()) {
-            object.toCIMXML(xmlWriter, profileName);
+            object.toCIMXML(xmlWriter, profileName, logger);
         }
     }
     objectArrayToCIMXML(xmlWriter, values, profileName) {
@@ -3633,15 +3816,6 @@ class ConverterIntegral7 {
         }
         return false;
     }
-    queryFunctionWrapper(query) {
-        return new Promise((resolve, reject) => {
-            this.queryFunction(query, (successResponse) => {
-                resolve(successResponse);
-            }, (errorResponse) => {
-                reject(errorResponse);
-            });
-        });
-    }
     queryFunction(query, successCallback, errorCallback) {
         this.mysqlConnection.query(query, (error, results, fields) => {
             if (error)
@@ -3649,6 +3823,9 @@ class ConverterIntegral7 {
             successCallback(results);
         });
     }
+    openConnection() {
+        this.mysqlConnection.connect();
+    }
     isTableAvailable(tableName) {
         return this.availableTableNames.indexOf(tableName) > -1 ? true : false;
     }
@@ -3661,13 +3838,26 @@ class ConverterIntegral7 {
             password: mySqlConfig.password,
         });
     }
-    openConnection() {
-        this.mysqlConnection.connect();
-    }
     closeConnection() {
         this.mysqlConnection.end();
     }
+    checkRegelungsknotenTerminals(schlaufenTerminals) {
+        for (const terminal of schlaufenTerminals) {
+            const cnI7IDs = this.UUID2Integral7ID_.get(terminal.connectivityNodeUUID);
+            if (!cnI7IDs)
+                continue;
+            const spData = this.knotenSpannungsband.get(cnI7IDs.find(elem => elem));
+            if (spData) {
+                spData.terminals.push({ uuid: terminal.mrid, connected: terminal.connected });
+            }
+        }
+    }
     addDefaultObjects(defaultValuesConfig) {
+        const region = utils_1.createIfNotExitsGeoregionByName(this.cimModel, defaultValuesConfig.GeographicalRegion.name);
+        region.description = defaultValuesConfig.GeographicalRegion.description;
+        const subregion = utils_1.createIfNotExitsSubGeoregionByName(this.cimModel, defaultValuesConfig.SubGeographicalRegion.name, region);
+        subregion.shortName = defaultValuesConfig.SubGeographicalRegion.shortName;
+        subregion.description = defaultValuesConfig.SubGeographicalRegion.description;
         const loadArea = new LoadArea_1.LoadArea(__1.generateUUID(), defaultValuesConfig.LoadArea.name);
         this.cimModel.addLoadArea(loadArea);
         const subLoadArea = new SubLoadArea_1.SubLoadArea(__1.generateUUID(), defaultValuesConfig.SubLoadArea.name);
@@ -3681,6 +3871,23 @@ class ConverterIntegral7 {
         coordinateSystem.crsUrn = crsUrn;
         this.cimModel.addCoordinateSystem(coordinateSystem);
     }
+    addIdMapping(i7ID, uuid, type) {
+        if (this.integralID2UUID.has(i7ID)) {
+            console.log(`ID ${i7ID} existiert bereits. Typ ${this.integralID2Type.get(i7ID)} neuer Typ ${type}`);
+        }
+        else {
+            this.integralID2UUID.set(i7ID, uuid);
+            this.integralID2Type.set(i7ID, type);
+        }
+    }
+    addUUIDMapping(i7ID, uuid) {
+        if (this.UUID2Integral7ID_.has(uuid)) {
+            this.UUID2Integral7ID_.get(uuid).push(i7ID);
+        }
+        else {
+            this.UUID2Integral7ID_.set(uuid, [i7ID]);
+        }
+    }
 }
 exports.ConverterIntegral7 = ConverterIntegral7;
 function getVoltageLevelByVoltage(subVlData, ur) {
@@ -3701,20 +3908,21 @@ exports.getVoltageLevelByVoltage = getVoltageLevelByVoltage;
 function validateRegulatingControls(regulatingControls, logger, type) {
     for (const rg of regulatingControls.values()) {
         if (!rg.name)
-            logger.info(`RegulatingControl ohne Namen | ${type}`);
+            logger.debug(`RegulatingControl ohne Namen | ${type}`);
         const terminalUUID = rg.terminal ? rg.terminal.mrid : rg.terminalUUID;
         if (!terminalUUID)
-            logger.info(`RegulatingControl ohne Terminal ${rg.name} | ${type}`);
+            logger.debug(`RegulatingControl ohne Terminal ${rg.name} | ${type}`);
     }
 }
 function getGeoCoordinates(i7Data) {
-    if (i7Data.geokoor_pl_breite_h && i7Data.geokoor_pl_breite_m && i7Data.geokoor_pl_breite_s) {
+    if (i7Data.geokoor_pl_breite_h && i7Data.geokoor_pl_breite_m && i7Data.geokoor_pl_breite_s &&
+        i7Data.geokoor_pl_laenge_h && i7Data.geokoor_pl_laenge_m && i7Data.geokoor_pl_laenge_s) {
         const lon = (((i7Data.geokoor_pl_laenge_s / 60) + i7Data.geokoor_pl_laenge_m) / 60) + i7Data.geokoor_pl_laenge_h;
         const lat = (((i7Data.geokoor_pl_breite_s / 60) + i7Data.geokoor_pl_breite_m) / 60) + i7Data.geokoor_pl_breite_h;
         return [String(lon), String(lat)];
     }
-    if (i7Data.geokoor_pl_breite_h && i7Data.geokoor_pl_laenge_s) {
-        return [String(i7Data.geokoor_pl_laenge_s), String(i7Data.geokoor_pl_breite_s)];
+    if (i7Data.geokoor_pl_breite_h && i7Data.geokoor_pl_laenge_h) {
+        return [String(i7Data.geokoor_pl_laenge_h), String(i7Data.geokoor_pl_breite_h)];
     }
     return undefined;
 }
@@ -3736,7 +3944,17 @@ function getValidTerminals(objects, inMemoryObjects) {
     return exportTerminals;
 }
 exports.getValidTerminals = getValidTerminals;
-function validateInMemoryObjects(objects) {
+function getValidTapChangerControls(objects) {
+    const exportInstances = new Map();
+    for (const value of objects.values()) {
+        if (value.terminal || value.terminalUUID) {
+            exportInstances.set(value.mrid, value);
+        }
+    }
+    return exportInstances;
+}
+exports.getValidTapChangerControls = getValidTapChangerControls;
+function validateInMemoryObjects(objects, logger) {
     const exportTerminals = new Map();
     for (const entry of objects.entries()) {
         const value = entry[1];
@@ -3746,11 +3964,11 @@ function validateInMemoryObjects(objects) {
                 (terminal.connectivityNode || terminal.connectivityNodeUUID)) {
                 exportTerminals.set(value.mrid, value);
             }
-            if (terminal.conductingEquipment && terminal.conductingEquipmentUUID) {
-                this.logger.info(`Terminal ohne conductingEquipment UUID ${terminal.mrid} shortName ${terminal.shortName} ID | ${entry[0]}`);
+            if (!terminal.conductingEquipment && !terminal.conductingEquipmentUUID) {
+                logger.debug(`Terminal ohne conductingEquipment UUID ${terminal.mrid} shortName ${terminal.shortName} ID | ${entry[0]}`);
             }
-            if (terminal.connectivityNode && terminal.connectivityNodeUUID) {
-                this.logger.info(`Terminal ohne connectivityNode UUID ${terminal.mrid} shortName ${terminal.shortName} ID | ${entry[0]}`);
+            if (!terminal.connectivityNode && !terminal.connectivityNodeUUID) {
+                logger.debug(`Terminal ohne connectivityNode UUID ${terminal.mrid} shortName ${terminal.shortName} ID | ${entry[0]}`);
             }
         }
     }