diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
index ce4feafb..a39a0c89 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
@@ -4733,6 +4733,19 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="72RDgIN3TIX" role="3cqZAp">
+          <node concept="37vLTI" id="72RDgIN3TIZ" role="3clFbG">
+            <node concept="2OqwBi" id="72RDgIN3TTV" role="37vLTJ">
+              <node concept="Xjq3P" id="72RDgIN3TUW" role="2Oq$k0" />
+              <node concept="2OwXpG" id="72RDgIN3TTY" role="2OqNvi">
+                <ref role="2Oxat5" node="72RDgIN3TIT" resolve="repository" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="72RDgIN3TJ3" role="37vLTx">
+              <ref role="3cqZAo" node="72RDgIN3THq" resolve="repository" />
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="37vLTG" id="7DvO2M9VeM8" role="3clF46">
         <property role="TrG5h" value="descriptors" />
@@ -4744,6 +4757,12 @@
           </node>
         </node>
       </node>
+      <node concept="37vLTG" id="72RDgIN3THq" role="3clF46">
+        <property role="TrG5h" value="repository" />
+        <node concept="3uibUv" id="72RDgIN3TIw" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="7P_FdVPFS$d" role="jymVt" />
     <node concept="3clFb_" id="20Ay2VeR9qk" role="jymVt">
@@ -4791,6 +4810,21 @@
       </node>
     </node>
     <node concept="2tJIrI" id="7WKNeR9amE4" role="jymVt" />
+    <node concept="3clFb_" id="72RDgIN45VE" role="jymVt">
+      <property role="TrG5h" value="repository" />
+      <node concept="3uibUv" id="72RDgIN4652" role="3clF45">
+        <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+      </node>
+      <node concept="3Tm1VV" id="72RDgIN45VH" role="1B3o_S" />
+      <node concept="3clFbS" id="72RDgIN45VI" role="3clF47">
+        <node concept="3clFbF" id="72RDgIN46k9" role="3cqZAp">
+          <node concept="37vLTw" id="72RDgIN46k8" role="3clFbG">
+            <ref role="3cqZAo" node="72RDgIN3TIT" resolve="repository" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="72RDgIN45M_" role="jymVt" />
     <node concept="3clFb_" id="7DvO2M9VeMb" role="jymVt">
       <property role="TrG5h" value="init" />
       <node concept="3Tm6S6" id="7DvO2M9VeMc" role="1B3o_S" />
@@ -5009,6 +5043,13 @@
         <ref role="3uigEE" node="7WKNeR93NDF" resolve="QueryTemplateIndex" />
       </node>
     </node>
+    <node concept="312cEg" id="72RDgIN3TIT" role="jymVt">
+      <property role="TrG5h" value="repository" />
+      <node concept="3Tm6S6" id="72RDgIN3TIU" role="1B3o_S" />
+      <node concept="3uibUv" id="72RDgIN3TIW" role="1tU5fm">
+        <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+      </node>
+    </node>
     <node concept="2tJIrI" id="7P_FdVPFLhr" role="jymVt" />
     <node concept="3Tm1VV" id="CGeqIk8WWV" role="1B3o_S" />
   </node>
@@ -5389,6 +5430,55 @@
             </node>
           </node>
         </node>
+        <node concept="3cpWs8" id="72RDgIN3C$C" role="3cqZAp">
+          <node concept="3cpWsn" id="72RDgIN3C$D" role="3cpWs9">
+            <property role="TrG5h" value="processing" />
+            <node concept="3uibUv" id="72RDgIN3C$$" role="1tU5fm">
+              <ref role="3uigEE" node="7DvO2M9IiKB" resolve="MacroProcessing" />
+            </node>
+            <node concept="2ShNRf" id="72RDgIN3C$E" role="33vP2m">
+              <node concept="YeOm9" id="72RDgIN3GAR" role="2ShVmc">
+                <node concept="1Y3b0j" id="72RDgIN3GAU" role="YeSDq">
+                  <property role="2bfB8j" value="true" />
+                  <ref role="1Y3XeK" node="7DvO2M9IiKB" resolve="MacroProcessing" />
+                  <ref role="37wK5l" node="7DvO2Ma0h_M" resolve="MacroProcessing" />
+                  <node concept="3Tm1VV" id="72RDgIN3GAV" role="1B3o_S" />
+                  <node concept="2OqwBi" id="72RDgIN3C$G" role="37wK5m">
+                    <node concept="37vLTw" id="72RDgIN3C$H" role="2Oq$k0">
+                      <ref role="3cqZAo" node="7WKNeR9bpBf" resolve="ruleProcessingSession" />
+                    </node>
+                    <node concept="liA8E" id="72RDgIN3C$I" role="2OqNvi">
+                      <ref role="37wK5l" node="7DvO2M9Icas" resolve="macroTemplates" />
+                    </node>
+                  </node>
+                  <node concept="3clFb_" id="72RDgIN3GL7" role="jymVt">
+                    <property role="1EzhhJ" value="false" />
+                    <property role="TrG5h" value="contextRepository" />
+                    <node concept="3uibUv" id="72RDgIN3GL8" role="3clF45">
+                      <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+                    </node>
+                    <node concept="3Tm1VV" id="72RDgIN3GL9" role="1B3o_S" />
+                    <node concept="3clFbS" id="72RDgIN3GLe" role="3clF47">
+                      <node concept="3clFbF" id="72RDgIN4dYT" role="3cqZAp">
+                        <node concept="2OqwBi" id="72RDgIN4e8j" role="3clFbG">
+                          <node concept="37vLTw" id="72RDgIN4dYS" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7WKNeR9bpBf" resolve="ruleProcessingSession" />
+                          </node>
+                          <node concept="liA8E" id="72RDgIN4elk" role="2OqNvi">
+                            <ref role="37wK5l" node="72RDgIN45VE" resolve="repository" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2AHcQZ" id="72RDgIN3GLf" role="2AJF6D">
+                      <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3cpWs8" id="6OXbTDxQIa7" role="3cqZAp">
           <node concept="3cpWsn" id="6OXbTDxQIa8" role="3cpWs9">
             <property role="TrG5h" value="factory" />
@@ -5398,18 +5488,8 @@
             <node concept="2ShNRf" id="6OXbTDxQIaa" role="33vP2m">
               <node concept="1pGfFk" id="6OXbTDxQIab" role="2ShVmc">
                 <ref role="37wK5l" node="7DvO2M9uuLO" resolve="ProgramProducer.ProgramFactory" />
-                <node concept="2ShNRf" id="6OXbTDxQIac" role="37wK5m">
-                  <node concept="1pGfFk" id="6OXbTDxQIad" role="2ShVmc">
-                    <ref role="37wK5l" node="7DvO2Ma0h_M" resolve="MacroProcessing" />
-                    <node concept="2OqwBi" id="6OXbTDxQIae" role="37wK5m">
-                      <node concept="37vLTw" id="6OXbTDxQIaf" role="2Oq$k0">
-                        <ref role="3cqZAo" node="7WKNeR9bpBf" resolve="ruleProcessingSession" />
-                      </node>
-                      <node concept="liA8E" id="6OXbTDxQIag" role="2OqNvi">
-                        <ref role="37wK5l" node="7DvO2M9Icas" resolve="macroTemplates" />
-                      </node>
-                    </node>
-                  </node>
+                <node concept="37vLTw" id="72RDgIN3C$J" role="37wK5m">
+                  <ref role="3cqZAo" node="72RDgIN3C$D" resolve="processing" />
                 </node>
                 <node concept="37vLTw" id="6OXbTDxQIah" role="37wK5m">
                   <ref role="3cqZAo" node="7kTeLbPnP2m" resolve="mainConstraint" />
@@ -10582,6 +10662,7 @@
   <node concept="312cEu" id="7DvO2M9IiKB">
     <property role="TrG5h" value="MacroProcessing" />
     <property role="2bfB8j" value="false" />
+    <property role="1sVAO0" value="true" />
     <node concept="2tJIrI" id="7DvO2M9IiKC" role="jymVt" />
     <node concept="3clFbW" id="7DvO2Ma0h_M" role="jymVt">
       <node concept="3cqZAl" id="7DvO2Ma0h_O" role="3clF45" />
diff --git a/coderules/solutions/jetbrains.mps.coderules/models/service.mps b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
index f24e3383..2bfdf24a 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
@@ -757,6 +757,9 @@
                                     </node>
                                   </node>
                                 </node>
+                                <node concept="37vLTw" id="72RDgIN3WaB" role="37wK5m">
+                                  <ref role="3cqZAo" node="6kREIVkLEGt" resolve="repository" />
+                                </node>
                               </node>
                             </node>
                           </node>
diff --git a/coderules/solutions/jetbrains.mps.controlflow/models/service.mps b/coderules/solutions/jetbrains.mps.controlflow/models/service.mps
index 0645179f..49b7068a 100644
--- a/coderules/solutions/jetbrains.mps.controlflow/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.controlflow/models/service.mps
@@ -70,6 +70,7 @@
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
       <concept id="1068390468200" name="jetbrains.mps.baseLanguage.structure.FieldDeclaration" flags="ig" index="312cEg" />
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
+        <property id="1075300953594" name="abstractClass" index="1sVAO0" />
         <child id="1095933932569" name="implementedInterface" index="EKbjA" />
         <child id="1165602531693" name="superclass" index="1zkMxy" />
       </concept>
@@ -340,6 +341,7 @@
   </node>
   <node concept="312cEu" id="7lt0LtQ_OIS">
     <property role="TrG5h" value="ControlflowSessionSolver" />
+    <property role="1sVAO0" value="true" />
     <node concept="2tJIrI" id="oI9Yrbvo_" role="jymVt" />
     <node concept="3clFbW" id="oI9Yrbvrt" role="jymVt">
       <node concept="3cqZAl" id="oI9Yrbvrv" role="3clF45" />
@@ -633,6 +635,25 @@
                     </node>
                   </node>
                 </node>
+                <node concept="2tJIrI" id="72RDgIN3jWs" role="jymVt" />
+                <node concept="3clFb_" id="72RDgIN3k5M" role="jymVt">
+                  <property role="1EzhhJ" value="false" />
+                  <property role="TrG5h" value="contextRepository" />
+                  <node concept="3uibUv" id="72RDgIN3k5N" role="3clF45">
+                    <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+                  </node>
+                  <node concept="3Tm1VV" id="72RDgIN3k5O" role="1B3o_S" />
+                  <node concept="3clFbS" id="72RDgIN3k5U" role="3clF47">
+                    <node concept="3clFbF" id="72RDgIN3pjg" role="3cqZAp">
+                      <node concept="1rXfSq" id="72RDgIN3pjf" role="3clFbG">
+                        <ref role="37wK5l" to="1yqb:443LGHBSOXq" resolve="getRepository" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2AHcQZ" id="72RDgIN3k5V" role="2AJF6D">
+                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                  </node>
+                </node>
               </node>
             </node>
           </node>
diff --git a/coderules/solutions/jetbrains.mps.reporting.runtime/jetbrains.mps.reporting.runtime.msd b/coderules/solutions/jetbrains.mps.reporting.runtime/jetbrains.mps.reporting.runtime.msd
index 5d648623..38cd8498 100644
--- a/coderules/solutions/jetbrains.mps.reporting.runtime/jetbrains.mps.reporting.runtime.msd
+++ b/coderules/solutions/jetbrains.mps.reporting.runtime/jetbrains.mps.reporting.runtime.msd
@@ -8,6 +8,7 @@
   <sourcePath />
   <dependencies>
     <dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
+    <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="6" />
@@ -20,6 +21,9 @@
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
+    <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
+    <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
+    <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
     <module reference="da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.reporting.runtime)" version="0" />
   </dependencyVersions>
diff --git a/coderules/solutions/jetbrains.mps.reporting.runtime/models/jetbrains.mps.lang.typesystem2.reporting.mps b/coderules/solutions/jetbrains.mps.reporting.runtime/models/jetbrains.mps.lang.typesystem2.reporting.mps
index cc237302..66f9cd7f 100644
--- a/coderules/solutions/jetbrains.mps.reporting.runtime/models/jetbrains.mps.lang.typesystem2.reporting.mps
+++ b/coderules/solutions/jetbrains.mps.reporting.runtime/models/jetbrains.mps.lang.typesystem2.reporting.mps
@@ -10,6 +10,7 @@
   </languages>
   <imports>
     <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
+    <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
@@ -175,6 +176,16 @@
       <node concept="3Tm1VV" id="oI9Ys2ypn" role="1B3o_S" />
       <node concept="3clFbS" id="oI9Ys2ypo" role="3clF47" />
     </node>
+    <node concept="2tJIrI" id="72RDgIN33KJ" role="jymVt" />
+    <node concept="3clFb_" id="72RDgIN33NR" role="jymVt">
+      <property role="1EzhhJ" value="true" />
+      <property role="TrG5h" value="contextRepository" />
+      <node concept="3uibUv" id="72RDgIN33Sa" role="3clF45">
+        <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+      </node>
+      <node concept="3Tm1VV" id="72RDgIN33NU" role="1B3o_S" />
+      <node concept="3clFbS" id="72RDgIN33NV" role="3clF47" />
+    </node>
     <node concept="2tJIrI" id="oI9YrIZfj" role="jymVt" />
     <node concept="3Tm1VV" id="oI9YrIZeT" role="1B3o_S" />
   </node>
diff --git a/coderules/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps b/coderules/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps
index 6ea972a3..d876e31d 100644
--- a/coderules/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps
+++ b/coderules/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps
@@ -81,6 +81,7 @@
         <child id="1068498886295" name="lValue" index="37vLTJ" />
       </concept>
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
+      <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
@@ -116,6 +117,7 @@
         <child id="1070534934092" name="expression" index="10QFUP" />
       </concept>
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
@@ -800,6 +802,7 @@
               <node concept="3cpWs8" id="6OXbTD_oHco" role="3cqZAp">
                 <node concept="3cpWsn" id="6OXbTD_oHcp" role="3cpWs9">
                   <property role="TrG5h" value="repo" />
+                  <property role="3TUv4t" value="true" />
                   <node concept="3uibUv" id="6OXbTD_oHcm" role="1tU5fm">
                     <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
                   </node>
@@ -864,6 +867,9 @@
                           </node>
                         </node>
                       </node>
+                      <node concept="37vLTw" id="72RDgIN4_KQ" role="37wK5m">
+                        <ref role="3cqZAo" node="6OXbTD_oHcp" resolve="repo" />
+                      </node>
                     </node>
                   </node>
                 </node>
@@ -1040,6 +1046,25 @@
                                 <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                               </node>
                             </node>
+                            <node concept="2tJIrI" id="72RDgIN3Ptd" role="jymVt" />
+                            <node concept="3clFb_" id="72RDgIN3POE" role="jymVt">
+                              <property role="1EzhhJ" value="false" />
+                              <property role="TrG5h" value="contextRepository" />
+                              <node concept="3uibUv" id="72RDgIN3POF" role="3clF45">
+                                <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+                              </node>
+                              <node concept="3Tm1VV" id="72RDgIN3POG" role="1B3o_S" />
+                              <node concept="3clFbS" id="72RDgIN3POM" role="3clF47">
+                                <node concept="3clFbF" id="72RDgIN3Ti5" role="3cqZAp">
+                                  <node concept="37vLTw" id="72RDgIN3Ti4" role="3clFbG">
+                                    <ref role="3cqZAo" node="6OXbTD_oHcp" resolve="repo" />
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="2AHcQZ" id="72RDgIN3PON" role="2AJF6D">
+                                <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                              </node>
+                            </node>
                           </node>
                         </node>
                       </node>
diff --git a/coderules/solutions/jetbrains.mps.typechecking/models/jetbrains.mps.typechecking.mps b/coderules/solutions/jetbrains.mps.typechecking/models/jetbrains.mps.typechecking.mps
index b1f28f07..41a53e55 100644
--- a/coderules/solutions/jetbrains.mps.typechecking/models/jetbrains.mps.typechecking.mps
+++ b/coderules/solutions/jetbrains.mps.typechecking/models/jetbrains.mps.typechecking.mps
@@ -87,6 +87,7 @@
       </concept>
       <concept id="1068390468200" name="jetbrains.mps.baseLanguage.structure.FieldDeclaration" flags="ig" index="312cEg" />
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
+        <property id="1075300953594" name="abstractClass" index="1sVAO0" />
         <child id="1095933932569" name="implementedInterface" index="EKbjA" />
         <child id="1165602531693" name="superclass" index="1zkMxy" />
       </concept>
@@ -1384,6 +1385,7 @@
   </node>
   <node concept="312cEu" id="7lt0LtQ_OIS">
     <property role="TrG5h" value="TypecheckingSessionSolver" />
+    <property role="1sVAO0" value="true" />
     <node concept="2tJIrI" id="oI9Yrbvo_" role="jymVt" />
     <node concept="3clFbW" id="oI9Yrbvrt" role="jymVt">
       <node concept="3cqZAl" id="oI9Yrbvrv" role="3clF45" />
diff --git a/coderules/solutions/jetbrains.mps.typechecking/models/service.mps b/coderules/solutions/jetbrains.mps.typechecking/models/service.mps
index 4449d3e8..ada07987 100644
--- a/coderules/solutions/jetbrains.mps.typechecking/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.typechecking/models/service.mps
@@ -1788,6 +1788,25 @@
                     </node>
                   </node>
                 </node>
+                <node concept="2tJIrI" id="72RDgIN4xNc" role="jymVt" />
+                <node concept="3clFb_" id="72RDgIN4y1k" role="jymVt">
+                  <property role="1EzhhJ" value="false" />
+                  <property role="TrG5h" value="contextRepository" />
+                  <node concept="3uibUv" id="72RDgIN4y1l" role="3clF45">
+                    <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+                  </node>
+                  <node concept="3Tm1VV" id="72RDgIN4y1m" role="1B3o_S" />
+                  <node concept="3clFbS" id="72RDgIN4y1s" role="3clF47">
+                    <node concept="3clFbF" id="72RDgIN4zob" role="3cqZAp">
+                      <node concept="1rXfSq" id="72RDgIN4zoa" role="3clFbG">
+                        <ref role="37wK5l" to="1yqb:443LGHBSOXq" resolve="getRepository" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2AHcQZ" id="72RDgIN4y1t" role="2AJF6D">
+                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                  </node>
+                </node>
               </node>
             </node>
           </node>