diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 58d13c02c..85b274f26 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -9,23 +9,6 @@
         <module name="MPS_Fbme_dsl" />
       </profile>
     </annotationProcessing>
-    <bytecodeTargetLevel target="11">
-      <module name="FBME.code.main" target="11" />
-      <module name="FBME.code.test" target="11" />
-      <module name="FBME.library" target="1.8" />
-      <module name="FBME.library.main" target="1.8" />
-      <module name="FBME.library.test" target="1.8" />
-      <module name="FBME.library_st-parser" target="1.8" />
-      <module name="FBME.library_st-parser.main" target="1.8" />
-      <module name="FBME.library_st-parser.test" target="1.8" />
-      <module name="iec61499.library_st-parser" target="1.8" />
-      <module name="iec61499.library_st-parser.main" target="1.8" />
-      <module name="iec61499.library_st-parser.test" target="1.8" />
-      <module name="iec61499.st-parser" target="1.8" />
-      <module name="iec61499.st-parser.main" target="1.8" />
-      <module name="iec61499.st-parser.test" target="1.8" />
-      <module name="st-parser_main" target="1.8" />
-      <module name="st-parser_test" target="1.8" />
-    </bytecodeTargetLevel>
+    <bytecodeTargetLevel target="11" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index 15a15b218..000000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
-</project>
\ No newline at end of file
diff --git a/.idea/kotlinScripting.xml b/.idea/kotlinScripting.xml
deleted file mode 100644
index a6fe551d0..000000000
--- a/.idea/kotlinScripting.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="KotlinScriptingSettings">
-    <option name="isAutoReloadEnabled" value="true" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 4981e477a..59b4d604e 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -10,6 +10,7 @@
         <option value="$PROJECT_DIR$/.teamcity/pom.xml" />
       </list>
     </option>
+    <option name="workspaceImportForciblyTurnedOn" value="true" />
   </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
diff --git a/code/cat_visual/src/main/kotlin/Main.kt b/code/cat_visual/src/main/kotlin/Main.kt
index 942d62ec4..879c16e8e 100644
--- a/code/cat_visual/src/main/kotlin/Main.kt
+++ b/code/cat_visual/src/main/kotlin/Main.kt
@@ -22,6 +22,7 @@ import androidx.compose.ui.zIndex
 import canvas.items.impl.CustomItem
 import canvas.items.impl.LampItem
 import canvas.items.impl.TextItem
+import canvas.items.impl.ToggleItem
 import canvas.items.interfaces.CanvasItemInterface
 import canvas.items.model.JsonCanvasModel
 import canvas.items.model.toItem
@@ -94,29 +95,62 @@ fun itemBar(
     Column(
         modifier = Modifier
             .background(Color.LightGray)
-            .width(100.dp)
+            .width(140.dp)
             .fillMaxHeight()
             .zIndex(-2f),
         horizontalAlignment = Alignment.End,
     ) {
         Button(
-            modifier = Modifier.align(alignment = Alignment.CenterHorizontally),
+            modifier = Modifier.align(alignment = Alignment.CenterHorizontally).width(130.dp),
             onClick = {
                 addNewItem(TextItem(content = "AddedText"))
             }
         ) {
-            Text(text = "Add text")
+            Text(text = "Text")
         }
         Button(
-            modifier = Modifier.align(alignment = Alignment.CenterHorizontally),
+            modifier = Modifier.align(alignment = Alignment.CenterHorizontally).width(130.dp),
             onClick = {
                 addNewItem(LampItem(client = client))
             }
         ) {
-            Text(text = "Add lamp")
+            Text(text = "Lamp")
         }
         Button(
-            modifier = Modifier.align(alignment = Alignment.CenterHorizontally),
+            modifier = Modifier.align(alignment = Alignment.CenterHorizontally).width(130.dp),
+            onClick = {
+                addNewItem(ToggleItem(client = client))
+            }
+        ) {
+            Text(text = "Toggle")
+        }
+        Button(
+            modifier = Modifier.align(alignment = Alignment.CenterHorizontally).width(130.dp),
+            onClick = {
+                addNewItem(LampItem(client = client))
+            }
+        ) {
+            Text(text = "Box")
+        }
+        Button(
+            modifier = Modifier.align(alignment = Alignment.CenterHorizontally).width(130.dp),
+            onClick = {
+                addNewItem(LampItem(client = client))
+            }
+        ) {
+            Text(text = "CheckBox")
+        }
+        Button(
+            modifier = Modifier.align(alignment = Alignment.CenterHorizontally).width(130.dp),
+            onClick = {
+                addNewItem(LampItem(client = client))
+            }
+        ) {
+            Text(text = "RadioButton")
+        }
+
+        Button(
+            modifier = Modifier.align(alignment = Alignment.CenterHorizontally).width(130.dp),
             onClick = {
                 val x = itemList.map {it.toModel()}
                 val json = Json.encodeToString(x)
@@ -142,7 +176,6 @@ fun main() = application {
                         .fillMaxWidth()
                         .fillMaxHeight(),
                 ) {
-//                CounterLampHMI(client, "1")
                     itemBar(itemList) { item ->
                         itemList += listOf(item)
                     }
diff --git a/code/cat_visual/src/main/kotlin/canvas/items/impl/LampItem.kt b/code/cat_visual/src/main/kotlin/canvas/items/impl/LampItem.kt
index 8b24df8df..041b0efa3 100644
--- a/code/cat_visual/src/main/kotlin/canvas/items/impl/LampItem.kt
+++ b/code/cat_visual/src/main/kotlin/canvas/items/impl/LampItem.kt
@@ -3,17 +3,21 @@ package canvas.items.impl
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.wrapContentSize
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.DropdownMenu
+import androidx.compose.material.DropdownMenuItem
+import androidx.compose.material.Switch
 import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
+import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.RectangleShape
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import canvas.items.Draggable
 import canvas.items.interfaces.CanvasItemInterface
 import canvas.items.interfaces.Focusable
@@ -50,22 +54,65 @@ class LampItem(
         val localDensity = LocalDensity.current
         val xPosition = remember { mutableStateOf(x) }
         val yPosition = remember { mutableStateOf(y) }
-        val focusRequester = remember { FocusRequester() }
-        val color = remember { mutableStateOf(Color.Black) }
-        Round(
+        var connectMenu by remember { mutableStateOf( false) }
+        var expandedDropDownMenu by remember { mutableStateOf(false) }
+        val idStaq by remember {mutableStateOf(id.toString())}
+        Box(
             modifier = modifier
                 .makeDraggable(localDensity, xPosition, yPosition)
-                .makeFocusable(focusRequester, color)
                 .background(brush = if (isLighting.value) LIGHT_RADIAL_BRUSH else DARK_RADIAL_BRUSH)
-                .border(width = 10.dp, brush = METALLIC_BRUSH, shape = CircleShape)
-                .clickable {
-                    isLighting.value = if (isLighting.value) false else true
-                    println("${xPosition.value} : ${yPosition.value}")
+                .border(width = 10.dp, brush = METALLIC_BRUSH, shape = RectangleShape)
+                .clickable{
+                    expandedDropDownMenu = !expandedDropDownMenu
                 }
-                .wrapContentSize(),
-            height = 60.dp,
-            width = 60.dp,
-        )
+                .width(60.dp)
+                .height(60.dp)
+        ) {
+            DropdownMenu(
+                expanded = expandedDropDownMenu,
+                onDismissRequest = {
+                    expandedDropDownMenu = false
+                },
+                modifier = Modifier.width(200.dp)
+            ) {
+                DropdownMenuItem(onClick = {
+                    deleteCurrentItem(idStaq)
+                }) {
+                    Text(
+                        text = "Удалить",
+                        modifier = Modifier
+                            .padding(5.dp),
+                        fontSize = 15.sp,
+                    )
+                }
+                DropdownMenuItem(
+                    onClick = {
+                        connectMenu = !connectMenu
+                    },
+                ) {
+                    Text(
+                        text = "Соединить",
+                        modifier = Modifier
+                            .padding(5.dp),
+                        fontSize = 15.sp,
+                    )
+                }
+                if (connectMenu) {
+                    DropdownMenuItem(
+                        onClick = {
+                            connectMenu = false
+                        },
+                    ) {
+                        Text(
+                            text = "Lamp 1",
+                            modifier = Modifier
+                                .padding(10.dp),
+                            fontSize = 15.sp,
+                        )
+                    }
+                }
+            }
+        }
         x = xPosition.value
         y = yPosition.value
     }
diff --git a/code/cat_visual/src/main/kotlin/canvas/items/impl/ToggleItem.kt b/code/cat_visual/src/main/kotlin/canvas/items/impl/ToggleItem.kt
new file mode 100644
index 000000000..6f5f3de27
--- /dev/null
+++ b/code/cat_visual/src/main/kotlin/canvas/items/impl/ToggleItem.kt
@@ -0,0 +1,111 @@
+package canvas.items.impl
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.*
+import androidx.compose.material.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import canvas.items.Draggable
+import canvas.items.interfaces.CanvasItemInterface
+import canvas.items.interfaces.Focusable
+import connection.AbstractClient
+import java.util.*
+
+class ToggleItem(
+    override val id: UUID = UUID.randomUUID(),
+    override var x: Float = 0f,
+    override var y: Float = 0f,
+    override val modifier: Modifier = Modifier,
+    override val client: AbstractClient,
+): AbstractItem(
+    x = x,
+    y = y,
+    modifier = modifier,
+    inputs = listOf(),
+    outputs = listOf(),
+    client = client,
+), Draggable, Focusable {
+
+
+    override val type = CanvasItemInterface.Type.TOGGLE
+
+    @Composable
+    override fun getContent(deleteCurrentItem: (String) -> Unit) {
+        val localDensity = LocalDensity.current
+        val xPosition = remember { mutableStateOf(x) }
+        val yPosition = remember { mutableStateOf(y) }
+        val focusRequester = remember { FocusRequester() }
+        val color = remember { mutableStateOf(Color.Black) }
+        val checkedStateToggle = remember { mutableStateOf(false) }
+        var connectMenu by remember { mutableStateOf( false) }
+        var expandedDropDownMenu by remember { mutableStateOf(false) }
+        val idStaq by remember {mutableStateOf(id.toString())}
+        Box(
+            modifier.makeDraggable(localDensity, xPosition, yPosition)
+                .makeFocusable(focusRequester, color)
+                .clickable{
+                    expandedDropDownMenu = !expandedDropDownMenu
+                }
+        ) {
+            Switch(
+                modifier = modifier
+                    .size(50.dp)
+                    .wrapContentSize(),
+                checked = checkedStateToggle.value,
+                onCheckedChange = {checkedStateToggle.value = !checkedStateToggle.value},
+            )
+            DropdownMenu(
+                expanded = expandedDropDownMenu,
+                onDismissRequest = {
+                    expandedDropDownMenu = false
+                },
+                modifier = Modifier.width(200.dp)
+            ) {
+                DropdownMenuItem(onClick = {
+                    deleteCurrentItem(idStaq)
+                }) {
+                    Text(
+                        text = "Удалить",
+                        modifier = Modifier
+                            .padding(5.dp),
+                        fontSize = 15.sp,
+                    )
+                }
+                DropdownMenuItem(
+                    onClick = {
+                        connectMenu = !connectMenu
+                    },
+                ) {
+                    Text(
+                        text = "Соединить",
+                        modifier = Modifier
+                            .padding(5.dp),
+                        fontSize = 15.sp,
+                    )
+                }
+                if (connectMenu) {
+                    DropdownMenuItem(
+                        onClick = {
+                            connectMenu = false
+                        },
+                    ) {
+                        Text(
+                            text = "Toggle 1",
+                            modifier = Modifier
+                                .padding(10.dp),
+                            fontSize = 15.sp,
+                        )
+                    }
+                }
+            }
+        }
+        x = xPosition.value
+        y = yPosition.value
+    }
+}
\ No newline at end of file
diff --git a/code/cat_visual/src/main/kotlin/canvas/items/interfaces/CanvasItemInterface.kt b/code/cat_visual/src/main/kotlin/canvas/items/interfaces/CanvasItemInterface.kt
index ef767567b..11d5a3285 100644
--- a/code/cat_visual/src/main/kotlin/canvas/items/interfaces/CanvasItemInterface.kt
+++ b/code/cat_visual/src/main/kotlin/canvas/items/interfaces/CanvasItemInterface.kt
@@ -23,6 +23,7 @@ interface CanvasItemInterface {
     enum class Type {
         TEXT,
         LAMP,
+        TOGGLE,
         UNKNOWN,
     }
 }
\ No newline at end of file
diff --git a/code/cat_visual/src/main/kotlin/canvas/items/model/JsonCanvasModel.kt b/code/cat_visual/src/main/kotlin/canvas/items/model/JsonCanvasModel.kt
index 5153435dd..bbb83ec89 100644
--- a/code/cat_visual/src/main/kotlin/canvas/items/model/JsonCanvasModel.kt
+++ b/code/cat_visual/src/main/kotlin/canvas/items/model/JsonCanvasModel.kt
@@ -4,9 +4,11 @@ import androidx.compose.ui.Modifier
 import canvas.exceptions.UnknownTypeItemException
 import canvas.items.impl.LampItem
 import canvas.items.impl.TextItem
+import canvas.items.impl.ToggleItem
 import canvas.items.interfaces.CanvasItemInterface
 import connection.AbstractClient
 import kotlinx.serialization.Serializable
+import lib.elements.setters.Toggle
 import java.util.*
 
 @Serializable
@@ -34,5 +36,11 @@ fun JsonCanvasModel.toItem(client: AbstractClient): CanvasItemInterface =
             y = y,
             client = client,
         )
+        CanvasItemInterface.Type.TOGGLE.name -> ToggleItem(
+            id = UUID.fromString(id),
+            x = x,
+            y = y,
+            client = client
+        )
         else -> throw UnknownTypeItemException(id, type)
     }
\ No newline at end of file
diff --git a/code/cat_visual/src/main/kotlin/canvas/items/model/figures/Templates.kt b/code/cat_visual/src/main/kotlin/canvas/items/model/figures/Templates.kt
index 23fcee40e..90d998000 100644
--- a/code/cat_visual/src/main/kotlin/canvas/items/model/figures/Templates.kt
+++ b/code/cat_visual/src/main/kotlin/canvas/items/model/figures/Templates.kt
@@ -17,5 +17,6 @@ fun Round(modifier: Modifier, width: Dp, height: Dp) {
             .width(width)
             .height(height)
             .clip(CircleShape)
-    )
+    ){
+    }
 }
\ No newline at end of file
diff --git a/code/cat_visual/src/main/kotlin/config/example.cfg b/code/cat_visual/src/main/kotlin/config/example.cfg
index 5807dfa1e..885cdc0ed 100644
--- a/code/cat_visual/src/main/kotlin/config/example.cfg
+++ b/code/cat_visual/src/main/kotlin/config/example.cfg
@@ -1,12 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE System SYSTEM "https://www.holobloc.com/xml/LibraryElement.dtd">
 
-<System Name="Example">
-	<CATType Name="SetLamp">
+<System Name="WaterTank">
+	<CATType Name="Lamp">
 	      <Inst ID="A8B344E30F0BAEE1" Name="Lamp1" />
 	      <Inst ID="B8B344E30F0BAEE2" Name="Lamp2" />
 	</CATType>
 	<CATType Name="Text" Namespace="Main">
 	      <Inst ID="6F4BDD83ED713070" Name="Text" />
 	</CATType>
+	<CATType Name="Lamp">
+    	 <Inst ID="C8B344E30F0BAEE1" Name="Lamp1" />
+    	 <Inst ID="D8B344E30F0BAEE2" Name="Lamp2" />
+    </CATType>
+
 </System>
\ No newline at end of file
diff --git a/code/cat_visual/src/main/kotlin/serializer/SerializationUtils.kt b/code/cat_visual/src/main/kotlin/serializer/SerializationUtils.kt
index 5b48fbd58..63faa3390 100644
--- a/code/cat_visual/src/main/kotlin/serializer/SerializationUtils.kt
+++ b/code/cat_visual/src/main/kotlin/serializer/SerializationUtils.kt
@@ -26,11 +26,11 @@ class SerializationUtils {
         private const val PATH: String = "/Users/sj/IdeaProjects/fbme/code/cat_visual/src/main/kotlin/serializer/saved"
 
         fun saveSnapshot(json: String) {
-            File(PATH, "test.json").writeText(json)
+            File(PATH, "example.json").writeText(json)
         }
 
         fun readSnapshot(): String {
-            return File(PATH, "test.json").readText()
+            return File(PATH, "example.json").readText()
         }
     }
 }
\ No newline at end of file
diff --git a/code/cat_visual/src/main/kotlin/serializer/saved/example.json b/code/cat_visual/src/main/kotlin/serializer/saved/example.json
new file mode 100644
index 000000000..4350fec07
--- /dev/null
+++ b/code/cat_visual/src/main/kotlin/serializer/saved/example.json
@@ -0,0 +1,38 @@
+[
+  {
+    "id": "7039d520-eb99-468f-9d7b-78c770588bb8",
+    "x": 250.0,
+    "y": -148.0,
+    "inputs": [],
+    "outputs": [],
+    "content": "Другой текст",
+    "type": "TEXT"
+  },
+  {
+    "id": "9728343a-a291-4d53-81bd-f4a95d2fec51",
+    "x": 421.75,
+    "y": 72.0,
+    "inputs": ["A8B344E30F0BAEE1"],
+    "outputs": ["A8B344E30FJH72F1"],
+    "content": "Тест",
+    "type": "TEXT"
+  },
+  {
+    "id": "1b4267f9-3d0f-43c5-b2db-a2a021725783",
+    "x": 246.0,
+    "y": 227.75,
+    "inputs": ["A8B344E30F0BAEE1"],
+    "outputs": ["A8B344E30FJH72F1"],
+    "content": "null",
+    "type": "LAMP"
+  },
+  {
+    "id": "c65328fe-8452-45d7-a054-454ed65aa2a6",
+    "x": 601.75,
+    "y": 132.0,
+    "inputs": ["B8B344E30F0BAEE1"],
+    "outputs": ["C8B344E30FJH72F1"],
+    "content": "null",
+    "type": "TOGGLE"
+  }
+]
\ No newline at end of file
diff --git a/code/cat_visual/src/main/kotlin/serializer/saved/test.json b/code/cat_visual/src/main/kotlin/serializer/saved/test.json
deleted file mode 100644
index 3cce12eae..000000000
--- a/code/cat_visual/src/main/kotlin/serializer/saved/test.json
+++ /dev/null
@@ -1,20 +0,0 @@
-[
-  {
-    "id": "1a83b4d3-98a2-47e2-b4f5-7a2c05ccc356",
-    "x": 604.0,
-    "y": 84.25,
-    "inputs": [],
-    "outputs": [],
-    "content": "null",
-    "type": "LAMP"
-  },
-  {
-    "id": "997d8f1c-bfb6-4ade-8ac9-bdfb70a0e0cb",
-    "x": 0.0,
-    "y": 0.0,
-    "inputs": [],
-    "outputs": [],
-    "content": "qwerty",
-    "type": "TEXT"
-  }
-]
\ No newline at end of file
diff --git a/code/language/languages/org.fbme.ide.st.lang/models/org.fbme.ide.st.lang.editor.mps b/code/language/languages/org.fbme.ide.st.lang/models/org.fbme.ide.st.lang.editor.mps
index 5a947bc38..f87885d00 100644
--- a/code/language/languages/org.fbme.ide.st.lang/models/org.fbme.ide.st.lang.editor.mps
+++ b/code/language/languages/org.fbme.ide.st.lang/models/org.fbme.ide.st.lang.editor.mps
@@ -40,6 +40,9 @@
         <child id="1140524464360" name="cellLayout" index="2czzBx" />
         <child id="1140524464359" name="emptyCellModel" index="2czzBI" />
       </concept>
+      <concept id="4510086454722552739" name="jetbrains.mps.lang.editor.structure.PropertyDeclarationCellSelector" flags="ng" index="eBIwv">
+        <reference id="4510086454740628767" name="propertyDeclaration" index="fyFUz" />
+      </concept>
       <concept id="1196434649611" name="jetbrains.mps.lang.editor.structure.SubstituteMenu_SimpleString" flags="ng" index="2h3Zct">
         <property id="1196434851095" name="text" index="2h4Kg1" />
       </concept>
@@ -312,6 +315,7 @@
       </concept>
       <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
       <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
+      <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
       <concept id="1225271221393" name="jetbrains.mps.baseLanguage.structure.NPENotEqualsExpression" flags="nn" index="17QLQc" />
       <concept id="1225271283259" name="jetbrains.mps.baseLanguage.structure.NPEEqualsExpression" flags="nn" index="17R0WA" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
@@ -412,6 +416,9 @@
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
+      <concept id="1200397529627" name="jetbrains.mps.baseLanguage.structure.CharConstant" flags="nn" index="1Xhbcc">
+        <property id="1200397540847" name="charConstant" index="1XhdNS" />
+      </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
@@ -492,6 +499,7 @@
       <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
         <child id="1177027386292" name="conceptArgument" index="cj9EA" />
       </concept>
+      <concept id="1171999116870" name="jetbrains.mps.lang.smodel.structure.Node_IsNullOperation" flags="nn" index="3w_OXm" />
       <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
       <concept id="1144100932627" name="jetbrains.mps.lang.smodel.structure.OperationParm_Inclusion" flags="ng" index="1xIGOp" />
       <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
@@ -531,6 +539,9 @@
       <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
         <reference id="1138056516764" name="link" index="3Tt5mk" />
       </concept>
+      <concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
+        <reference id="1138056546658" name="link" index="3TtcxE" />
+      </concept>
       <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
@@ -564,6 +575,7 @@
         <child id="1237721435808" name="initValue" index="HW$Y0" />
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
+      <concept id="1227022179634" name="jetbrains.mps.baseLanguage.collections.structure.AddLastElementOperation" flags="nn" index="2Ke9KJ" />
       <concept id="1227026082377" name="jetbrains.mps.baseLanguage.collections.structure.RemoveFirstElementOperation" flags="nn" index="2Kt2Hk" />
       <concept id="1227026094155" name="jetbrains.mps.baseLanguage.collections.structure.RemoveLastElementOperation" flags="nn" index="2Kt5_m" />
       <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
@@ -706,7 +718,7 @@
   </node>
   <node concept="24kQdi" id="3HBlKeoZzvZ">
     <property role="3GE5qa" value="expressions" />
-    <ref role="1XX52x" to="gpgy:3HBlKeoZu2i" resolve="DecIntegerLiteral" />
+    <ref role="1XX52x" to="gpgy:3HBlKeoZu2i" resolve="SingedIntegerLiteral" />
     <node concept="3F0A7n" id="3Qd3IVOK7JS" role="2wV5jI">
       <ref role="1NtTu8" to="gpgy:3HBlKeoZu2j" resolve="value" />
     </node>
@@ -960,6 +972,9 @@
           <node concept="ljvvj" id="7GyesCp9TOm" role="3F10Kt">
             <property role="VOm3f" value="true" />
           </node>
+          <node concept="A1WHu" id="3rfKXADyCGN" role="3vIgyS">
+            <ref role="A1WHt" node="3rfKXADyoCS" resolve="AddElseClause" />
+          </node>
         </node>
         <node concept="3F1sOY" id="7GyesCp9TNR" role="3EZMnx">
           <ref role="1NtTu8" to="gpgy:7GyesCp9TLt" resolve="elseClause" />
@@ -994,6 +1009,9 @@
       <node concept="3F0ifn" id="7GyesCp9TOl" role="3EZMnx">
         <property role="3F0ifm" value="ENDIF" />
         <ref role="1k5W1q" node="7GyesCpx4MI" resolve="Operational" />
+        <node concept="A1WHu" id="3rfKXADyCGL" role="3vIgyS">
+          <ref role="A1WHt" node="3rfKXADyoCS" resolve="AddElseClause" />
+        </node>
       </node>
       <node concept="PMmxH" id="7GyesCpsbpk" role="3EZMnx">
         <ref role="PMmxG" node="7GyesCpsa$X" resolve="Semicolon" />
@@ -9077,7 +9095,7 @@
     </node>
   </node>
   <node concept="3ICUPy" id="3Sv$YXXqkXu">
-    <ref role="aqKnT" to="gpgy:23XkovW7Yj2" resolve="NongenericType" />
+    <ref role="aqKnT" to="gpgy:23XkovW7Yj2" resolve="NonGenericType" />
     <node concept="22hDWj" id="6pYQ4mCjF2g" role="22hAXT" />
     <node concept="1Qtc8_" id="3Sv$YXXqkXv" role="IW6Ez">
       <node concept="L$LW2" id="3Sv$YXXZ_5W" role="1Qtc8A" />
@@ -9704,7 +9722,7 @@
     </node>
   </node>
   <node concept="22mcaB" id="3Sv$YXXOCm$">
-    <ref role="aqKnT" to="gpgy:3HBlKeoZu2i" resolve="DecIntegerLiteral" />
+    <ref role="aqKnT" to="gpgy:3HBlKeoZu2i" resolve="SingedIntegerLiteral" />
     <node concept="22hDWj" id="6pYQ4mCjF2o" role="22hAXT" />
     <node concept="3eGOop" id="3Sv$YXXOC_Z" role="3ft7WO">
       <node concept="ucgPf" id="3Sv$YXXOCA0" role="3aKz83">
@@ -9713,12 +9731,12 @@
             <node concept="3cpWsn" id="3Sv$YXXOCA3" role="3cpWs9">
               <property role="TrG5h" value="node" />
               <node concept="3Tqbb2" id="3Sv$YXXOCA4" role="1tU5fm">
-                <ref role="ehGHo" to="gpgy:3HBlKeoZu2i" resolve="DecIntegerLiteral" />
+                <ref role="ehGHo" to="gpgy:3HBlKeoZu2i" resolve="SingedIntegerLiteral" />
               </node>
               <node concept="2ShNRf" id="3Sv$YXXOCA5" role="33vP2m">
                 <node concept="3zrR0B" id="3Sv$YXXOCA6" role="2ShVmc">
                   <node concept="3Tqbb2" id="3Sv$YXXOCA7" role="3zrR0E">
-                    <ref role="ehGHo" to="gpgy:3HBlKeoZu2i" resolve="DecIntegerLiteral" />
+                    <ref role="ehGHo" to="gpgy:3HBlKeoZu2i" resolve="SingedIntegerLiteral" />
                   </node>
                 </node>
               </node>
@@ -9874,5 +9892,248 @@
       <node concept="l2Vlx" id="3cys4Y4ones" role="2iSdaV" />
     </node>
   </node>
+  <node concept="24kQdi" id="3te61Mg3Zj0">
+    <property role="3GE5qa" value="expressions" />
+    <ref role="1XX52x" to="gpgy:3te61Mg3Ziy" resolve="RealLiteral" />
+    <node concept="3F0A7n" id="3te61Mg3Zj2" role="2wV5jI">
+      <ref role="1NtTu8" to="gpgy:3te61Mg3Ziz" resolve="value" />
+    </node>
+  </node>
+  <node concept="3ICUPy" id="22BHT1ekZvm">
+    <property role="3GE5qa" value="expressions" />
+    <ref role="aqKnT" to="gpgy:3HBlKeoZu2i" resolve="SingedIntegerLiteral" />
+    <node concept="1Qtc8_" id="22BHT1ekZvq" role="IW6Ez">
+      <node concept="3cWJ9i" id="22BHT1ekZvw" role="1Qtc8$">
+        <node concept="CtIbL" id="22BHT1ekZvy" role="CtIbM">
+          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
+        </node>
+      </node>
+      <node concept="IWgqT" id="22BHT1ekZ$H" role="1Qtc8A">
+        <node concept="1hCUdq" id="22BHT1ekZ$I" role="1hCUd6">
+          <node concept="3clFbS" id="22BHT1ekZ$J" role="2VODD2">
+            <node concept="3clFbF" id="22BHT1ekZ_s" role="3cqZAp">
+              <node concept="Xl_RD" id="22BHT1el0T8" role="3clFbG">
+                <property role="Xl_RC" value="." />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="IWg2L" id="22BHT1ekZ$K" role="IWgqQ">
+          <node concept="3clFbS" id="22BHT1ekZ$L" role="2VODD2">
+            <node concept="3cpWs8" id="22BHT1el1tz" role="3cqZAp">
+              <node concept="3cpWsn" id="22BHT1el1t$" role="3cpWs9">
+                <property role="TrG5h" value="newNode" />
+                <node concept="3Tqbb2" id="22BHT1el1rd" role="1tU5fm">
+                  <ref role="ehGHo" to="gpgy:3te61Mg3Ziy" resolve="RealLiteral" />
+                </node>
+                <node concept="2OqwBi" id="22BHT1el1t_" role="33vP2m">
+                  <node concept="7Obwk" id="22BHT1el1tA" role="2Oq$k0" />
+                  <node concept="1_qnLN" id="22BHT1el1tB" role="2OqNvi">
+                    <ref role="1_rbq0" to="gpgy:3te61Mg3Ziy" resolve="RealLiteral" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs8" id="3vzjl3iNBot" role="3cqZAp">
+              <node concept="3cpWsn" id="3vzjl3iNBou" role="3cpWs9">
+                <property role="TrG5h" value="newValue" />
+                <node concept="17QB3L" id="3vzjl3iNA4p" role="1tU5fm" />
+                <node concept="3cpWs3" id="3vzjl3iNBov" role="33vP2m">
+                  <node concept="1Xhbcc" id="3vzjl3iNBow" role="3uHU7w">
+                    <property role="1XhdNS" value="." />
+                  </node>
+                  <node concept="2OqwBi" id="3vzjl3iNBox" role="3uHU7B">
+                    <node concept="7Obwk" id="3vzjl3iNBoy" role="2Oq$k0" />
+                    <node concept="3TrcHB" id="3vzjl3iNBoz" role="2OqNvi">
+                      <ref role="3TsBF5" to="gpgy:3HBlKeoZu2j" resolve="value" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="22BHT1el0YM" role="3cqZAp">
+              <node concept="37vLTI" id="22BHT1el2sh" role="3clFbG">
+                <node concept="37vLTw" id="3vzjl3iNBo$" role="37vLTx">
+                  <ref role="3cqZAo" node="3vzjl3iNBou" resolve="string" />
+                </node>
+                <node concept="2OqwBi" id="22BHT1el1Cb" role="37vLTJ">
+                  <node concept="37vLTw" id="22BHT1el1tC" role="2Oq$k0">
+                    <ref role="3cqZAo" node="22BHT1el1t$" resolve="newNode" />
+                  </node>
+                  <node concept="3TrcHB" id="22BHT1el22c" role="2OqNvi">
+                    <ref role="3TsBF5" to="gpgy:3te61Mg3Ziz" resolve="value" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="22BHT1el42t" role="3cqZAp">
+              <node concept="2OqwBi" id="22BHT1el4g4" role="3clFbG">
+                <node concept="37vLTw" id="22BHT1el4$P" role="2Oq$k0">
+                  <ref role="3cqZAo" node="22BHT1el1t$" resolve="newNode" />
+                </node>
+                <node concept="1OKiuA" id="3vzjl3iNArJ" role="2OqNvi">
+                  <node concept="1Q80Hx" id="3vzjl3iNAtD" role="lBI5i" />
+                  <node concept="eBIwv" id="3vzjl3iNADg" role="lGT1i">
+                    <ref role="fyFUz" to="gpgy:3te61Mg3Ziz" resolve="value" />
+                  </node>
+                  <node concept="2OqwBi" id="3vzjl3iNCb2" role="3dN3m$">
+                    <node concept="37vLTw" id="3vzjl3iNBSo" role="2Oq$k0">
+                      <ref role="3cqZAo" node="3vzjl3iNBou" resolve="newValue" />
+                    </node>
+                    <node concept="liA8E" id="3vzjl3iNCBo" role="2OqNvi">
+                      <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="22hDWj" id="22BHT1ekZvn" role="22hAXT" />
+  </node>
+  <node concept="22mcaB" id="22BHT1el4NW">
+    <property role="3GE5qa" value="expressions" />
+    <ref role="aqKnT" to="gpgy:3te61Mg3Ziy" resolve="RealLiteral" />
+    <node concept="22hDWj" id="22BHT1el4NX" role="22hAXT" />
+  </node>
+  <node concept="24kQdi" id="xMzeUwj0IJ">
+    <property role="3GE5qa" value="datatypes.array" />
+    <ref role="1XX52x" to="gpgy:xMzeUwj0qQ" resolve="ArrayType" />
+    <node concept="3EZMnI" id="xMzeUwj0IL" role="2wV5jI">
+      <node concept="3F0ifn" id="xMzeUwj0IV" role="3EZMnx">
+        <property role="3F0ifm" value="ARRAY" />
+        <ref role="1k5W1q" node="3HBlKeoYLK_" resolve="Keyword" />
+      </node>
+      <node concept="3F0ifn" id="xMzeUwj0J1" role="3EZMnx">
+        <property role="3F0ifm" value="[" />
+      </node>
+      <node concept="3F1sOY" id="xMzeUwj0JV" role="3EZMnx">
+        <ref role="1NtTu8" to="gpgy:xMzeUwj0Ii" resolve="dimensions" />
+      </node>
+      <node concept="3F0ifn" id="xMzeUwj0J9" role="3EZMnx">
+        <property role="3F0ifm" value="]" />
+      </node>
+      <node concept="3F0ifn" id="xMzeUwj0Jp" role="3EZMnx">
+        <property role="3F0ifm" value="OF" />
+      </node>
+      <node concept="3F1sOY" id="xMzeUwj0J_" role="3EZMnx">
+        <ref role="1NtTu8" to="gpgy:xMzeUwj0If" resolve="baseType" />
+      </node>
+      <node concept="l2Vlx" id="xMzeUwj0IO" role="2iSdaV" />
+    </node>
+  </node>
+  <node concept="24kQdi" id="xMzeUwj0TL">
+    <property role="3GE5qa" value="datatypes.array" />
+    <ref role="1XX52x" to="gpgy:xMzeUwj0Tg" resolve="ArrayTypeSizes" />
+    <node concept="3F2HdR" id="xMzeUwj0TS" role="2wV5jI">
+      <property role="2czwfO" value="," />
+      <property role="Q2I2d" value="g$1Qtxb/punctuation" />
+      <ref role="1NtTu8" to="gpgy:xMzeUwj0Th" resolve="sizes" />
+      <node concept="l2Vlx" id="xMzeUwj0U6" role="2czzBx" />
+    </node>
+  </node>
+  <node concept="24kQdi" id="xMzeUwj0U$">
+    <property role="3GE5qa" value="datatypes.array" />
+    <ref role="1XX52x" to="gpgy:xMzeUwj0Tm" resolve="ArrayTypeSubranges" />
+    <node concept="3F2HdR" id="xMzeUwj0UA" role="2wV5jI">
+      <property role="2czwfO" value="," />
+      <property role="Q2I2d" value="g$1Qtxb/punctuation" />
+      <ref role="1NtTu8" to="gpgy:xMzeUwj0U8" resolve="subranges" />
+      <node concept="l2Vlx" id="xMzeUwj0UC" role="2czzBx" />
+    </node>
+  </node>
+  <node concept="24kQdi" id="31xUmiuWy$L">
+    <ref role="1XX52x" to="gpgy:xMzeUwj0Tj" resolve="Size" />
+    <node concept="3F0A7n" id="31xUmiuWy$N" role="2wV5jI">
+      <ref role="1NtTu8" to="gpgy:xMzeUwj0Tk" resolve="value" />
+    </node>
+  </node>
+  <node concept="3ICUPy" id="3rfKXADyoCS">
+    <property role="3GE5qa" value="statements" />
+    <ref role="aqKnT" to="gpgy:7GyesCp9TK7" resolve="IfStatement" />
+    <node concept="1Qtc8_" id="3rfKXADyoCV" role="IW6Ez">
+      <node concept="3eGOoe" id="3rfKXADyoCZ" role="1Qtc8$" />
+      <node concept="IWgqT" id="3rfKXADyoD2" role="1Qtc8A">
+        <node concept="1hCUdq" id="3rfKXADyoD3" role="1hCUd6">
+          <node concept="3clFbS" id="3rfKXADyoD4" role="2VODD2">
+            <node concept="3clFbF" id="3rfKXADyoI7" role="3cqZAp">
+              <node concept="Xl_RD" id="3rfKXADyoI6" role="3clFbG">
+                <property role="Xl_RC" value="ELSE" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="IWg2L" id="3rfKXADyoD5" role="IWgqQ">
+          <node concept="3clFbS" id="3rfKXADyoD6" role="2VODD2">
+            <node concept="3clFbF" id="3rfKXADyq5v" role="3cqZAp">
+              <node concept="2OqwBi" id="3rfKXADyqEF" role="3clFbG">
+                <node concept="2OqwBi" id="3rfKXADyqdt" role="2Oq$k0">
+                  <node concept="7Obwk" id="3rfKXADyq5u" role="2Oq$k0" />
+                  <node concept="3TrEf2" id="3rfKXADyqoe" role="2OqNvi">
+                    <ref role="3Tt5mk" to="gpgy:7GyesCp9TLt" resolve="elseClause" />
+                  </node>
+                </node>
+                <node concept="2DeJnY" id="3rfKXADyr5F" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="27VH4U" id="3rfKXADyoNt" role="2jiSrf">
+          <node concept="3clFbS" id="3rfKXADyoNu" role="2VODD2">
+            <node concept="3clFbF" id="3rfKXADyoRP" role="3cqZAp">
+              <node concept="2OqwBi" id="3rfKXADyp_H" role="3clFbG">
+                <node concept="2OqwBi" id="3rfKXADyp5u" role="2Oq$k0">
+                  <node concept="7Obwk" id="3rfKXADyoRO" role="2Oq$k0" />
+                  <node concept="3TrEf2" id="3rfKXADypgZ" role="2OqNvi">
+                    <ref role="3Tt5mk" to="gpgy:7GyesCp9TLt" resolve="elseClause" />
+                  </node>
+                </node>
+                <node concept="3w_OXm" id="3rfKXADypVs" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="IWgqT" id="3rfKXADyrkN" role="1Qtc8A">
+        <node concept="1hCUdq" id="3rfKXADyrkP" role="1hCUd6">
+          <node concept="3clFbS" id="3rfKXADyrkR" role="2VODD2">
+            <node concept="3clFbF" id="3rfKXADyrrx" role="3cqZAp">
+              <node concept="Xl_RD" id="3rfKXADyrrw" role="3clFbG">
+                <property role="Xl_RC" value="ELSIF" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="IWg2L" id="3rfKXADyrkT" role="IWgqQ">
+          <node concept="3clFbS" id="3rfKXADyrkV" role="2VODD2">
+            <node concept="3clFbF" id="3rfKXADyr_x" role="3cqZAp">
+              <node concept="2OqwBi" id="3rfKXADythJ" role="3clFbG">
+                <node concept="2OqwBi" id="3rfKXADyrHv" role="2Oq$k0">
+                  <node concept="7Obwk" id="3rfKXADyr_w" role="2Oq$k0" />
+                  <node concept="3Tsc0h" id="3rfKXADyrUs" role="2OqNvi">
+                    <ref role="3TtcxE" to="gpgy:7GyesCp9TLp" resolve="elseifClauses" />
+                  </node>
+                </node>
+                <node concept="2Ke9KJ" id="3rfKXADyxrv" role="2OqNvi">
+                  <node concept="2ShNRf" id="3rfKXADyy_L" role="25WWJ7">
+                    <node concept="2fJWfE" id="3rfKXADy$ZN" role="2ShVmc">
+                      <node concept="3Tqbb2" id="3rfKXADy$ZP" role="3zrR0E">
+                        <ref role="ehGHo" to="gpgy:7GyesCp9TKa" resolve="ElseIfClause" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="22hDWg" id="3rfKXADyoCT" role="22hAXT">
+      <property role="TrG5h" value="AddElseClause" />
+    </node>
+  </node>
 </model>
 
diff --git a/code/library/src/main/kotlin/org/fbme/lib/iec61499/stringify/BasicFBTypePrinter.kt b/code/library/src/main/kotlin/org/fbme/lib/iec61499/stringify/BasicFBTypePrinter.kt
index 1824e429d..0c00bfbc7 100644
--- a/code/library/src/main/kotlin/org/fbme/lib/iec61499/stringify/BasicFBTypePrinter.kt
+++ b/code/library/src/main/kotlin/org/fbme/lib/iec61499/stringify/BasicFBTypePrinter.kt
@@ -64,11 +64,11 @@ class BasicFBTypePrinter(declaration: BasicFBTypeDeclaration) :
         val conditionText: String = when {
             guardCondition == null && eventPresentation.isEmpty() -> "1"
             guardCondition != null && eventPresentation.isEmpty() -> {
-                "[" + escapeXML(STPrinter.printExpression(guardCondition)) + "]"
+                "[" + STPrinter.printExpression(guardCondition) + "]"
             }
 
             guardCondition == null -> eventPresentation
-            else -> "$eventPresentation[" + escapeXML(STPrinter.printExpression(guardCondition)) + "]"
+            else -> "$eventPresentation[" + STPrinter.printExpression(guardCondition) + "]"
         }
         element.setAttribute("Condition", conditionText)
         return element
@@ -82,12 +82,12 @@ class BasicFBTypePrinter(declaration: BasicFBTypeDeclaration) :
             ParameterDeclarationPrinter.printAll(this.element.temporaryVariables, element)
             if (language === AlgorithmLanguage.ST) {
                 val st = Element("ST")
-                st.setAttribute("Text", escapeXML(STPrinter.printStatementList((body as AlgorithmBody.ST).statements)))
+                st.setAttribute("Text", STPrinter.printStatementList((body as AlgorithmBody.ST).statements))
                 element.addContent(st)
             } else if (AlgorithmLanguage.isUnknown(language)) {
                 val other = Element("Other")
                 other.setAttribute("Language", language.languageName)
-                other.setAttribute("Text", escapeXML((body as AlgorithmBody.Unknown).text))
+                other.setAttribute("Text", (body as AlgorithmBody.Unknown).text)
                 element.addContent(other)
             } else {
                 throw IllegalStateException("Unrecognized language")
diff --git a/code/library/src/main/kotlin/org/fbme/lib/iec61499/stringify/PrinterBase.kt b/code/library/src/main/kotlin/org/fbme/lib/iec61499/stringify/PrinterBase.kt
index bf53e39ae..4bae075d4 100644
--- a/code/library/src/main/kotlin/org/fbme/lib/iec61499/stringify/PrinterBase.kt
+++ b/code/library/src/main/kotlin/org/fbme/lib/iec61499/stringify/PrinterBase.kt
@@ -13,17 +13,5 @@ abstract class PrinterBase<ElementT : Element>(protected val element: ElementT)
             }
             parent.addContent(child)
         }
-
-        @JvmStatic
-        protected fun escapeXML(text: String?): String? {
-            var text = text ?: return null
-            text = text.replace("\n", "&#10;")
-            text = text.replace("\"", "&#34;")
-            text = text.replace("&", "&#38;")
-            text = text.replace("'", "&#39;")
-            text = text.replace("<", "&#60;")
-            text = text.replace(">", "&#62;")
-            return text
-        }
     }
 }
diff --git a/code/library/src/main/kotlin/org/fbme/lib/iec61499/stringify/RootDeclarationPrinter.kt b/code/library/src/main/kotlin/org/fbme/lib/iec61499/stringify/RootDeclarationPrinter.kt
index bda80f13a..959a941e0 100644
--- a/code/library/src/main/kotlin/org/fbme/lib/iec61499/stringify/RootDeclarationPrinter.kt
+++ b/code/library/src/main/kotlin/org/fbme/lib/iec61499/stringify/RootDeclarationPrinter.kt
@@ -8,7 +8,7 @@ import org.jdom.DocType
 import org.jdom.Document
 import org.jdom.Element
 
-class RootDeclarationPrinter(private val myDeclaration: Declaration, val converterArguments: Iec61499ConverterConfiguration) {
+class RootDeclarationPrinter(private val myDeclaration: Declaration, private val converterArguments: Iec61499ConverterConfiguration) {
     fun print(): Document {
         val rootElement: Element = when (myDeclaration) {
             is AdapterTypeDeclaration -> AdapterTypePrinter(myDeclaration).print()
diff --git a/code/nxt-integration/src/test/java/org/fbme/integration/nxt/importer/BasicFbTypeNxtImporterTest.java b/code/nxt-integration/src/test/java/org/fbme/integration/nxt/importer/BasicFbTypeNxtImporterTest.java
deleted file mode 100644
index 91c1579b7..000000000
--- a/code/nxt-integration/src/test/java/org/fbme/integration/nxt/importer/BasicFbTypeNxtImporterTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.fbme.integration.nxt.importer;
-
-import org.fbme.ide.platform.testing.PlatformTestBase;
-import org.fbme.ide.platform.testing.PlatformTestRunner;
-import org.fbme.lib.iec61499.declarations.BasicFBTypeDeclaration;
-import org.fbme.lib.iec61499.stringify.BasicFBTypePrinter;
-import org.fbme.lib.st.types.ElementaryType;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(PlatformTestRunner.class)
-public class BasicFbTypeNxtImporterTest extends PlatformTestBase {
-    @Test
-    public void parseTest1() {
-        var fbType = rootConverterByPath("/boolMerge.fbt", NxtImporterConfiguration.FACTORY).convertFBType();
-        Assert.assertNotNull(fbType);
-    }
-
-    @Test
-    public void testParseAlgorithmWithTemporaryVariables() {
-        var fbType = rootConverterByPath("/AlgorithmWithTemporaryVariables.fbt", NxtImporterConfiguration.FACTORY).convertFBType();
-        Assert.assertTrue(fbType instanceof BasicFBTypeDeclaration);
-        var basicFbType = (BasicFBTypeDeclaration) fbType;
-        var algorithm = basicFbType.getAlgorithms().get(0);
-        Assert.assertNotNull(algorithm);
-        var temporaryVariable = algorithm.getTemporaryVariables().get(0);
-        Assert.assertNotNull(temporaryVariable);
-        Assert.assertEquals("temp", temporaryVariable.getName());
-        Assert.assertEquals(ElementaryType.INT, temporaryVariable.getType());
-    }
-}
diff --git a/code/platform/src/main/kotlin/org/fbme/ide/platform/persistence/Iec61499ModelFactory.kt b/code/platform/src/main/kotlin/org/fbme/ide/platform/persistence/Iec61499ModelFactory.kt
index 14c0a0e65..02e5e0ebc 100644
--- a/code/platform/src/main/kotlin/org/fbme/ide/platform/persistence/Iec61499ModelFactory.kt
+++ b/code/platform/src/main/kotlin/org/fbme/ide/platform/persistence/Iec61499ModelFactory.kt
@@ -9,18 +9,11 @@ import jetbrains.mps.extapi.model.SModelData
 import jetbrains.mps.extapi.model.SModelSimpleHeader
 import jetbrains.mps.extapi.persistence.FileDataSource
 import jetbrains.mps.ide.MPSCoreComponents
-import jetbrains.mps.internal.collections.runtime.ISelector
 import jetbrains.mps.internal.collections.runtime.ListSequence
 import jetbrains.mps.persistence.DataLocationAwareModelFactory
 import jetbrains.mps.smodel.SModel.ImportElement
 import jetbrains.mps.smodel.SModelId
 import jetbrains.mps.smodel.SNodeUtil
-import jetbrains.mps.smodel.adapter.ids.SContainmentLinkId
-import jetbrains.mps.smodel.adapter.ids.SPropertyId
-import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory
-import jetbrains.mps.smodel.adapter.structure.link.SContainmentLinkAdapter
-import jetbrains.mps.smodel.adapter.structure.link.SContainmentLinkAdapterById
-import jetbrains.mps.smodel.adapter.structure.property.SPropertyAdapter
 import jetbrains.mps.util.FileUtil
 import jetbrains.mps.util.JDOMUtil
 import jetbrains.mps.util.NameUtil
@@ -30,14 +23,10 @@ import org.fbme.ide.iec61499.repository.PlatformElement
 import org.fbme.ide.iec61499.repository.PlatformElementsOwner
 import org.fbme.ide.iec61499.repository.PlatformRepository
 import org.fbme.ide.platform.MpsLanguages
-import org.fbme.ide.platform.converter.PlatformConverter
 import org.fbme.ide.platform.converter.PlatformConverter.create
 import org.fbme.lib.common.Declaration
 import org.fbme.lib.common.RootElement
 import org.fbme.lib.iec61499.declarations.*
-import org.fbme.lib.iec61499.parser.Iec61499ConverterConfiguration
-import org.fbme.lib.iec61499.parser.StandardIec61499ConverterConfiguration
-import org.fbme.lib.iec61499.stringify.DependentDeclarationGenerator
 import org.fbme.lib.iec61499.stringify.RootDeclarationPrinter
 import org.jdom.Document
 import org.jetbrains.mps.openapi.model.SModel
@@ -55,7 +44,6 @@ import java.io.InputStreamReader
 import java.io.OutputStream
 import java.util.*
 import java.util.stream.Collectors
-import kotlin.io.path.Path
 
 class Iec61499ModelFactory : ModelFactory, DataLocationAwareModelFactory {
     private fun supportedFileExtension(fileExt: String): Boolean {
@@ -66,7 +54,6 @@ class Iec61499ModelFactory : ModelFactory, DataLocationAwareModelFactory {
                 || fileExt == DEV_FILE_EXT
                 || fileExt == SYS_FILE_EXT
                 || fileExt == SEG_FILE_EXT
-                || fileExt == CFG_FILE_EXT
     }
 
     override fun supports(dataSource: DataSource): Boolean {
@@ -251,12 +238,7 @@ class Iec61499ModelFactory : ModelFactory, DataLocationAwareModelFactory {
                         val importedModels = model.importedModels()
                         val richHeader = Iec61499ModelHeader(
                             header.modelReference,
-                            ListSequence.fromList(importedModels)
-                                .select(object : ISelector<ImportElement, SModelReference>() {
-                                    override fun select(it: ImportElement): SModelReference {
-                                        return it.modelReference
-                                    }
-                                }).toListSequence()
+                            importedModels.map { it.modelReference }
                         )
                         richHeader.save(headerOS)
                     } finally {
@@ -280,46 +262,16 @@ class Iec61499ModelFactory : ModelFactory, DataLocationAwareModelFactory {
                     .getComponent(MPSCoreComponents::class.java).moduleRepository
                 val platformRepository = PlatformRepository(repository)
 
-                val nodesToDelete = mutableListOf<SNode>()
-                val dependents = mutableListOf<SNode>()
+                val errors = arrayListOf<SModel.Problem>()
+                //  Write nodes to xml files
                 for (rootNode in model.rootNodes) {
-                    if (rootNode.getProperty(SNodeUtil.property_BaseConcept_virtualPackage).orEmpty().endsWith("_dependent")) {
-//                                c.dropReference(it.link)
-                        nodesToDelete.add(rootNode)
+                    val document = try {
+                        val declaration = platformRepository.getAdapter(rootNode, Declaration::class.java)
+                        RootDeclarationPrinter(declaration).print()
+                    } catch (e: Exception) {
+                        errors += PersistenceProblem(SModel.Problem.Kind.Save, e.message, rootNode.name, true)
                         continue
                     }
-                    val owner = PlatformElementsOwner()
-                    val conf = PlatformConverter.STANDARD_CONFIG_FACTORY.createConfiguration(owner)
-                    val declaration = platformRepository.getAdapter(rootNode, Declaration::class.java)
-
-                    val els = DependentDeclarationGenerator(declaration, conf).generate()
-                    els.forEach { element ->
-                        val node = (element as PlatformElement).node
-                        node.setProperty(SNodeUtil.property_BaseConcept_virtualPackage, rootNode.getProperty(SNodeUtil.property_BaseConcept_virtualPackage).orEmpty() + ".${rootNode.name}_dependent")
-                        dependents.add(node)
-                    }
-                }
-
-                LOG.info("Deleting nodes size: {}", nodesToDelete.size)
-                nodesToDelete.forEach {
-                    model.enterUpdateMode()
-                    model.removeRootNode(it)
-                    it.delete()
-                    model.leaveUpdateMode()
-                }
-                LOG.info("Dependents size: {}", dependents.size)
-                dependents.forEach {
-                    model.enterUpdateMode()
-                    model.addRootNode(it)
-                    model.leaveUpdateMode()
-                }
-
-                //  Write nodes to xml files
-                for (rootNode in model.rootNodes) {
-                    val conf = StandardIec61499ConverterConfiguration(platformRepository.iec61499Factory, platformRepository.stFactory)
-
-                    val declaration = platformRepository.getAdapter(rootNode, Declaration::class.java)
-                    val document = RootDeclarationPrinter(declaration!!, conf).print()
                     val folderName =
                         rootNode.getProperty(SNodeUtil.property_BaseConcept_virtualPackage).orEmpty().replace(".", "/")
                     val fileLocalName = rootNode.name + "." + getExtensionOfSource(rootNode, platformRepository)
@@ -338,6 +290,10 @@ class Iec61499ModelFactory : ModelFactory, DataLocationAwareModelFactory {
                 for (file in trackedSources) {
                     file.delete()
                 }
+
+                if (errors.isNotEmpty()) {
+                    throw ModelSaveException("Multiple errors raised during save", errors, null)
+                }
             } catch (e: IOException) {
                 LOG.error("Exception raised during save", e)
                 throw ModelSaveException("Exception raised during save", emptyList(), e)
@@ -345,8 +301,6 @@ class Iec61499ModelFactory : ModelFactory, DataLocationAwareModelFactory {
         }
     }
 
-
-
     companion object {
         private val LOG = LoggerFactory.getLogger(Iec61499ModelFactory::class.java)
 
@@ -357,7 +311,6 @@ class Iec61499ModelFactory : ModelFactory, DataLocationAwareModelFactory {
         const val DEV_FILE_EXT = "dev"
         const val SEG_FILE_EXT = "seg"
         const val SYS_FILE_EXT = "sys"
-        const val CFG_FILE_EXT = "cfg"
         const val HEADER_FILE_EXT = "iec61499"
         const val HEADER_FILE = "header.iec61499"
 
@@ -391,7 +344,6 @@ class Iec61499ModelFactory : ModelFactory, DataLocationAwareModelFactory {
                 DEV_FILE_EXT -> (converter.convertDeviceType() as PlatformElement).node
                 SEG_FILE_EXT -> (converter.convertSegmentType() as PlatformElement).node
                 SYS_FILE_EXT -> (converter.convertSystemConfiguration() as PlatformElement).node
-                CFG_FILE_EXT -> (converter.convertCATConfiguration() as PlatformElement).node
                 else -> null
             }
         }
@@ -406,7 +358,6 @@ class Iec61499ModelFactory : ModelFactory, DataLocationAwareModelFactory {
                 is DeviceTypeDeclaration -> DEV_FILE_EXT
                 is SegmentTypeDeclaration -> SEG_FILE_EXT
                 is SystemDeclaration -> SYS_FILE_EXT
-                is CATBlockTypeDeclaration -> CFG_FILE_EXT
                 else -> null
             }
         }