diff --git a/languages/RatingRulesLanguage/source_gen/RatingRulesLanguage/actions/trace.info b/languages/RatingRulesLanguage/source_gen/RatingRulesLanguage/actions/trace.info
diff --git a/...tingRulesLanguage/source_gen/RatingRulesLanguage/behavior/Actions_BehaviorDescriptor.java b/...tingRulesLanguage/source_gen/RatingRulesLanguage/behavior/Actions_BehaviorDescriptor.java
@@ -0,0 +1,20 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+import jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor;
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public class Actions_BehaviorDescriptor extends BaseConcept_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.Actions";
+  }
+
+}
diff --git a/...RatingRulesLanguage/source_gen/RatingRulesLanguage/behavior/AndNL_BehaviorDescriptor.java b/...RatingRulesLanguage/source_gen/RatingRulesLanguage/behavior/AndNL_BehaviorDescriptor.java
@@ -0,0 +1,19 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public class AndNL_BehaviorDescriptor extends LogicalOperator_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.AndNL";
+  }
+
+}
diff --git a/...s/RatingRulesLanguage/source_gen/RatingRulesLanguage/behavior/And_BehaviorDescriptor.java b/...s/RatingRulesLanguage/source_gen/RatingRulesLanguage/behavior/And_BehaviorDescriptor.java
@@ -0,0 +1,19 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public class And_BehaviorDescriptor extends LogicalOperator_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.And";
+  }
+
+}
diff --git a/...nguage/source_gen/RatingRulesLanguage/behavior/AssignmentOperator_BehaviorDescriptor.java b/...nguage/source_gen/RatingRulesLanguage/behavior/AssignmentOperator_BehaviorDescriptor.java
@@ -0,0 +1,19 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public class AssignmentOperator_BehaviorDescriptor extends BaseAssignmentOperator_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.AssignmentOperator";
+  }
+
+}
diff --git a/...gRulesLanguage/source_gen/RatingRulesLanguage/behavior/BaseAction_BehaviorDescriptor.java b/...gRulesLanguage/source_gen/RatingRulesLanguage/behavior/BaseAction_BehaviorDescriptor.java
@@ -0,0 +1,20 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+import jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor;
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public abstract class BaseAction_BehaviorDescriptor extends BaseConcept_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.BaseAction";
+  }
+
+}
diff --git a/...ge/source_gen/RatingRulesLanguage/behavior/BaseAssignmentOperator_BehaviorDescriptor.java b/...ge/source_gen/RatingRulesLanguage/behavior/BaseAssignmentOperator_BehaviorDescriptor.java
@@ -0,0 +1,20 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+import jetbrains.mps.lang.core.behavior.IDontSubstituteByDefault_BehaviorDescriptor;
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public abstract class BaseAssignmentOperator_BehaviorDescriptor extends RValue_BehaviorDescriptor implements IDontSubstituteByDefault_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.BaseAssignmentOperator";
+  }
+
+}
diff --git a/...anguage/source_gen/RatingRulesLanguage/behavior/BaseAttributeType_BehaviorDescriptor.java b/...anguage/source_gen/RatingRulesLanguage/behavior/BaseAttributeType_BehaviorDescriptor.java
@@ -0,0 +1,19 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public class BaseAttributeType_BehaviorDescriptor extends BaseDataType_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.BaseAttributeType";
+  }
+
+}
diff --git a/...ge/source_gen/RatingRulesLanguage/behavior/BaseCollectionDataType_BehaviorDescriptor.java b/...ge/source_gen/RatingRulesLanguage/behavior/BaseCollectionDataType_BehaviorDescriptor.java
@@ -0,0 +1,21 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+import jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor;
+import jetbrains.mps.lang.core.behavior.IType_BehaviorDescriptor;
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public abstract class BaseCollectionDataType_BehaviorDescriptor extends BaseConcept_BehaviorDescriptor implements IType_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.BaseCollectionDataType";
+  }
+
+}
diff --git a/.../source_gen/RatingRulesLanguage/behavior/BaseCollectionOfConcepts_BehaviorDescriptor.java b/.../source_gen/RatingRulesLanguage/behavior/BaseCollectionOfConcepts_BehaviorDescriptor.java
@@ -0,0 +1,21 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+import jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor;
+import jetbrains.mps.lang.core.behavior.IType_BehaviorDescriptor;
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public abstract class BaseCollectionOfConcepts_BehaviorDescriptor extends BaseConcept_BehaviorDescriptor implements IType_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.BaseCollectionOfConcepts";
+  }
+
+}
diff --git a/...Language/source_gen/RatingRulesLanguage/behavior/BaseCollectionwithUniqueID_Behavior.java b/...Language/source_gen/RatingRulesLanguage/behavior/BaseCollectionwithUniqueID_Behavior.java
@@ -0,0 +1,16 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+import org.jetbrains.mps.openapi.model.SNode;
+
+/**
+ * Will be removed after 3.3
+ * Need to support the legacy static direct method calls
+ */
+@Deprecated
+public class BaseCollectionwithUniqueID_Behavior {
+  public static int call_GetNewID_2018270309120290442(SNode __thisNode__) {
+    return BaseCollectionwithUniqueID__BehaviorDescriptor.GetNewID_id1K2lyszPiUa(__thisNode__);
+  }
+}
diff --git a/...ource_gen/RatingRulesLanguage/behavior/BaseCollectionwithUniqueID_BehaviorDescriptor.java b/...ource_gen/RatingRulesLanguage/behavior/BaseCollectionwithUniqueID_BehaviorDescriptor.java
@@ -0,0 +1,19 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public class BaseCollectionwithUniqueID_BehaviorDescriptor extends BaseCollectionDataType_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.BaseCollectionwithUniqueID";
+  }
+
+}
diff --git a/...urce_gen/RatingRulesLanguage/behavior/BaseCollectionwithUniqueID__BehaviorDescriptor.java b/...urce_gen/RatingRulesLanguage/behavior/BaseCollectionwithUniqueID__BehaviorDescriptor.java
@@ -0,0 +1,87 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+import jetbrains.mps.core.aspects.behaviour.BaseBHDescriptor;
+import org.jetbrains.mps.openapi.language.SAbstractConcept;
+import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory;
+import jetbrains.mps.core.aspects.behaviour.api.BehaviorRegistry;
+import jetbrains.mps.smodel.language.ConceptRegistry;
+import jetbrains.mps.core.aspects.behaviour.api.SMethod;
+import jetbrains.mps.core.aspects.behaviour.SMethodBuilder;
+import jetbrains.mps.core.aspects.behaviour.SJavaCompoundTypeImpl;
+import jetbrains.mps.core.aspects.behaviour.SModifiersImpl;
+import jetbrains.mps.core.aspects.behaviour.AccessPrivileges;
+import java.util.List;
+import java.util.Arrays;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.mps.openapi.model.SNode;
+import jetbrains.mps.lang.smodel.generator.smodelAdapter.SPropertyOperations;
+import jetbrains.mps.core.aspects.behaviour.api.SConstructor;
+import org.jetbrains.annotations.Nullable;
+import jetbrains.mps.core.aspects.behaviour.api.BHMethodNotFoundException;
+
+public final class BaseCollectionwithUniqueID__BehaviorDescriptor extends BaseBHDescriptor {
+  private static final SAbstractConcept CONCEPT = MetaAdapterFactory.getConcept(0xfffd25317c948b3L, 0x9419ce44b0a40631L, 0x1c02562723d52abeL, "RatingRulesLanguage.structure.BaseCollectionwithUniqueID");
+  private static final BehaviorRegistry REGISTRY = ConceptRegistry.getInstance().getBehaviorRegistry();
+
+  public static final SMethod<Integer> GetNewID_id1K2lyszPiUa = new SMethodBuilder<Integer>(new SJavaCompoundTypeImpl(Integer.TYPE)).name("GetNewID").modifiers(SModifiersImpl.create(0, AccessPrivileges.PUBLIC)).concept(CONCEPT).id("1K2lyszPiUa").registry(REGISTRY).build();
+
+  private static final List<SMethod<?>> BH_METHODS = Arrays.<SMethod<?>>asList(GetNewID_id1K2lyszPiUa);
+
+  private static void ___init___(@NotNull SNode __thisNode__) {
+    SPropertyOperations.set(__thisNode__, MetaAdapterFactory.getProperty(0xfffd25317c948b3L, 0x9419ce44b0a40631L, 0x1c02562723d52abeL, 0x1c02562723d52abfL, "IDValue"), "" + (0));
+  }
+
+  /*package*/ static int GetNewID_id1K2lyszPiUa(@NotNull SNode __thisNode__) {
+    SPropertyOperations.set(__thisNode__, MetaAdapterFactory.getProperty(0xfffd25317c948b3L, 0x9419ce44b0a40631L, 0x1c02562723d52abeL, 0x1c02562723d52abfL, "IDValue"), "" + (SPropertyOperations.getInteger(__thisNode__, MetaAdapterFactory.getProperty(0xfffd25317c948b3L, 0x9419ce44b0a40631L, 0x1c02562723d52abeL, 0x1c02562723d52abfL, "IDValue")) + 1));
+    return SPropertyOperations.getInteger(__thisNode__, MetaAdapterFactory.getProperty(0xfffd25317c948b3L, 0x9419ce44b0a40631L, 0x1c02562723d52abeL, 0x1c02562723d52abfL, "IDValue"));
+  }
+
+  /*package*/ BaseCollectionwithUniqueID__BehaviorDescriptor() {
+    super(REGISTRY);
+  }
+
+  @Override
+  protected void initNode(@NotNull SNode node, @NotNull SConstructor constructor, @Nullable Object[] parameters) {
+    ___init___(node);
+  }
+
+  @Override
+  protected <T> T invokeSpecial0(@NotNull SNode node, @NotNull SMethod<T> method, @Nullable Object[] parameters) {
+    int methodIndex = BH_METHODS.indexOf(method);
+    if (methodIndex < 0) {
+      throw new BHMethodNotFoundException(this, method);
+    }
+    switch (methodIndex) {
+      case 0:
+        return (T) ((Integer) GetNewID_id1K2lyszPiUa(node));
+      default:
+        throw new BHMethodNotFoundException(this, method);
+    }
+  }
+
+  @Override
+  protected <T> T invokeSpecial0(@NotNull SAbstractConcept concept, @NotNull SMethod<T> method, @Nullable Object[] parameters) {
+    int methodIndex = BH_METHODS.indexOf(method);
+    if (methodIndex < 0) {
+      throw new BHMethodNotFoundException(this, method);
+    }
+    switch (methodIndex) {
+      default:
+        throw new BHMethodNotFoundException(this, method);
+    }
+  }
+
+  @NotNull
+  @Override
+  public List<SMethod<?>> getDeclaredMethods() {
+    return BH_METHODS;
+  }
+
+  @NotNull
+  @Override
+  public SAbstractConcept getConcept() {
+    return CONCEPT;
+  }
+}
diff --git a/...guage/source_gen/RatingRulesLanguage/behavior/BaseConceptOrgCollectionBlock_Behavior.java b/...guage/source_gen/RatingRulesLanguage/behavior/BaseConceptOrgCollectionBlock_Behavior.java
@@ -0,0 +1,12 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support the legacy static direct method calls
+ */
+@Deprecated
+public class BaseConceptOrgCollectionBlock_Behavior {
+}
diff --git a/...ce_gen/RatingRulesLanguage/behavior/BaseConceptOrgCollectionBlock_BehaviorDescriptor.java b/...ce_gen/RatingRulesLanguage/behavior/BaseConceptOrgCollectionBlock_BehaviorDescriptor.java
@@ -0,0 +1,19 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public class BaseConceptOrgCollectionBlock_BehaviorDescriptor extends BaseCollectionOfConcepts_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.BaseConceptOrgCollectionBlock";
+  }
+
+}
diff --git a/...e_gen/RatingRulesLanguage/behavior/BaseConceptOrgCollectionBlock__BehaviorDescriptor.java b/...e_gen/RatingRulesLanguage/behavior/BaseConceptOrgCollectionBlock__BehaviorDescriptor.java
@@ -0,0 +1,74 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+import jetbrains.mps.core.aspects.behaviour.BaseBHDescriptor;
+import org.jetbrains.mps.openapi.language.SAbstractConcept;
+import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory;
+import jetbrains.mps.core.aspects.behaviour.api.BehaviorRegistry;
+import jetbrains.mps.smodel.language.ConceptRegistry;
+import java.util.List;
+import jetbrains.mps.core.aspects.behaviour.api.SMethod;
+import java.util.Arrays;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.mps.openapi.model.SNode;
+import jetbrains.mps.core.aspects.behaviour.api.SConstructor;
+import org.jetbrains.annotations.Nullable;
+import jetbrains.mps.core.aspects.behaviour.api.BHMethodNotFoundException;
+
+public final class BaseConceptOrgCollectionBlock__BehaviorDescriptor extends BaseBHDescriptor {
+  private static final SAbstractConcept CONCEPT = MetaAdapterFactory.getConcept(0xfffd25317c948b3L, 0x9419ce44b0a40631L, 0x176a094254900dd2L, "RatingRulesLanguage.structure.BaseConceptOrgCollectionBlock");
+  private static final BehaviorRegistry REGISTRY = ConceptRegistry.getInstance().getBehaviorRegistry();
+
+
+  private static final List<SMethod<?>> BH_METHODS = Arrays.<SMethod<?>>asList();
+
+  private static void ___init___(@NotNull SNode __thisNode__) {
+  }
+
+
+  /*package*/ BaseConceptOrgCollectionBlock__BehaviorDescriptor() {
+    super(REGISTRY);
+  }
+
+  @Override
+  protected void initNode(@NotNull SNode node, @NotNull SConstructor constructor, @Nullable Object[] parameters) {
+    ___init___(node);
+  }
+
+  @Override
+  protected <T> T invokeSpecial0(@NotNull SNode node, @NotNull SMethod<T> method, @Nullable Object[] parameters) {
+    int methodIndex = BH_METHODS.indexOf(method);
+    if (methodIndex < 0) {
+      throw new BHMethodNotFoundException(this, method);
+    }
+    switch (methodIndex) {
+      default:
+        throw new BHMethodNotFoundException(this, method);
+    }
+  }
+
+  @Override
+  protected <T> T invokeSpecial0(@NotNull SAbstractConcept concept, @NotNull SMethod<T> method, @Nullable Object[] parameters) {
+    int methodIndex = BH_METHODS.indexOf(method);
+    if (methodIndex < 0) {
+      throw new BHMethodNotFoundException(this, method);
+    }
+    switch (methodIndex) {
+      default:
+        throw new BHMethodNotFoundException(this, method);
+    }
+  }
+
+  @NotNull
+  @Override
+  public List<SMethod<?>> getDeclaredMethods() {
+    return BH_METHODS;
+  }
+
+  @NotNull
+  @Override
+  public SAbstractConcept getConcept() {
+    return CONCEPT;
+  }
+}
diff --git a/...ource_gen/RatingRulesLanguage/behavior/BaseConceptOrgCollectionWithUniqueID_Behavior.java b/...ource_gen/RatingRulesLanguage/behavior/BaseConceptOrgCollectionWithUniqueID_Behavior.java
@@ -0,0 +1,16 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+import org.jetbrains.mps.openapi.model.SNode;
+
+/**
+ * Will be removed after 3.3
+ * Need to support the legacy static direct method calls
+ */
+@Deprecated
+public class BaseConceptOrgCollectionWithUniqueID_Behavior {
+  public static int call_GetNewID_2018270309120290442(SNode __thisNode__) {
+    return BaseConceptOrgCollectionWithUniqueID__BehaviorDescriptor.GetNewID_id1K2lyszPiUa(__thisNode__);
+  }
+}
diff --git a/...RatingRulesLanguage/behavior/BaseConceptOrgCollectionWithUniqueID_BehaviorDescriptor.java b/...RatingRulesLanguage/behavior/BaseConceptOrgCollectionWithUniqueID_BehaviorDescriptor.java
@@ -0,0 +1,19 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public class BaseConceptOrgCollectionWithUniqueID_BehaviorDescriptor extends BaseConceptOrgCollectionBlock_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.BaseConceptOrgCollectionWithUniqueID";
+  }
+
+}
diff --git a/...atingRulesLanguage/behavior/BaseConceptOrgCollectionWithUniqueID__BehaviorDescriptor.java b/...atingRulesLanguage/behavior/BaseConceptOrgCollectionWithUniqueID__BehaviorDescriptor.java
@@ -0,0 +1,87 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+import jetbrains.mps.core.aspects.behaviour.BaseBHDescriptor;
+import org.jetbrains.mps.openapi.language.SAbstractConcept;
+import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory;
+import jetbrains.mps.core.aspects.behaviour.api.BehaviorRegistry;
+import jetbrains.mps.smodel.language.ConceptRegistry;
+import jetbrains.mps.core.aspects.behaviour.api.SMethod;
+import jetbrains.mps.core.aspects.behaviour.SMethodBuilder;
+import jetbrains.mps.core.aspects.behaviour.SJavaCompoundTypeImpl;
+import jetbrains.mps.core.aspects.behaviour.SModifiersImpl;
+import jetbrains.mps.core.aspects.behaviour.AccessPrivileges;
+import java.util.List;
+import java.util.Arrays;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.mps.openapi.model.SNode;
+import jetbrains.mps.lang.smodel.generator.smodelAdapter.SPropertyOperations;
+import jetbrains.mps.core.aspects.behaviour.api.SConstructor;
+import org.jetbrains.annotations.Nullable;
+import jetbrains.mps.core.aspects.behaviour.api.BHMethodNotFoundException;
+
+public final class BaseConceptOrgCollectionWithUniqueID__BehaviorDescriptor extends BaseBHDescriptor {
+  private static final SAbstractConcept CONCEPT = MetaAdapterFactory.getConcept(0xfffd25317c948b3L, 0x9419ce44b0a40631L, 0x1c02562723d52abeL, "RatingRulesLanguage.structure.BaseConceptOrgCollectionWithUniqueID");
+  private static final BehaviorRegistry REGISTRY = ConceptRegistry.getInstance().getBehaviorRegistry();
+
+  public static final SMethod<Integer> GetNewID_id1K2lyszPiUa = new SMethodBuilder<Integer>(new SJavaCompoundTypeImpl(Integer.TYPE)).name("GetNewID").modifiers(SModifiersImpl.create(0, AccessPrivileges.PUBLIC)).concept(CONCEPT).id("1K2lyszPiUa").registry(REGISTRY).build();
+
+  private static final List<SMethod<?>> BH_METHODS = Arrays.<SMethod<?>>asList(GetNewID_id1K2lyszPiUa);
+
+  private static void ___init___(@NotNull SNode __thisNode__) {
+    SPropertyOperations.set(__thisNode__, MetaAdapterFactory.getProperty(0xfffd25317c948b3L, 0x9419ce44b0a40631L, 0x1c02562723d52abeL, 0x1c02562723d52abfL, "IDValue"), "" + (0));
+  }
+
+  /*package*/ static int GetNewID_id1K2lyszPiUa(@NotNull SNode __thisNode__) {
+    SPropertyOperations.set(__thisNode__, MetaAdapterFactory.getProperty(0xfffd25317c948b3L, 0x9419ce44b0a40631L, 0x1c02562723d52abeL, 0x1c02562723d52abfL, "IDValue"), "" + (SPropertyOperations.getInteger(__thisNode__, MetaAdapterFactory.getProperty(0xfffd25317c948b3L, 0x9419ce44b0a40631L, 0x1c02562723d52abeL, 0x1c02562723d52abfL, "IDValue")) + 1));
+    return SPropertyOperations.getInteger(__thisNode__, MetaAdapterFactory.getProperty(0xfffd25317c948b3L, 0x9419ce44b0a40631L, 0x1c02562723d52abeL, 0x1c02562723d52abfL, "IDValue"));
+  }
+
+  /*package*/ BaseConceptOrgCollectionWithUniqueID__BehaviorDescriptor() {
+    super(REGISTRY);
+  }
+
+  @Override
+  protected void initNode(@NotNull SNode node, @NotNull SConstructor constructor, @Nullable Object[] parameters) {
+    ___init___(node);
+  }
+
+  @Override
+  protected <T> T invokeSpecial0(@NotNull SNode node, @NotNull SMethod<T> method, @Nullable Object[] parameters) {
+    int methodIndex = BH_METHODS.indexOf(method);
+    if (methodIndex < 0) {
+      throw new BHMethodNotFoundException(this, method);
+    }
+    switch (methodIndex) {
+      case 0:
+        return (T) ((Integer) GetNewID_id1K2lyszPiUa(node));
+      default:
+        throw new BHMethodNotFoundException(this, method);
+    }
+  }
+
+  @Override
+  protected <T> T invokeSpecial0(@NotNull SAbstractConcept concept, @NotNull SMethod<T> method, @Nullable Object[] parameters) {
+    int methodIndex = BH_METHODS.indexOf(method);
+    if (methodIndex < 0) {
+      throw new BHMethodNotFoundException(this, method);
+    }
+    switch (methodIndex) {
+      default:
+        throw new BHMethodNotFoundException(this, method);
+    }
+  }
+
+  @NotNull
+  @Override
+  public List<SMethod<?>> getDeclaredMethods() {
+    return BH_METHODS;
+  }
+
+  @NotNull
+  @Override
+  public SAbstractConcept getConcept() {
+    return CONCEPT;
+  }
+}
diff --git a/...es/RatingRulesLanguage/source_gen/RatingRulesLanguage/behavior/BaseConstant_Behavior.java b/...es/RatingRulesLanguage/source_gen/RatingRulesLanguage/behavior/BaseConstant_Behavior.java
@@ -0,0 +1,12 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support the legacy static direct method calls
+ */
+@Deprecated
+public class BaseConstant_Behavior {
+}
diff --git a/...ulesLanguage/source_gen/RatingRulesLanguage/behavior/BaseConstant_BehaviorDescriptor.java b/...ulesLanguage/source_gen/RatingRulesLanguage/behavior/BaseConstant_BehaviorDescriptor.java
@@ -0,0 +1,20 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+import jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor;
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public abstract class BaseConstant_BehaviorDescriptor extends BaseConcept_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.BaseConstant";
+  }
+
+}
diff --git a/...lesLanguage/source_gen/RatingRulesLanguage/behavior/BaseConstant__BehaviorDescriptor.java b/...lesLanguage/source_gen/RatingRulesLanguage/behavior/BaseConstant__BehaviorDescriptor.java
@@ -0,0 +1,74 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+import jetbrains.mps.core.aspects.behaviour.BaseBHDescriptor;
+import org.jetbrains.mps.openapi.language.SAbstractConcept;
+import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory;
+import jetbrains.mps.core.aspects.behaviour.api.BehaviorRegistry;
+import jetbrains.mps.smodel.language.ConceptRegistry;
+import java.util.List;
+import jetbrains.mps.core.aspects.behaviour.api.SMethod;
+import java.util.Arrays;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.mps.openapi.model.SNode;
+import jetbrains.mps.core.aspects.behaviour.api.SConstructor;
+import org.jetbrains.annotations.Nullable;
+import jetbrains.mps.core.aspects.behaviour.api.BHMethodNotFoundException;
+
+public final class BaseConstant__BehaviorDescriptor extends BaseBHDescriptor {
+  private static final SAbstractConcept CONCEPT = MetaAdapterFactory.getConcept(0xfffd25317c948b3L, 0x9419ce44b0a40631L, 0x59a528db6b3d9e09L, "RatingRulesLanguage.structure.BaseConstant");
+  private static final BehaviorRegistry REGISTRY = ConceptRegistry.getInstance().getBehaviorRegistry();
+
+
+  private static final List<SMethod<?>> BH_METHODS = Arrays.<SMethod<?>>asList();
+
+  private static void ___init___(@NotNull SNode __thisNode__) {
+  }
+
+
+  /*package*/ BaseConstant__BehaviorDescriptor() {
+    super(REGISTRY);
+  }
+
+  @Override
+  protected void initNode(@NotNull SNode node, @NotNull SConstructor constructor, @Nullable Object[] parameters) {
+    ___init___(node);
+  }
+
+  @Override
+  protected <T> T invokeSpecial0(@NotNull SNode node, @NotNull SMethod<T> method, @Nullable Object[] parameters) {
+    int methodIndex = BH_METHODS.indexOf(method);
+    if (methodIndex < 0) {
+      throw new BHMethodNotFoundException(this, method);
+    }
+    switch (methodIndex) {
+      default:
+        throw new BHMethodNotFoundException(this, method);
+    }
+  }
+
+  @Override
+  protected <T> T invokeSpecial0(@NotNull SAbstractConcept concept, @NotNull SMethod<T> method, @Nullable Object[] parameters) {
+    int methodIndex = BH_METHODS.indexOf(method);
+    if (methodIndex < 0) {
+      throw new BHMethodNotFoundException(this, method);
+    }
+    switch (methodIndex) {
+      default:
+        throw new BHMethodNotFoundException(this, method);
+    }
+  }
+
+  @NotNull
+  @Override
+  public List<SMethod<?>> getDeclaredMethods() {
+    return BH_METHODS;
+  }
+
+  @NotNull
+  @Override
+  public SAbstractConcept getConcept() {
+    return CONCEPT;
+  }
+}
diff --git a/...e/source_gen/RatingRulesLanguage/behavior/BaseCriteriaDeclaration_BehaviorDescriptor.java b/...e/source_gen/RatingRulesLanguage/behavior/BaseCriteriaDeclaration_BehaviorDescriptor.java
@@ -0,0 +1,20 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+import jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor;
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public abstract class BaseCriteriaDeclaration_BehaviorDescriptor extends BaseConcept_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.BaseCriteriaDeclaration";
+  }
+
+}
diff --git a/...ge/source_gen/RatingRulesLanguage/behavior/BaseCriteriaExpression_BehaviorDescriptor.java b/...ge/source_gen/RatingRulesLanguage/behavior/BaseCriteriaExpression_BehaviorDescriptor.java
@@ -0,0 +1,19 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public abstract class BaseCriteriaExpression_BehaviorDescriptor extends LogicalExpression_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.BaseCriteriaExpression";
+  }
+
+}
diff --git a/...ulesLanguage/source_gen/RatingRulesLanguage/behavior/BaseDataType_BehaviorDescriptor.java b/...ulesLanguage/source_gen/RatingRulesLanguage/behavior/BaseDataType_BehaviorDescriptor.java
@@ -0,0 +1,26 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+import jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor;
+import jetbrains.mps.lang.core.behavior.INamedConcept_BehaviorDescriptor;
+import jetbrains.mps.lang.core.behavior.IType_BehaviorDescriptor;
+import org.jetbrains.mps.openapi.model.SNode;
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public abstract class BaseDataType_BehaviorDescriptor extends BaseConcept_BehaviorDescriptor implements INamedConcept_BehaviorDescriptor, IType_BehaviorDescriptor {
+  public String virtual_getFqName_1213877404258(SNode __thisNode__) {
+    return null;
+  }
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.BaseDataType";
+  }
+
+}
diff --git a/...anguage/source_gen/RatingRulesLanguage/behavior/BaseFloatFunctionDefinition_Behavior.java b/...anguage/source_gen/RatingRulesLanguage/behavior/BaseFloatFunctionDefinition_Behavior.java
@@ -0,0 +1,12 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support the legacy static direct method calls
+ */
+@Deprecated
+public class BaseFloatFunctionDefinition_Behavior {
+}
diff --git a/...urce_gen/RatingRulesLanguage/behavior/BaseFloatFunctionDefinition_BehaviorDescriptor.java b/...urce_gen/RatingRulesLanguage/behavior/BaseFloatFunctionDefinition_BehaviorDescriptor.java
@@ -0,0 +1,19 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public class BaseFloatFunctionDefinition_BehaviorDescriptor extends BaseNumericFunctionDef_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.BaseFloatFunctionDefinition";
+  }
+
+}
diff --git a/...rce_gen/RatingRulesLanguage/behavior/BaseFloatFunctionDefinition__BehaviorDescriptor.java b/...rce_gen/RatingRulesLanguage/behavior/BaseFloatFunctionDefinition__BehaviorDescriptor.java
@@ -0,0 +1,77 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+import jetbrains.mps.core.aspects.behaviour.BaseBHDescriptor;
+import org.jetbrains.mps.openapi.language.SAbstractConcept;
+import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory;
+import jetbrains.mps.core.aspects.behaviour.api.BehaviorRegistry;
+import jetbrains.mps.smodel.language.ConceptRegistry;
+import java.util.List;
+import jetbrains.mps.core.aspects.behaviour.api.SMethod;
+import java.util.Arrays;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.mps.openapi.model.SNode;
+import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations;
+import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations;
+import jetbrains.mps.core.aspects.behaviour.api.SConstructor;
+import org.jetbrains.annotations.Nullable;
+import jetbrains.mps.core.aspects.behaviour.api.BHMethodNotFoundException;
+
+public final class BaseFloatFunctionDefinition__BehaviorDescriptor extends BaseBHDescriptor {
+  private static final SAbstractConcept CONCEPT = MetaAdapterFactory.getConcept(0xfffd25317c948b3L, 0x9419ce44b0a40631L, 0x30491a7e2ad61471L, "RatingRulesLanguage.structure.BaseFloatFunctionDefinition");
+  private static final BehaviorRegistry REGISTRY = ConceptRegistry.getInstance().getBehaviorRegistry();
+
+
+  private static final List<SMethod<?>> BH_METHODS = Arrays.<SMethod<?>>asList();
+
+  private static void ___init___(@NotNull SNode __thisNode__) {
+    SLinkOperations.setNewChild(__thisNode__, MetaAdapterFactory.getContainmentLink(0xfffd25317c948b3L, 0x9419ce44b0a40631L, 0x65d53d0d8db56f56L, 0x30491a7e2aaaf673L, "type"), SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0xfffd25317c948b3L, 0x9419ce44b0a40631L, 0x59a528db6b5188d6L, "RatingRulesLanguage.structure.FloatVarType")));
+  }
+
+
+  /*package*/ BaseFloatFunctionDefinition__BehaviorDescriptor() {
+    super(REGISTRY);
+  }
+
+  @Override
+  protected void initNode(@NotNull SNode node, @NotNull SConstructor constructor, @Nullable Object[] parameters) {
+    ___init___(node);
+  }
+
+  @Override
+  protected <T> T invokeSpecial0(@NotNull SNode node, @NotNull SMethod<T> method, @Nullable Object[] parameters) {
+    int methodIndex = BH_METHODS.indexOf(method);
+    if (methodIndex < 0) {
+      throw new BHMethodNotFoundException(this, method);
+    }
+    switch (methodIndex) {
+      default:
+        throw new BHMethodNotFoundException(this, method);
+    }
+  }
+
+  @Override
+  protected <T> T invokeSpecial0(@NotNull SAbstractConcept concept, @NotNull SMethod<T> method, @Nullable Object[] parameters) {
+    int methodIndex = BH_METHODS.indexOf(method);
+    if (methodIndex < 0) {
+      throw new BHMethodNotFoundException(this, method);
+    }
+    switch (methodIndex) {
+      default:
+        throw new BHMethodNotFoundException(this, method);
+    }
+  }
+
+  @NotNull
+  @Override
+  public List<SMethod<?>> getDeclaredMethods() {
+    return BH_METHODS;
+  }
+
+  @NotNull
+  @Override
+  public SAbstractConcept getConcept() {
+    return CONCEPT;
+  }
+}
diff --git a/...anguage/source_gen/RatingRulesLanguage/behavior/BaseNamedFunction_BehaviorDescriptor.java b/...anguage/source_gen/RatingRulesLanguage/behavior/BaseNamedFunction_BehaviorDescriptor.java
@@ -0,0 +1,24 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+import jetbrains.mps.lang.core.behavior.INamedConcept_BehaviorDescriptor;
+import org.jetbrains.mps.openapi.model.SNode;
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public abstract class BaseNamedFunction_BehaviorDescriptor extends RValue_BehaviorDescriptor implements INamedConcept_BehaviorDescriptor {
+  public String virtual_getFqName_1213877404258(SNode __thisNode__) {
+    return null;
+  }
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.BaseNamedFunction";
+  }
+
+}
diff --git a/...ulesLanguage/source_gen/RatingRulesLanguage/behavior/BaseNumericFunctionDef_Behavior.java b/...ulesLanguage/source_gen/RatingRulesLanguage/behavior/BaseNumericFunctionDef_Behavior.java
@@ -0,0 +1,12 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support the legacy static direct method calls
+ */
+@Deprecated
+public class BaseNumericFunctionDef_Behavior {
+}
diff --git a/...ge/source_gen/RatingRulesLanguage/behavior/BaseNumericFunctionDef_BehaviorDescriptor.java b/...ge/source_gen/RatingRulesLanguage/behavior/BaseNumericFunctionDef_BehaviorDescriptor.java
@@ -0,0 +1,25 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+import jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor;
+import jetbrains.mps.lang.core.behavior.INamedConcept_BehaviorDescriptor;
+import org.jetbrains.mps.openapi.model.SNode;
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public abstract class BaseNumericFunctionDef_BehaviorDescriptor extends BaseConcept_BehaviorDescriptor implements INamedConcept_BehaviorDescriptor {
+  public String virtual_getFqName_1213877404258(SNode __thisNode__) {
+    return null;
+  }
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.BaseNumericFunctionDef";
+  }
+
+}
diff --git a/...e/source_gen/RatingRulesLanguage/behavior/BaseNumericFunctionDef__BehaviorDescriptor.java b/...e/source_gen/RatingRulesLanguage/behavior/BaseNumericFunctionDef__BehaviorDescriptor.java
@@ -0,0 +1,74 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+import jetbrains.mps.core.aspects.behaviour.BaseBHDescriptor;
+import org.jetbrains.mps.openapi.language.SAbstractConcept;
+import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory;
+import jetbrains.mps.core.aspects.behaviour.api.BehaviorRegistry;
+import jetbrains.mps.smodel.language.ConceptRegistry;
+import java.util.List;
+import jetbrains.mps.core.aspects.behaviour.api.SMethod;
+import java.util.Arrays;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.mps.openapi.model.SNode;
+import jetbrains.mps.core.aspects.behaviour.api.SConstructor;
+import org.jetbrains.annotations.Nullable;
+import jetbrains.mps.core.aspects.behaviour.api.BHMethodNotFoundException;
+
+public final class BaseNumericFunctionDef__BehaviorDescriptor extends BaseBHDescriptor {
+  private static final SAbstractConcept CONCEPT = MetaAdapterFactory.getConcept(0xfffd25317c948b3L, 0x9419ce44b0a40631L, 0x65d53d0d8db56f56L, "RatingRulesLanguage.structure.BaseNumericFunctionDef");
+  private static final BehaviorRegistry REGISTRY = ConceptRegistry.getInstance().getBehaviorRegistry();
+
+
+  private static final List<SMethod<?>> BH_METHODS = Arrays.<SMethod<?>>asList();
+
+  private static void ___init___(@NotNull SNode __thisNode__) {
+  }
+
+
+  /*package*/ BaseNumericFunctionDef__BehaviorDescriptor() {
+    super(REGISTRY);
+  }
+
+  @Override
+  protected void initNode(@NotNull SNode node, @NotNull SConstructor constructor, @Nullable Object[] parameters) {
+    ___init___(node);
+  }
+
+  @Override
+  protected <T> T invokeSpecial0(@NotNull SNode node, @NotNull SMethod<T> method, @Nullable Object[] parameters) {
+    int methodIndex = BH_METHODS.indexOf(method);
+    if (methodIndex < 0) {
+      throw new BHMethodNotFoundException(this, method);
+    }
+    switch (methodIndex) {
+      default:
+        throw new BHMethodNotFoundException(this, method);
+    }
+  }
+
+  @Override
+  protected <T> T invokeSpecial0(@NotNull SAbstractConcept concept, @NotNull SMethod<T> method, @Nullable Object[] parameters) {
+    int methodIndex = BH_METHODS.indexOf(method);
+    if (methodIndex < 0) {
+      throw new BHMethodNotFoundException(this, method);
+    }
+    switch (methodIndex) {
+      default:
+        throw new BHMethodNotFoundException(this, method);
+    }
+  }
+
+  @NotNull
+  @Override
+  public List<SMethod<?>> getDeclaredMethods() {
+    return BH_METHODS;
+  }
+
+  @NotNull
+  @Override
+  public SAbstractConcept getConcept() {
+    return CONCEPT;
+  }
+}
diff --git a/...tingRulesLanguage/behavior/BaseOccurencePatternCriteriaExpression_BehaviorDescriptor.java b/...tingRulesLanguage/behavior/BaseOccurencePatternCriteriaExpression_BehaviorDescriptor.java
@@ -0,0 +1,19 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public abstract class BaseOccurencePatternCriteriaExpression_BehaviorDescriptor extends LogicalExpression_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.BaseOccurencePatternCriteriaExpression";
+  }
+
+}
diff --git a/...ulesLanguage/source_gen/RatingRulesLanguage/behavior/BaseOperator_BehaviorDescriptor.java b/...ulesLanguage/source_gen/RatingRulesLanguage/behavior/BaseOperator_BehaviorDescriptor.java
@@ -0,0 +1,20 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+import jetbrains.mps.lang.core.behavior.IDontSubstituteByDefault_BehaviorDescriptor;
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public abstract class BaseOperator_BehaviorDescriptor extends RValue_BehaviorDescriptor implements IDontSubstituteByDefault_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.BaseOperator";
+  }
+
+}
diff --git a/...guage/source_gen/RatingRulesLanguage/behavior/BaseProductDataType_BehaviorDescriptor.java b/...guage/source_gen/RatingRulesLanguage/behavior/BaseProductDataType_BehaviorDescriptor.java
@@ -0,0 +1,19 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public class BaseProductDataType_BehaviorDescriptor extends NameIDPairTypedVarDeclaration_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.BaseProductDataType";
+  }
+
+}
diff --git a/...uage/source_gen/RatingRulesLanguage/behavior/BaseReferenceConcept_BehaviorDescriptor.java b/...uage/source_gen/RatingRulesLanguage/behavior/BaseReferenceConcept_BehaviorDescriptor.java
@@ -0,0 +1,20 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+import jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor;
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public abstract class BaseReferenceConcept_BehaviorDescriptor extends BaseConcept_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.BaseReferenceConcept";
+  }
+
+}
diff --git a/...lesLanguage/source_gen/RatingRulesLanguage/behavior/BaseRootNamedConceptOrg_Behavior.java b/...lesLanguage/source_gen/RatingRulesLanguage/behavior/BaseRootNamedConceptOrg_Behavior.java
@@ -0,0 +1,12 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support the legacy static direct method calls
+ */
+@Deprecated
+public class BaseRootNamedConceptOrg_Behavior {
+}
diff --git a/...e/source_gen/RatingRulesLanguage/behavior/BaseRootNamedConceptOrg_BehaviorDescriptor.java b/...e/source_gen/RatingRulesLanguage/behavior/BaseRootNamedConceptOrg_BehaviorDescriptor.java
@@ -0,0 +1,26 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+import jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor;
+import jetbrains.mps.lang.core.behavior.INamedConcept_BehaviorDescriptor;
+import jetbrains.mps.lang.core.behavior.IType_BehaviorDescriptor;
+import org.jetbrains.mps.openapi.model.SNode;
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public abstract class BaseRootNamedConceptOrg_BehaviorDescriptor extends BaseConcept_BehaviorDescriptor implements INamedConcept_BehaviorDescriptor, IType_BehaviorDescriptor {
+  public String virtual_getFqName_1213877404258(SNode __thisNode__) {
+    return null;
+  }
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.BaseRootNamedConceptOrg";
+  }
+
+}
diff --git a/.../source_gen/RatingRulesLanguage/behavior/BaseRootNamedConceptOrg__BehaviorDescriptor.java b/.../source_gen/RatingRulesLanguage/behavior/BaseRootNamedConceptOrg__BehaviorDescriptor.java
@@ -0,0 +1,74 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+import jetbrains.mps.core.aspects.behaviour.BaseBHDescriptor;
+import org.jetbrains.mps.openapi.language.SAbstractConcept;
+import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory;
+import jetbrains.mps.core.aspects.behaviour.api.BehaviorRegistry;
+import jetbrains.mps.smodel.language.ConceptRegistry;
+import java.util.List;
+import jetbrains.mps.core.aspects.behaviour.api.SMethod;
+import java.util.Arrays;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.mps.openapi.model.SNode;
+import jetbrains.mps.core.aspects.behaviour.api.SConstructor;
+import org.jetbrains.annotations.Nullable;
+import jetbrains.mps.core.aspects.behaviour.api.BHMethodNotFoundException;
+
+public final class BaseRootNamedConceptOrg__BehaviorDescriptor extends BaseBHDescriptor {
+  private static final SAbstractConcept CONCEPT = MetaAdapterFactory.getConcept(0xfffd25317c948b3L, 0x9419ce44b0a40631L, 0x6773d363de8e8fd1L, "RatingRulesLanguage.structure.BaseRootNamedConceptOrg");
+  private static final BehaviorRegistry REGISTRY = ConceptRegistry.getInstance().getBehaviorRegistry();
+
+
+  private static final List<SMethod<?>> BH_METHODS = Arrays.<SMethod<?>>asList();
+
+  private static void ___init___(@NotNull SNode __thisNode__) {
+  }
+
+
+  /*package*/ BaseRootNamedConceptOrg__BehaviorDescriptor() {
+    super(REGISTRY);
+  }
+
+  @Override
+  protected void initNode(@NotNull SNode node, @NotNull SConstructor constructor, @Nullable Object[] parameters) {
+    ___init___(node);
+  }
+
+  @Override
+  protected <T> T invokeSpecial0(@NotNull SNode node, @NotNull SMethod<T> method, @Nullable Object[] parameters) {
+    int methodIndex = BH_METHODS.indexOf(method);
+    if (methodIndex < 0) {
+      throw new BHMethodNotFoundException(this, method);
+    }
+    switch (methodIndex) {
+      default:
+        throw new BHMethodNotFoundException(this, method);
+    }
+  }
+
+  @Override
+  protected <T> T invokeSpecial0(@NotNull SAbstractConcept concept, @NotNull SMethod<T> method, @Nullable Object[] parameters) {
+    int methodIndex = BH_METHODS.indexOf(method);
+    if (methodIndex < 0) {
+      throw new BHMethodNotFoundException(this, method);
+    }
+    switch (methodIndex) {
+      default:
+        throw new BHMethodNotFoundException(this, method);
+    }
+  }
+
+  @NotNull
+  @Override
+  public List<SMethod<?>> getDeclaredMethods() {
+    return BH_METHODS;
+  }
+
+  @NotNull
+  @Override
+  public SAbstractConcept getConcept() {
+    return CONCEPT;
+  }
+}
diff --git a/...en/RatingRulesLanguage/behavior/BaseSystemDefinedCriteriaFunction_BehaviorDescriptor.java b/...en/RatingRulesLanguage/behavior/BaseSystemDefinedCriteriaFunction_BehaviorDescriptor.java
@@ -0,0 +1,19 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public abstract class BaseSystemDefinedCriteriaFunction_BehaviorDescriptor extends BaseCriteriaExpression_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.BaseSystemDefinedCriteriaFunction";
+  }
+
+}
diff --git a/...anguage/behavior/BaseSystemDefinedLocationRelatedCriteriaFunction_BehaviorDescriptor.java b/...anguage/behavior/BaseSystemDefinedLocationRelatedCriteriaFunction_BehaviorDescriptor.java
@@ -0,0 +1,19 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public abstract class BaseSystemDefinedLocationRelatedCriteriaFunction_BehaviorDescriptor extends BaseSystemDefinedCriteriaFunction_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.BaseSystemDefinedLocationRelatedCriteriaFunction";
+  }
+
+}
diff --git a/...ngRulesLanguage/behavior/BaseSystemDefinedTransferRelatedCriteria_BehaviorDescriptor.java b/...ngRulesLanguage/behavior/BaseSystemDefinedTransferRelatedCriteria_BehaviorDescriptor.java
@@ -0,0 +1,19 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public abstract class BaseSystemDefinedTransferRelatedCriteria_BehaviorDescriptor extends BaseSystemDefinedCriteriaFunction_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.BaseSystemDefinedTransferRelatedCriteria";
+  }
+
+}
diff --git a/...uage/source_gen/RatingRulesLanguage/behavior/BaseUDNamedCriteriaDeclaration_Behavior.java b/...uage/source_gen/RatingRulesLanguage/behavior/BaseUDNamedCriteriaDeclaration_Behavior.java
@@ -0,0 +1,12 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support the legacy static direct method calls
+ */
+@Deprecated
+public class BaseUDNamedCriteriaDeclaration_Behavior {
+}
diff --git a/...e_gen/RatingRulesLanguage/behavior/BaseUDNamedCriteriaDeclaration_BehaviorDescriptor.java b/...e_gen/RatingRulesLanguage/behavior/BaseUDNamedCriteriaDeclaration_BehaviorDescriptor.java
@@ -0,0 +1,24 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+import jetbrains.mps.lang.core.behavior.INamedConcept_BehaviorDescriptor;
+import org.jetbrains.mps.openapi.model.SNode;
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public abstract class BaseUDNamedCriteriaDeclaration_BehaviorDescriptor extends BaseCriteriaDeclaration_BehaviorDescriptor implements INamedConcept_BehaviorDescriptor {
+  public String virtual_getFqName_1213877404258(SNode __thisNode__) {
+    return null;
+  }
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.BaseUDNamedCriteriaDeclaration";
+  }
+
+}
diff --git a/..._gen/RatingRulesLanguage/behavior/BaseUDNamedCriteriaDeclaration__BehaviorDescriptor.java b/..._gen/RatingRulesLanguage/behavior/BaseUDNamedCriteriaDeclaration__BehaviorDescriptor.java
@@ -0,0 +1,77 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+import jetbrains.mps.core.aspects.behaviour.BaseBHDescriptor;
+import org.jetbrains.mps.openapi.language.SAbstractConcept;
+import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory;
+import jetbrains.mps.core.aspects.behaviour.api.BehaviorRegistry;
+import jetbrains.mps.smodel.language.ConceptRegistry;
+import java.util.List;
+import jetbrains.mps.core.aspects.behaviour.api.SMethod;
+import java.util.Arrays;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.mps.openapi.model.SNode;
+import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations;
+import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations;
+import jetbrains.mps.core.aspects.behaviour.api.SConstructor;
+import org.jetbrains.annotations.Nullable;
+import jetbrains.mps.core.aspects.behaviour.api.BHMethodNotFoundException;
+
+public final class BaseUDNamedCriteriaDeclaration__BehaviorDescriptor extends BaseBHDescriptor {
+  private static final SAbstractConcept CONCEPT = MetaAdapterFactory.getConcept(0xfffd25317c948b3L, 0x9419ce44b0a40631L, 0x7627b8e69aa84752L, "RatingRulesLanguage.structure.BaseUDNamedCriteriaDeclaration");
+  private static final BehaviorRegistry REGISTRY = ConceptRegistry.getInstance().getBehaviorRegistry();
+
+
+  private static final List<SMethod<?>> BH_METHODS = Arrays.<SMethod<?>>asList();
+
+  private static void ___init___(@NotNull SNode __thisNode__) {
+    SLinkOperations.setNewChild(__thisNode__, MetaAdapterFactory.getContainmentLink(0xfffd25317c948b3L, 0x9419ce44b0a40631L, 0x7627b8e69aa84752L, 0x30491a7e2ae07067L, "type"), SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0xfffd25317c948b3L, 0x9419ce44b0a40631L, 0x4be494590ea1a73cL, "RatingRulesLanguage.structure.BooleanType")));
+  }
+
+
+  /*package*/ BaseUDNamedCriteriaDeclaration__BehaviorDescriptor() {
+    super(REGISTRY);
+  }
+
+  @Override
+  protected void initNode(@NotNull SNode node, @NotNull SConstructor constructor, @Nullable Object[] parameters) {
+    ___init___(node);
+  }
+
+  @Override
+  protected <T> T invokeSpecial0(@NotNull SNode node, @NotNull SMethod<T> method, @Nullable Object[] parameters) {
+    int methodIndex = BH_METHODS.indexOf(method);
+    if (methodIndex < 0) {
+      throw new BHMethodNotFoundException(this, method);
+    }
+    switch (methodIndex) {
+      default:
+        throw new BHMethodNotFoundException(this, method);
+    }
+  }
+
+  @Override
+  protected <T> T invokeSpecial0(@NotNull SAbstractConcept concept, @NotNull SMethod<T> method, @Nullable Object[] parameters) {
+    int methodIndex = BH_METHODS.indexOf(method);
+    if (methodIndex < 0) {
+      throw new BHMethodNotFoundException(this, method);
+    }
+    switch (methodIndex) {
+      default:
+        throw new BHMethodNotFoundException(this, method);
+    }
+  }
+
+  @NotNull
+  @Override
+  public List<SMethod<?>> getDeclaredMethods() {
+    return BH_METHODS;
+  }
+
+  @NotNull
+  @Override
+  public SAbstractConcept getConcept() {
+    return CONCEPT;
+  }
+}
diff --git a/...age/source_gen/RatingRulesLanguage/behavior/BaseUDNamedIDCriteriaDefinition_Behavior.java b/...age/source_gen/RatingRulesLanguage/behavior/BaseUDNamedIDCriteriaDefinition_Behavior.java
@@ -0,0 +1,12 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support the legacy static direct method calls
+ */
+@Deprecated
+public class BaseUDNamedIDCriteriaDefinition_Behavior {
+}
diff --git a/..._gen/RatingRulesLanguage/behavior/BaseUDNamedIDCriteriaDefinition_BehaviorDescriptor.java b/..._gen/RatingRulesLanguage/behavior/BaseUDNamedIDCriteriaDefinition_BehaviorDescriptor.java
@@ -0,0 +1,19 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public abstract class BaseUDNamedIDCriteriaDefinition_BehaviorDescriptor extends BaseUDNamedCriteriaDeclaration_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.BaseUDNamedIDCriteriaDefinition";
+  }
+
+}
diff --git a/...gen/RatingRulesLanguage/behavior/BaseUDNamedIDCriteriaDefinition__BehaviorDescriptor.java b/...gen/RatingRulesLanguage/behavior/BaseUDNamedIDCriteriaDefinition__BehaviorDescriptor.java
@@ -0,0 +1,76 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+import jetbrains.mps.core.aspects.behaviour.BaseBHDescriptor;
+import org.jetbrains.mps.openapi.language.SAbstractConcept;
+import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory;
+import jetbrains.mps.core.aspects.behaviour.api.BehaviorRegistry;
+import jetbrains.mps.smodel.language.ConceptRegistry;
+import java.util.List;
+import jetbrains.mps.core.aspects.behaviour.api.SMethod;
+import java.util.Arrays;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.mps.openapi.model.SNode;
+import jetbrains.mps.lang.smodel.generator.smodelAdapter.SPropertyOperations;
+import jetbrains.mps.core.aspects.behaviour.api.SConstructor;
+import org.jetbrains.annotations.Nullable;
+import jetbrains.mps.core.aspects.behaviour.api.BHMethodNotFoundException;
+
+public final class BaseUDNamedIDCriteriaDefinition__BehaviorDescriptor extends BaseBHDescriptor {
+  private static final SAbstractConcept CONCEPT = MetaAdapterFactory.getConcept(0xfffd25317c948b3L, 0x9419ce44b0a40631L, 0x7627b8e69aa84759L, "RatingRulesLanguage.structure.BaseUDNamedIDCriteriaDefinition");
+  private static final BehaviorRegistry REGISTRY = ConceptRegistry.getInstance().getBehaviorRegistry();
+
+
+  private static final List<SMethod<?>> BH_METHODS = Arrays.<SMethod<?>>asList();
+
+  private static void ___init___(@NotNull SNode __thisNode__) {
+    SPropertyOperations.set(__thisNode__, MetaAdapterFactory.getProperty(0xfffd25317c948b3L, 0x9419ce44b0a40631L, 0x7627b8e69aa84759L, 0x7627b8e69aa8475aL, "ID"), "" + (-1));
+  }
+
+
+  /*package*/ BaseUDNamedIDCriteriaDefinition__BehaviorDescriptor() {
+    super(REGISTRY);
+  }
+
+  @Override
+  protected void initNode(@NotNull SNode node, @NotNull SConstructor constructor, @Nullable Object[] parameters) {
+    ___init___(node);
+  }
+
+  @Override
+  protected <T> T invokeSpecial0(@NotNull SNode node, @NotNull SMethod<T> method, @Nullable Object[] parameters) {
+    int methodIndex = BH_METHODS.indexOf(method);
+    if (methodIndex < 0) {
+      throw new BHMethodNotFoundException(this, method);
+    }
+    switch (methodIndex) {
+      default:
+        throw new BHMethodNotFoundException(this, method);
+    }
+  }
+
+  @Override
+  protected <T> T invokeSpecial0(@NotNull SAbstractConcept concept, @NotNull SMethod<T> method, @Nullable Object[] parameters) {
+    int methodIndex = BH_METHODS.indexOf(method);
+    if (methodIndex < 0) {
+      throw new BHMethodNotFoundException(this, method);
+    }
+    switch (methodIndex) {
+      default:
+        throw new BHMethodNotFoundException(this, method);
+    }
+  }
+
+  @NotNull
+  @Override
+  public List<SMethod<?>> getDeclaredMethods() {
+    return BH_METHODS;
+  }
+
+  @NotNull
+  @Override
+  public SAbstractConcept getConcept() {
+    return CONCEPT;
+  }
+}
diff --git a/...nguage/source_gen/RatingRulesLanguage/behavior/BaseUDTCriteriaRef_BehaviorDescriptor.java b/...nguage/source_gen/RatingRulesLanguage/behavior/BaseUDTCriteriaRef_BehaviorDescriptor.java
@@ -0,0 +1,19 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public abstract class BaseUDTCriteriaRef_BehaviorDescriptor extends BaseCriteriaExpression_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.BaseUDTCriteriaRef";
+  }
+
+}
diff --git a/...anguage/source_gen/RatingRulesLanguage/behavior/BaseUnaryOperator_BehaviorDescriptor.java b/...anguage/source_gen/RatingRulesLanguage/behavior/BaseUnaryOperator_BehaviorDescriptor.java
@@ -0,0 +1,20 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+import jetbrains.mps.lang.core.behavior.IDontSubstituteByDefault_BehaviorDescriptor;
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public abstract class BaseUnaryOperator_BehaviorDescriptor extends RValue_BehaviorDescriptor implements IDontSubstituteByDefault_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.BaseUnaryOperator";
+  }
+
+}
diff --git a/...sLanguage/source_gen/RatingRulesLanguage/behavior/BaseVarDataType_BehaviorDescriptor.java b/...sLanguage/source_gen/RatingRulesLanguage/behavior/BaseVarDataType_BehaviorDescriptor.java
@@ -0,0 +1,20 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+import jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor;
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public abstract class BaseVarDataType_BehaviorDescriptor extends BaseConcept_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.BaseVarDataType";
+  }
+
+}
diff --git a/...RatingRulesLanguage/source_gen/RatingRulesLanguage/behavior/BehaviorAspectDescriptor.java b/...RatingRulesLanguage/source_gen/RatingRulesLanguage/behavior/BehaviorAspectDescriptor.java
@@ -0,0 +1,157 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+import jetbrains.mps.core.aspects.behaviour.BaseBehaviorAspectDescriptor;
+import jetbrains.mps.core.aspects.behaviour.api.BHDescriptor;
+import jetbrains.mps.smodel.runtime.BehaviorDescriptor;
+import jetbrains.mps.smodel.runtime.interpreted.BehaviorAspectInterpreted;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.NotNull;
+import jetbrains.mps.smodel.adapter.ids.SConceptId;
+import java.util.Arrays;
+
+public final class BehaviorAspectDescriptor extends BaseBehaviorAspectDescriptor {
+  private final BHDescriptor myServiceProvider__BehaviorDescriptor = new ServiceProvider__BehaviorDescriptor();
+  private final BHDescriptor myModOfTransportation__BehaviorDescriptor = new ModOfTransportation__BehaviorDescriptor();
+  private final BHDescriptor myRoute__BehaviorDescriptor = new Route__BehaviorDescriptor();
+  private final BHDescriptor myWeekDay__BehaviorDescriptor = new WeekDay__BehaviorDescriptor();
+  private final BHDescriptor myRecurrenceCriteriaDef__BehaviorDescriptor = new RecurrenceCriteriaDef__BehaviorDescriptor();
+  private final BHDescriptor myConcessionDeclaration__BehaviorDescriptor = new ConcessionDeclaration__BehaviorDescriptor();
+  private final BHDescriptor myProductDeclaration__BehaviorDescriptor = new ProductDeclaration__BehaviorDescriptor();
+  private final BHDescriptor myProductFamilyDeclaration__BehaviorDescriptor = new ProductFamilyDeclaration__BehaviorDescriptor();
+  private final BHDescriptor myLocationDeclaration__BehaviorDescriptor = new LocationDeclaration__BehaviorDescriptor();
+  private final BHDescriptor myLocationReference__BehaviorDescriptor = new LocationReference__BehaviorDescriptor();
+  private final BHDescriptor myBaseConceptOrgCollectionBlock__BehaviorDescriptor = new BaseConceptOrgCollectionBlock__BehaviorDescriptor();
+  private final BHDescriptor myBaseConceptOrgCollectionWithUniqueID__BehaviorDescriptor = new BaseConceptOrgCollectionWithUniqueID__BehaviorDescriptor();
+  private final BHDescriptor myBaseFloatFunctionDefinition__BehaviorDescriptor = new BaseFloatFunctionDefinition__BehaviorDescriptor();
+  private final BHDescriptor myUDFReference__BehaviorDescriptor = new UDFReference__BehaviorDescriptor();
+  private final BHDescriptor myUDCReference__BehaviorDescriptor = new UDCReference__BehaviorDescriptor();
+  private final BHDescriptor myConstantFloatValue__BehaviorDescriptor = new ConstantFloatValue__BehaviorDescriptor();
+  private final BHDescriptor myBaseConstant__BehaviorDescriptor = new BaseConstant__BehaviorDescriptor();
+  private final BHDescriptor myConstantTypedVarDeclaration__BehaviorDescriptor = new ConstantTypedVarDeclaration__BehaviorDescriptor();
+  private final BHDescriptor myConstantFloatVarDeclaration__BehaviorDescriptor = new ConstantFloatVarDeclaration__BehaviorDescriptor();
+  private final BHDescriptor myConstantPointToPointVarDeclaration__BehaviorDescriptor = new ConstantPointToPointVarDeclaration__BehaviorDescriptor();
+  private final BHDescriptor myBaseNumericFunctionDef__BehaviorDescriptor = new BaseNumericFunctionDef__BehaviorDescriptor();
+  private final BHDescriptor myFloatFarePriceCalculationFct__BehaviorDescriptor = new FloatFarePriceCalculationFct__BehaviorDescriptor();
+  private final BHDescriptor myBaseRootNamedConceptOrg__BehaviorDescriptor = new BaseRootNamedConceptOrg__BehaviorDescriptor();
+  private final BHDescriptor myFareRuleDefinition__BehaviorDescriptor = new FareRuleDefinition__BehaviorDescriptor();
+  private final BHDescriptor myBaseUDNamedCriteriaDeclaration__BehaviorDescriptor = new BaseUDNamedCriteriaDeclaration__BehaviorDescriptor();
+  private final BHDescriptor myBaseUDNamedIDCriteriaDefinition__BehaviorDescriptor = new BaseUDNamedIDCriteriaDefinition__BehaviorDescriptor();
+  private final BHDescriptor myConcessionSelectionCriteriaDef__BehaviorDescriptor = new ConcessionSelectionCriteriaDef__BehaviorDescriptor();
+  private final BHDescriptor myCrtLifespanValidationCriteria__BehaviorDescriptor = new CrtLifespanValidationCriteria__BehaviorDescriptor();
+  private final BHDescriptor myConcessionSelectionCriterias__BehaviorDescriptor = new ConcessionSelectionCriterias__BehaviorDescriptor();
+  private final BHDescriptor myProductSelectionCriteriaDef__BehaviorDescriptor = new ProductSelectionCriteriaDef__BehaviorDescriptor();
+
+  private final long[] myConceptBehaviorIds;
+
+  public BehaviorAspectDescriptor() {
+    myConceptBehaviorIds = new long[30];
+    myConceptBehaviorIds[0] = 0x9a73ffb2d9f2df5L;
+    myConceptBehaviorIds[1] = 0x9a73ffb2d9f2e19L;
+    myConceptBehaviorIds[2] = 0x9a73ffb2da4382dL;
+    myConceptBehaviorIds[3] = 0x9a73ffb2da5a58cL;
+    myConceptBehaviorIds[4] = 0x9a73ffb2da5a88fL;
+    myConceptBehaviorIds[5] = 0x9a73ffb2db09a1fL;
+    myConceptBehaviorIds[6] = 0x9a73ffb2db09a5aL;
+    myConceptBehaviorIds[7] = 0x9a73ffb2db09a76L;
+    myConceptBehaviorIds[8] = 0x9a73ffb2db09c52L;
+    myConceptBehaviorIds[9] = 0x9a73ffb2db0f562L;
+    myConceptBehaviorIds[10] = 0x176a094254900dd2L;
+    myConceptBehaviorIds[11] = 0x1c02562723d52abeL;
+    myConceptBehaviorIds[12] = 0x30491a7e2ad61471L;
+    myConceptBehaviorIds[13] = 0x30491a7e2ade5d01L;
+    myConceptBehaviorIds[14] = 0x30491a7e2ae06c3eL;
+    myConceptBehaviorIds[15] = 0x59a528db6b3d9dfaL;
+    myConceptBehaviorIds[16] = 0x59a528db6b3d9e09L;
+    myConceptBehaviorIds[17] = 0x59a528db6b5188cfL;
+    myConceptBehaviorIds[18] = 0x59a528db6b5b5e5fL;
+    myConceptBehaviorIds[19] = 0x59a528db6b5b5e60L;
+    myConceptBehaviorIds[20] = 0x65d53d0d8db56f56L;
+    myConceptBehaviorIds[21] = 0x65d53d0d8db70fffL;
+    myConceptBehaviorIds[22] = 0x6773d363de8e8fd1L;
+    myConceptBehaviorIds[23] = 0x6773d363de94c3dbL;
+    myConceptBehaviorIds[24] = 0x7627b8e69aa84752L;
+    myConceptBehaviorIds[25] = 0x7627b8e69aa84759L;
+    myConceptBehaviorIds[26] = 0x7627b8e69aaa7fe3L;
+    myConceptBehaviorIds[27] = 0x7627b8e69aaa8105L;
+    myConceptBehaviorIds[28] = 0x7627b8e69aab7381L;
+    myConceptBehaviorIds[29] = 0x7627b8e69aab741bL;
+  }
+
+  @Deprecated
+  @Override
+  public BehaviorDescriptor getDescriptor(String fqName) {
+    return BehaviorAspectInterpreted.getInstance().getDescriptor(fqName);
+  }
+
+  @Nullable
+  @Override
+  public BHDescriptor getDescriptor(@NotNull SConceptId conceptId) {
+    int behaviorIndex = Arrays.binarySearch(myConceptBehaviorIds, conceptId.getIdValue());
+    switch (behaviorIndex) {
+      case 0:
+        return myServiceProvider__BehaviorDescriptor;
+      case 1:
+        return myModOfTransportation__BehaviorDescriptor;
+      case 2:
+        return myRoute__BehaviorDescriptor;
+      case 3:
+        return myWeekDay__BehaviorDescriptor;
+      case 4:
+        return myRecurrenceCriteriaDef__BehaviorDescriptor;
+      case 5:
+        return myConcessionDeclaration__BehaviorDescriptor;
+      case 6:
+        return myProductDeclaration__BehaviorDescriptor;
+      case 7:
+        return myProductFamilyDeclaration__BehaviorDescriptor;
+      case 8:
+        return myLocationDeclaration__BehaviorDescriptor;
+      case 9:
+        return myLocationReference__BehaviorDescriptor;
+      case 10:
+        return myBaseConceptOrgCollectionBlock__BehaviorDescriptor;
+      case 11:
+        return myBaseConceptOrgCollectionWithUniqueID__BehaviorDescriptor;
+      case 12:
+        return myBaseFloatFunctionDefinition__BehaviorDescriptor;
+      case 13:
+        return myUDFReference__BehaviorDescriptor;
+      case 14:
+        return myUDCReference__BehaviorDescriptor;
+      case 15:
+        return myConstantFloatValue__BehaviorDescriptor;
+      case 16:
+        return myBaseConstant__BehaviorDescriptor;
+      case 17:
+        return myConstantTypedVarDeclaration__BehaviorDescriptor;
+      case 18:
+        return myConstantFloatVarDeclaration__BehaviorDescriptor;
+      case 19:
+        return myConstantPointToPointVarDeclaration__BehaviorDescriptor;
+      case 20:
+        return myBaseNumericFunctionDef__BehaviorDescriptor;
+      case 21:
+        return myFloatFarePriceCalculationFct__BehaviorDescriptor;
+      case 22:
+        return myBaseRootNamedConceptOrg__BehaviorDescriptor;
+      case 23:
+        return myFareRuleDefinition__BehaviorDescriptor;
+      case 24:
+        return myBaseUDNamedCriteriaDeclaration__BehaviorDescriptor;
+      case 25:
+        return myBaseUDNamedIDCriteriaDefinition__BehaviorDescriptor;
+      case 26:
+        return myConcessionSelectionCriteriaDef__BehaviorDescriptor;
+      case 27:
+        return myCrtLifespanValidationCriteria__BehaviorDescriptor;
+      case 28:
+        return myConcessionSelectionCriterias__BehaviorDescriptor;
+      case 29:
+        return myProductSelectionCriteriaDef__BehaviorDescriptor;
+      default:
+        return null;
+    }
+  }
+}
diff --git a/...RulesLanguage/source_gen/RatingRulesLanguage/behavior/BooleanType_BehaviorDescriptor.java b/...RulesLanguage/source_gen/RatingRulesLanguage/behavior/BooleanType_BehaviorDescriptor.java
@@ -0,0 +1,19 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public class BooleanType_BehaviorDescriptor extends BaseVarDataType_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.BooleanType";
+  }
+
+}
diff --git a/...RulesLanguage/source_gen/RatingRulesLanguage/behavior/ConcessionDeclaration_Behavior.java b/...RulesLanguage/source_gen/RatingRulesLanguage/behavior/ConcessionDeclaration_Behavior.java
@@ -0,0 +1,12 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support the legacy static direct method calls
+ */
+@Deprecated
+public class ConcessionDeclaration_Behavior {
+}
diff --git a/...age/source_gen/RatingRulesLanguage/behavior/ConcessionDeclaration_BehaviorDescriptor.java b/...age/source_gen/RatingRulesLanguage/behavior/ConcessionDeclaration_BehaviorDescriptor.java
@@ -0,0 +1,19 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public class ConcessionDeclaration_BehaviorDescriptor extends NameIDPairTypedVarDeclaration_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.ConcessionDeclaration";
+  }
+
+}
diff --git a/...ge/source_gen/RatingRulesLanguage/behavior/ConcessionDeclaration__BehaviorDescriptor.java b/...ge/source_gen/RatingRulesLanguage/behavior/ConcessionDeclaration__BehaviorDescriptor.java
@@ -0,0 +1,77 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+import jetbrains.mps.core.aspects.behaviour.BaseBHDescriptor;
+import org.jetbrains.mps.openapi.language.SAbstractConcept;
+import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory;
+import jetbrains.mps.core.aspects.behaviour.api.BehaviorRegistry;
+import jetbrains.mps.smodel.language.ConceptRegistry;
+import java.util.List;
+import jetbrains.mps.core.aspects.behaviour.api.SMethod;
+import java.util.Arrays;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.mps.openapi.model.SNode;
+import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations;
+import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations;
+import jetbrains.mps.core.aspects.behaviour.api.SConstructor;
+import org.jetbrains.annotations.Nullable;
+import jetbrains.mps.core.aspects.behaviour.api.BHMethodNotFoundException;
+
+public final class ConcessionDeclaration__BehaviorDescriptor extends BaseBHDescriptor {
+  private static final SAbstractConcept CONCEPT = MetaAdapterFactory.getConcept(0xfffd25317c948b3L, 0x9419ce44b0a40631L, 0x9a73ffb2db09a1fL, "RatingRulesLanguage.structure.ConcessionDeclaration");
+  private static final BehaviorRegistry REGISTRY = ConceptRegistry.getInstance().getBehaviorRegistry();
+
+
+  private static final List<SMethod<?>> BH_METHODS = Arrays.<SMethod<?>>asList();
+
+  private static void ___init___(@NotNull SNode __thisNode__) {
+    SLinkOperations.setNewChild(__thisNode__, MetaAdapterFactory.getContainmentLink(0xfffd25317c948b3L, 0x9419ce44b0a40631L, 0x9a73ffb2d9f2e13L, 0x4be494590ea1cc59L, "type"), SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0xfffd25317c948b3L, 0x9419ce44b0a40631L, 0x4be494590ea7fdedL, "RatingRulesLanguage.structure.ConcessionType")));
+  }
+
+
+  /*package*/ ConcessionDeclaration__BehaviorDescriptor() {
+    super(REGISTRY);
+  }
+
+  @Override
+  protected void initNode(@NotNull SNode node, @NotNull SConstructor constructor, @Nullable Object[] parameters) {
+    ___init___(node);
+  }
+
+  @Override
+  protected <T> T invokeSpecial0(@NotNull SNode node, @NotNull SMethod<T> method, @Nullable Object[] parameters) {
+    int methodIndex = BH_METHODS.indexOf(method);
+    if (methodIndex < 0) {
+      throw new BHMethodNotFoundException(this, method);
+    }
+    switch (methodIndex) {
+      default:
+        throw new BHMethodNotFoundException(this, method);
+    }
+  }
+
+  @Override
+  protected <T> T invokeSpecial0(@NotNull SAbstractConcept concept, @NotNull SMethod<T> method, @Nullable Object[] parameters) {
+    int methodIndex = BH_METHODS.indexOf(method);
+    if (methodIndex < 0) {
+      throw new BHMethodNotFoundException(this, method);
+    }
+    switch (methodIndex) {
+      default:
+        throw new BHMethodNotFoundException(this, method);
+    }
+  }
+
+  @NotNull
+  @Override
+  public List<SMethod<?>> getDeclaredMethods() {
+    return BH_METHODS;
+  }
+
+  @NotNull
+  @Override
+  public SAbstractConcept getConcept() {
+    return CONCEPT;
+  }
+}
diff --git a/...uage/source_gen/RatingRulesLanguage/behavior/ConcessionSelectionCriteriaDef_Behavior.java b/...uage/source_gen/RatingRulesLanguage/behavior/ConcessionSelectionCriteriaDef_Behavior.java
@@ -0,0 +1,12 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support the legacy static direct method calls
+ */
+@Deprecated
+public class ConcessionSelectionCriteriaDef_Behavior {
+}
diff --git a/...e_gen/RatingRulesLanguage/behavior/ConcessionSelectionCriteriaDef_BehaviorDescriptor.java b/...e_gen/RatingRulesLanguage/behavior/ConcessionSelectionCriteriaDef_BehaviorDescriptor.java
@@ -0,0 +1,19 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public class ConcessionSelectionCriteriaDef_BehaviorDescriptor extends BaseUDNamedIDCriteriaDefinition_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.ConcessionSelectionCriteriaDef";
+  }
+
+}
diff --git a/..._gen/RatingRulesLanguage/behavior/ConcessionSelectionCriteriaDef__BehaviorDescriptor.java b/..._gen/RatingRulesLanguage/behavior/ConcessionSelectionCriteriaDef__BehaviorDescriptor.java
@@ -0,0 +1,78 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+import jetbrains.mps.core.aspects.behaviour.BaseBHDescriptor;
+import org.jetbrains.mps.openapi.language.SAbstractConcept;
+import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory;
+import jetbrains.mps.core.aspects.behaviour.api.BehaviorRegistry;
+import jetbrains.mps.smodel.language.ConceptRegistry;
+import java.util.List;
+import jetbrains.mps.core.aspects.behaviour.api.SMethod;
+import java.util.Arrays;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.mps.openapi.model.SNode;
+import jetbrains.mps.lang.smodel.generator.smodelAdapter.SPropertyOperations;
+import jetbrains.mps.core.aspects.behaviour.api.SConstructor;
+import org.jetbrains.annotations.Nullable;
+import jetbrains.mps.core.aspects.behaviour.api.BHMethodNotFoundException;
+
+public final class ConcessionSelectionCriteriaDef__BehaviorDescriptor extends BaseBHDescriptor {
+  private static final SAbstractConcept CONCEPT = MetaAdapterFactory.getConcept(0xfffd25317c948b3L, 0x9419ce44b0a40631L, 0x7627b8e69aaa7fe3L, "RatingRulesLanguage.structure.ConcessionSelectionCriteriaDef");
+  private static final BehaviorRegistry REGISTRY = ConceptRegistry.getInstance().getBehaviorRegistry();
+
+
+  private static final List<SMethod<?>> BH_METHODS = Arrays.<SMethod<?>>asList();
+
+  private static void ___init___(@NotNull SNode __thisNode__) {
+    // Initialize teh node ID value 
+    SPropertyOperations.set(__thisNode__, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "<NameNotSetYet>");
+
+  }
+
+
+  /*package*/ ConcessionSelectionCriteriaDef__BehaviorDescriptor() {
+    super(REGISTRY);
+  }
+
+  @Override
+  protected void initNode(@NotNull SNode node, @NotNull SConstructor constructor, @Nullable Object[] parameters) {
+    ___init___(node);
+  }
+
+  @Override
+  protected <T> T invokeSpecial0(@NotNull SNode node, @NotNull SMethod<T> method, @Nullable Object[] parameters) {
+    int methodIndex = BH_METHODS.indexOf(method);
+    if (methodIndex < 0) {
+      throw new BHMethodNotFoundException(this, method);
+    }
+    switch (methodIndex) {
+      default:
+        throw new BHMethodNotFoundException(this, method);
+    }
+  }
+
+  @Override
+  protected <T> T invokeSpecial0(@NotNull SAbstractConcept concept, @NotNull SMethod<T> method, @Nullable Object[] parameters) {
+    int methodIndex = BH_METHODS.indexOf(method);
+    if (methodIndex < 0) {
+      throw new BHMethodNotFoundException(this, method);
+    }
+    switch (methodIndex) {
+      default:
+        throw new BHMethodNotFoundException(this, method);
+    }
+  }
+
+  @NotNull
+  @Override
+  public List<SMethod<?>> getDeclaredMethods() {
+    return BH_METHODS;
+  }
+
+  @NotNull
+  @Override
+  public SAbstractConcept getConcept() {
+    return CONCEPT;
+  }
+}
diff --git a/...nguage/source_gen/RatingRulesLanguage/behavior/ConcessionSelectionCriterias_Behavior.java b/...nguage/source_gen/RatingRulesLanguage/behavior/ConcessionSelectionCriterias_Behavior.java
@@ -0,0 +1,12 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support the legacy static direct method calls
+ */
+@Deprecated
+public class ConcessionSelectionCriterias_Behavior {
+}
diff --git a/...rce_gen/RatingRulesLanguage/behavior/ConcessionSelectionCriterias_BehaviorDescriptor.java b/...rce_gen/RatingRulesLanguage/behavior/ConcessionSelectionCriterias_BehaviorDescriptor.java
@@ -0,0 +1,19 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public class ConcessionSelectionCriterias_BehaviorDescriptor extends BaseConceptOrgCollectionWithUniqueID_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.ConcessionSelectionCriterias";
+  }
+
+}
diff --git a/...ce_gen/RatingRulesLanguage/behavior/ConcessionSelectionCriterias__BehaviorDescriptor.java b/...ce_gen/RatingRulesLanguage/behavior/ConcessionSelectionCriterias__BehaviorDescriptor.java
@@ -0,0 +1,74 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+import jetbrains.mps.core.aspects.behaviour.BaseBHDescriptor;
+import org.jetbrains.mps.openapi.language.SAbstractConcept;
+import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory;
+import jetbrains.mps.core.aspects.behaviour.api.BehaviorRegistry;
+import jetbrains.mps.smodel.language.ConceptRegistry;
+import java.util.List;
+import jetbrains.mps.core.aspects.behaviour.api.SMethod;
+import java.util.Arrays;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.mps.openapi.model.SNode;
+import jetbrains.mps.core.aspects.behaviour.api.SConstructor;
+import org.jetbrains.annotations.Nullable;
+import jetbrains.mps.core.aspects.behaviour.api.BHMethodNotFoundException;
+
+public final class ConcessionSelectionCriterias__BehaviorDescriptor extends BaseBHDescriptor {
+  private static final SAbstractConcept CONCEPT = MetaAdapterFactory.getConcept(0xfffd25317c948b3L, 0x9419ce44b0a40631L, 0x7627b8e69aab7381L, "RatingRulesLanguage.structure.ConcessionSelectionCriterias");
+  private static final BehaviorRegistry REGISTRY = ConceptRegistry.getInstance().getBehaviorRegistry();
+
+
+  private static final List<SMethod<?>> BH_METHODS = Arrays.<SMethod<?>>asList();
+
+  private static void ___init___(@NotNull SNode __thisNode__) {
+  }
+
+
+  /*package*/ ConcessionSelectionCriterias__BehaviorDescriptor() {
+    super(REGISTRY);
+  }
+
+  @Override
+  protected void initNode(@NotNull SNode node, @NotNull SConstructor constructor, @Nullable Object[] parameters) {
+    ___init___(node);
+  }
+
+  @Override
+  protected <T> T invokeSpecial0(@NotNull SNode node, @NotNull SMethod<T> method, @Nullable Object[] parameters) {
+    int methodIndex = BH_METHODS.indexOf(method);
+    if (methodIndex < 0) {
+      throw new BHMethodNotFoundException(this, method);
+    }
+    switch (methodIndex) {
+      default:
+        throw new BHMethodNotFoundException(this, method);
+    }
+  }
+
+  @Override
+  protected <T> T invokeSpecial0(@NotNull SAbstractConcept concept, @NotNull SMethod<T> method, @Nullable Object[] parameters) {
+    int methodIndex = BH_METHODS.indexOf(method);
+    if (methodIndex < 0) {
+      throw new BHMethodNotFoundException(this, method);
+    }
+    switch (methodIndex) {
+      default:
+        throw new BHMethodNotFoundException(this, method);
+    }
+  }
+
+  @NotNull
+  @Override
+  public List<SMethod<?>> getDeclaredMethods() {
+    return BH_METHODS;
+  }
+
+  @NotNull
+  @Override
+  public SAbstractConcept getConcept() {
+    return CONCEPT;
+  }
+}
diff --git a/...esLanguage/source_gen/RatingRulesLanguage/behavior/ConcessionType_BehaviorDescriptor.java b/...esLanguage/source_gen/RatingRulesLanguage/behavior/ConcessionType_BehaviorDescriptor.java
@@ -0,0 +1,19 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public class ConcessionType_BehaviorDescriptor extends BaseVarDataType_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.ConcessionType";
+  }
+
+}
diff --git a/...RulesLanguage/source_gen/RatingRulesLanguage/behavior/Concessions_BehaviorDescriptor.java b/...RulesLanguage/source_gen/RatingRulesLanguage/behavior/Concessions_BehaviorDescriptor.java
@@ -0,0 +1,19 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public class Concessions_BehaviorDescriptor extends BaseCollectionOfConcepts_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.Concessions";
+  }
+
+}
diff --git a/...ingRulesLanguage/source_gen/RatingRulesLanguage/behavior/ConstantFloatValue_Behavior.java b/...ingRulesLanguage/source_gen/RatingRulesLanguage/behavior/ConstantFloatValue_Behavior.java
@@ -0,0 +1,12 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support the legacy static direct method calls
+ */
+@Deprecated
+public class ConstantFloatValue_Behavior {
+}
diff --git a/...nguage/source_gen/RatingRulesLanguage/behavior/ConstantFloatValue_BehaviorDescriptor.java b/...nguage/source_gen/RatingRulesLanguage/behavior/ConstantFloatValue_BehaviorDescriptor.java
@@ -0,0 +1,19 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public class ConstantFloatValue_BehaviorDescriptor extends BaseConstant_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.ConstantFloatValue";
+  }
+
+}
diff --git a/...guage/source_gen/RatingRulesLanguage/behavior/ConstantFloatValue__BehaviorDescriptor.java b/...guage/source_gen/RatingRulesLanguage/behavior/ConstantFloatValue__BehaviorDescriptor.java
@@ -0,0 +1,76 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+import jetbrains.mps.core.aspects.behaviour.BaseBHDescriptor;
+import org.jetbrains.mps.openapi.language.SAbstractConcept;
+import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory;
+import jetbrains.mps.core.aspects.behaviour.api.BehaviorRegistry;
+import jetbrains.mps.smodel.language.ConceptRegistry;
+import java.util.List;
+import jetbrains.mps.core.aspects.behaviour.api.SMethod;
+import java.util.Arrays;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.mps.openapi.model.SNode;
+import jetbrains.mps.lang.smodel.generator.smodelAdapter.SPropertyOperations;
+import jetbrains.mps.core.aspects.behaviour.api.SConstructor;
+import org.jetbrains.annotations.Nullable;
+import jetbrains.mps.core.aspects.behaviour.api.BHMethodNotFoundException;
+
+public final class ConstantFloatValue__BehaviorDescriptor extends BaseBHDescriptor {
+  private static final SAbstractConcept CONCEPT = MetaAdapterFactory.getConcept(0xfffd25317c948b3L, 0x9419ce44b0a40631L, 0x59a528db6b3d9dfaL, "RatingRulesLanguage.structure.ConstantFloatValue");
+  private static final BehaviorRegistry REGISTRY = ConceptRegistry.getInstance().getBehaviorRegistry();
+
+
+  private static final List<SMethod<?>> BH_METHODS = Arrays.<SMethod<?>>asList();
+
+  private static void ___init___(@NotNull SNode __thisNode__) {
+    SPropertyOperations.set(__thisNode__, MetaAdapterFactory.getProperty(0xfffd25317c948b3L, 0x9419ce44b0a40631L, 0x59a528db6b3d9dfaL, 0x59a528db6b47a178L, "unitsOfMeasure"), "");
+  }
+
+
+  /*package*/ ConstantFloatValue__BehaviorDescriptor() {
+    super(REGISTRY);
+  }
+
+  @Override
+  protected void initNode(@NotNull SNode node, @NotNull SConstructor constructor, @Nullable Object[] parameters) {
+    ___init___(node);
+  }
+
+  @Override
+  protected <T> T invokeSpecial0(@NotNull SNode node, @NotNull SMethod<T> method, @Nullable Object[] parameters) {
+    int methodIndex = BH_METHODS.indexOf(method);
+    if (methodIndex < 0) {
+      throw new BHMethodNotFoundException(this, method);
+    }
+    switch (methodIndex) {
+      default:
+        throw new BHMethodNotFoundException(this, method);
+    }
+  }
+
+  @Override
+  protected <T> T invokeSpecial0(@NotNull SAbstractConcept concept, @NotNull SMethod<T> method, @Nullable Object[] parameters) {
+    int methodIndex = BH_METHODS.indexOf(method);
+    if (methodIndex < 0) {
+      throw new BHMethodNotFoundException(this, method);
+    }
+    switch (methodIndex) {
+      default:
+        throw new BHMethodNotFoundException(this, method);
+    }
+  }
+
+  @NotNull
+  @Override
+  public List<SMethod<?>> getDeclaredMethods() {
+    return BH_METHODS;
+  }
+
+  @NotNull
+  @Override
+  public SAbstractConcept getConcept() {
+    return CONCEPT;
+  }
+}
diff --git a/...anguage/source_gen/RatingRulesLanguage/behavior/ConstantFloatVarDeclaration_Behavior.java b/...anguage/source_gen/RatingRulesLanguage/behavior/ConstantFloatVarDeclaration_Behavior.java
@@ -0,0 +1,12 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support the legacy static direct method calls
+ */
+@Deprecated
+public class ConstantFloatVarDeclaration_Behavior {
+}
diff --git a/...urce_gen/RatingRulesLanguage/behavior/ConstantFloatVarDeclaration_BehaviorDescriptor.java b/...urce_gen/RatingRulesLanguage/behavior/ConstantFloatVarDeclaration_BehaviorDescriptor.java
@@ -0,0 +1,19 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public class ConstantFloatVarDeclaration_BehaviorDescriptor extends ConstantTypedVarDeclaration_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.ConstantFloatVarDeclaration";
+  }
+
+}
diff --git a/...rce_gen/RatingRulesLanguage/behavior/ConstantFloatVarDeclaration__BehaviorDescriptor.java b/...rce_gen/RatingRulesLanguage/behavior/ConstantFloatVarDeclaration__BehaviorDescriptor.java
@@ -0,0 +1,78 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+import jetbrains.mps.core.aspects.behaviour.BaseBHDescriptor;
+import org.jetbrains.mps.openapi.language.SAbstractConcept;
+import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory;
+import jetbrains.mps.core.aspects.behaviour.api.BehaviorRegistry;
+import jetbrains.mps.smodel.language.ConceptRegistry;
+import java.util.List;
+import jetbrains.mps.core.aspects.behaviour.api.SMethod;
+import java.util.Arrays;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.mps.openapi.model.SNode;
+import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations;
+import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations;
+import jetbrains.mps.core.aspects.behaviour.api.SConstructor;
+import org.jetbrains.annotations.Nullable;
+import jetbrains.mps.core.aspects.behaviour.api.BHMethodNotFoundException;
+
+public final class ConstantFloatVarDeclaration__BehaviorDescriptor extends BaseBHDescriptor {
+  private static final SAbstractConcept CONCEPT = MetaAdapterFactory.getConcept(0xfffd25317c948b3L, 0x9419ce44b0a40631L, 0x59a528db6b5b5e5fL, "RatingRulesLanguage.structure.ConstantFloatVarDeclaration");
+  private static final BehaviorRegistry REGISTRY = ConceptRegistry.getInstance().getBehaviorRegistry();
+
+
+  private static final List<SMethod<?>> BH_METHODS = Arrays.<SMethod<?>>asList();
+
+  private static void ___init___(@NotNull SNode __thisNode__) {
+    SLinkOperations.setNewChild(__thisNode__, MetaAdapterFactory.getContainmentLink(0xfffd25317c948b3L, 0x9419ce44b0a40631L, 0x59a528db6b5188cfL, 0x59a528db6b5188d0L, "type"), SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0xfffd25317c948b3L, 0x9419ce44b0a40631L, 0x59a528db6b5188d6L, "RatingRulesLanguage.structure.FloatVarType")));
+    SLinkOperations.setNewChild(__thisNode__, MetaAdapterFactory.getContainmentLink(0xfffd25317c948b3L, 0x9419ce44b0a40631L, 0x59a528db6b5188c6L, 0x59a528db6b5188cbL, "initializer"), SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0xfffd25317c948b3L, 0x9419ce44b0a40631L, 0x59a528db6b3d9dfaL, "RatingRulesLanguage.structure.ConstantFloatValue")));
+  }
+
+
+  /*package*/ ConstantFloatVarDeclaration__BehaviorDescriptor() {
+    super(REGISTRY);
+  }
+
+  @Override
+  protected void initNode(@NotNull SNode node, @NotNull SConstructor constructor, @Nullable Object[] parameters) {
+    ___init___(node);
+  }
+
+  @Override
+  protected <T> T invokeSpecial0(@NotNull SNode node, @NotNull SMethod<T> method, @Nullable Object[] parameters) {
+    int methodIndex = BH_METHODS.indexOf(method);
+    if (methodIndex < 0) {
+      throw new BHMethodNotFoundException(this, method);
+    }
+    switch (methodIndex) {
+      default:
+        throw new BHMethodNotFoundException(this, method);
+    }
+  }
+
+  @Override
+  protected <T> T invokeSpecial0(@NotNull SAbstractConcept concept, @NotNull SMethod<T> method, @Nullable Object[] parameters) {
+    int methodIndex = BH_METHODS.indexOf(method);
+    if (methodIndex < 0) {
+      throw new BHMethodNotFoundException(this, method);
+    }
+    switch (methodIndex) {
+      default:
+        throw new BHMethodNotFoundException(this, method);
+    }
+  }
+
+  @NotNull
+  @Override
+  public List<SMethod<?>> getDeclaredMethods() {
+    return BH_METHODS;
+  }
+
+  @NotNull
+  @Override
+  public SAbstractConcept getConcept() {
+    return CONCEPT;
+  }
+}
diff --git a/.../RatingRulesLanguage/behavior/ConstantPointToPointFareMatrixValue_BehaviorDescriptor.java b/.../RatingRulesLanguage/behavior/ConstantPointToPointFareMatrixValue_BehaviorDescriptor.java
@@ -0,0 +1,19 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public class ConstantPointToPointFareMatrixValue_BehaviorDescriptor extends BaseConstant_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.ConstantPointToPointFareMatrixValue";
+  }
+
+}
diff --git a/.../source_gen/RatingRulesLanguage/behavior/ConstantPointToPointVarDeclaration_Behavior.java b/.../source_gen/RatingRulesLanguage/behavior/ConstantPointToPointVarDeclaration_Behavior.java
@@ -0,0 +1,12 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support the legacy static direct method calls
+ */
+@Deprecated
+public class ConstantPointToPointVarDeclaration_Behavior {
+}
diff --git a/...n/RatingRulesLanguage/behavior/ConstantPointToPointVarDeclaration_BehaviorDescriptor.java b/...n/RatingRulesLanguage/behavior/ConstantPointToPointVarDeclaration_BehaviorDescriptor.java
@@ -0,0 +1,19 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public class ConstantPointToPointVarDeclaration_BehaviorDescriptor extends ConstantTypedVarDeclaration_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.ConstantPointToPointVarDeclaration";
+  }
+
+}
diff --git a/.../RatingRulesLanguage/behavior/ConstantPointToPointVarDeclaration__BehaviorDescriptor.java b/.../RatingRulesLanguage/behavior/ConstantPointToPointVarDeclaration__BehaviorDescriptor.java
@@ -0,0 +1,79 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+import jetbrains.mps.core.aspects.behaviour.BaseBHDescriptor;
+import org.jetbrains.mps.openapi.language.SAbstractConcept;
+import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory;
+import jetbrains.mps.core.aspects.behaviour.api.BehaviorRegistry;
+import jetbrains.mps.smodel.language.ConceptRegistry;
+import java.util.List;
+import jetbrains.mps.core.aspects.behaviour.api.SMethod;
+import java.util.Arrays;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.mps.openapi.model.SNode;
+import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations;
+import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations;
+import jetbrains.mps.core.aspects.behaviour.api.SConstructor;
+import org.jetbrains.annotations.Nullable;
+import jetbrains.mps.core.aspects.behaviour.api.BHMethodNotFoundException;
+
+public final class ConstantPointToPointVarDeclaration__BehaviorDescriptor extends BaseBHDescriptor {
+  private static final SAbstractConcept CONCEPT = MetaAdapterFactory.getConcept(0xfffd25317c948b3L, 0x9419ce44b0a40631L, 0x59a528db6b5b5e60L, "RatingRulesLanguage.structure.ConstantPointToPointVarDeclaration");
+  private static final BehaviorRegistry REGISTRY = ConceptRegistry.getInstance().getBehaviorRegistry();
+
+
+  private static final List<SMethod<?>> BH_METHODS = Arrays.<SMethod<?>>asList();
+
+  private static void ___init___(@NotNull SNode __thisNode__) {
+    SLinkOperations.setNewChild(__thisNode__, MetaAdapterFactory.getContainmentLink(0xfffd25317c948b3L, 0x9419ce44b0a40631L, 0x59a528db6b5188cfL, 0x59a528db6b5188d0L, "type"), SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0xfffd25317c948b3L, 0x9419ce44b0a40631L, 0x59a528db6b5188dcL, "RatingRulesLanguage.structure.PointToPointFareMatrixVarType")));
+    SLinkOperations.setNewChild(__thisNode__, MetaAdapterFactory.getContainmentLink(0xfffd25317c948b3L, 0x9419ce44b0a40631L, 0x59a528db6b5188c6L, 0x59a528db6b5188cbL, "initializer"), SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0xfffd25317c948b3L, 0x9419ce44b0a40631L, 0x65d53d0d8db57cabL, "RatingRulesLanguage.structure.ConstantPointToPointFareMatrixValue")));
+
+  }
+
+
+  /*package*/ ConstantPointToPointVarDeclaration__BehaviorDescriptor() {
+    super(REGISTRY);
+  }
+
+  @Override
+  protected void initNode(@NotNull SNode node, @NotNull SConstructor constructor, @Nullable Object[] parameters) {
+    ___init___(node);
+  }
+
+  @Override
+  protected <T> T invokeSpecial0(@NotNull SNode node, @NotNull SMethod<T> method, @Nullable Object[] parameters) {
+    int methodIndex = BH_METHODS.indexOf(method);
+    if (methodIndex < 0) {
+      throw new BHMethodNotFoundException(this, method);
+    }
+    switch (methodIndex) {
+      default:
+        throw new BHMethodNotFoundException(this, method);
+    }
+  }
+
+  @Override
+  protected <T> T invokeSpecial0(@NotNull SAbstractConcept concept, @NotNull SMethod<T> method, @Nullable Object[] parameters) {
+    int methodIndex = BH_METHODS.indexOf(method);
+    if (methodIndex < 0) {
+      throw new BHMethodNotFoundException(this, method);
+    }
+    switch (methodIndex) {
+      default:
+        throw new BHMethodNotFoundException(this, method);
+    }
+  }
+
+  @NotNull
+  @Override
+  public List<SMethod<?>> getDeclaredMethods() {
+    return BH_METHODS;
+  }
+
+  @NotNull
+  @Override
+  public SAbstractConcept getConcept() {
+    return CONCEPT;
+  }
+}
diff --git a/...anguage/source_gen/RatingRulesLanguage/behavior/ConstantTypedVarDeclaration_Behavior.java b/...anguage/source_gen/RatingRulesLanguage/behavior/ConstantTypedVarDeclaration_Behavior.java
@@ -0,0 +1,12 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support the legacy static direct method calls
+ */
+@Deprecated
+public class ConstantTypedVarDeclaration_Behavior {
+}
diff --git a/...urce_gen/RatingRulesLanguage/behavior/ConstantTypedVarDeclaration_BehaviorDescriptor.java b/...urce_gen/RatingRulesLanguage/behavior/ConstantTypedVarDeclaration_BehaviorDescriptor.java
@@ -0,0 +1,19 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public abstract class ConstantTypedVarDeclaration_BehaviorDescriptor extends ConstantVarDeclaration_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.ConstantTypedVarDeclaration";
+  }
+
+}
diff --git a/...rce_gen/RatingRulesLanguage/behavior/ConstantTypedVarDeclaration__BehaviorDescriptor.java b/...rce_gen/RatingRulesLanguage/behavior/ConstantTypedVarDeclaration__BehaviorDescriptor.java
@@ -0,0 +1,74 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+import jetbrains.mps.core.aspects.behaviour.BaseBHDescriptor;
+import org.jetbrains.mps.openapi.language.SAbstractConcept;
+import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory;
+import jetbrains.mps.core.aspects.behaviour.api.BehaviorRegistry;
+import jetbrains.mps.smodel.language.ConceptRegistry;
+import java.util.List;
+import jetbrains.mps.core.aspects.behaviour.api.SMethod;
+import java.util.Arrays;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.mps.openapi.model.SNode;
+import jetbrains.mps.core.aspects.behaviour.api.SConstructor;
+import org.jetbrains.annotations.Nullable;
+import jetbrains.mps.core.aspects.behaviour.api.BHMethodNotFoundException;
+
+public final class ConstantTypedVarDeclaration__BehaviorDescriptor extends BaseBHDescriptor {
+  private static final SAbstractConcept CONCEPT = MetaAdapterFactory.getConcept(0xfffd25317c948b3L, 0x9419ce44b0a40631L, 0x59a528db6b5188cfL, "RatingRulesLanguage.structure.ConstantTypedVarDeclaration");
+  private static final BehaviorRegistry REGISTRY = ConceptRegistry.getInstance().getBehaviorRegistry();
+
+
+  private static final List<SMethod<?>> BH_METHODS = Arrays.<SMethod<?>>asList();
+
+  private static void ___init___(@NotNull SNode __thisNode__) {
+  }
+
+
+  /*package*/ ConstantTypedVarDeclaration__BehaviorDescriptor() {
+    super(REGISTRY);
+  }
+
+  @Override
+  protected void initNode(@NotNull SNode node, @NotNull SConstructor constructor, @Nullable Object[] parameters) {
+    ___init___(node);
+  }
+
+  @Override
+  protected <T> T invokeSpecial0(@NotNull SNode node, @NotNull SMethod<T> method, @Nullable Object[] parameters) {
+    int methodIndex = BH_METHODS.indexOf(method);
+    if (methodIndex < 0) {
+      throw new BHMethodNotFoundException(this, method);
+    }
+    switch (methodIndex) {
+      default:
+        throw new BHMethodNotFoundException(this, method);
+    }
+  }
+
+  @Override
+  protected <T> T invokeSpecial0(@NotNull SAbstractConcept concept, @NotNull SMethod<T> method, @Nullable Object[] parameters) {
+    int methodIndex = BH_METHODS.indexOf(method);
+    if (methodIndex < 0) {
+      throw new BHMethodNotFoundException(this, method);
+    }
+    switch (methodIndex) {
+      default:
+        throw new BHMethodNotFoundException(this, method);
+    }
+  }
+
+  @NotNull
+  @Override
+  public List<SMethod<?>> getDeclaredMethods() {
+    return BH_METHODS;
+  }
+
+  @NotNull
+  @Override
+  public SAbstractConcept getConcept() {
+    return CONCEPT;
+  }
+}
diff --git a/...ge/source_gen/RatingRulesLanguage/behavior/ConstantVarDeclaration_BehaviorDescriptor.java b/...ge/source_gen/RatingRulesLanguage/behavior/ConstantVarDeclaration_BehaviorDescriptor.java
@@ -0,0 +1,24 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+import jetbrains.mps.lang.core.behavior.INamedConcept_BehaviorDescriptor;
+import org.jetbrains.mps.openapi.model.SNode;
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public abstract class ConstantVarDeclaration_BehaviorDescriptor extends RValue_BehaviorDescriptor implements INamedConcept_BehaviorDescriptor {
+  public String virtual_getFqName_1213877404258(SNode __thisNode__) {
+    return null;
+  }
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.ConstantVarDeclaration";
+  }
+
+}
diff --git a/...uage/source_gen/RatingRulesLanguage/behavior/ConstantVarReference_BehaviorDescriptor.java b/...uage/source_gen/RatingRulesLanguage/behavior/ConstantVarReference_BehaviorDescriptor.java
@@ -0,0 +1,19 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public class ConstantVarReference_BehaviorDescriptor extends RValue_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.ConstantVarReference";
+  }
+
+}
diff --git a/...source_gen/RatingRulesLanguage/behavior/ConstantsDeclarationBlock_BehaviorDescriptor.java b/...source_gen/RatingRulesLanguage/behavior/ConstantsDeclarationBlock_BehaviorDescriptor.java
@@ -0,0 +1,19 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public class ConstantsDeclarationBlock_BehaviorDescriptor extends BaseRootNamedConceptOrg_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.ConstantsDeclarationBlock";
+  }
+
+}
diff --git a/...urce_gen/RatingRulesLanguage/behavior/CreateTransferProductAction_BehaviorDescriptor.java b/...urce_gen/RatingRulesLanguage/behavior/CreateTransferProductAction_BehaviorDescriptor.java
@@ -0,0 +1,19 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public class CreateTransferProductAction_BehaviorDescriptor extends BaseAction_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.CreateTransferProductAction";
+  }
+
+}
diff --git a/...ource_gen/RatingRulesLanguage/behavior/CrtAgeVerificationCriteria_BehaviorDescriptor.java b/...ource_gen/RatingRulesLanguage/behavior/CrtAgeVerificationCriteria_BehaviorDescriptor.java
@@ -0,0 +1,19 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public class CrtAgeVerificationCriteria_BehaviorDescriptor extends BaseSystemDefinedCriteriaFunction_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.CrtAgeVerificationCriteria";
+  }
+
+}
diff --git a/...en/RatingRulesLanguage/behavior/CrtEPurseGreatesThanValueCriteria_BehaviorDescriptor.java b/...en/RatingRulesLanguage/behavior/CrtEPurseGreatesThanValueCriteria_BehaviorDescriptor.java
@@ -0,0 +1,19 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public class CrtEPurseGreatesThanValueCriteria_BehaviorDescriptor extends BaseSystemDefinedCriteriaFunction_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.CrtEPurseGreatesThanValueCriteria";
+  }
+
+}
diff --git a/...guage/source_gen/RatingRulesLanguage/behavior/CrtLifespanValidationCriteria_Behavior.java b/...guage/source_gen/RatingRulesLanguage/behavior/CrtLifespanValidationCriteria_Behavior.java
@@ -0,0 +1,12 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support the legacy static direct method calls
+ */
+@Deprecated
+public class CrtLifespanValidationCriteria_Behavior {
+}
diff --git a/...ce_gen/RatingRulesLanguage/behavior/CrtLifespanValidationCriteria_BehaviorDescriptor.java b/...ce_gen/RatingRulesLanguage/behavior/CrtLifespanValidationCriteria_BehaviorDescriptor.java
@@ -0,0 +1,19 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public class CrtLifespanValidationCriteria_BehaviorDescriptor extends BaseSystemDefinedCriteriaFunction_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.CrtLifespanValidationCriteria";
+  }
+
+}
diff --git a/...e_gen/RatingRulesLanguage/behavior/CrtLifespanValidationCriteria__BehaviorDescriptor.java b/...e_gen/RatingRulesLanguage/behavior/CrtLifespanValidationCriteria__BehaviorDescriptor.java
@@ -0,0 +1,77 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+import jetbrains.mps.core.aspects.behaviour.BaseBHDescriptor;
+import org.jetbrains.mps.openapi.language.SAbstractConcept;
+import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory;
+import jetbrains.mps.core.aspects.behaviour.api.BehaviorRegistry;
+import jetbrains.mps.smodel.language.ConceptRegistry;
+import java.util.List;
+import jetbrains.mps.core.aspects.behaviour.api.SMethod;
+import java.util.Arrays;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.mps.openapi.model.SNode;
+import jetbrains.mps.lang.smodel.generator.smodelAdapter.SPropertyOperations;
+import jetbrains.mps.core.aspects.behaviour.api.SConstructor;
+import org.jetbrains.annotations.Nullable;
+import jetbrains.mps.core.aspects.behaviour.api.BHMethodNotFoundException;
+
+public final class CrtLifespanValidationCriteria__BehaviorDescriptor extends BaseBHDescriptor {
+  private static final SAbstractConcept CONCEPT = MetaAdapterFactory.getConcept(0xfffd25317c948b3L, 0x9419ce44b0a40631L, 0x7627b8e69aaa8105L, "RatingRulesLanguage.structure.CrtLifespanValidationCriteria");
+  private static final BehaviorRegistry REGISTRY = ConceptRegistry.getInstance().getBehaviorRegistry();
+
+
+  private static final List<SMethod<?>> BH_METHODS = Arrays.<SMethod<?>>asList();
+
+  private static void ___init___(@NotNull SNode __thisNode__) {
+    SPropertyOperations.set(__thisNode__, MetaAdapterFactory.getProperty(0xfffd25317c948b3L, 0x9419ce44b0a40631L, 0x7627b8e69aaa8105L, 0x7627b8e69aaa810aL, "VerifyActivationDate"), "" + (true));
+    SPropertyOperations.set(__thisNode__, MetaAdapterFactory.getProperty(0xfffd25317c948b3L, 0x9419ce44b0a40631L, 0x7627b8e69aaa8105L, 0x7627b8e69aaa8111L, "VerifyExpirationDate"), "" + (true));
+  }
+
+
+  /*package*/ CrtLifespanValidationCriteria__BehaviorDescriptor() {
+    super(REGISTRY);
+  }
+
+  @Override
+  protected void initNode(@NotNull SNode node, @NotNull SConstructor constructor, @Nullable Object[] parameters) {
+    ___init___(node);
+  }
+
+  @Override
+  protected <T> T invokeSpecial0(@NotNull SNode node, @NotNull SMethod<T> method, @Nullable Object[] parameters) {
+    int methodIndex = BH_METHODS.indexOf(method);
+    if (methodIndex < 0) {
+      throw new BHMethodNotFoundException(this, method);
+    }
+    switch (methodIndex) {
+      default:
+        throw new BHMethodNotFoundException(this, method);
+    }
+  }
+
+  @Override
+  protected <T> T invokeSpecial0(@NotNull SAbstractConcept concept, @NotNull SMethod<T> method, @Nullable Object[] parameters) {
+    int methodIndex = BH_METHODS.indexOf(method);
+    if (methodIndex < 0) {
+      throw new BHMethodNotFoundException(this, method);
+    }
+    switch (methodIndex) {
+      default:
+        throw new BHMethodNotFoundException(this, method);
+    }
+  }
+
+  @NotNull
+  @Override
+  public List<SMethod<?>> getDeclaredMethods() {
+    return BH_METHODS;
+  }
+
+  @NotNull
+  @Override
+  public SAbstractConcept getConcept() {
+    return CONCEPT;
+  }
+}
diff --git a/...source_gen/RatingRulesLanguage/behavior/CrtLocationEqualsCriteria_BehaviorDescriptor.java b/...source_gen/RatingRulesLanguage/behavior/CrtLocationEqualsCriteria_BehaviorDescriptor.java
@@ -0,0 +1,19 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public class CrtLocationEqualsCriteria_BehaviorDescriptor extends BaseSystemDefinedCriteriaFunction_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.CrtLocationEqualsCriteria";
+  }
+
+}
diff --git a/...uage/source_gen/RatingRulesLanguage/behavior/CrtMOTEqualsCriteria_BehaviorDescriptor.java b/...uage/source_gen/RatingRulesLanguage/behavior/CrtMOTEqualsCriteria_BehaviorDescriptor.java
@@ -0,0 +1,19 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public class CrtMOTEqualsCriteria_BehaviorDescriptor extends BaseSystemDefinedLocationRelatedCriteriaFunction_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.CrtMOTEqualsCriteria";
+  }
+
+}
diff --git a/...ge/source_gen/RatingRulesLanguage/behavior/CrtRouteEqualsCriteria_BehaviorDescriptor.java b/...ge/source_gen/RatingRulesLanguage/behavior/CrtRouteEqualsCriteria_BehaviorDescriptor.java
@@ -0,0 +1,19 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public class CrtRouteEqualsCriteria_BehaviorDescriptor extends BaseSystemDefinedLocationRelatedCriteriaFunction_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.CrtRouteEqualsCriteria";
+  }
+
+}
diff --git a/...gen/RatingRulesLanguage/behavior/CrtServiceProviderEqualsCriteria_BehaviorDescriptor.java b/...gen/RatingRulesLanguage/behavior/CrtServiceProviderEqualsCriteria_BehaviorDescriptor.java
@@ -0,0 +1,19 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public class CrtServiceProviderEqualsCriteria_BehaviorDescriptor extends BaseSystemDefinedLocationRelatedCriteriaFunction_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.CrtServiceProviderEqualsCriteria";
+  }
+
+}
diff --git a/...ge/source_gen/RatingRulesLanguage/behavior/CrtTapIsOfTypeCriteria_BehaviorDescriptor.java b/...ge/source_gen/RatingRulesLanguage/behavior/CrtTapIsOfTypeCriteria_BehaviorDescriptor.java
@@ -0,0 +1,19 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public class CrtTapIsOfTypeCriteria_BehaviorDescriptor extends BaseSystemDefinedCriteriaFunction_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.CrtTapIsOfTypeCriteria";
+  }
+
+}
diff --git a/...ge/source_gen/RatingRulesLanguage/behavior/CrtTapTransferCriteria_BehaviorDescriptor.java b/...ge/source_gen/RatingRulesLanguage/behavior/CrtTapTransferCriteria_BehaviorDescriptor.java
@@ -0,0 +1,19 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public class CrtTapTransferCriteria_BehaviorDescriptor extends BaseSystemDefinedTransferRelatedCriteria_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.CrtTapTransferCriteria";
+  }
+
+}
diff --git a/...nguage/source_gen/RatingRulesLanguage/behavior/DivisionNLOperator_BehaviorDescriptor.java b/...nguage/source_gen/RatingRulesLanguage/behavior/DivisionNLOperator_BehaviorDescriptor.java
@@ -0,0 +1,19 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public class DivisionNLOperator_BehaviorDescriptor extends BaseOperator_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.DivisionNLOperator";
+  }
+
+}
diff --git a/...Language/source_gen/RatingRulesLanguage/behavior/DivisionOperator_BehaviorDescriptor.java b/...Language/source_gen/RatingRulesLanguage/behavior/DivisionOperator_BehaviorDescriptor.java
@@ -0,0 +1,19 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public class DivisionOperator_BehaviorDescriptor extends BaseOperator_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.DivisionOperator";
+  }
+
+}
diff --git a/...esLanguage/source_gen/RatingRulesLanguage/behavior/ElementVarType_BehaviorDescriptor.java b/...esLanguage/source_gen/RatingRulesLanguage/behavior/ElementVarType_BehaviorDescriptor.java
@@ -0,0 +1,19 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public abstract class ElementVarType_BehaviorDescriptor extends BaseVarDataType_BehaviorDescriptor {
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.ElementVarType";
+  }
+
+}
diff --git a/...Language/source_gen/RatingRulesLanguage/behavior/ExternalDataType_BehaviorDescriptor.java b/...Language/source_gen/RatingRulesLanguage/behavior/ExternalDataType_BehaviorDescriptor.java
@@ -0,0 +1,26 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+import jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor;
+import jetbrains.mps.lang.core.behavior.INamedConcept_BehaviorDescriptor;
+import jetbrains.mps.lang.core.behavior.IType_BehaviorDescriptor;
+import org.jetbrains.mps.openapi.model.SNode;
+
+/**
+ * Will be removed after 3.3
+ * Need to support compilation of the legacy behavior descriptors before the language is rebuilt
+ * This class is not involved in the actual method invocation
+ */
+@Deprecated
+public abstract class ExternalDataType_BehaviorDescriptor extends BaseConcept_BehaviorDescriptor implements INamedConcept_BehaviorDescriptor, IType_BehaviorDescriptor {
+  public String virtual_getFqName_1213877404258(SNode __thisNode__) {
+    return null;
+  }
+
+  @Override
+  public String getConceptFqName() {
+    return "RatingRulesLanguage.structure.ExternalDataType";
+  }
+
+}
diff --git a/...ingRulesLanguage/source_gen/RatingRulesLanguage/behavior/FareRuleDefinition_Behavior.java b/...ingRulesLanguage/source_gen/RatingRulesLanguage/behavior/FareRuleDefinition_Behavior.java
@@ -0,0 +1,12 @@
+package RatingRulesLanguage.behavior;
+
+/*Generated by MPS */
+
+
+/**
+ * Will be removed after 3.3
+ * Need to support the legacy static direct method calls
+ */
+@Deprecated
+public class FareRuleDefinition_Behavior {
+}