diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/typesystem.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/typesystem.mps
index 9e1b48c307c..18bf5249f75 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/typesystem.mps
@@ -121,7 +121,7 @@
         <child id="1068580123161" name="ifTrue" index="3clFbx" />
         <child id="1206060520071" name="elsifClauses" index="3eNLev" />
       </concept>
-      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" index="3clFbS">
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
       <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
@@ -663,21 +663,6 @@
           </node>
         </node>
       </node>
-      <node concept="3SKdUt" id="1a8ZPnIbXCw" role="3cqZAp">
-        <node concept="3SKdUq" id="1a8ZPnIbXDf" role="3SKWNk">
-          <property role="3SKdUp" value="hack: type of NumericLiteral not calculated" />
-        </node>
-      </node>
-      <node concept="3clFbF" id="1a8ZPnI7DvM" role="3cqZAp">
-        <node concept="1Z2H0r" id="1a8ZPnI7DvI" role="3clFbG">
-          <node concept="2OqwBi" id="1a8ZPnI7D$A" role="1Z2MuG">
-            <node concept="1YBJjd" id="1a8ZPnI7DwH" role="2Oq$k0">
-              <ref role="1YBMHb" node="4ZVDCZCbtjo" resolve="parensExpression" />
-            </node>
-            <node concept="1mfA1w" id="1a8ZPnI7DUr" role="2OqNvi" />
-          </node>
-        </node>
-      </node>
     </node>
     <node concept="1YaCAy" id="4ZVDCZCbtjo" role="1YuTPh">
       <property role="TrG5h" value="parensExpression" />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/dataFlow.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/dataFlow.mps
index 831a63f298d..39188a599ff 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/dataFlow.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/dataFlow.mps
@@ -46,6 +46,7 @@
       </concept>
       <concept id="6618572076229093257" name="jetbrains.mps.lang.dataFlow.analyzers.structure.Analyzer" flags="ng" index="38boeP">
         <child id="3325264799421088056" name="instruction" index="2ZJRuf" />
+        <child id="3993089038373544707" name="constructorParameters" index="3fEaTh" />
         <child id="4746038179140588765" name="initialFunction" index="1fK8h9" />
         <child id="4746038179140588766" name="funFunction" index="1fK8ha" />
         <child id="4746038179140586188" name="mergeFunction" index="1fK9Do" />
@@ -61,6 +62,8 @@
       <concept id="4943044633101449694" name="jetbrains.mps.lang.dataFlow.analyzers.structure.ConceptCondition" flags="ng" index="3cs84T">
         <reference id="4943044633101738901" name="concept" index="3ctLHM" />
       </concept>
+      <concept id="3993089038373626360" name="jetbrains.mps.lang.dataFlow.analyzers.structure.AnalyzerConstructorParameterReference" flags="ng" index="3fFAME" />
+      <concept id="3993089038373626032" name="jetbrains.mps.lang.dataFlow.analyzers.structure.AnalyzerConstructorParameter" flags="ng" index="3fFARy" />
       <concept id="4746038179140566716" name="jetbrains.mps.lang.dataFlow.analyzers.structure.AnalyzerParameterProgram" flags="nn" index="1fK2SC" />
       <concept id="4746038179140566725" name="jetbrains.mps.lang.dataFlow.analyzers.structure.AnalyzerMergeParameterInput" flags="nn" index="1fK2Th" />
       <concept id="4746038179140588756" name="jetbrains.mps.lang.dataFlow.analyzers.structure.AnalyzerFunParameterInput" flags="nn" index="1fK8h0" />
@@ -275,6 +278,9 @@
         <child id="1163668922816" name="ifTrue" index="3K4E3e" />
         <child id="1163668934364" name="ifFalse" index="3K4GZi" />
       </concept>
+      <concept id="5497648299878491908" name="jetbrains.mps.baseLanguage.structure.BaseVariableReference" flags="nn" index="1M0zk4">
+        <reference id="5497648299878491909" name="baseVariableDeclaration" index="1M0zk5" />
+      </concept>
       <concept id="6329021646629104957" name="jetbrains.mps.baseLanguage.structure.TextCommentPart" flags="nn" index="3SKdUq">
         <property id="6329021646629104958" name="text" index="3SKdUp" />
       </concept>
@@ -1670,6 +1676,24 @@
   <node concept="38boeP" id="7vcqB$mvpmV">
     <property role="3GE5qa" value="analyzers.init" />
     <property role="TrG5h" value="InitializedVariablesAnalyzer" />
+    <node concept="3fFARy" id="_oDvx5PCQg" role="3fEaTh">
+      <property role="TrG5h" value="pointerAnalysisResult" />
+      <node concept="3uibUv" id="_oDvx5PHvy" role="1tU5fm">
+        <ref role="3uigEE" to="1fjm:~AnalysisResult" resolve="AnalysisResult" />
+        <node concept="3uibUv" id="_oDvx5PHvz" role="11_B2D">
+          <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
+          <node concept="3uibUv" id="_oDvx5PHv$" role="11_B2D">
+            <ref role="3uigEE" node="4zFXTqpFLST" resolve="VariableWrapper" />
+          </node>
+          <node concept="3uibUv" id="_oDvx5PHv_" role="11_B2D">
+            <ref role="3uigEE" to="33ny:~Set" resolve="Set" />
+            <node concept="3uibUv" id="_oDvx5PHvA" role="11_B2D">
+              <ref role="3uigEE" node="4zFXTqpFLST" resolve="VariableWrapper" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="38boeQ" id="7vcqB$mv$mt" role="2ZJRuf">
       <property role="TrG5h" value="defInit" />
       <node concept="2SCD3b" id="5kXaxjH1ftJ" role="2ZJRvN">
@@ -1837,53 +1861,6 @@
                   </node>
                 </node>
               </node>
-              <node concept="3cpWs8" id="4zFXTqqqDM0" role="3cqZAp">
-                <node concept="3cpWsn" id="4zFXTqqqDM1" role="3cpWs9">
-                  <property role="TrG5h" value="root" />
-                  <node concept="3Tqbb2" id="4zFXTqqqDM2" role="1tU5fm">
-                    <ref role="ehGHo" to="c4fa:3CmSUB7Fp_l" resolve="StatementList" />
-                  </node>
-                  <node concept="2YIFZM" id="4zFXTqqqDM3" role="33vP2m">
-                    <ref role="37wK5l" node="321ojDtuLZs" resolve="getRootStatementList" />
-                    <ref role="1Pybhc" node="321ojDtuLZq" resolve="AnalyzerHelper" />
-                    <node concept="37vLTw" id="7Ehk3$1Fxq$" role="37wK5m">
-                      <ref role="3cqZAo" node="7Ehk3$1Cbpx" resolve="source" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3cpWs8" id="4zFXTqqqDM5" role="3cqZAp">
-                <node concept="3cpWsn" id="4zFXTqqqDM6" role="3cpWs9">
-                  <property role="TrG5h" value="pointerAnalysisResult" />
-                  <node concept="3uibUv" id="4zFXTqqqDM7" role="1tU5fm">
-                    <ref role="3uigEE" to="1fjm:~AnalysisResult" resolve="AnalysisResult" />
-                    <node concept="3uibUv" id="4zFXTqqqDM8" role="11_B2D">
-                      <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
-                      <node concept="3uibUv" id="4zFXTqqqDM9" role="11_B2D">
-                        <ref role="3uigEE" node="4zFXTqpFLST" resolve="VariableWrapper" />
-                      </node>
-                      <node concept="3uibUv" id="4zFXTqqqDMa" role="11_B2D">
-                        <ref role="3uigEE" to="33ny:~Set" resolve="Set" />
-                        <node concept="3uibUv" id="4zFXTqqqDMb" role="11_B2D">
-                          <ref role="3uigEE" node="4zFXTqpFLST" resolve="VariableWrapper" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="2OqwBi" id="4zFXTqqqDMc" role="33vP2m">
-                    <node concept="10M0yZ" id="4zFXTqqqDMd" role="2Oq$k0">
-                      <ref role="3cqZAo" node="321ojDtkPEO" resolve="resultMap" />
-                      <ref role="1PxDUh" node="7PgKJZvfe2t" resolve="PointerAnalyzerHelper" />
-                    </node>
-                    <node concept="liA8E" id="4zFXTqqqDMe" role="2OqNvi">
-                      <ref role="37wK5l" to="33ny:~Map.get(java.lang.Object):java.lang.Object" resolve="get" />
-                      <node concept="37vLTw" id="4zFXTqqqDMf" role="37wK5m">
-                        <ref role="3cqZAo" node="4zFXTqqqDM1" resolve="root" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
               <node concept="3clFbH" id="4zFXTqqpBf7" role="3cqZAp" />
               <node concept="3clFbJ" id="5kXaxjH0GHA" role="3cqZAp">
                 <node concept="3clFbS" id="5kXaxjH0GHD" role="3clFbx">
@@ -2039,8 +2016,8 @@
                               <node concept="37vLTw" id="3ieSxUOn2dr" role="37wK5m">
                                 <ref role="3cqZAo" node="5kXaxjH08$N" resolve="instruction" />
                               </node>
-                              <node concept="37vLTw" id="4zFXTqqqO3C" role="37wK5m">
-                                <ref role="3cqZAo" node="4zFXTqqqDM6" resolve="pointerAnalysisResult" />
+                              <node concept="3fFAME" id="_oDvx5PK3M" role="37wK5m">
+                                <ref role="1M0zk5" node="_oDvx5PCQg" resolve="pointerAnalysisResult" />
                               </node>
                               <node concept="3cpWsd" id="4zFXTqqqV$R" role="37wK5m">
                                 <node concept="2YIFZM" id="4zFXTqqqYNs" role="3uHU7w">
@@ -2255,8 +2232,8 @@
                                           <ref role="3cqZAo" node="321ojDtld$C" resolve="genInstruction" />
                                         </node>
                                       </node>
-                                      <node concept="37vLTw" id="3ieSxUOmIIR" role="37wK5m">
-                                        <ref role="3cqZAo" node="4zFXTqqqDM6" resolve="pointerAnalysisResult" />
+                                      <node concept="3fFAME" id="_oDvx5PK3Y" role="37wK5m">
+                                        <ref role="1M0zk5" node="_oDvx5PCQg" resolve="pointerAnalysisResult" />
                                       </node>
                                       <node concept="3cmrfG" id="3ieSxUOmIIS" role="37wK5m">
                                         <property role="3cmrfH" value="1" />
@@ -3330,79 +3307,6 @@
     <property role="3GE5qa" value="analyzers.pointer" />
     <property role="TrG5h" value="PointerAnalyzerHelper" />
     <node concept="2tJIrI" id="321ojDtkSwK" role="jymVt" />
-    <node concept="Wx3nA" id="321ojDtkPEO" role="jymVt">
-      <property role="2dlcS1" value="false" />
-      <property role="2dld4O" value="false" />
-      <property role="TrG5h" value="resultMap" />
-      <property role="3TUv4t" value="false" />
-      <node concept="3Tm1VV" id="321ojDtkLV5" role="1B3o_S" />
-      <node concept="3uibUv" id="321ojDtkMzY" role="1tU5fm">
-        <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
-        <node concept="3Tqbb2" id="321ojDtqy5X" role="11_B2D">
-          <ref role="ehGHo" to="c4fa:3CmSUB7Fp_l" resolve="StatementList" />
-        </node>
-        <node concept="3uibUv" id="7PgKJZviZ_$" role="11_B2D">
-          <ref role="3uigEE" to="1fjm:~AnalysisResult" resolve="AnalysisResult" />
-          <node concept="3uibUv" id="7PgKJZvj1Or" role="11_B2D">
-            <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
-            <node concept="3uibUv" id="4zFXTqq0PkB" role="11_B2D">
-              <ref role="3uigEE" node="4zFXTqpFLST" resolve="VariableWrapper" />
-            </node>
-            <node concept="3uibUv" id="7PgKJZvj2e5" role="11_B2D">
-              <ref role="3uigEE" to="33ny:~Set" resolve="Set" />
-              <node concept="3uibUv" id="4zFXTqq0PM6" role="11_B2D">
-                <ref role="3uigEE" node="4zFXTqpFLST" resolve="VariableWrapper" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2YIFZM" id="321ojDtkQ02" role="33vP2m">
-        <ref role="37wK5l" to="33ny:~Collections.synchronizedMap(java.util.Map):java.util.Map" resolve="synchronizedMap" />
-        <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
-        <node concept="2ShNRf" id="321ojDtkQbJ" role="37wK5m">
-          <node concept="1pGfFk" id="321ojDtkRfT" role="2ShVmc">
-            <ref role="37wK5l" to="33ny:~WeakHashMap.&lt;init&gt;()" resolve="WeakHashMap" />
-            <node concept="3Tqbb2" id="321ojDtqz4u" role="1pMfVU">
-              <ref role="ehGHo" to="c4fa:3CmSUB7Fp_l" resolve="StatementList" />
-            </node>
-            <node concept="3uibUv" id="321ojDtkS61" role="1pMfVU">
-              <ref role="3uigEE" to="1fjm:~AnalysisResult" resolve="AnalysisResult" />
-              <node concept="3uibUv" id="321ojDtkS62" role="11_B2D">
-                <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
-                <node concept="3uibUv" id="4zFXTqq0QfB" role="11_B2D">
-                  <ref role="3uigEE" node="4zFXTqpFLST" resolve="VariableWrapper" />
-                </node>
-                <node concept="3uibUv" id="321ojDtkS64" role="11_B2D">
-                  <ref role="3uigEE" to="33ny:~Set" resolve="Set" />
-                  <node concept="3uibUv" id="4zFXTqq0QGO" role="11_B2D">
-                    <ref role="3uigEE" node="4zFXTqpFLST" resolve="VariableWrapper" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="z59LJ" id="321ojDtkT2k" role="lGtFl">
-        <node concept="TZ5HA" id="321ojDtkT2l" role="TZ5H$">
-          <node concept="1dT_AC" id="321ojDtkT2m" role="1dT_Ay">
-            <property role="1dT_AB" value="This map is a workaround for making the analyses results available between consecutive analyzer runs." />
-          </node>
-        </node>
-        <node concept="TZ5HA" id="321ojDtkTqm" role="TZ5H$">
-          <node concept="1dT_AC" id="321ojDtkTqn" role="1dT_Ay">
-            <property role="1dT_AB" value="On of the usages is to make the result of a points-to analysis accessible inside the uninitialized" />
-          </node>
-        </node>
-        <node concept="TZ5HA" id="321ojDtkTqs" role="TZ5H$">
-          <node concept="1dT_AC" id="321ojDtkTqt" role="1dT_Ay">
-            <property role="1dT_AB" value="read analyzer. " />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="321ojDtkLLH" role="jymVt" />
     <node concept="Wx3nA" id="L2WnbQM5Oz" role="jymVt">
       <property role="2dlcS1" value="false" />
       <property role="2dld4O" value="false" />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/typesystem.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/typesystem.mps
index 13b61e621aa..01c830a3239 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/typesystem.mps
@@ -43,6 +43,7 @@
     <language id="97a52717-898f-4598-8150-573d9fd03868" name="jetbrains.mps.lang.dataFlow.analyzers">
       <concept id="95073643532950038" name="jetbrains.mps.lang.dataFlow.analyzers.structure.AnalyzerRunnerCreator" flags="nn" index="2v6lVJ">
         <reference id="95073643532950039" name="analyzer" index="2v6lVI" />
+        <child id="3993089038374473158" name="parameters" index="3fIO2k" />
         <child id="178770917832625312" name="nodeToCheck" index="3vVDej" />
       </concept>
     </language>
@@ -6740,23 +6741,6 @@
               </node>
             </node>
           </node>
-          <node concept="3clFbF" id="321ojDtkXwr" role="3cqZAp">
-            <node concept="2OqwBi" id="321ojDtkZpJ" role="3clFbG">
-              <node concept="10M0yZ" id="321ojDtkXwq" role="2Oq$k0">
-                <ref role="1PxDUh" to="9xhd:7PgKJZvfe2t" resolve="PointerAnalyzerHelper" />
-                <ref role="3cqZAo" to="9xhd:321ojDtkPEO" resolve="resultMap" />
-              </node>
-              <node concept="liA8E" id="321ojDtl1ua" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~Map.put(java.lang.Object,java.lang.Object):java.lang.Object" resolve="put" />
-                <node concept="1YBJjd" id="321ojDtqD7_" role="37wK5m">
-                  <ref role="1YBMHb" node="2GqtAvyKZ4G" resolve="statements" />
-                </node>
-                <node concept="37vLTw" id="321ojDtvope" role="37wK5m">
-                  <ref role="3cqZAo" node="321ojDtvopa" resolve="pointerAnalyzerResult" />
-                </node>
-              </node>
-            </node>
-          </node>
           <node concept="3clFbH" id="7PgKJZviTp2" role="3cqZAp" />
           <node concept="3SKdUt" id="7t5t4TsykIh" role="3cqZAp">
             <node concept="3SKdUq" id="7t5t4Tsyl7J" role="3SKWNk">
@@ -6780,6 +6764,9 @@
                 <node concept="1YBJjd" id="2GqtAvyMzld" role="3vVDej">
                   <ref role="1YBMHb" node="2GqtAvyKZ4G" resolve="statements" />
                 </node>
+                <node concept="37vLTw" id="_oDvx5PFZa" role="3fIO2k">
+                  <ref role="3cqZAo" node="321ojDtvopa" resolve="pointerAnalyzerResult" />
+                </node>
               </node>
             </node>
           </node>