diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 4396efa..d5ec23e 100644
--- a/MAIN_SSG.rdx
+++ b/MAIN_SSG.rdx
@@ -122,7 +122,7 @@
 					<FIELD Id="RDK:24351631" Name="AsmName" Type="string" />
 					<FIELD Id="RDK:24351633" Name="Parts" Type="string" DesignTimeTip=";separated string with all necessary files for this assembly" />
 				</TYPE>
-				<TYPE Id="RDK:21686352" Name="KurveFoerdererType" SubType="structure">
+				<TYPE Id="RDK:21686352" Name="KurveFoerdererType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:21686345" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:21686346" Name="L1" Type="double" />
@@ -251,7 +251,7 @@
 					<FIELD Id="RDK:1652523" Name="Drehung" Type="integer" DesignTimeNotes="1= im Uhrzeigersinn=rechts&#xD;&#xA;-1= Gegen Uhrzeigersinn=links" />
 					<FIELD Id="RDK:1657744" Name="Beschreibung" Type="string" />
 				</TYPE>
-				<TYPE Id="RDK:16525251" Name="BTMTEntladungType" SubType="structure">
+				<TYPE Id="RDK:16525251" Name="BTMTEntladungType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:16525221" Name="Hoehe" Type="double" />
 					<FIELD Id="RDK:16525231" Name="Drehung" Type="integer" DesignTimeNotes="1= im Uhrzeigersinn=rechts&#xD;&#xA;-1= Gegen Uhrzeigersinn=links" />
@@ -1041,7 +1041,7 @@
 					<FIELD Id="RDK:24365630" Name="Drehung" Type="double" />
 					<FIELD Id="RDK:24300973" Name="SivasNummer" Type="string" />
 				</TYPE>
-				<TYPE Id="RDK:23017792" Name="OFBogenMerkmaleType" SubType="structure">
+				<TYPE Id="RDK:23017792" Name="OFBogenMerkmaleType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:23017787" Name="Länge in Meter" Type="string" />
 					<FIELD Id="RDK:23017789" Name="Kurvenwinkel" Type="double" />
@@ -23436,7 +23436,7 @@ SSGConnectionPoint.x_M
 									<EXP><![CDATA[$C$CalculateFoerdererData]]></EXP>
 								</PAR>
 								<PAR Name="InputExp">
-									<EXP><![CDATA[$=$ShapeList[shapeList_idx].FoerdererDefinition]]></EXP>
+									<EXP><![CDATA[$=$ShapeList["id="+shapeId].FoerdererDefinition]]></EXP>
 								</PAR>
 								<PAR Name="ResultRef">
 									<EXP><![CDATA[$V$foerdererData]]></EXP>
@@ -23448,13 +23448,13 @@ SSGConnectionPoint.x_M
 									<EXP><![CDATA[$=$IsEmpty(foerdererData)]]></EXP>
 								</VALUECONDITION>
 								<GROUP Id="RDK:19927897" SubType="Then">
-									<SET Id="RDK:19927901" VarRef="ShapeList[shapeList_idx].FoerdererDefinition.LH_fits">
+									<SET Id="RDK:19927901" VarRef="ShapeList[&quot;id=&quot;+shapeId].FoerdererDefinition.LH_fits">
 										<EXP><![CDATA[$C$False]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</GROUP>
 								<GROUP Id="RDK:19927898" SubType="Else">
-									<SET Id="RDK:19927903" VarRef="ShapeList[shapeList_idx].FoerdererDefinition.LH_fits">
+									<SET Id="RDK:19927903" VarRef="ShapeList[&quot;id=&quot;+shapeId].FoerdererDefinition.LH_fits">
 										<EXP><![CDATA[$C$True]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
@@ -39719,7 +39719,7 @@ me.x
 							<EXP><![CDATA[$=$False]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
-						<SET Id="RDK:22885644" VarRef="ShapeList[&quot;id=&quot;+id0].GefaelleDefinition..HoeheUnten" DesignTimeRemark="Wenn Unlinked erfolgt, wird der Flag istfixiert auf false gesetzt.">
+						<SET Id="RDK:22885644" VarRef="ShapeList[&quot;id=&quot;+id0].GefaelleDefinition.HoeheUnten" DesignTimeRemark="Wenn Unlinked erfolgt, wird der Flag istfixiert auf false gesetzt.">
 							<EXP><![CDATA[$=$0]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
@@ -42906,6 +42906,9 @@ me.x
 										<PAR Name="Höhe unten">
 											<EXP><![CDATA[$=$StrReplace(ShapeItem.GefaelleDefinition.HoeheUnten/1000, ",", ".")]]></EXP>
 										</PAR>
+										<PAR Name="Drehung">
+											<EXP><![CDATA[$=$IIF(IsEmpty(ShapeItem.rotation),0,ShapeItem.rotation)]]></EXP>
+										</PAR>
 									</SET_STRUCT>
 									<SET Id="RDK:24270633" VarRef="CSV_Item.Merkmale">
 										<EXP><![CDATA[$=$ToJSON(GefaellestreckeMerkmale)]]></EXP>
@@ -42978,10 +42981,13 @@ me.x
 											<EXP><![CDATA[$=$ShapeItem.FoerdererDefinition.n_Scan]]></EXP>
 										</PAR>
 										<PAR Name="Höhe Anfang">
-											<EXP><![CDATA[$=$StrReplace(ShapeItem.VarioFoerdererDefinition.H_0/1000, ",", ".")]]></EXP>
+											<EXP><![CDATA[$=$StrReplace(ShapeItem.FoerdererDefinition.H_0/1000, ",", ".")]]></EXP>
 										</PAR>
 										<PAR Name="Höhe Ende">
-											<EXP><![CDATA[$=$StrReplace(ShapeItem.VarioFoerdererDefinition.H_1/1000, ",", ".")]]></EXP>
+											<EXP><![CDATA[$=$StrReplace(ShapeItem.FoerdererDefinition.H_1/1000, ",", ".")]]></EXP>
+										</PAR>
+										<PAR Name="Drehung">
+											<EXP><![CDATA[$=$IIF(IsEmpty(ShapeItem.rotation),0,ShapeItem.rotation)]]></EXP>
 										</PAR>
 										<PAR Name="Drehung">
 											<EXP><![CDATA[$=$Drehung]]></EXP>
@@ -48375,7 +48381,7 @@ me.x
 						<EXP><![CDATA[$C$Foerderer]]></EXP>
 						<IFTHENELSE Id="RDK:19603049">
 							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$ShapeList[shapeList_idx].FoerdererDefinition.LH_fits]]></EXP>
+								<EXP><![CDATA[$=$ShapeList["id="+shapeId].FoerdererDefinition.LH_fits]]></EXP>
 							</VALUECONDITION>
 							<GROUP Id="RDK:19603046" SubType="Then">
 								<CALLFUNCTION Id="RDK:19603045">
@@ -48447,7 +48453,7 @@ me.x
 						<EXP><![CDATA[$C$Kurve]]></EXP>
 						<IFTHENELSE Id="RDK:21032034">
 							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$ShapeList[shapeList_idx].KurveDefinition.isOk]]></EXP>
+								<EXP><![CDATA[$=$ShapeList["id="+shapeId].KurveDefinition.isOk]]></EXP>
 							</VALUECONDITION>
 							<GROUP Id="RDK:21032047" SubType="Then">
 								<CALLFUNCTION Id="RDK:21032046">
@@ -48483,7 +48489,7 @@ me.x
 						<EXP><![CDATA[$C$KurveFoerderer]]></EXP>
 						<IFTHENELSE Id="RDK:21692417">
 							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$ShapeList[shapeList_idx].KurveFoerdererDefinition.isOk]]></EXP>
+								<EXP><![CDATA[$=$ShapeList["id="+shapeId].KurveFoerdererDefinition.isOk]]></EXP>
 							</VALUECONDITION>
 							<GROUP Id="RDK:21692414" SubType="Then">
 								<CALLFUNCTION Id="RDK:21692413">
@@ -48519,7 +48525,7 @@ me.x
 						<EXP><![CDATA[$C$BTMTBeladung]]></EXP>
 						<IFTHENELSE Id="RDK:19603057">
 							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$ShapeList[shapeList_idx].BTMTBeladungDefinition.Drehung > 0]]></EXP>
+								<EXP><![CDATA[$=$ShapeList["id="+shapeId].BTMTBeladungDefinition.Drehung > 0]]></EXP>
 							</VALUECONDITION>
 							<GROUP Id="RDK:19603063" SubType="Then">
 								<CALLFUNCTION Id="RDK:19603069">
@@ -48555,7 +48561,7 @@ me.x
 						<EXP><![CDATA[$C$BTMTEntladung]]></EXP>
 						<IFTHENELSE Id="RDK:19603081">
 							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$ShapeList[shapeList_idx].BTMTBeladungDefinition.Drehung < 0]]></EXP>
+								<EXP><![CDATA[$=$ShapeList["id="+shapeId].BTMTBeladungDefinition.Drehung < 0]]></EXP>
 							</VALUECONDITION>
 							<GROUP Id="RDK:19603078" SubType="Then">
 								<CALLFUNCTION Id="RDK:19603077">
@@ -61663,4 +61669,4 @@ me.x
 		</PROFILES_DATA>
 		<BOM_DATA />
 	</EXTERNAL_DATA>
-</PROCESS>
\ No newline at end of file
+</PROCESS>