24 files changed, 2001 insertions, 607 deletions
diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/model/generated/AlloyLanguage.ecore b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/model/generated/AlloyLanguage.ecore
index a825966e..3e88c460 100644
--- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/model/generated/AlloyLanguage.ecore
+++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/model/generated/AlloyLanguage.ecore
@@ -91,6 +91,7 @@
    <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="#//ALSSignatureDeclaration"/>
  </eClassifiers>
  <eClassifiers xsi:type="ecore:EClass" name="ALSIntScope" eSuperTypes="#//ALSTypeScope"/>
+  <eClassifiers xsi:type="ecore:EClass" name="ALSStringScope" eSuperTypes="#//ALSTypeScope"/>
  <eClassifiers xsi:type="ecore:EClass" name="ALSQuantifiedEx" eSuperTypes="#//ALSTerm">
    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="#//ALSMultiplicity"/>
    <eStructuralFeatures xsi:type="ecore:EAttribute" name="disj" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
@@ -258,10 +259,14 @@
  <eClassifiers xsi:type="ecore:EClass" name="ALSIden" eSuperTypes="#//ALSTerm"/>
  <eClassifiers xsi:type="ecore:EClass" name="ALSUniv" eSuperTypes="#//ALSTerm"/>
  <eClassifiers xsi:type="ecore:EClass" name="ALSInt" eSuperTypes="#//ALSTerm"/>
+  <eClassifiers xsi:type="ecore:EClass" name="ALSString" eSuperTypes="#//ALSTerm"/>
  <eClassifiers xsi:type="ecore:EClass" name="ALSReference" eSuperTypes="#//ALSTerm">
    <eStructuralFeatures xsi:type="ecore:EReference" name="referred" eType="#//ALSRelationDeclaration"/>
  </eClassifiers>
  <eClassifiers xsi:type="ecore:EClass" name="ALSNumberLiteral" eSuperTypes="#//ALSTerm">
    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ALSStringLiteral" eSuperTypes="#//ALSTerm">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
 </ecore:EPackage>
diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/model/generated/AlloyLanguage.genmodel b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/model/generated/AlloyLanguage.genmodel
index 97c59724..f8505d33 100644
--- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/model/generated/AlloyLanguage.genmodel
+++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/model/generated/AlloyLanguage.genmodel
@@ -5,7 +5,7 @@
    modelPluginID="hu.bme.mit.inf.dslreasoner.alloy.language" forceOverwrite="true"
    modelName="AlloyLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
    complianceLevel="6.0" copyrightFields="false" editPluginID="hu.bme.mit.inf.dslreasoner.alloy.language.edit"
-    editorPluginID="hu.bme.mit.inf.dslreasoner.alloy.language.editor" runtimeVersion="2.12">
+    editorPluginID="hu.bme.mit.inf.dslreasoner.alloy.language.editor" runtimeVersion="2.13">
  <genPackages prefix="AlloyLanguage" basePackage="hu.bme.mit.inf.dslreasoner" disposableProviderFactory="true"
      fileExtensions="als" ecorePackage="AlloyLanguage.ecore#/">
    <genEnums typeSafeEnumCompatible="false" ecoreEnum="AlloyLanguage.ecore#//ALSMultiplicity">
@@ -80,6 +80,7 @@
      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference AlloyLanguage.ecore#//ALSSigScope/type"/>
    </genClasses>
    <genClasses ecoreClass="AlloyLanguage.ecore#//ALSIntScope"/>
+    <genClasses ecoreClass="AlloyLanguage.ecore#//ALSStringScope"/>
    <genClasses ecoreClass="AlloyLanguage.ecore#//ALSQuantifiedEx">
      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute AlloyLanguage.ecore#//ALSQuantifiedEx/type"/>
      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute AlloyLanguage.ecore#//ALSQuantifiedEx/disj"/>
@@ -196,11 +197,15 @@
    <genClasses ecoreClass="AlloyLanguage.ecore#//ALSIden"/>
    <genClasses ecoreClass="AlloyLanguage.ecore#//ALSUniv"/>
    <genClasses ecoreClass="AlloyLanguage.ecore#//ALSInt"/>
+    <genClasses ecoreClass="AlloyLanguage.ecore#//ALSString"/>
    <genClasses ecoreClass="AlloyLanguage.ecore#//ALSReference">
      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference AlloyLanguage.ecore#//ALSReference/referred"/>
    </genClasses>
    <genClasses ecoreClass="AlloyLanguage.ecore#//ALSNumberLiteral">
      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute AlloyLanguage.ecore#//ALSNumberLiteral/value"/>
    </genClasses>
+    <genClasses ecoreClass="AlloyLanguage.ecore#//ALSStringLiteral">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute AlloyLanguage.ecore#//ALSStringLiteral/value"/>
+    </genClasses>
  </genPackages>
 </genmodel:GenModel>
diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/AlloyLanguage.xtextbin b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/AlloyLanguage.xtextbin
index a1410bb7..f5684306 100644
--- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/AlloyLanguage.xtextbin
+++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/AlloyLanguage.xtextbin
Binary files differ
diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/alloyLanguage/ALSString.java b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/alloyLanguage/ALSString.java
new file mode 100644
index 00000000..12addd5f
--- /dev/null
+++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/alloyLanguage/ALSString.java
@@ -0,0 +1,18 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.alloyLanguage;
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>ALS String</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.AlloyLanguagePackage#getALSString()
+ * @model
+ * @generated
+ */
+public interface ALSString extends ALSTerm
+{
+} // ALSString
diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/alloyLanguage/ALSStringLiteral.java b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/alloyLanguage/ALSStringLiteral.java
new file mode 100644
index 00000000..015319f2
--- /dev/null
+++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/alloyLanguage/ALSStringLiteral.java
@@ -0,0 +1,50 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.alloyLanguage;
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>ALS String Literal</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSStringLiteral#getValue <em>Value</em>}</li>
+ * </ul>
+ *
+ * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.AlloyLanguagePackage#getALSStringLiteral()
+ * @model
+ * @generated
+ */
+public interface ALSStringLiteral extends ALSTerm
+{
+  /**
+   * Returns the value of the '<em><b>Value</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Value</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Value</em>' attribute.
+   * @see #setValue(String)
+   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.AlloyLanguagePackage#getALSStringLiteral_Value()
+   * @model
+   * @generated
+   */
+  String getValue();
+  /**
+   * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSStringLiteral#getValue <em>Value</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Value</em>' attribute.
+   * @see #getValue()
+   * @generated
+   */
+  void setValue(String value);
+} // ALSStringLiteral
diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/alloyLanguage/ALSStringScope.java b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/alloyLanguage/ALSStringScope.java
new file mode 100644
index 00000000..6bf0ce5b
--- /dev/null
+++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/alloyLanguage/ALSStringScope.java
@@ -0,0 +1,18 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.alloyLanguage;
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>ALS String Scope</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.AlloyLanguagePackage#getALSStringScope()
+ * @model
+ * @generated
+ */
+public interface ALSStringScope extends ALSTypeScope
+{
+} // ALSStringScope
diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/alloyLanguage/AlloyLanguageFactory.java b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/alloyLanguage/AlloyLanguageFactory.java
index 06919ba8..e2998ff6 100644
--- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/alloyLanguage/AlloyLanguageFactory.java
+++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/alloyLanguage/AlloyLanguageFactory.java
@@ -185,6 +185,15 @@ public interface AlloyLanguageFactory extends EFactory
  ALSIntScope createALSIntScope();
  /**
+   * Returns a new object of class '<em>ALS String Scope</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>ALS String Scope</em>'.
+   * @generated
+   */
+  ALSStringScope createALSStringScope();
+  /**
   * Returns a new object of class '<em>ALS Quantified Ex</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
@@ -473,6 +482,15 @@ public interface AlloyLanguageFactory extends EFactory
  ALSInt createALSInt();
  /**
+   * Returns a new object of class '<em>ALS String</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>ALS String</em>'.
+   * @generated
+   */
+  ALSString createALSString();
+  /**
   * Returns a new object of class '<em>ALS Reference</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
@@ -491,6 +509,15 @@ public interface AlloyLanguageFactory extends EFactory
  ALSNumberLiteral createALSNumberLiteral();
  /**
+   * Returns a new object of class '<em>ALS String Literal</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>ALS String Literal</em>'.
+   * @generated
+   */
+  ALSStringLiteral createALSStringLiteral();
+  /**
   * Returns the package supported by this factory.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/alloyLanguage/AlloyLanguagePackage.java b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/alloyLanguage/AlloyLanguagePackage.java
index 50e3d607..38d225e3 100644
--- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/alloyLanguage/AlloyLanguagePackage.java
+++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/alloyLanguage/AlloyLanguagePackage.java
@@ -769,6 +769,34 @@ public interface AlloyLanguagePackage extends EPackage
  int ALS_INT_SCOPE_FEATURE_COUNT = ALS_TYPE_SCOPE_FEATURE_COUNT + 0;
  /**
+   * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.ALSStringScopeImpl <em>ALS String Scope</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.ALSStringScopeImpl
+   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.AlloyLanguagePackageImpl#getALSStringScope()
+   * @generated
+   */
+  int ALS_STRING_SCOPE = 18;
+  /**
+   * The feature id for the '<em><b>Number</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int ALS_STRING_SCOPE__NUMBER = ALS_TYPE_SCOPE__NUMBER;
+  /**
+   * The number of structural features of the '<em>ALS String Scope</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int ALS_STRING_SCOPE_FEATURE_COUNT = ALS_TYPE_SCOPE_FEATURE_COUNT + 0;
+  /**
   * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.ALSQuantifiedExImpl <em>ALS Quantified Ex</em>}' class.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
@@ -776,7 +804,7 @@ public interface AlloyLanguagePackage extends EPackage
   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.AlloyLanguagePackageImpl#getALSQuantifiedEx()
   * @generated
   */
-  int ALS_QUANTIFIED_EX = 18;
+  int ALS_QUANTIFIED_EX = 19;
  /**
   * The feature id for the '<em><b>Type</b></em>' attribute.
@@ -831,7 +859,7 @@ public interface AlloyLanguagePackage extends EPackage
   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.AlloyLanguagePackageImpl#getALSOr()
   * @generated
   */
-  int ALS_OR = 19;
+  int ALS_OR = 20;
  /**
   * The feature id for the '<em><b>Left Operand</b></em>' containment reference.
@@ -868,7 +896,7 @@ public interface AlloyLanguagePackage extends EPackage
   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.AlloyLanguagePackageImpl#getALSIff()
   * @generated
   */
-  int ALS_IFF = 20;
+  int ALS_IFF = 21;
  /**
   * The feature id for the '<em><b>Left Operand</b></em>' containment reference.
@@ -905,7 +933,7 @@ public interface AlloyLanguagePackage extends EPackage
   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.AlloyLanguagePackageImpl#getALSImpl()
   * @generated
   */
-  int ALS_IMPL = 21;
+  int ALS_IMPL = 22;
  /**
   * The feature id for the '<em><b>Left Operand</b></em>' containment reference.
@@ -951,7 +979,7 @@ public interface AlloyLanguagePackage extends EPackage
   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.AlloyLanguagePackageImpl#getALSAnd()
   * @generated
   */
-  int ALS_AND = 22;
+  int ALS_AND = 23;
  /**
   * The feature id for the '<em><b>Left Operand</b></em>' containment reference.
@@ -988,7 +1016,7 @@ public interface AlloyLanguagePackage extends EPackage
   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.AlloyLanguagePackageImpl#getALSEquals()
   * @generated
   */
-  int ALS_EQUALS = 23;
+  int ALS_EQUALS = 24;
  /**
   * The feature id for the '<em><b>Left Operand</b></em>' containment reference.
@@ -1025,7 +1053,7 @@ public interface AlloyLanguagePackage extends EPackage
   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.AlloyLanguagePackageImpl#getALSNotEquals()
   * @generated
   */
-  int ALS_NOT_EQUALS = 24;
+  int ALS_NOT_EQUALS = 25;
  /**
   * The feature id for the '<em><b>Left Operand</b></em>' containment reference.
@@ -1062,7 +1090,7 @@ public interface AlloyLanguagePackage extends EPackage
   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.AlloyLanguagePackageImpl#getALSSubset()
   * @generated
   */
-  int ALS_SUBSET = 25;
+  int ALS_SUBSET = 26;
  /**
   * The feature id for the '<em><b>Left Operand</b></em>' containment reference.
@@ -1099,7 +1127,7 @@ public interface AlloyLanguagePackage extends EPackage
   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.AlloyLanguagePackageImpl#getALSLess()
   * @generated
   */
-  int ALS_LESS = 26;
+  int ALS_LESS = 27;
  /**
   * The feature id for the '<em><b>Left Operand</b></em>' containment reference.
@@ -1136,7 +1164,7 @@ public interface AlloyLanguagePackage extends EPackage
   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.AlloyLanguagePackageImpl#getALSLeq()
   * @generated
   */
-  int ALS_LEQ = 27;
+  int ALS_LEQ = 28;
  /**
   * The feature id for the '<em><b>Left Operand</b></em>' containment reference.
@@ -1173,7 +1201,7 @@ public interface AlloyLanguagePackage extends EPackage
   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.AlloyLanguagePackageImpl#getALSMore()
   * @generated
   */
-  int ALS_MORE = 28;
+  int ALS_MORE = 29;
  /**
   * The feature id for the '<em><b>Left Operand</b></em>' containment reference.
@@ -1210,7 +1238,7 @@ public interface AlloyLanguagePackage extends EPackage
   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.AlloyLanguagePackageImpl#getALSMeq()
   * @generated
   */
-  int ALS_MEQ = 29;
+  int ALS_MEQ = 30;
  /**
   * The feature id for the '<em><b>Left Operand</b></em>' containment reference.
@@ -1247,7 +1275,7 @@ public interface AlloyLanguagePackage extends EPackage
   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.AlloyLanguagePackageImpl#getALSOverride()
   * @generated
   */
-  int ALS_OVERRIDE = 30;
+  int ALS_OVERRIDE = 31;
  /**
   * The feature id for the '<em><b>Left Operand</b></em>' containment reference.
@@ -1284,7 +1312,7 @@ public interface AlloyLanguagePackage extends EPackage
   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.AlloyLanguagePackageImpl#getALSRangeRestrictionRight()
   * @generated
   */
-  int ALS_RANGE_RESTRICTION_RIGHT = 31;
+  int ALS_RANGE_RESTRICTION_RIGHT = 32;
  /**
   * The feature id for the '<em><b>Relation</b></em>' containment reference.
@@ -1321,7 +1349,7 @@ public interface AlloyLanguagePackage extends EPackage
   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.AlloyLanguagePackageImpl#getALSRangeRestrictionLeft()
   * @generated
   */
-  int ALS_RANGE_RESTRICTION_LEFT = 32;
+  int ALS_RANGE_RESTRICTION_LEFT = 33;
  /**
   * The feature id for the '<em><b>Filter</b></em>' containment reference.
@@ -1358,7 +1386,7 @@ public interface AlloyLanguagePackage extends EPackage
   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.AlloyLanguagePackageImpl#getALSJoin()
   * @generated
   */
-  int ALS_JOIN = 33;
+  int ALS_JOIN = 34;
  /**
   * The feature id for the '<em><b>Left Operand</b></em>' containment reference.
@@ -1395,7 +1423,7 @@ public interface AlloyLanguagePackage extends EPackage
   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.AlloyLanguagePackageImpl#getALSMinus()
   * @generated
   */
-  int ALS_MINUS = 34;
+  int ALS_MINUS = 35;
  /**
   * The feature id for the '<em><b>Left Operand</b></em>' containment reference.
@@ -1432,7 +1460,7 @@ public interface AlloyLanguagePackage extends EPackage
   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.AlloyLanguagePackageImpl#getALSPlus()
   * @generated
   */
-  int ALS_PLUS = 35;
+  int ALS_PLUS = 36;
  /**
   * The feature id for the '<em><b>Left Operand</b></em>' containment reference.
@@ -1469,7 +1497,7 @@ public interface AlloyLanguagePackage extends EPackage
   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.AlloyLanguagePackageImpl#getALSIntersection()
   * @generated
   */
-  int ALS_INTERSECTION = 36;
+  int ALS_INTERSECTION = 37;
  /**
   * The feature id for the '<em><b>Left Operand</b></em>' containment reference.
@@ -1506,7 +1534,7 @@ public interface AlloyLanguagePackage extends EPackage
   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.AlloyLanguagePackageImpl#getALSDirectProduct()
   * @generated
   */
-  int ALS_DIRECT_PRODUCT = 37;
+  int ALS_DIRECT_PRODUCT = 38;
  /**
   * The feature id for the '<em><b>Left Operand</b></em>' containment reference.
@@ -1561,7 +1589,7 @@ public interface AlloyLanguagePackage extends EPackage
   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.AlloyLanguagePackageImpl#getALSNot()
   * @generated
   */
-  int ALS_NOT = 38;
+  int ALS_NOT = 39;
  /**
   * The feature id for the '<em><b>Operand</b></em>' containment reference.
@@ -1589,7 +1617,7 @@ public interface AlloyLanguagePackage extends EPackage
   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.AlloyLanguagePackageImpl#getALSInverseRelation()
   * @generated
   */
-  int ALS_INVERSE_RELATION = 39;
+  int ALS_INVERSE_RELATION = 40;
  /**
   * The feature id for the '<em><b>Operand</b></em>' containment reference.
@@ -1617,7 +1645,7 @@ public interface AlloyLanguagePackage extends EPackage
   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.AlloyLanguagePackageImpl#getAlSTransitiveClosure()
   * @generated
   */
-  int AL_STRANSITIVE_CLOSURE = 40;
+  int AL_STRANSITIVE_CLOSURE = 41;
  /**
   * The feature id for the '<em><b>Operand</b></em>' containment reference.
@@ -1645,7 +1673,7 @@ public interface AlloyLanguagePackage extends EPackage
   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.AlloyLanguagePackageImpl#getALSReflectiveTransitiveClosure()
   * @generated
   */
-  int ALS_REFLECTIVE_TRANSITIVE_CLOSURE = 41;
+  int ALS_REFLECTIVE_TRANSITIVE_CLOSURE = 42;
  /**
   * The feature id for the '<em><b>Operand</b></em>' containment reference.
@@ -1673,7 +1701,7 @@ public interface AlloyLanguagePackage extends EPackage
   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.AlloyLanguagePackageImpl#getALSCardinality()
   * @generated
   */
-  int ALS_CARDINALITY = 42;
+  int ALS_CARDINALITY = 43;
  /**
   * The feature id for the '<em><b>Operand</b></em>' containment reference.
@@ -1701,7 +1729,7 @@ public interface AlloyLanguagePackage extends EPackage
   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.AlloyLanguagePackageImpl#getALSUnaryMinus()
   * @generated
   */
-  int ALS_UNARY_MINUS = 43;
+  int ALS_UNARY_MINUS = 44;
  /**
   * The feature id for the '<em><b>Operand</b></em>' containment reference.
@@ -1729,7 +1757,7 @@ public interface AlloyLanguagePackage extends EPackage
   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.AlloyLanguagePackageImpl#getALSSum()
   * @generated
   */
-  int ALS_SUM = 44;
+  int ALS_SUM = 45;
  /**
   * The feature id for the '<em><b>Variables</b></em>' containment reference list.
@@ -1766,7 +1794,7 @@ public interface AlloyLanguagePackage extends EPackage
   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.AlloyLanguagePackageImpl#getALSFunctionCall()
   * @generated
   */
-  int ALS_FUNCTION_CALL = 45;
+  int ALS_FUNCTION_CALL = 46;
  /**
   * The feature id for the '<em><b>Referred Definition</b></em>' reference.
@@ -1812,7 +1840,7 @@ public interface AlloyLanguagePackage extends EPackage
   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.AlloyLanguagePackageImpl#getALSNone()
   * @generated
   */
-  int ALS_NONE = 46;
+  int ALS_NONE = 47;
  /**
   * The number of structural features of the '<em>ALS None</em>' class.
@@ -1831,7 +1859,7 @@ public interface AlloyLanguagePackage extends EPackage
   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.AlloyLanguagePackageImpl#getALSIden()
   * @generated
   */
-  int ALS_IDEN = 47;
+  int ALS_IDEN = 48;
  /**
   * The number of structural features of the '<em>ALS Iden</em>' class.
@@ -1850,7 +1878,7 @@ public interface AlloyLanguagePackage extends EPackage
   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.AlloyLanguagePackageImpl#getALSUniv()
   * @generated
   */
-  int ALS_UNIV = 48;
+  int ALS_UNIV = 49;
  /**
   * The number of structural features of the '<em>ALS Univ</em>' class.
@@ -1869,7 +1897,7 @@ public interface AlloyLanguagePackage extends EPackage
   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.AlloyLanguagePackageImpl#getALSInt()
   * @generated
   */
-  int ALS_INT = 49;
+  int ALS_INT = 50;
  /**
   * The number of structural features of the '<em>ALS Int</em>' class.
@@ -1881,6 +1909,25 @@ public interface AlloyLanguagePackage extends EPackage
  int ALS_INT_FEATURE_COUNT = ALS_TERM_FEATURE_COUNT + 0;
  /**
+   * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.ALSStringImpl <em>ALS String</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.ALSStringImpl
+   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.AlloyLanguagePackageImpl#getALSString()
+   * @generated
+   */
+  int ALS_STRING = 51;
+  /**
+   * The number of structural features of the '<em>ALS String</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int ALS_STRING_FEATURE_COUNT = ALS_TERM_FEATURE_COUNT + 0;
+  /**
   * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.ALSReferenceImpl <em>ALS Reference</em>}' class.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
@@ -1888,7 +1935,7 @@ public interface AlloyLanguagePackage extends EPackage
   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.AlloyLanguagePackageImpl#getALSReference()
   * @generated
   */
-  int ALS_REFERENCE = 50;
+  int ALS_REFERENCE = 52;
  /**
   * The feature id for the '<em><b>Referred</b></em>' reference.
@@ -1916,7 +1963,7 @@ public interface AlloyLanguagePackage extends EPackage
   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.AlloyLanguagePackageImpl#getALSNumberLiteral()
   * @generated
   */
-  int ALS_NUMBER_LITERAL = 51;
+  int ALS_NUMBER_LITERAL = 53;
  /**
   * The feature id for the '<em><b>Value</b></em>' attribute.
@@ -1937,6 +1984,34 @@ public interface AlloyLanguagePackage extends EPackage
  int ALS_NUMBER_LITERAL_FEATURE_COUNT = ALS_TERM_FEATURE_COUNT + 1;
  /**
+   * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.ALSStringLiteralImpl <em>ALS String Literal</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.ALSStringLiteralImpl
+   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.AlloyLanguagePackageImpl#getALSStringLiteral()
+   * @generated
+   */
+  int ALS_STRING_LITERAL = 54;
+  /**
+   * The feature id for the '<em><b>Value</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int ALS_STRING_LITERAL__VALUE = ALS_TERM_FEATURE_COUNT + 0;
+  /**
+   * The number of structural features of the '<em>ALS String Literal</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int ALS_STRING_LITERAL_FEATURE_COUNT = ALS_TERM_FEATURE_COUNT + 1;
+  /**
   * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSMultiplicity <em>ALS Multiplicity</em>}' enum.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
@@ -1944,7 +2019,7 @@ public interface AlloyLanguagePackage extends EPackage
   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.AlloyLanguagePackageImpl#getALSMultiplicity()
   * @generated
   */
-  int ALS_MULTIPLICITY = 52;
+  int ALS_MULTIPLICITY = 55;
  /**
   * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSNumericOperator <em>ALS Numeric Operator</em>}' enum.
@@ -1954,7 +2029,7 @@ public interface AlloyLanguagePackage extends EPackage
   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.AlloyLanguagePackageImpl#getALSNumericOperator()
   * @generated
   */
-  int ALS_NUMERIC_OPERATOR = 53;
+  int ALS_NUMERIC_OPERATOR = 56;
  /**
@@ -2435,6 +2510,16 @@ public interface AlloyLanguagePackage extends EPackage
  EClass getALSIntScope();
  /**
+   * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSStringScope <em>ALS String Scope</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>ALS String Scope</em>'.
+   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSStringScope
+   * @generated
+   */
+  EClass getALSStringScope();
+  /**
   * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSQuantifiedEx <em>ALS Quantified Ex</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
@@ -3371,6 +3456,16 @@ public interface AlloyLanguagePackage extends EPackage
  EClass getALSInt();
  /**
+   * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSString <em>ALS String</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>ALS String</em>'.
+   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSString
+   * @generated
+   */
+  EClass getALSString();
+  /**
   * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSReference <em>ALS Reference</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
@@ -3413,6 +3508,27 @@ public interface AlloyLanguagePackage extends EPackage
  EAttribute getALSNumberLiteral_Value();
  /**
+   * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSStringLiteral <em>ALS String Literal</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>ALS String Literal</em>'.
+   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSStringLiteral
+   * @generated
+   */
+  EClass getALSStringLiteral();
+  /**
+   * Returns the meta object for the attribute '{@link hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSStringLiteral#getValue <em>Value</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the attribute '<em>Value</em>'.
+   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSStringLiteral#getValue()
+   * @see #getALSStringLiteral()
+   * @generated
+   */
+  EAttribute getALSStringLiteral_Value();
+  /**
   * Returns the meta object for enum '{@link hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSMultiplicity <em>ALS Multiplicity</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
@@ -3852,6 +3968,16 @@ public interface AlloyLanguagePackage extends EPackage
    EClass ALS_INT_SCOPE = eINSTANCE.getALSIntScope();
    /**
+     * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.ALSStringScopeImpl <em>ALS String Scope</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.ALSStringScopeImpl
+     * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.AlloyLanguagePackageImpl#getALSStringScope()
+     * @generated
+     */
+    EClass ALS_STRING_SCOPE = eINSTANCE.getALSStringScope();
+    /**
     * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.ALSQuantifiedExImpl <em>ALS Quantified Ex</em>}' class.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
@@ -4620,6 +4746,16 @@ public interface AlloyLanguagePackage extends EPackage
    EClass ALS_INT = eINSTANCE.getALSInt();
    /**
+     * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.ALSStringImpl <em>ALS String</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.ALSStringImpl
+     * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.AlloyLanguagePackageImpl#getALSString()
+     * @generated
+     */
+    EClass ALS_STRING = eINSTANCE.getALSString();
+    /**
     * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.ALSReferenceImpl <em>ALS Reference</em>}' class.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
@@ -4656,6 +4792,24 @@ public interface AlloyLanguagePackage extends EPackage
    EAttribute ALS_NUMBER_LITERAL__VALUE = eINSTANCE.getALSNumberLiteral_Value();
    /**
+     * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.ALSStringLiteralImpl <em>ALS String Literal</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.ALSStringLiteralImpl
+     * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.AlloyLanguagePackageImpl#getALSStringLiteral()
+     * @generated
+     */
+    EClass ALS_STRING_LITERAL = eINSTANCE.getALSStringLiteral();
+    /**
+     * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EAttribute ALS_STRING_LITERAL__VALUE = eINSTANCE.getALSStringLiteral_Value();
+    /**
     * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSMultiplicity <em>ALS Multiplicity</em>}' enum.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/alloyLanguage/impl/ALSStringImpl.java b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/alloyLanguage/impl/ALSStringImpl.java
new file mode 100644
index 00000000..d6ce0712
--- /dev/null
+++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/alloyLanguage/impl/ALSStringImpl.java
@@ -0,0 +1,40 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.alloyLanguage.impl;
+import hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSString;
+import hu.bme.mit.inf.dslreasoner.alloyLanguage.AlloyLanguagePackage;
+import org.eclipse.emf.ecore.EClass;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>ALS String</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class ALSStringImpl extends ALSTermImpl implements ALSString
+{
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected ALSStringImpl()
+  {
+    super();
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return AlloyLanguagePackage.Literals.ALS_STRING;
+  }
+} //ALSStringImpl
diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/alloyLanguage/impl/ALSStringLiteralImpl.java b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/alloyLanguage/impl/ALSStringLiteralImpl.java
new file mode 100644
index 00000000..207be30b
--- /dev/null
+++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/alloyLanguage/impl/ALSStringLiteralImpl.java
@@ -0,0 +1,176 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.alloyLanguage.impl;
+import hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSStringLiteral;
+import hu.bme.mit.inf.dslreasoner.alloyLanguage.AlloyLanguagePackage;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>ALS String Literal</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.alloyLanguage.impl.ALSStringLiteralImpl#getValue <em>Value</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ALSStringLiteralImpl extends ALSTermImpl implements ALSStringLiteral
+{
+  /**
+   * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getValue()
+   * @generated
+   * @ordered
+   */
+  protected static final String VALUE_EDEFAULT = null;
+  /**
+   * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getValue()
+   * @generated
+   * @ordered
+   */
+  protected String value = VALUE_EDEFAULT;
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected ALSStringLiteralImpl()
+  {
+    super();
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return AlloyLanguagePackage.Literals.ALS_STRING_LITERAL;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public String getValue()
+  {
+    return value;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setValue(String newValue)
+  {
+    String oldValue = value;
+    value = newValue;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, AlloyLanguagePackage.ALS_STRING_LITERAL__VALUE, oldValue, value));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+      case AlloyLanguagePackage.ALS_STRING_LITERAL__VALUE:
+        return getValue();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+      case AlloyLanguagePackage.ALS_STRING_LITERAL__VALUE:
+        setValue((String)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+      case AlloyLanguagePackage.ALS_STRING_LITERAL__VALUE:
+        setValue(VALUE_EDEFAULT);
+        return;
+    }
+    super.eUnset(featureID);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+      case AlloyLanguagePackage.ALS_STRING_LITERAL__VALUE:
+        return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
+    }
+    return super.eIsSet(featureID);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    if (eIsProxy()) return super.toString();
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (value: ");
+    result.append(value);
+    result.append(')');
+    return result.toString();
+  }
+} //ALSStringLiteralImpl
diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/alloyLanguage/impl/ALSStringScopeImpl.java b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/alloyLanguage/impl/ALSStringScopeImpl.java
new file mode 100644
index 00000000..244821c6
--- /dev/null
+++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/alloyLanguage/impl/ALSStringScopeImpl.java
@@ -0,0 +1,40 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.alloyLanguage.impl;
+import hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSStringScope;
+import hu.bme.mit.inf.dslreasoner.alloyLanguage.AlloyLanguagePackage;
+import org.eclipse.emf.ecore.EClass;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>ALS String Scope</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class ALSStringScopeImpl extends ALSTypeScopeImpl implements ALSStringScope
+{
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected ALSStringScopeImpl()
+  {
+    super();
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return AlloyLanguagePackage.Literals.ALS_STRING_SCOPE;
+  }
+} //ALSStringScopeImpl
diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/alloyLanguage/impl/AlloyLanguageFactoryImpl.java b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/alloyLanguage/impl/AlloyLanguageFactoryImpl.java
index 45d92dca..11faf739 100644
--- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/alloyLanguage/impl/AlloyLanguageFactoryImpl.java
+++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/alloyLanguage/impl/AlloyLanguageFactoryImpl.java
@@ -83,6 +83,7 @@ public class AlloyLanguageFactoryImpl extends EFactoryImpl implements AlloyLangu
      case AlloyLanguagePackage.ALS_TYPE_SCOPE: return createALSTypeScope();
      case AlloyLanguagePackage.ALS_SIG_SCOPE: return createALSSigScope();
      case AlloyLanguagePackage.ALS_INT_SCOPE: return createALSIntScope();
+      case AlloyLanguagePackage.ALS_STRING_SCOPE: return createALSStringScope();
      case AlloyLanguagePackage.ALS_QUANTIFIED_EX: return createALSQuantifiedEx();
      case AlloyLanguagePackage.ALS_OR: return createALSOr();
      case AlloyLanguagePackage.ALS_IFF: return createALSIff();
@@ -115,8 +116,10 @@ public class AlloyLanguageFactoryImpl extends EFactoryImpl implements AlloyLangu
      case AlloyLanguagePackage.ALS_IDEN: return createALSIden();
      case AlloyLanguagePackage.ALS_UNIV: return createALSUniv();
      case AlloyLanguagePackage.ALS_INT: return createALSInt();
+      case AlloyLanguagePackage.ALS_STRING: return createALSString();
      case AlloyLanguagePackage.ALS_REFERENCE: return createALSReference();
      case AlloyLanguagePackage.ALS_NUMBER_LITERAL: return createALSNumberLiteral();
+      case AlloyLanguagePackage.ALS_STRING_LITERAL: return createALSStringLiteral();
      default:
        throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
    }
@@ -363,6 +366,17 @@ public class AlloyLanguageFactoryImpl extends EFactoryImpl implements AlloyLangu
   * <!-- end-user-doc -->
   * @generated
   */
+  public ALSStringScope createALSStringScope()
+  {
+    ALSStringScopeImpl alsStringScope = new ALSStringScopeImpl();
+    return alsStringScope;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
  public ALSQuantifiedEx createALSQuantifiedEx()
  {
    ALSQuantifiedExImpl alsQuantifiedEx = new ALSQuantifiedExImpl();
@@ -715,6 +729,17 @@ public class AlloyLanguageFactoryImpl extends EFactoryImpl implements AlloyLangu
   * <!-- end-user-doc -->
   * @generated
   */
+  public ALSString createALSString()
+  {
+    ALSStringImpl alsString = new ALSStringImpl();
+    return alsString;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
  public ALSReference createALSReference()
  {
    ALSReferenceImpl alsReference = new ALSReferenceImpl();
@@ -737,6 +762,17 @@ public class AlloyLanguageFactoryImpl extends EFactoryImpl implements AlloyLangu
   * <!-- end-user-doc -->
   * @generated
   */
+  public ALSStringLiteral createALSStringLiteral()
+  {
+    ALSStringLiteralImpl alsStringLiteral = new ALSStringLiteralImpl();
+    return alsStringLiteral;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
  public ALSMultiplicity createALSMultiplicityFromString(EDataType eDataType, String initialValue)
  {
    ALSMultiplicity result = ALSMultiplicity.get(initialValue);
diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/alloyLanguage/impl/AlloyLanguagePackageImpl.java b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/alloyLanguage/impl/AlloyLanguagePackageImpl.java
index 1fd90aa9..6227ccd3 100644
--- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/alloyLanguage/impl/AlloyLanguagePackageImpl.java
+++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/alloyLanguage/impl/AlloyLanguagePackageImpl.java
@@ -47,6 +47,9 @@ import hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSRunCommand;
 import hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSSigScope;
 import hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSSignatureBody;
 import hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSSignatureDeclaration;
+import hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSString;
+import hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSStringLiteral;
+import hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSStringScope;
 import hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSSubset;
 import hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSSum;
 import hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSTerm;
@@ -206,6 +209,13 @@ public class AlloyLanguagePackageImpl extends EPackageImpl implements AlloyLangu
   * <!-- end-user-doc -->
   * @generated
   */
+  private EClass alsStringScopeEClass = null;
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
  private EClass alsQuantifiedExEClass = null;
  /**
@@ -430,6 +440,13 @@ public class AlloyLanguagePackageImpl extends EPackageImpl implements AlloyLangu
   * <!-- end-user-doc -->
   * @generated
   */
+  private EClass alsStringEClass = null;
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
  private EClass alsReferenceEClass = null;
  /**
@@ -444,6 +461,13 @@ public class AlloyLanguagePackageImpl extends EPackageImpl implements AlloyLangu
   * <!-- end-user-doc -->
   * @generated
   */
+  private EClass alsStringLiteralEClass = null;
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
  private EEnum alsMultiplicityEEnum = null;
  /**
@@ -971,6 +995,16 @@ public class AlloyLanguagePackageImpl extends EPackageImpl implements AlloyLangu
   * <!-- end-user-doc -->
   * @generated
   */
+  public EClass getALSStringScope()
+  {
+    return alsStringScopeEClass;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
  public EClass getALSQuantifiedEx()
  {
    return alsQuantifiedExEClass;
@@ -1851,6 +1885,16 @@ public class AlloyLanguagePackageImpl extends EPackageImpl implements AlloyLangu
   * <!-- end-user-doc -->
   * @generated
   */
+  public EClass getALSString()
+  {
+    return alsStringEClass;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
  public EClass getALSReference()
  {
    return alsReferenceEClass;
@@ -1891,6 +1935,26 @@ public class AlloyLanguagePackageImpl extends EPackageImpl implements AlloyLangu
   * <!-- end-user-doc -->
   * @generated
   */
+  public EClass getALSStringLiteral()
+  {
+    return alsStringLiteralEClass;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EAttribute getALSStringLiteral_Value()
+  {
+    return (EAttribute)alsStringLiteralEClass.getEStructuralFeatures().get(0);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
  public EEnum getALSMultiplicity()
  {
    return alsMultiplicityEEnum;
@@ -1999,6 +2063,8 @@ public class AlloyLanguagePackageImpl extends EPackageImpl implements AlloyLangu
    alsIntScopeEClass = createEClass(ALS_INT_SCOPE);
+    alsStringScopeEClass = createEClass(ALS_STRING_SCOPE);
    alsQuantifiedExEClass = createEClass(ALS_QUANTIFIED_EX);
    createEAttribute(alsQuantifiedExEClass, ALS_QUANTIFIED_EX__TYPE);
    createEAttribute(alsQuantifiedExEClass, ALS_QUANTIFIED_EX__DISJ);
@@ -2119,12 +2185,17 @@ public class AlloyLanguagePackageImpl extends EPackageImpl implements AlloyLangu
    alsIntEClass = createEClass(ALS_INT);
+    alsStringEClass = createEClass(ALS_STRING);
    alsReferenceEClass = createEClass(ALS_REFERENCE);
    createEReference(alsReferenceEClass, ALS_REFERENCE__REFERRED);
    alsNumberLiteralEClass = createEClass(ALS_NUMBER_LITERAL);
    createEAttribute(alsNumberLiteralEClass, ALS_NUMBER_LITERAL__VALUE);
+    alsStringLiteralEClass = createEClass(ALS_STRING_LITERAL);
+    createEAttribute(alsStringLiteralEClass, ALS_STRING_LITERAL__VALUE);
    // Create enums
    alsMultiplicityEEnum = createEEnum(ALS_MULTIPLICITY);
    alsNumericOperatorEEnum = createEEnum(ALS_NUMERIC_OPERATOR);
@@ -2169,6 +2240,7 @@ public class AlloyLanguagePackageImpl extends EPackageImpl implements AlloyLangu
    alsVariableDeclarationEClass.getESuperTypes().add(this.getALSRelationDeclaration());
    alsSigScopeEClass.getESuperTypes().add(this.getALSTypeScope());
    alsIntScopeEClass.getESuperTypes().add(this.getALSTypeScope());
+    alsStringScopeEClass.getESuperTypes().add(this.getALSTypeScope());
    alsQuantifiedExEClass.getESuperTypes().add(this.getALSTerm());
    alsOrEClass.getESuperTypes().add(this.getALSTerm());
    alsIffEClass.getESuperTypes().add(this.getALSTerm());
@@ -2201,8 +2273,10 @@ public class AlloyLanguagePackageImpl extends EPackageImpl implements AlloyLangu
    alsIdenEClass.getESuperTypes().add(this.getALSTerm());
    alsUnivEClass.getESuperTypes().add(this.getALSTerm());
    alsIntEClass.getESuperTypes().add(this.getALSTerm());
+    alsStringEClass.getESuperTypes().add(this.getALSTerm());
    alsReferenceEClass.getESuperTypes().add(this.getALSTerm());
    alsNumberLiteralEClass.getESuperTypes().add(this.getALSTerm());
+    alsStringLiteralEClass.getESuperTypes().add(this.getALSTerm());
    // Initialize classes and features; add operations and parameters
    initEClass(alsDocumentEClass, ALSDocument.class, "ALSDocument", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -2268,6 +2342,8 @@ public class AlloyLanguagePackageImpl extends EPackageImpl implements AlloyLangu
    initEClass(alsIntScopeEClass, ALSIntScope.class, "ALSIntScope", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(alsStringScopeEClass, ALSStringScope.class, "ALSStringScope", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
    initEClass(alsQuantifiedExEClass, ALSQuantifiedEx.class, "ALSQuantifiedEx", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
    initEAttribute(getALSQuantifiedEx_Type(), this.getALSMultiplicity(), "type", null, 0, 1, ALSQuantifiedEx.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
    initEAttribute(getALSQuantifiedEx_Disj(), ecorePackage.getEBoolean(), "disj", null, 0, 1, ALSQuantifiedEx.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -2388,12 +2464,17 @@ public class AlloyLanguagePackageImpl extends EPackageImpl implements AlloyLangu
    initEClass(alsIntEClass, ALSInt.class, "ALSInt", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(alsStringEClass, ALSString.class, "ALSString", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
    initEClass(alsReferenceEClass, ALSReference.class, "ALSReference", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
    initEReference(getALSReference_Referred(), this.getALSRelationDeclaration(), null, "referred", null, 0, 1, ALSReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
    initEClass(alsNumberLiteralEClass, ALSNumberLiteral.class, "ALSNumberLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
    initEAttribute(getALSNumberLiteral_Value(), ecorePackage.getEInt(), "value", null, 0, 1, ALSNumberLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(alsStringLiteralEClass, ALSStringLiteral.class, "ALSStringLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getALSStringLiteral_Value(), ecorePackage.getEString(), "value", null, 0, 1, ALSStringLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
    // Initialize enums and add enum literals
    initEEnum(alsMultiplicityEEnum, ALSMultiplicity.class, "ALSMultiplicity");
    addEEnumLiteral(alsMultiplicityEEnum, ALSMultiplicity.ALL);
diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/alloyLanguage/util/AlloyLanguageAdapterFactory.java b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/alloyLanguage/util/AlloyLanguageAdapterFactory.java
index d3d842af..5ca262fe 100644
--- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/alloyLanguage/util/AlloyLanguageAdapterFactory.java
+++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/alloyLanguage/util/AlloyLanguageAdapterFactory.java
@@ -165,6 +165,11 @@ public class AlloyLanguageAdapterFactory extends AdapterFactoryImpl
        return createALSIntScopeAdapter();
      }
      @Override
+      public Adapter caseALSStringScope(ALSStringScope object)
+      {
+        return createALSStringScopeAdapter();
+      }
+      @Override
      public Adapter caseALSQuantifiedEx(ALSQuantifiedEx object)
      {
        return createALSQuantifiedExAdapter();
@@ -325,6 +330,11 @@ public class AlloyLanguageAdapterFactory extends AdapterFactoryImpl
        return createALSIntAdapter();
      }
      @Override
+      public Adapter caseALSString(ALSString object)
+      {
+        return createALSStringAdapter();
+      }
+      @Override
      public Adapter caseALSReference(ALSReference object)
      {
        return createALSReferenceAdapter();
@@ -335,6 +345,11 @@ public class AlloyLanguageAdapterFactory extends AdapterFactoryImpl
        return createALSNumberLiteralAdapter();
      }
      @Override
+      public Adapter caseALSStringLiteral(ALSStringLiteral object)
+      {
+        return createALSStringLiteralAdapter();
+      }
+      @Override
      public Adapter defaultCase(EObject object)
      {
        return createEObjectAdapter();
@@ -627,6 +642,21 @@ public class AlloyLanguageAdapterFactory extends AdapterFactoryImpl
  }
  /**
+   * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSStringScope <em>ALS String Scope</em>}'.
+   * <!-- begin-user-doc -->
+   * This default implementation returns null so that we can easily ignore cases;
+   * it's useful to ignore a case when inheritance will catch all the cases anyway.
+   * <!-- end-user-doc -->
+   * @return the new adapter.
+   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSStringScope
+   * @generated
+   */
+  public Adapter createALSStringScopeAdapter()
+  {
+    return null;
+  }
+  /**
   * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSQuantifiedEx <em>ALS Quantified Ex</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
@@ -1107,6 +1137,21 @@ public class AlloyLanguageAdapterFactory extends AdapterFactoryImpl
  }
  /**
+   * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSString <em>ALS String</em>}'.
+   * <!-- begin-user-doc -->
+   * This default implementation returns null so that we can easily ignore cases;
+   * it's useful to ignore a case when inheritance will catch all the cases anyway.
+   * <!-- end-user-doc -->
+   * @return the new adapter.
+   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSString
+   * @generated
+   */
+  public Adapter createALSStringAdapter()
+  {
+    return null;
+  }
+  /**
   * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSReference <em>ALS Reference</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
@@ -1137,6 +1182,21 @@ public class AlloyLanguageAdapterFactory extends AdapterFactoryImpl
  }
  /**
+   * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSStringLiteral <em>ALS String Literal</em>}'.
+   * <!-- begin-user-doc -->
+   * This default implementation returns null so that we can easily ignore cases;
+   * it's useful to ignore a case when inheritance will catch all the cases anyway.
+   * <!-- end-user-doc -->
+   * @return the new adapter.
+   * @see hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSStringLiteral
+   * @generated
+   */
+  public Adapter createALSStringLiteralAdapter()
+  {
+    return null;
+  }
+  /**
   * Creates a new adapter for the default case.
   * <!-- begin-user-doc -->
   * This default implementation returns null.
diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/alloyLanguage/util/AlloyLanguageSwitch.java b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/alloyLanguage/util/AlloyLanguageSwitch.java
index 91fa2086..3551c90f 100644
--- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/alloyLanguage/util/AlloyLanguageSwitch.java
+++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/alloyLanguage/util/AlloyLanguageSwitch.java
@@ -210,6 +210,14 @@ public class AlloyLanguageSwitch<T> extends Switch<T>
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
+      case AlloyLanguagePackage.ALS_STRING_SCOPE:
+      {
+        ALSStringScope alsStringScope = (ALSStringScope)theEObject;
+        T result = caseALSStringScope(alsStringScope);
+        if (result == null) result = caseALSTypeScope(alsStringScope);
+        if (result == null) result = defaultCase(theEObject);
+        return result;
+      }
      case AlloyLanguagePackage.ALS_QUANTIFIED_EX:
      {
        ALSQuantifiedEx alsQuantifiedEx = (ALSQuantifiedEx)theEObject;
@@ -466,6 +474,14 @@ public class AlloyLanguageSwitch<T> extends Switch<T>
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
+      case AlloyLanguagePackage.ALS_STRING:
+      {
+        ALSString alsString = (ALSString)theEObject;
+        T result = caseALSString(alsString);
+        if (result == null) result = caseALSTerm(alsString);
+        if (result == null) result = defaultCase(theEObject);
+        return result;
+      }
      case AlloyLanguagePackage.ALS_REFERENCE:
      {
        ALSReference alsReference = (ALSReference)theEObject;
@@ -482,6 +498,14 @@ public class AlloyLanguageSwitch<T> extends Switch<T>
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
+      case AlloyLanguagePackage.ALS_STRING_LITERAL:
+      {
+        ALSStringLiteral alsStringLiteral = (ALSStringLiteral)theEObject;
+        T result = caseALSStringLiteral(alsStringLiteral);
+        if (result == null) result = caseALSTerm(alsStringLiteral);
+        if (result == null) result = defaultCase(theEObject);
+        return result;
+      }
      default: return defaultCase(theEObject);
    }
  }
@@ -775,6 +799,22 @@ public class AlloyLanguageSwitch<T> extends Switch<T>
  }
  /**
+   * Returns the result of interpreting the object as an instance of '<em>ALS String Scope</em>'.
+   * <!-- begin-user-doc -->
+   * This implementation returns null;
+   * returning a non-null result will terminate the switch.
+   * <!-- end-user-doc -->
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>ALS String Scope</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseALSStringScope(ALSStringScope object)
+  {
+    return null;
+  }
+  /**
   * Returns the result of interpreting the object as an instance of '<em>ALS Quantified Ex</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
@@ -1287,6 +1327,22 @@ public class AlloyLanguageSwitch<T> extends Switch<T>
  }
  /**
+   * Returns the result of interpreting the object as an instance of '<em>ALS String</em>'.
+   * <!-- begin-user-doc -->
+   * This implementation returns null;
+   * returning a non-null result will terminate the switch.
+   * <!-- end-user-doc -->
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>ALS String</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseALSString(ALSString object)
+  {
+    return null;
+  }
+  /**
   * Returns the result of interpreting the object as an instance of '<em>ALS Reference</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
@@ -1319,6 +1375,22 @@ public class AlloyLanguageSwitch<T> extends Switch<T>
  }
  /**
+   * Returns the result of interpreting the object as an instance of '<em>ALS String Literal</em>'.
+   * <!-- begin-user-doc -->
+   * This implementation returns null;
+   * returning a non-null result will terminate the switch.
+   * <!-- end-user-doc -->
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>ALS String Literal</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseALSStringLiteral(ALSStringLiteral object)
+  {
+    return null;
+  }
+  /**
   * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/parser/antlr/internal/InternalAlloyLanguage.g b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/parser/antlr/internal/InternalAlloyLanguage.g
index 25558250..a00a01ba 100644
--- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/parser/antlr/internal/InternalAlloyLanguage.g
+++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/parser/antlr/internal/InternalAlloyLanguage.g
@@ -2650,7 +2650,18 @@ ruleALSBasicRelationTerm returns [EObject current=null]
    |((
    {
        $current = forceCreateModelElement(
-            grammarAccess.getALSBasicRelationTermAccess().getALSReferenceAction_4_0(),
+            grammarAccess.getALSBasicRelationTermAccess().getALSStringAction_4_0(),
+            $current);
+    }
+)       otherlv_9='String' 
+    {
+        newLeafNode(otherlv_9, grammarAccess.getALSBasicRelationTermAccess().getStringKeyword_4_1());
+    }
+)
+    |((
+    {
+        $current = forceCreateModelElement(
+            grammarAccess.getALSBasicRelationTermAccess().getALSReferenceAction_5_0(),
            $current);
    }
 )(
@@ -2660,9 +2671,9 @@ ruleALSBasicRelationTerm returns [EObject current=null]
                    $current = createModelElement(grammarAccess.getALSBasicRelationTermRule());
                }
        }
-        otherlv_9=RULE_ID
+        otherlv_11=RULE_ID
        {
-                newLeafNode(otherlv_9, grammarAccess.getALSBasicRelationTermAccess().getReferredALSRelationDeclarationCrossReference_4_1_0()); 
+                newLeafNode(otherlv_11, grammarAccess.getALSBasicRelationTermAccess().getReferredALSRelationDeclarationCrossReference_5_1_0()); 
        }
 )
@@ -2670,14 +2681,14 @@ ruleALSBasicRelationTerm returns [EObject current=null]
    |((
    {
        $current = forceCreateModelElement(
-            grammarAccess.getALSBasicRelationTermAccess().getALSNumberLiteralAction_5_0(),
+            grammarAccess.getALSBasicRelationTermAccess().getALSNumberLiteralAction_6_0(),
            $current);
    }
 )(
 (
-                lv_value_11_0=RULE_INT
+                lv_value_13_0=RULE_INT
                {
-                        newLeafNode(lv_value_11_0, grammarAccess.getALSBasicRelationTermAccess().getValueINTTerminalRuleCall_5_1_0()); 
+                        newLeafNode(lv_value_13_0, grammarAccess.getALSBasicRelationTermAccess().getValueINTTerminalRuleCall_6_1_0()); 
                }
                {
                if ($current==null) {
@@ -2686,28 +2697,53 @@ ruleALSBasicRelationTerm returns [EObject current=null]
                setWithLastConsumed(
                        $current, 
                        "value",
-                        lv_value_11_0, 
+                        lv_value_13_0, 
                        "org.eclipse.xtext.common.Terminals.INT");
            }
 )
 ))
-    |(  otherlv_12='(' 
+    |((
    {
-        newLeafNode(otherlv_12, grammarAccess.getALSBasicRelationTermAccess().getLeftParenthesisKeyword_6_0());
+        $current = forceCreateModelElement(
+            grammarAccess.getALSBasicRelationTermAccess().getALSStringLiteralAction_7_0(),
+            $current);
+    }
+)(
+(
+                lv_value_15_0=RULE_STRING
+                {
+                        newLeafNode(lv_value_15_0, grammarAccess.getALSBasicRelationTermAccess().getValueSTRINGTerminalRuleCall_7_1_0()); 
+                }
+                {
+                if ($current==null) {
+                    $current = createModelElement(grammarAccess.getALSBasicRelationTermRule());
+                }
+                setWithLastConsumed(
+                        $current, 
+                        "value",
+                        lv_value_15_0, 
+                        "org.eclipse.xtext.common.Terminals.STRING");
+            }
+)
+))
+    |(  otherlv_16='(' 
+    {
+        newLeafNode(otherlv_16, grammarAccess.getALSBasicRelationTermAccess().getLeftParenthesisKeyword_8_0());
    }
    { 
-        newCompositeNode(grammarAccess.getALSBasicRelationTermAccess().getALSTermParserRuleCall_6_1()); 
+        newCompositeNode(grammarAccess.getALSBasicRelationTermAccess().getALSTermParserRuleCall_8_1()); 
    }
-    this_ALSTerm_13=ruleALSTerm
+    this_ALSTerm_17=ruleALSTerm
    { 
-        $current = $this_ALSTerm_13.current; 
+        $current = $this_ALSTerm_17.current; 
        afterParserOrEnumRuleCall();
    }
-        otherlv_14=')' 
+        otherlv_18=')' 
    {
-        newLeafNode(otherlv_14, grammarAccess.getALSBasicRelationTermAccess().getRightParenthesisKeyword_6_2());
+        newLeafNode(otherlv_18, grammarAccess.getALSBasicRelationTermAccess().getRightParenthesisKeyword_8_2());
    }
 ))
 ;
@@ -2832,6 +2868,16 @@ ruleALSTypeScope returns [EObject current=null]
        $current = $this_ALSIntScope_1.current; 
        afterParserOrEnumRuleCall();
    }
+    |
+    { 
+        newCompositeNode(grammarAccess.getALSTypeScopeAccess().getALSStringScopeParserRuleCall_2()); 
+    }
+    this_ALSStringScope_2=ruleALSStringScope
+    { 
+        $current = $this_ALSStringScope_2.current; 
+        afterParserOrEnumRuleCall();
+    }
 )
 ;
@@ -2949,6 +2995,53 @@ ruleALSIntScope returns [EObject current=null]
+// Entry rule entryRuleALSStringScope
+entryRuleALSStringScope returns [EObject current=null] 
+        :
+        { newCompositeNode(grammarAccess.getALSStringScopeRule()); }
+         iv_ruleALSStringScope=ruleALSStringScope 
+         { $current=$iv_ruleALSStringScope.current; } 
+         EOF 
+;
+// Rule ALSStringScope
+ruleALSStringScope returns [EObject current=null] 
+    @init { enterRule(); 
+    }
+    @after { leaveRule(); }:
+(       otherlv_0='exactly' 
+    {
+        newLeafNode(otherlv_0, grammarAccess.getALSStringScopeAccess().getExactlyKeyword_0());
+    }
+(
+(
+                lv_number_1_0=RULE_INT
+                {
+                        newLeafNode(lv_number_1_0, grammarAccess.getALSStringScopeAccess().getNumberINTTerminalRuleCall_1_0()); 
+                }
+                {
+                if ($current==null) {
+                    $current = createModelElement(grammarAccess.getALSStringScopeRule());
+                }
+                setWithLastConsumed(
+                        $current, 
+                        "number",
+                        lv_number_1_0, 
+                        "org.eclipse.xtext.common.Terminals.INT");
+            }
+)
+)       otherlv_2='String' 
+    {
+        newLeafNode(otherlv_2, grammarAccess.getALSStringScopeAccess().getStringKeyword_2());
+    }
+)
+;
 // Rule ALSMultiplicity
 ruleALSMultiplicity returns [Enumerator current=null] 
    @init { enterRule(); }
diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/parser/antlr/internal/InternalAlloyLanguage.tokens b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/parser/antlr/internal/InternalAlloyLanguage.tokens
index 49d2a448..94ce3ecb 100644
--- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/parser/antlr/internal/InternalAlloyLanguage.tokens
+++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/parser/antlr/internal/InternalAlloyLanguage.tokens
@@ -3,8 +3,8 @@
 '#'=54
 '&&'=34
 '&'=47
-'('=60
+'('=61
-')'=61
+')'=62
 '*'=53
 '+'=19
 '++'=42
@@ -23,40 +23,41 @@
 '>'=38
 '>='=39
 'Int'=59
+'String'=60
 '['=22
 ']'=23
 '^'=52
 'abstract'=15
-'all'=65
+'all'=66
 'and'=35
 'disj'=26
-'div'=75
+'div'=76
 'else'=33
 'enum'=11
-'exactly'=64
+'exactly'=65
 'extends'=17
 'fact'=25
-'for'=63
+'for'=64
 'fun'=21
 'iden'=57
 'iff'=30
 'implies'=32
 'in'=18
-'lone'=68
+'lone'=69
-'mul'=73
+'mul'=74
-'no'=66
+'no'=67
 'none'=56
 'not'=50
-'one'=69
+'one'=70
 'or'=28
-'plus'=71
+'plus'=72
 'pred'=24
-'rem'=74
+'rem'=75
-'run'=62
+'run'=63
-'set'=70
+'set'=71
 'sig'=16
-'some'=67
+'some'=68
-'sub'=72
+'sub'=73
 'sum'=55
 'univ'=58
 '{'=12
@@ -135,3 +136,4 @@ T__72=72
 T__73=73
 T__74=74
 T__75=75
+T__76=76
diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/parser/antlr/internal/InternalAlloyLanguageLexer.java b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/parser/antlr/internal/InternalAlloyLanguageLexer.java
index 27488784..793fe13d 100644
--- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/parser/antlr/internal/InternalAlloyLanguageLexer.java
+++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/parser/antlr/internal/InternalAlloyLanguageLexer.java
@@ -73,6 +73,7 @@ public class InternalAlloyLanguageLexer extends Lexer {
    public static final int T__31=31;
    public static final int T__75=75;
    public static final int T__32=32;
+    public static final int T__76=76;
    public static final int RULE_WS=9;
    public static final int RULE_ANY_OTHER=10;
    public static final int T__48=48;
@@ -1115,10 +1116,11 @@ public class InternalAlloyLanguageLexer extends Lexer {
        try {
            int _type = T__60;
            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalAlloyLanguage.g:60:7: ( '(' )
+            // InternalAlloyLanguage.g:60:7: ( 'String' )
-            // InternalAlloyLanguage.g:60:9: '('
+            // InternalAlloyLanguage.g:60:9: 'String'
            {
-            match('('); 
+            match("String"); 
            }
@@ -1135,10 +1137,10 @@ public class InternalAlloyLanguageLexer extends Lexer {
        try {
            int _type = T__61;
            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalAlloyLanguage.g:61:7: ( ')' )
+            // InternalAlloyLanguage.g:61:7: ( '(' )
-            // InternalAlloyLanguage.g:61:9: ')'
+            // InternalAlloyLanguage.g:61:9: '('
            {
-            match(')'); 
+            match('('); 
            }
@@ -1155,11 +1157,10 @@ public class InternalAlloyLanguageLexer extends Lexer {
        try {
            int _type = T__62;
            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalAlloyLanguage.g:62:7: ( 'run' )
+            // InternalAlloyLanguage.g:62:7: ( ')' )
-            // InternalAlloyLanguage.g:62:9: 'run'
+            // InternalAlloyLanguage.g:62:9: ')'
            {
-            match("run"); 
+            match(')'); 
            }
@@ -1176,10 +1177,10 @@ public class InternalAlloyLanguageLexer extends Lexer {
        try {
            int _type = T__63;
            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalAlloyLanguage.g:63:7: ( 'for' )
+            // InternalAlloyLanguage.g:63:7: ( 'run' )
-            // InternalAlloyLanguage.g:63:9: 'for'
+            // InternalAlloyLanguage.g:63:9: 'run'
            {
-            match("for"); 
+            match("run"); 
            }
@@ -1197,10 +1198,10 @@ public class InternalAlloyLanguageLexer extends Lexer {
        try {
            int _type = T__64;
            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalAlloyLanguage.g:64:7: ( 'exactly' )
+            // InternalAlloyLanguage.g:64:7: ( 'for' )
-            // InternalAlloyLanguage.g:64:9: 'exactly'
+            // InternalAlloyLanguage.g:64:9: 'for'
            {
-            match("exactly"); 
+            match("for"); 
            }
@@ -1218,10 +1219,10 @@ public class InternalAlloyLanguageLexer extends Lexer {
        try {
            int _type = T__65;
            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalAlloyLanguage.g:65:7: ( 'all' )
+            // InternalAlloyLanguage.g:65:7: ( 'exactly' )
-            // InternalAlloyLanguage.g:65:9: 'all'
+            // InternalAlloyLanguage.g:65:9: 'exactly'
            {
-            match("all"); 
+            match("exactly"); 
            }
@@ -1239,10 +1240,10 @@ public class InternalAlloyLanguageLexer extends Lexer {
        try {
            int _type = T__66;
            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalAlloyLanguage.g:66:7: ( 'no' )
+            // InternalAlloyLanguage.g:66:7: ( 'all' )
-            // InternalAlloyLanguage.g:66:9: 'no'
+            // InternalAlloyLanguage.g:66:9: 'all'
            {
-            match("no"); 
+            match("all"); 
            }
@@ -1260,10 +1261,10 @@ public class InternalAlloyLanguageLexer extends Lexer {
        try {
            int _type = T__67;
            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalAlloyLanguage.g:67:7: ( 'some' )
+            // InternalAlloyLanguage.g:67:7: ( 'no' )
-            // InternalAlloyLanguage.g:67:9: 'some'
+            // InternalAlloyLanguage.g:67:9: 'no'
            {
-            match("some"); 
+            match("no"); 
            }
@@ -1281,10 +1282,10 @@ public class InternalAlloyLanguageLexer extends Lexer {
        try {
            int _type = T__68;
            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalAlloyLanguage.g:68:7: ( 'lone' )
+            // InternalAlloyLanguage.g:68:7: ( 'some' )
-            // InternalAlloyLanguage.g:68:9: 'lone'
+            // InternalAlloyLanguage.g:68:9: 'some'
            {
-            match("lone"); 
+            match("some"); 
            }
@@ -1302,10 +1303,10 @@ public class InternalAlloyLanguageLexer extends Lexer {
        try {
            int _type = T__69;
            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalAlloyLanguage.g:69:7: ( 'one' )
+            // InternalAlloyLanguage.g:69:7: ( 'lone' )
-            // InternalAlloyLanguage.g:69:9: 'one'
+            // InternalAlloyLanguage.g:69:9: 'lone'
            {
-            match("one"); 
+            match("lone"); 
            }
@@ -1323,10 +1324,10 @@ public class InternalAlloyLanguageLexer extends Lexer {
        try {
            int _type = T__70;
            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalAlloyLanguage.g:70:7: ( 'set' )
+            // InternalAlloyLanguage.g:70:7: ( 'one' )
-            // InternalAlloyLanguage.g:70:9: 'set'
+            // InternalAlloyLanguage.g:70:9: 'one'
            {
-            match("set"); 
+            match("one"); 
            }
@@ -1344,10 +1345,10 @@ public class InternalAlloyLanguageLexer extends Lexer {
        try {
            int _type = T__71;
            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalAlloyLanguage.g:71:7: ( 'plus' )
+            // InternalAlloyLanguage.g:71:7: ( 'set' )
-            // InternalAlloyLanguage.g:71:9: 'plus'
+            // InternalAlloyLanguage.g:71:9: 'set'
            {
-            match("plus"); 
+            match("set"); 
            }
@@ -1365,10 +1366,10 @@ public class InternalAlloyLanguageLexer extends Lexer {
        try {
            int _type = T__72;
            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalAlloyLanguage.g:72:7: ( 'sub' )
+            // InternalAlloyLanguage.g:72:7: ( 'plus' )
-            // InternalAlloyLanguage.g:72:9: 'sub'
+            // InternalAlloyLanguage.g:72:9: 'plus'
            {
-            match("sub"); 
+            match("plus"); 
            }
@@ -1386,10 +1387,10 @@ public class InternalAlloyLanguageLexer extends Lexer {
        try {
            int _type = T__73;
            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalAlloyLanguage.g:73:7: ( 'mul' )
+            // InternalAlloyLanguage.g:73:7: ( 'sub' )
-            // InternalAlloyLanguage.g:73:9: 'mul'
+            // InternalAlloyLanguage.g:73:9: 'sub'
            {
-            match("mul"); 
+            match("sub"); 
            }
@@ -1407,10 +1408,10 @@ public class InternalAlloyLanguageLexer extends Lexer {
        try {
            int _type = T__74;
            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalAlloyLanguage.g:74:7: ( 'rem' )
+            // InternalAlloyLanguage.g:74:7: ( 'mul' )
-            // InternalAlloyLanguage.g:74:9: 'rem'
+            // InternalAlloyLanguage.g:74:9: 'mul'
            {
-            match("rem"); 
+            match("mul"); 
            }
@@ -1428,10 +1429,10 @@ public class InternalAlloyLanguageLexer extends Lexer {
        try {
            int _type = T__75;
            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalAlloyLanguage.g:75:7: ( 'div' )
+            // InternalAlloyLanguage.g:75:7: ( 'rem' )
-            // InternalAlloyLanguage.g:75:9: 'div'
+            // InternalAlloyLanguage.g:75:9: 'rem'
            {
-            match("div"); 
+            match("rem"); 
            }
@@ -1444,13 +1445,34 @@ public class InternalAlloyLanguageLexer extends Lexer {
    }
    // $ANTLR end "T__75"
+    // $ANTLR start "T__76"
+    public final void mT__76() throws RecognitionException {
+        try {
+            int _type = T__76;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // InternalAlloyLanguage.g:76:7: ( 'div' )
+            // InternalAlloyLanguage.g:76:9: 'div'
+            {
+            match("div"); 
+            }
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end "T__76"
    // $ANTLR start "RULE_ID"
    public final void mRULE_ID() throws RecognitionException {
        try {
            int _type = RULE_ID;
            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalAlloyLanguage.g:3032:9: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '\\'' | '\"' | '0' .. '9' )* )
+            // InternalAlloyLanguage.g:3125:9: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '\\'' | '\"' | '0' .. '9' )* )
-            // InternalAlloyLanguage.g:3032:11: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '\\'' | '\"' | '0' .. '9' )*
+            // InternalAlloyLanguage.g:3125:11: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '\\'' | '\"' | '0' .. '9' )*
            {
            if ( (input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
                input.consume();
@@ -1461,7 +1483,7 @@ public class InternalAlloyLanguageLexer extends Lexer {
                recover(mse);
                throw mse;}
-            // InternalAlloyLanguage.g:3032:35: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '\\'' | '\"' | '0' .. '9' )*
+            // InternalAlloyLanguage.g:3125:35: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '\\'' | '\"' | '0' .. '9' )*
            loop1:
            do {
                int alt1=2;
@@ -1510,10 +1532,10 @@ public class InternalAlloyLanguageLexer extends Lexer {
        try {
            int _type = RULE_INT;
            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalAlloyLanguage.g:3034:10: ( ( '0' .. '9' )+ )
+            // InternalAlloyLanguage.g:3127:10: ( ( '0' .. '9' )+ )
-            // InternalAlloyLanguage.g:3034:12: ( '0' .. '9' )+
+            // InternalAlloyLanguage.g:3127:12: ( '0' .. '9' )+
            {
-            // InternalAlloyLanguage.g:3034:12: ( '0' .. '9' )+
+            // InternalAlloyLanguage.g:3127:12: ( '0' .. '9' )+
            int cnt2=0;
            loop2:
            do {
@@ -1527,7 +1549,7 @@ public class InternalAlloyLanguageLexer extends Lexer {
                switch (alt2) {
                case 1 :
-                    // InternalAlloyLanguage.g:3034:13: '0' .. '9'
+                    // InternalAlloyLanguage.g:3127:13: '0' .. '9'
                    {
                    matchRange('0','9'); 
@@ -1559,10 +1581,10 @@ public class InternalAlloyLanguageLexer extends Lexer {
        try {
            int _type = RULE_STRING;
            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalAlloyLanguage.g:3036:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+            // InternalAlloyLanguage.g:3129:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
-            // InternalAlloyLanguage.g:3036:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalAlloyLanguage.g:3129:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
            {
-            // InternalAlloyLanguage.g:3036:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalAlloyLanguage.g:3129:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
            int alt5=2;
            int LA5_0 = input.LA(1);
@@ -1580,10 +1602,10 @@ public class InternalAlloyLanguageLexer extends Lexer {
            }
            switch (alt5) {
                case 1 :
-                    // InternalAlloyLanguage.g:3036:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+                    // InternalAlloyLanguage.g:3129:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
                    {
                    match('\"'); 
-                    // InternalAlloyLanguage.g:3036:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+                    // InternalAlloyLanguage.g:3129:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
                    loop3:
                    do {
                        int alt3=3;
@@ -1599,7 +1621,7 @@ public class InternalAlloyLanguageLexer extends Lexer {
                        switch (alt3) {
                        case 1 :
-                            // InternalAlloyLanguage.g:3036:21: '\\\\' .
+                            // InternalAlloyLanguage.g:3129:21: '\\\\' .
                            {
                            match('\\'); 
                            matchAny(); 
@@ -1607,7 +1629,7 @@ public class InternalAlloyLanguageLexer extends Lexer {
                            }
                            break;
                        case 2 :
-                            // InternalAlloyLanguage.g:3036:28: ~ ( ( '\\\\' | '\"' ) )
+                            // InternalAlloyLanguage.g:3129:28: ~ ( ( '\\\\' | '\"' ) )
                            {
                            if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                                input.consume();
@@ -1632,10 +1654,10 @@ public class InternalAlloyLanguageLexer extends Lexer {
                    }
                    break;
                case 2 :
-                    // InternalAlloyLanguage.g:3036:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+                    // InternalAlloyLanguage.g:3129:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
                    {
                    match('\''); 
-                    // InternalAlloyLanguage.g:3036:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    // InternalAlloyLanguage.g:3129:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
                    loop4:
                    do {
                        int alt4=3;
@@ -1651,7 +1673,7 @@ public class InternalAlloyLanguageLexer extends Lexer {
                        switch (alt4) {
                        case 1 :
-                            // InternalAlloyLanguage.g:3036:54: '\\\\' .
+                            // InternalAlloyLanguage.g:3129:54: '\\\\' .
                            {
                            match('\\'); 
                            matchAny(); 
@@ -1659,7 +1681,7 @@ public class InternalAlloyLanguageLexer extends Lexer {
                            }
                            break;
                        case 2 :
-                            // InternalAlloyLanguage.g:3036:61: ~ ( ( '\\\\' | '\\'' ) )
+                            // InternalAlloyLanguage.g:3129:61: ~ ( ( '\\\\' | '\\'' ) )
                            {
                            if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                                input.consume();
@@ -1702,12 +1724,12 @@ public class InternalAlloyLanguageLexer extends Lexer {
        try {
            int _type = RULE_ML_COMMENT;
            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalAlloyLanguage.g:3038:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalAlloyLanguage.g:3131:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // InternalAlloyLanguage.g:3038:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalAlloyLanguage.g:3131:19: '/*' ( options {greedy=false; } : . )* '*/'
            {
            match("/*"); 
-            // InternalAlloyLanguage.g:3038:24: ( options {greedy=false; } : . )*
+            // InternalAlloyLanguage.g:3131:24: ( options {greedy=false; } : . )*
            loop6:
            do {
                int alt6=2;
@@ -1732,7 +1754,7 @@ public class InternalAlloyLanguageLexer extends Lexer {
                switch (alt6) {
                case 1 :
-                    // InternalAlloyLanguage.g:3038:52: .
+                    // InternalAlloyLanguage.g:3131:52: .
                    {
                    matchAny(); 
@@ -1762,12 +1784,12 @@ public class InternalAlloyLanguageLexer extends Lexer {
        try {
            int _type = RULE_SL_COMMENT;
            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalAlloyLanguage.g:3040:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalAlloyLanguage.g:3133:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // InternalAlloyLanguage.g:3040:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalAlloyLanguage.g:3133:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
            {
            match("//"); 
-            // InternalAlloyLanguage.g:3040:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // InternalAlloyLanguage.g:3133:24: (~ ( ( '\\n' | '\\r' ) ) )*
            loop7:
            do {
                int alt7=2;
@@ -1780,7 +1802,7 @@ public class InternalAlloyLanguageLexer extends Lexer {
                switch (alt7) {
                case 1 :
-                    // InternalAlloyLanguage.g:3040:24: ~ ( ( '\\n' | '\\r' ) )
+                    // InternalAlloyLanguage.g:3133:24: ~ ( ( '\\n' | '\\r' ) )
                    {
                    if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
                        input.consume();
@@ -1800,7 +1822,7 @@ public class InternalAlloyLanguageLexer extends Lexer {
                }
            } while (true);
-            // InternalAlloyLanguage.g:3040:40: ( ( '\\r' )? '\\n' )?
+            // InternalAlloyLanguage.g:3133:40: ( ( '\\r' )? '\\n' )?
            int alt9=2;
            int LA9_0 = input.LA(1);
@@ -1809,9 +1831,9 @@ public class InternalAlloyLanguageLexer extends Lexer {
            }
            switch (alt9) {
                case 1 :
-                    // InternalAlloyLanguage.g:3040:41: ( '\\r' )? '\\n'
+                    // InternalAlloyLanguage.g:3133:41: ( '\\r' )? '\\n'
                    {
-                    // InternalAlloyLanguage.g:3040:41: ( '\\r' )?
+                    // InternalAlloyLanguage.g:3133:41: ( '\\r' )?
                    int alt8=2;
                    int LA8_0 = input.LA(1);
@@ -1820,7 +1842,7 @@ public class InternalAlloyLanguageLexer extends Lexer {
                    }
                    switch (alt8) {
                        case 1 :
-                            // InternalAlloyLanguage.g:3040:41: '\\r'
+                            // InternalAlloyLanguage.g:3133:41: '\\r'
                            {
                            match('\r'); 
@@ -1852,10 +1874,10 @@ public class InternalAlloyLanguageLexer extends Lexer {
        try {
            int _type = RULE_WS;
            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalAlloyLanguage.g:3042:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalAlloyLanguage.g:3135:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // InternalAlloyLanguage.g:3042:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalAlloyLanguage.g:3135:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
            {
-            // InternalAlloyLanguage.g:3042:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalAlloyLanguage.g:3135:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
            int cnt10=0;
            loop10:
            do {
@@ -1909,8 +1931,8 @@ public class InternalAlloyLanguageLexer extends Lexer {
        try {
            int _type = RULE_ANY_OTHER;
            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalAlloyLanguage.g:3044:16: ( . )
+            // InternalAlloyLanguage.g:3137:16: ( . )
-            // InternalAlloyLanguage.g:3044:18: .
+            // InternalAlloyLanguage.g:3137:18: .
            {
            matchAny(); 
@@ -1925,8 +1947,8 @@ public class InternalAlloyLanguageLexer extends Lexer {
    // $ANTLR end "RULE_ANY_OTHER"
    public void mTokens() throws RecognitionException {
-        // InternalAlloyLanguage.g:1:8: ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        // InternalAlloyLanguage.g:1:8: ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
-        int alt11=72;
+        int alt11=73;
        alt11 = dfa11.predict(input);
        switch (alt11) {
            case 1 :
@@ -2385,49 +2407,56 @@ public class InternalAlloyLanguageLexer extends Lexer {
                }
                break;
            case 66 :
-                // InternalAlloyLanguage.g:1:400: RULE_ID
+                // InternalAlloyLanguage.g:1:400: T__76
                {
-                mRULE_ID(); 
+                mT__76(); 
                }
                break;
            case 67 :
-                // InternalAlloyLanguage.g:1:408: RULE_INT
+                // InternalAlloyLanguage.g:1:406: RULE_ID
                {
-                mRULE_INT(); 
+                mRULE_ID(); 
                }
                break;
            case 68 :
-                // InternalAlloyLanguage.g:1:417: RULE_STRING
+                // InternalAlloyLanguage.g:1:414: RULE_INT
                {
-                mRULE_STRING(); 
+                mRULE_INT(); 
                }
                break;
            case 69 :
-                // InternalAlloyLanguage.g:1:429: RULE_ML_COMMENT
+                // InternalAlloyLanguage.g:1:423: RULE_STRING
                {
-                mRULE_ML_COMMENT(); 
+                mRULE_STRING(); 
                }
                break;
            case 70 :
-                // InternalAlloyLanguage.g:1:445: RULE_SL_COMMENT
+                // InternalAlloyLanguage.g:1:435: RULE_ML_COMMENT
                {
-                mRULE_SL_COMMENT(); 
+                mRULE_ML_COMMENT(); 
                }
                break;
            case 71 :
-                // InternalAlloyLanguage.g:1:461: RULE_WS
+                // InternalAlloyLanguage.g:1:451: RULE_SL_COMMENT
                {
-                mRULE_WS(); 
+                mRULE_SL_COMMENT(); 
                }
                break;
            case 72 :
-                // InternalAlloyLanguage.g:1:469: RULE_ANY_OTHER
+                // InternalAlloyLanguage.g:1:467: RULE_WS
+                {
+                mRULE_WS(); 
+                }
+                break;
+            case 73 :
+                // InternalAlloyLanguage.g:1:475: RULE_ANY_OTHER
                {
                mRULE_ANY_OTHER(); 
@@ -2441,97 +2470,96 @@ public class InternalAlloyLanguageLexer extends Lexer {
    protected DFA11 dfa11 = new DFA11(this);
    static final String DFA11_eotS =
-        "\1\uffff\1\56\3\uffff\3\56\1\76\1\100\1\56\2\uffff\2\56\1\52\1\56\1\116\1\120\1\122\1\124\1\126\1\uffff\1\131\1\56\4\uffff\2\56\2\uffff\3\56\2\uffff\3\52\2\uffff\3\56\4\uffff\7\56\1\170\3\56\4\uffff\3\56\2\uffff\3\56\1\uffff\1\u0083\1\56\1\u0086\15\uffff\1\u0089\4\uffff\2\56\2\uffff\4\56\5\uffff\5\56\1\u0095\1\u0096\1\u0097\1\u0098\1\u0099\1\56\1\u009b\1\uffff\1\u009c\2\56\1\u009f\1\56\1\u00a1\3\56\1\u00a5\1\uffff\1\u00a6\2\uffff\1\u00a7\1\56\1\uffff\1\56\1\u00aa\1\u00ab\1\u00ac\1\56\1\u00ae\1\u00af\2\56\1\u00b2\1\56\5\uffff\1\u00b4\2\uffff\1\56\1\u00b6\1\uffff\1\u00b7\1\uffff\1\u00b8\1\u00b9\1\u00ba\3\uffff\1\u00bb\1\u00bc\3\uffff\1\u00bd\2\uffff\2\56\1\uffff\1\56\1\uffff\1\56\10\uffff\4\56\1\u00c6\1\u00c7\1\56\1\u00c9\2\uffff\1\u00ca\2\uffff";
+        "\1\uffff\1\57\3\uffff\3\57\1\77\1\101\1\57\2\uffff\2\57\1\53\1\57\1\117\1\121\1\123\1\125\1\127\1\uffff\1\132\1\57\4\uffff\3\57\2\uffff\3\57\2\uffff\3\53\2\uffff\3\57\4\uffff\7\57\1\172\3\57\4\uffff\3\57\2\uffff\3\57\1\uffff\1\u0085\1\57\1\u0088\15\uffff\1\u008b\4\uffff\3\57\2\uffff\4\57\5\uffff\5\57\1\u0098\1\u0099\1\u009a\1\u009b\1\u009c\1\57\1\u009e\1\uffff\1\u009f\2\57\1\u00a2\1\57\1\u00a4\3\57\1\u00a8\1\uffff\1\u00a9\2\uffff\1\u00aa\1\57\1\uffff\1\57\1\u00ad\1\57\1\u00af\1\u00b0\1\57\1\u00b2\1\u00b3\2\57\1\u00b6\1\57\5\uffff\1\u00b8\2\uffff\1\57\1\u00ba\1\uffff\1\u00bb\1\uffff\1\u00bc\1\u00bd\1\u00be\3\uffff\1\u00bf\1\u00c0\1\uffff\1\57\2\uffff\1\u00c2\2\uffff\2\57\1\uffff\1\57\1\uffff\1\57\7\uffff\1\57\1\uffff\4\57\1\u00cc\1\u00cd\1\u00ce\1\57\1\u00d0\3\uffff\1\u00d1\2\uffff";
    static final String DFA11_eofS =
-        "\u00cb\uffff";
+        "\u00d2\uffff";
    static final String DFA11_minS =
-        "\1\0\1\154\3\uffff\1\142\1\145\1\144\1\53\1\76\1\141\2\uffff\1\154\1\151\1\174\1\156\1\72\1\76\1\46\2\75\1\uffff\1\76\1\157\4\uffff\2\156\2\uffff\1\145\1\157\1\165\2\uffff\2\0\1\52\2\uffff\1\165\1\141\1\163\4\uffff\1\163\1\144\1\154\1\147\1\142\1\155\1\164\1\42\1\146\1\160\1\145\4\uffff\1\156\1\143\1\162\2\uffff\1\145\1\165\1\163\1\uffff\1\42\1\145\1\76\15\uffff\1\42\4\uffff\1\151\1\164\2\uffff\1\156\1\155\1\156\1\154\5\uffff\1\155\1\145\1\143\1\145\1\164\5\42\1\145\1\42\1\uffff\1\42\1\154\1\156\1\42\1\164\1\42\1\144\1\163\1\152\1\42\1\uffff\1\42\2\uffff\1\42\1\145\1\uffff\1\166\3\42\1\145\2\42\1\156\1\164\1\42\1\162\5\uffff\1\42\2\uffff\1\151\1\42\1\uffff\1\42\1\uffff\3\42\3\uffff\2\42\3\uffff\1\42\2\uffff\1\144\1\154\1\uffff\1\141\1\uffff\1\145\10\uffff\1\163\1\171\1\143\1\163\2\42\1\164\1\42\2\uffff\1\42\2\uffff";
+        "\1\0\1\154\3\uffff\1\142\1\145\1\144\1\53\1\76\1\141\2\uffff\1\154\1\151\1\174\1\156\1\72\1\76\1\46\2\75\1\uffff\1\76\1\157\4\uffff\2\156\1\164\2\uffff\1\145\1\157\1\165\2\uffff\2\0\1\52\2\uffff\1\165\1\141\1\163\4\uffff\1\163\1\144\1\154\1\147\1\142\1\155\1\164\1\42\1\146\1\160\1\145\4\uffff\1\156\1\143\1\162\2\uffff\1\145\1\165\1\163\1\uffff\1\42\1\145\1\76\15\uffff\1\42\4\uffff\1\151\1\164\1\162\2\uffff\1\156\1\155\1\156\1\154\5\uffff\1\155\1\145\1\143\1\145\1\164\5\42\1\145\1\42\1\uffff\1\42\1\154\1\156\1\42\1\164\1\42\1\144\1\163\1\152\1\42\1\uffff\1\42\2\uffff\1\42\1\145\1\uffff\1\166\1\42\1\151\2\42\1\145\2\42\1\156\1\164\1\42\1\162\5\uffff\1\42\2\uffff\1\151\1\42\1\uffff\1\42\1\uffff\3\42\3\uffff\2\42\1\uffff\1\156\2\uffff\1\42\2\uffff\1\144\1\154\1\uffff\1\141\1\uffff\1\145\7\uffff\1\147\1\uffff\1\163\1\171\1\143\1\163\3\42\1\164\1\42\3\uffff\1\42\2\uffff";
    static final String DFA11_maxS =
-        "\1\uffff\1\170\3\uffff\1\156\1\165\1\156\1\53\1\76\1\165\2\uffff\1\162\1\151\1\174\1\162\1\75\1\76\1\46\2\75\1\uffff\1\76\1\157\4\uffff\2\156\2\uffff\1\165\1\157\1\165\2\uffff\2\uffff\1\57\2\uffff\1\165\1\164\1\163\4\uffff\1\163\1\144\1\154\1\147\2\155\1\164\1\172\1\146\1\160\1\145\4\uffff\1\156\1\143\1\162\2\uffff\1\145\1\165\1\166\1\uffff\1\172\1\145\1\76\15\uffff\1\172\4\uffff\1\151\1\164\2\uffff\1\156\1\155\1\156\1\154\5\uffff\1\155\1\145\1\143\1\145\1\164\5\172\1\145\1\172\1\uffff\1\172\1\154\1\156\1\172\1\164\1\172\1\144\1\163\1\152\1\172\1\uffff\1\172\2\uffff\1\172\1\145\1\uffff\1\166\3\172\1\145\2\172\1\156\1\164\1\172\1\162\5\uffff\1\172\2\uffff\1\151\1\172\1\uffff\1\172\1\uffff\3\172\3\uffff\2\172\3\uffff\1\172\2\uffff\1\144\1\154\1\uffff\1\141\1\uffff\1\145\10\uffff\1\163\1\171\1\143\1\163\2\172\1\164\1\172\2\uffff\1\172\2\uffff";
+        "\1\uffff\1\170\3\uffff\1\156\1\165\1\156\1\53\1\76\1\165\2\uffff\1\162\1\151\1\174\1\162\1\75\1\76\1\46\2\75\1\uffff\1\76\1\157\4\uffff\2\156\1\164\2\uffff\1\165\1\157\1\165\2\uffff\2\uffff\1\57\2\uffff\1\165\1\164\1\163\4\uffff\1\163\1\144\1\154\1\147\2\155\1\164\1\172\1\146\1\160\1\145\4\uffff\1\156\1\143\1\162\2\uffff\1\145\1\165\1\166\1\uffff\1\172\1\145\1\76\15\uffff\1\172\4\uffff\1\151\1\164\1\162\2\uffff\1\156\1\155\1\156\1\154\5\uffff\1\155\1\145\1\143\1\145\1\164\5\172\1\145\1\172\1\uffff\1\172\1\154\1\156\1\172\1\164\1\172\1\144\1\163\1\152\1\172\1\uffff\1\172\2\uffff\1\172\1\145\1\uffff\1\166\1\172\1\151\2\172\1\145\2\172\1\156\1\164\1\172\1\162\5\uffff\1\172\2\uffff\1\151\1\172\1\uffff\1\172\1\uffff\3\172\3\uffff\2\172\1\uffff\1\156\2\uffff\1\172\2\uffff\1\144\1\154\1\uffff\1\141\1\uffff\1\145\7\uffff\1\147\1\uffff\1\163\1\171\1\143\1\163\3\172\1\164\1\172\3\uffff\1\172\2\uffff";
    static final String DFA11_acceptS =
-        "\2\uffff\1\2\1\3\1\4\6\uffff\1\14\1\15\11\uffff\1\43\2\uffff\1\51\1\52\1\53\1\54\2\uffff\1\62\1\63\3\uffff\1\102\1\103\3\uffff\1\107\1\110\3\uffff\1\102\1\2\1\3\1\4\13\uffff\1\40\1\11\1\41\1\12\3\uffff\1\14\1\15\3\uffff\1\21\3\uffff\1\42\1\36\1\25\1\32\1\30\1\45\1\33\1\47\1\35\1\34\1\43\1\46\1\44\1\uffff\1\51\1\52\1\53\1\54\2\uffff\1\62\1\63\4\uffff\1\103\1\104\1\105\1\106\1\107\14\uffff\1\10\12\uffff\1\22\1\uffff\1\23\1\37\2\uffff\1\70\13\uffff\1\31\1\67\1\6\1\55\1\76\1\uffff\1\74\1\24\2\uffff\1\13\1\uffff\1\65\3\uffff\1\101\1\73\1\50\2\uffff\1\61\1\64\1\100\1\uffff\1\77\1\1\2\uffff\1\27\1\uffff\1\71\1\uffff\1\57\1\17\1\16\1\75\1\20\1\56\1\60\1\72\10\uffff\1\7\1\66\1\uffff\1\26\1\5";
+        "\2\uffff\1\2\1\3\1\4\6\uffff\1\14\1\15\11\uffff\1\43\2\uffff\1\51\1\52\1\53\1\54\3\uffff\1\63\1\64\3\uffff\1\103\1\104\3\uffff\1\110\1\111\3\uffff\1\103\1\2\1\3\1\4\13\uffff\1\40\1\11\1\41\1\12\3\uffff\1\14\1\15\3\uffff\1\21\3\uffff\1\42\1\36\1\25\1\32\1\30\1\45\1\33\1\47\1\35\1\34\1\43\1\46\1\44\1\uffff\1\51\1\52\1\53\1\54\3\uffff\1\63\1\64\4\uffff\1\104\1\105\1\106\1\107\1\110\14\uffff\1\10\12\uffff\1\22\1\uffff\1\23\1\37\2\uffff\1\71\14\uffff\1\31\1\70\1\6\1\55\1\77\1\uffff\1\75\1\24\2\uffff\1\13\1\uffff\1\66\3\uffff\1\102\1\74\1\50\2\uffff\1\61\1\uffff\1\65\1\101\1\uffff\1\100\1\1\2\uffff\1\27\1\uffff\1\72\1\uffff\1\57\1\17\1\16\1\76\1\20\1\56\1\60\1\uffff\1\73\11\uffff\1\62\1\7\1\67\1\uffff\1\26\1\5";
    static final String DFA11_specialS =
-        "\1\0\45\uffff\1\1\1\2\u00a3\uffff}>";
+        "\1\1\46\uffff\1\2\1\0\u00a9\uffff}>";
    static final String[] DFA11_transitionS = {
-            "\11\52\2\51\2\52\1\51\22\52\1\51\1\24\1\46\1\34\2\52\1\23\1\47\1\37\1\40\1\33\1\10\1\3\1\27\1\26\1\50\12\45\1\11\1\52\1\21\1\22\1\25\2\52\10\44\1\36\21\44\1\13\1\52\1\14\1\32\1\44\1\52\1\5\2\44\1\16\1\1\1\12\2\44\1\7\2\44\1\42\1\43\1\30\1\20\1\15\1\44\1\41\1\6\1\44\1\35\5\44\1\2\1\17\1\4\1\31\uff81\52",
+            "\11\53\2\52\2\53\1\52\22\53\1\52\1\24\1\47\1\34\2\53\1\23\1\50\1\40\1\41\1\33\1\10\1\3\1\27\1\26\1\51\12\46\1\11\1\53\1\21\1\22\1\25\2\53\10\45\1\36\11\45\1\37\7\45\1\13\1\53\1\14\1\32\1\45\1\53\1\5\2\45\1\16\1\1\1\12\2\45\1\7\2\45\1\43\1\44\1\30\1\20\1\15\1\45\1\42\1\6\1\45\1\35\5\45\1\2\1\17\1\4\1\31\uff81\53",
-            "\1\55\1\uffff\1\53\11\uffff\1\54",
+            "\1\56\1\uffff\1\54\11\uffff\1\55",
            "",
            "",
            "",
-            "\1\62\11\uffff\1\64\1\uffff\1\63",
+            "\1\63\11\uffff\1\65\1\uffff\1\64",
-            "\1\70\3\uffff\1\65\5\uffff\1\67\5\uffff\1\66",
+            "\1\71\3\uffff\1\66\5\uffff\1\70\5\uffff\1\67",
-            "\1\74\1\uffff\1\72\6\uffff\1\73\1\71",
+            "\1\75\1\uffff\1\73\6\uffff\1\74\1\72",
-            "\1\75",
+            "\1\76",
-            "\1\77",
+            "\1\100",
-            "\1\102\15\uffff\1\103\5\uffff\1\101",
+            "\1\103\15\uffff\1\104\5\uffff\1\102",
            "",
            "",
-            "\1\107\5\uffff\1\106",
+            "\1\110\5\uffff\1\107",
-            "\1\110",
            "\1\111",
-            "\1\113\3\uffff\1\112",
+            "\1\112",
-            "\1\115\2\uffff\1\114",
+            "\1\114\3\uffff\1\113",
-            "\1\117",
+            "\1\116\2\uffff\1\115",
-            "\1\121",
+            "\1\120",
-            "\1\123",
+            "\1\122",
-            "\1\125",
+            "\1\124",
+            "\1\126",
            "",
-            "\1\130",
+            "\1\131",
-            "\1\132",
+            "\1\133",
            "",
            "",
            "",
            "",
-            "\1\137",
            "\1\140",
+            "\1\141",
+            "\1\142",
            "",
            "",
-            "\1\144\17\uffff\1\143",
+            "\1\146\17\uffff\1\145",
-            "\1\145",
+            "\1\147",
-            "\1\146",
+            "\1\150",
            "",
            "",
-            "\0\150",
+            "\0\152",
-            "\0\150",
+            "\0\152",
-            "\1\151\4\uffff\1\152",
+            "\1\153\4\uffff\1\154",
            "",
            "",
-            "\1\154",
+            "\1\156",
-            "\1\156\22\uffff\1\155",
+            "\1\160\22\uffff\1\157",
-            "\1\157",
+            "\1\161",
            "",
            "",
            "",
            "",
-            "\1\160",
-            "\1\161",
            "\1\162",
            "\1\163",
-            "\1\165\12\uffff\1\164",
+            "\1\164",
-            "\1\166",
+            "\1\165",
-            "\1\167",
+            "\1\167\12\uffff\1\166",
-            "\1\56\4\uffff\1\56\10\uffff\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
+            "\1\170",
            "\1\171",
-            "\1\172",
+            "\1\57\4\uffff\1\57\10\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
            "\1\173",
+            "\1\174",
+            "\1\175",
            "",
            "",
            "",
            "",
-            "\1\174",
-            "\1\175",
            "\1\176",
-            "",
-            "",
            "\1\177",
            "\1\u0080",
-            "\1\u0081\2\uffff\1\u0082",
            "",
-            "\1\56\4\uffff\1\56\10\uffff\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
-            "\1\u0084",
-            "\1\u0085",
            "",
+            "\1\u0081",
+            "\1\u0082",
+            "\1\u0083\2\uffff\1\u0084",
            "",
+            "\1\57\4\uffff\1\57\10\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
+            "\1\u0086",
+            "\1\u0087",
            "",
            "",
            "",
@@ -2543,98 +2571,103 @@ public class InternalAlloyLanguageLexer extends Lexer {
            "",
            "",
            "",
-            "\1\56\4\uffff\1\56\10\uffff\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\15\56\1\u0088\5\56\1\u0087\6\56",
            "",
            "",
+            "\1\57\4\uffff\1\57\10\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\15\57\1\u008a\5\57\1\u0089\6\57",
            "",
            "",
-            "\1\u008a",
-            "\1\u008b",
            "",
            "",
            "\1\u008c",
            "\1\u008d",
            "\1\u008e",
+            "",
+            "",
            "\1\u008f",
+            "\1\u0090",
+            "\1\u0091",
+            "\1\u0092",
            "",
            "",
            "",
            "",
            "",
-            "\1\u0090",
-            "\1\u0091",
-            "\1\u0092",
            "\1\u0093",
            "\1\u0094",
-            "\1\56\4\uffff\1\56\10\uffff\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
+            "\1\u0095",
-            "\1\56\4\uffff\1\56\10\uffff\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
+            "\1\u0096",
-            "\1\56\4\uffff\1\56\10\uffff\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
+            "\1\u0097",
-            "\1\56\4\uffff\1\56\10\uffff\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
+            "\1\57\4\uffff\1\57\10\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
-            "\1\56\4\uffff\1\56\10\uffff\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
+            "\1\57\4\uffff\1\57\10\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
-            "\1\u009a",
+            "\1\57\4\uffff\1\57\10\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
-            "\1\56\4\uffff\1\56\10\uffff\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
+            "\1\57\4\uffff\1\57\10\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
-            "",
+            "\1\57\4\uffff\1\57\10\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
-            "\1\56\4\uffff\1\56\10\uffff\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
            "\1\u009d",
-            "\1\u009e",
+            "\1\57\4\uffff\1\57\10\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
-            "\1\56\4\uffff\1\56\10\uffff\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
+            "",
+            "\1\57\4\uffff\1\57\10\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
            "\1\u00a0",
-            "\1\56\4\uffff\1\56\10\uffff\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
+            "\1\u00a1",
-            "\1\u00a2",
+            "\1\57\4\uffff\1\57\10\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
            "\1\u00a3",
-            "\1\u00a4",
+            "\1\57\4\uffff\1\57\10\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
-            "\1\56\4\uffff\1\56\10\uffff\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
+            "\1\u00a5",
+            "\1\u00a6",
+            "\1\u00a7",
+            "\1\57\4\uffff\1\57\10\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
            "",
-            "\1\56\4\uffff\1\56\10\uffff\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
+            "\1\57\4\uffff\1\57\10\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
            "",
            "",
-            "\1\56\4\uffff\1\56\10\uffff\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
+            "\1\57\4\uffff\1\57\10\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
-            "\1\u00a8",
+            "\1\u00ab",
            "",
-            "\1\u00a9",
+            "\1\u00ac",
-            "\1\56\4\uffff\1\56\10\uffff\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
+            "\1\57\4\uffff\1\57\10\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
-            "\1\56\4\uffff\1\56\10\uffff\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
+            "\1\u00ae",
-            "\1\56\4\uffff\1\56\10\uffff\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
+            "\1\57\4\uffff\1\57\10\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
-            "\1\u00ad",
+            "\1\57\4\uffff\1\57\10\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
-            "\1\56\4\uffff\1\56\10\uffff\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
-            "\1\56\4\uffff\1\56\10\uffff\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
-            "\1\u00b0",
            "\1\u00b1",
-            "\1\56\4\uffff\1\56\10\uffff\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
+            "\1\57\4\uffff\1\57\10\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
-            "\1\u00b3",
+            "\1\57\4\uffff\1\57\10\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
+            "\1\u00b4",
+            "\1\u00b5",
+            "\1\57\4\uffff\1\57\10\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
+            "\1\u00b7",
            "",
            "",
            "",
            "",
            "",
-            "\1\56\4\uffff\1\56\10\uffff\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
+            "\1\57\4\uffff\1\57\10\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
            "",
            "",
-            "\1\u00b5",
+            "\1\u00b9",
-            "\1\56\4\uffff\1\56\10\uffff\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
+            "\1\57\4\uffff\1\57\10\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
            "",
-            "\1\56\4\uffff\1\56\10\uffff\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
+            "\1\57\4\uffff\1\57\10\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
            "",
-            "\1\56\4\uffff\1\56\10\uffff\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
+            "\1\57\4\uffff\1\57\10\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
-            "\1\56\4\uffff\1\56\10\uffff\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
+            "\1\57\4\uffff\1\57\10\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
-            "\1\56\4\uffff\1\56\10\uffff\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
+            "\1\57\4\uffff\1\57\10\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
            "",
            "",
            "",
-            "\1\56\4\uffff\1\56\10\uffff\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
+            "\1\57\4\uffff\1\57\10\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
-            "\1\56\4\uffff\1\56\10\uffff\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
+            "\1\57\4\uffff\1\57\10\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
            "",
+            "\1\u00c1",
            "",
            "",
-            "\1\56\4\uffff\1\56\10\uffff\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
+            "\1\57\4\uffff\1\57\10\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
            "",
            "",
-            "\1\u00be",
+            "\1\u00c3",
-            "\1\u00bf",
+            "\1\u00c4",
            "",
-            "\1\u00c0",
+            "\1\u00c5",
            "",
-            "\1\u00c1",
+            "\1\u00c6",
            "",
            "",
            "",
@@ -2642,18 +2675,21 @@ public class InternalAlloyLanguageLexer extends Lexer {
            "",
            "",
            "",
+            "\1\u00c7",
            "",
-            "\1\u00c2",
-            "\1\u00c3",
-            "\1\u00c4",
-            "\1\u00c5",
-            "\1\56\4\uffff\1\56\10\uffff\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
-            "\1\56\4\uffff\1\56\10\uffff\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
            "\1\u00c8",
-            "\1\56\4\uffff\1\56\10\uffff\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
+            "\1\u00c9",
+            "\1\u00ca",
+            "\1\u00cb",
+            "\1\57\4\uffff\1\57\10\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
+            "\1\57\4\uffff\1\57\10\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
+            "\1\57\4\uffff\1\57\10\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
+            "\1\u00cf",
+            "\1\57\4\uffff\1\57\10\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
+            "",
            "",
            "",
-            "\1\56\4\uffff\1\56\10\uffff\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
+            "\1\57\4\uffff\1\57\10\uffff\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
            "",
            ""
    };
@@ -2688,13 +2724,23 @@ public class InternalAlloyLanguageLexer extends Lexer {
            this.transition = DFA11_transition;
        }
        public String getDescription() {
-            return "1:1: Tokens : ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
+            return "1:1: Tokens : ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
        }
        public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
            IntStream input = _input;
                int _s = s;
            switch ( s ) {
                    case 0 : 
+                        int LA11_40 = input.LA(1);
+                        s = -1;
+                        if ( ((LA11_40>='\u0000' && LA11_40<='\uFFFF')) ) {s = 106;}
+                        else s = 43;
+                        if ( s>=0 ) return s;
+                        break;
+                    case 1 : 
                        int LA11_0 = input.LA(1);
                        s = -1;
@@ -2758,39 +2804,31 @@ public class InternalAlloyLanguageLexer extends Lexer {
                        else if ( (LA11_0=='I') ) {s = 30;}
-                        else if ( (LA11_0=='(') ) {s = 31;}
+                        else if ( (LA11_0=='S') ) {s = 31;}
-                        else if ( (LA11_0==')') ) {s = 32;}
+                        else if ( (LA11_0=='(') ) {s = 32;}
-                        else if ( (LA11_0=='r') ) {s = 33;}
+                        else if ( (LA11_0==')') ) {s = 33;}
-                        else if ( (LA11_0=='l') ) {s = 34;}
+                        else if ( (LA11_0=='r') ) {s = 34;}
-                        else if ( (LA11_0=='m') ) {s = 35;}
+                        else if ( (LA11_0=='l') ) {s = 35;}
-                        else if ( ((LA11_0>='A' && LA11_0<='H')||(LA11_0>='J' && LA11_0<='Z')||LA11_0=='_'||(LA11_0>='b' && LA11_0<='c')||(LA11_0>='g' && LA11_0<='h')||(LA11_0>='j' && LA11_0<='k')||LA11_0=='q'||LA11_0=='t'||(LA11_0>='v' && LA11_0<='z')) ) {s = 36;}
+                        else if ( (LA11_0=='m') ) {s = 36;}
-                        else if ( ((LA11_0>='0' && LA11_0<='9')) ) {s = 37;}
+                        else if ( ((LA11_0>='A' && LA11_0<='H')||(LA11_0>='J' && LA11_0<='R')||(LA11_0>='T' && LA11_0<='Z')||LA11_0=='_'||(LA11_0>='b' && LA11_0<='c')||(LA11_0>='g' && LA11_0<='h')||(LA11_0>='j' && LA11_0<='k')||LA11_0=='q'||LA11_0=='t'||(LA11_0>='v' && LA11_0<='z')) ) {s = 37;}
-                        else if ( (LA11_0=='\"') ) {s = 38;}
+                        else if ( ((LA11_0>='0' && LA11_0<='9')) ) {s = 38;}
-                        else if ( (LA11_0=='\'') ) {s = 39;}
+                        else if ( (LA11_0=='\"') ) {s = 39;}
-                        else if ( (LA11_0=='/') ) {s = 40;}
+                        else if ( (LA11_0=='\'') ) {s = 40;}
-                        else if ( ((LA11_0>='\t' && LA11_0<='\n')||LA11_0=='\r'||LA11_0==' ') ) {s = 41;}
+                        else if ( (LA11_0=='/') ) {s = 41;}
-                        else if ( ((LA11_0>='\u0000' && LA11_0<='\b')||(LA11_0>='\u000B' && LA11_0<='\f')||(LA11_0>='\u000E' && LA11_0<='\u001F')||(LA11_0>='$' && LA11_0<='%')||LA11_0==';'||(LA11_0>='?' && LA11_0<='@')||LA11_0=='\\'||LA11_0=='`'||(LA11_0>='\u007F' && LA11_0<='\uFFFF')) ) {s = 42;}
+                        else if ( ((LA11_0>='\t' && LA11_0<='\n')||LA11_0=='\r'||LA11_0==' ') ) {s = 42;}
-                        if ( s>=0 ) return s;
-                        break;
-                    case 1 : 
-                        int LA11_38 = input.LA(1);
-                        s = -1;
-                        if ( ((LA11_38>='\u0000' && LA11_38<='\uFFFF')) ) {s = 104;}
-                        else s = 42;
+                        else if ( ((LA11_0>='\u0000' && LA11_0<='\b')||(LA11_0>='\u000B' && LA11_0<='\f')||(LA11_0>='\u000E' && LA11_0<='\u001F')||(LA11_0>='$' && LA11_0<='%')||LA11_0==';'||(LA11_0>='?' && LA11_0<='@')||LA11_0=='\\'||LA11_0=='`'||(LA11_0>='\u007F' && LA11_0<='\uFFFF')) ) {s = 43;}
                        if ( s>=0 ) return s;
                        break;
@@ -2798,9 +2836,9 @@ public class InternalAlloyLanguageLexer extends Lexer {
                        int LA11_39 = input.LA(1);
                        s = -1;
-                        if ( ((LA11_39>='\u0000' && LA11_39<='\uFFFF')) ) {s = 104;}
+                        if ( ((LA11_39>='\u0000' && LA11_39<='\uFFFF')) ) {s = 106;}
-                        else s = 42;
+                        else s = 43;
                        if ( s>=0 ) return s;
                        break;
diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/parser/antlr/internal/InternalAlloyLanguageParser.java b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/parser/antlr/internal/InternalAlloyLanguageParser.java
index 1735afbd..bb317b9b 100644
--- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/parser/antlr/internal/InternalAlloyLanguageParser.java
+++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/parser/antlr/internal/InternalAlloyLanguageParser.java
@@ -23,7 +23,7 @@ import java.util.HashMap;
 @SuppressWarnings("all")
 public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
    public static final String[] tokenNames = new String[] {
-        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_INT", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'enum'", "'{'", "','", "'}'", "'abstract'", "'sig'", "'extends'", "'in'", "'+'", "':'", "'fun'", "'['", "']'", "'pred'", "'fact'", "'disj'", "'||'", "'or'", "'<=>'", "'iff'", "'=>'", "'implies'", "'else'", "'&&'", "'and'", "'='", "'!='", "'>'", "'>='", "'<'", "'<='", "'++'", "':>'", "'<:'", "'.'", "'-'", "'&'", "'->'", "'!'", "'not'", "'~'", "'^'", "'*'", "'#'", "'sum'", "'none'", "'iden'", "'univ'", "'Int'", "'('", "')'", "'run'", "'for'", "'exactly'", "'all'", "'no'", "'some'", "'lone'", "'one'", "'set'", "'plus'", "'sub'", "'mul'", "'rem'", "'div'"
+        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_INT", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'enum'", "'{'", "','", "'}'", "'abstract'", "'sig'", "'extends'", "'in'", "'+'", "':'", "'fun'", "'['", "']'", "'pred'", "'fact'", "'disj'", "'||'", "'or'", "'<=>'", "'iff'", "'=>'", "'implies'", "'else'", "'&&'", "'and'", "'='", "'!='", "'>'", "'>='", "'<'", "'<='", "'++'", "':>'", "'<:'", "'.'", "'-'", "'&'", "'->'", "'!'", "'not'", "'~'", "'^'", "'*'", "'#'", "'sum'", "'none'", "'iden'", "'univ'", "'Int'", "'String'", "'('", "')'", "'run'", "'for'", "'exactly'", "'all'", "'no'", "'some'", "'lone'", "'one'", "'set'", "'plus'", "'sub'", "'mul'", "'rem'", "'div'"
    };
    public static final int T__50=50;
    public static final int T__19=19;
@@ -86,6 +86,7 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
    public static final int T__31=31;
    public static final int T__75=75;
    public static final int T__32=32;
+    public static final int T__76=76;
    public static final int RULE_WS=9;
    public static final int RULE_ANY_OTHER=10;
    public static final int T__48=48;
@@ -217,12 +218,12 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
                    break;
                case 15:
                case 16:
-                case 65:
                case 66:
                case 67:
                case 68:
                case 69:
                case 70:
+                case 71:
                    {
                    alt1=2;
                    }
@@ -1291,7 +1292,7 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
                int alt4=3;
                int LA4_0 = input.LA(1);
-                if ( LA4_0 >= 65 && LA4_0 <= 70 && getUnorderedGroupHelper().canSelect(grammarAccess.getALSSignatureBodyAccess().getUnorderedGroup_0(), 0) ) {
+                if ( LA4_0 >= 66 && LA4_0 <= 71 && getUnorderedGroupHelper().canSelect(grammarAccess.getALSSignatureBodyAccess().getUnorderedGroup_0(), 0) ) {
                    alt4=1;
                }
                else if ( LA4_0 == 15 && getUnorderedGroupHelper().canSelect(grammarAccess.getALSSignatureBodyAccess().getUnorderedGroup_0(), 1) ) {
@@ -3040,10 +3041,10 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
            int alt16=2;
            int LA16_0 = input.LA(1);
-            if ( ((LA16_0>=65 && LA16_0<=70)) ) {
+            if ( ((LA16_0>=66 && LA16_0<=71)) ) {
                alt16=1;
            }
-            else if ( ((LA16_0>=RULE_ID && LA16_0<=RULE_INT)||LA16_0==46||(LA16_0>=49 && LA16_0<=60)||(LA16_0>=71 && LA16_0<=75)) ) {
+            else if ( ((LA16_0>=RULE_ID && LA16_0<=RULE_STRING)||LA16_0==46||(LA16_0>=49 && LA16_0<=61)||(LA16_0>=72 && LA16_0<=76)) ) {
                alt16=2;
            }
            else {
@@ -5957,7 +5958,7 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
            int alt37=2;
            int LA37_0 = input.LA(1);
-            if ( (LA37_0==48||(LA37_0>=65 && LA37_0<=70)) ) {
+            if ( (LA37_0==48||(LA37_0>=66 && LA37_0<=71)) ) {
                alt37=1;
            }
            switch (alt37) {
@@ -5981,7 +5982,7 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
                    int alt35=2;
                    int LA35_0 = input.LA(1);
-                    if ( ((LA35_0>=65 && LA35_0<=70)) ) {
+                    if ( ((LA35_0>=66 && LA35_0<=71)) ) {
                        alt35=1;
                    }
                    switch (alt35) {
@@ -6033,7 +6034,7 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
                    int alt36=2;
                    int LA36_0 = input.LA(1);
-                    if ( ((LA36_0>=65 && LA36_0<=70)) ) {
+                    if ( ((LA36_0>=66 && LA36_0<=71)) ) {
                        alt36=1;
                    }
                    switch (alt36) {
@@ -6892,7 +6893,7 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
                    if ( (LA40_0==RULE_ID) ) {
                        alt40=1;
                    }
-                    else if ( ((LA40_0>=71 && LA40_0<=75)) ) {
+                    else if ( ((LA40_0>=72 && LA40_0<=76)) ) {
                        alt40=2;
                    }
                    else {
@@ -7339,7 +7340,7 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
    // $ANTLR start "ruleALSBasicRelationTerm"
-    // InternalAlloyLanguage.g:2602:1: ruleALSBasicRelationTerm returns [EObject current=null] : ( ( () otherlv_1= 'none' ) | ( () otherlv_3= 'iden' ) | ( () otherlv_5= 'univ' ) | ( () otherlv_7= 'Int' ) | ( () ( (otherlv_9= RULE_ID ) ) ) | ( () ( (lv_value_11_0= RULE_INT ) ) ) | (otherlv_12= '(' this_ALSTerm_13= ruleALSTerm otherlv_14= ')' ) ) ;
+    // InternalAlloyLanguage.g:2602:1: ruleALSBasicRelationTerm returns [EObject current=null] : ( ( () otherlv_1= 'none' ) | ( () otherlv_3= 'iden' ) | ( () otherlv_5= 'univ' ) | ( () otherlv_7= 'Int' ) | ( () otherlv_9= 'String' ) | ( () ( (otherlv_11= RULE_ID ) ) ) | ( () ( (lv_value_13_0= RULE_INT ) ) ) | ( () ( (lv_value_15_0= RULE_STRING ) ) ) | (otherlv_16= '(' this_ALSTerm_17= ruleALSTerm otherlv_18= ')' ) ) ;
    public final EObject ruleALSBasicRelationTerm() throws RecognitionException {
        EObject current = null;
@@ -7348,20 +7349,22 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
        Token otherlv_5=null;
        Token otherlv_7=null;
        Token otherlv_9=null;
-        Token lv_value_11_0=null;
+        Token otherlv_11=null;
-        Token otherlv_12=null;
+        Token lv_value_13_0=null;
-        Token otherlv_14=null;
+        Token lv_value_15_0=null;
-        EObject this_ALSTerm_13 = null;
+        Token otherlv_16=null;
+        Token otherlv_18=null;
+        EObject this_ALSTerm_17 = null;
         enterRule(); 
            
        try {
-            // InternalAlloyLanguage.g:2605:28: ( ( ( () otherlv_1= 'none' ) | ( () otherlv_3= 'iden' ) | ( () otherlv_5= 'univ' ) | ( () otherlv_7= 'Int' ) | ( () ( (otherlv_9= RULE_ID ) ) ) | ( () ( (lv_value_11_0= RULE_INT ) ) ) | (otherlv_12= '(' this_ALSTerm_13= ruleALSTerm otherlv_14= ')' ) ) )
+            // InternalAlloyLanguage.g:2605:28: ( ( ( () otherlv_1= 'none' ) | ( () otherlv_3= 'iden' ) | ( () otherlv_5= 'univ' ) | ( () otherlv_7= 'Int' ) | ( () otherlv_9= 'String' ) | ( () ( (otherlv_11= RULE_ID ) ) ) | ( () ( (lv_value_13_0= RULE_INT ) ) ) | ( () ( (lv_value_15_0= RULE_STRING ) ) ) | (otherlv_16= '(' this_ALSTerm_17= ruleALSTerm otherlv_18= ')' ) ) )
-            // InternalAlloyLanguage.g:2606:1: ( ( () otherlv_1= 'none' ) | ( () otherlv_3= 'iden' ) | ( () otherlv_5= 'univ' ) | ( () otherlv_7= 'Int' ) | ( () ( (otherlv_9= RULE_ID ) ) ) | ( () ( (lv_value_11_0= RULE_INT ) ) ) | (otherlv_12= '(' this_ALSTerm_13= ruleALSTerm otherlv_14= ')' ) )
+            // InternalAlloyLanguage.g:2606:1: ( ( () otherlv_1= 'none' ) | ( () otherlv_3= 'iden' ) | ( () otherlv_5= 'univ' ) | ( () otherlv_7= 'Int' ) | ( () otherlv_9= 'String' ) | ( () ( (otherlv_11= RULE_ID ) ) ) | ( () ( (lv_value_13_0= RULE_INT ) ) ) | ( () ( (lv_value_15_0= RULE_STRING ) ) ) | (otherlv_16= '(' this_ALSTerm_17= ruleALSTerm otherlv_18= ')' ) )
            {
-            // InternalAlloyLanguage.g:2606:1: ( ( () otherlv_1= 'none' ) | ( () otherlv_3= 'iden' ) | ( () otherlv_5= 'univ' ) | ( () otherlv_7= 'Int' ) | ( () ( (otherlv_9= RULE_ID ) ) ) | ( () ( (lv_value_11_0= RULE_INT ) ) ) | (otherlv_12= '(' this_ALSTerm_13= ruleALSTerm otherlv_14= ')' ) )
+            // InternalAlloyLanguage.g:2606:1: ( ( () otherlv_1= 'none' ) | ( () otherlv_3= 'iden' ) | ( () otherlv_5= 'univ' ) | ( () otherlv_7= 'Int' ) | ( () otherlv_9= 'String' ) | ( () ( (otherlv_11= RULE_ID ) ) ) | ( () ( (lv_value_13_0= RULE_INT ) ) ) | ( () ( (lv_value_15_0= RULE_STRING ) ) ) | (otherlv_16= '(' this_ALSTerm_17= ruleALSTerm otherlv_18= ')' ) )
-            int alt43=7;
+            int alt43=9;
            switch ( input.LA(1) ) {
            case 56:
                {
@@ -7383,21 +7386,31 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
                alt43=4;
                }
                break;
-            case RULE_ID:
+            case 60:
                {
                alt43=5;
                }
                break;
-            case RULE_INT:
+            case RULE_ID:
                {
                alt43=6;
                }
                break;
-            case 60:
+            case RULE_INT:
                {
                alt43=7;
                }
                break;
+            case RULE_STRING:
+                {
+                alt43=8;
+                }
+                break;
+            case 61:
+                {
+                alt43=9;
+                }
+                break;
            default:
                if (state.backtracking>0) {state.failed=true; return current;}
                NoViableAltException nvae =
@@ -7532,10 +7545,10 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
                    }
                    break;
                case 5 :
-                    // InternalAlloyLanguage.g:2650:6: ( () ( (otherlv_9= RULE_ID ) ) )
+                    // InternalAlloyLanguage.g:2650:6: ( () otherlv_9= 'String' )
                    {
-                    // InternalAlloyLanguage.g:2650:6: ( () ( (otherlv_9= RULE_ID ) ) )
+                    // InternalAlloyLanguage.g:2650:6: ( () otherlv_9= 'String' )
-                    // InternalAlloyLanguage.g:2650:7: () ( (otherlv_9= RULE_ID ) )
+                    // InternalAlloyLanguage.g:2650:7: () otherlv_9= 'String'
                    {
                    // InternalAlloyLanguage.g:2650:7: ()
                    // InternalAlloyLanguage.g:2651:5: 
@@ -7543,18 +7556,49 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
                    if ( state.backtracking==0 ) {
                              current = forceCreateModelElement(
-                                  grammarAccess.getALSBasicRelationTermAccess().getALSReferenceAction_4_0(),
+                                  grammarAccess.getALSBasicRelationTermAccess().getALSStringAction_4_0(),
                                  current);
                          
                    }
                    }
-                    // InternalAlloyLanguage.g:2656:2: ( (otherlv_9= RULE_ID ) )
+                    otherlv_9=(Token)match(input,60,FOLLOW_2); if (state.failed) return current;
-                    // InternalAlloyLanguage.g:2657:1: (otherlv_9= RULE_ID )
+                    if ( state.backtracking==0 ) {
+                                newLeafNode(otherlv_9, grammarAccess.getALSBasicRelationTermAccess().getStringKeyword_4_1());
+                          
+                    }
+                    }
+                    }
+                    break;
+                case 6 :
+                    // InternalAlloyLanguage.g:2661:6: ( () ( (otherlv_11= RULE_ID ) ) )
+                    {
+                    // InternalAlloyLanguage.g:2661:6: ( () ( (otherlv_11= RULE_ID ) ) )
+                    // InternalAlloyLanguage.g:2661:7: () ( (otherlv_11= RULE_ID ) )
                    {
-                    // InternalAlloyLanguage.g:2657:1: (otherlv_9= RULE_ID )
+                    // InternalAlloyLanguage.g:2661:7: ()
-                    // InternalAlloyLanguage.g:2658:3: otherlv_9= RULE_ID
+                    // InternalAlloyLanguage.g:2662:5: 
+                    {
+                    if ( state.backtracking==0 ) {
+                              current = forceCreateModelElement(
+                                  grammarAccess.getALSBasicRelationTermAccess().getALSReferenceAction_5_0(),
+                                  current);
+                          
+                    }
+                    }
+                    // InternalAlloyLanguage.g:2667:2: ( (otherlv_11= RULE_ID ) )
+                    // InternalAlloyLanguage.g:2668:1: (otherlv_11= RULE_ID )
+                    {
+                    // InternalAlloyLanguage.g:2668:1: (otherlv_11= RULE_ID )
+                    // InternalAlloyLanguage.g:2669:3: otherlv_11= RULE_ID
                    {
                    if ( state.backtracking==0 ) {
@@ -7563,10 +7607,10 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
                                }
                              
                    }
-                    otherlv_9=(Token)match(input,RULE_ID,FOLLOW_2); if (state.failed) return current;
+                    otherlv_11=(Token)match(input,RULE_ID,FOLLOW_2); if (state.failed) return current;
                    if ( state.backtracking==0 ) {
-                                newLeafNode(otherlv_9, grammarAccess.getALSBasicRelationTermAccess().getReferredALSRelationDeclarationCrossReference_4_1_0()); 
+                                newLeafNode(otherlv_11, grammarAccess.getALSBasicRelationTermAccess().getReferredALSRelationDeclarationCrossReference_5_1_0()); 
                        
                    }
@@ -7581,35 +7625,35 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
                    }
                    break;
-                case 6 :
+                case 7 :
-                    // InternalAlloyLanguage.g:2670:6: ( () ( (lv_value_11_0= RULE_INT ) ) )
+                    // InternalAlloyLanguage.g:2681:6: ( () ( (lv_value_13_0= RULE_INT ) ) )
                    {
-                    // InternalAlloyLanguage.g:2670:6: ( () ( (lv_value_11_0= RULE_INT ) ) )
+                    // InternalAlloyLanguage.g:2681:6: ( () ( (lv_value_13_0= RULE_INT ) ) )
-                    // InternalAlloyLanguage.g:2670:7: () ( (lv_value_11_0= RULE_INT ) )
+                    // InternalAlloyLanguage.g:2681:7: () ( (lv_value_13_0= RULE_INT ) )
                    {
-                    // InternalAlloyLanguage.g:2670:7: ()
+                    // InternalAlloyLanguage.g:2681:7: ()
-                    // InternalAlloyLanguage.g:2671:5: 
+                    // InternalAlloyLanguage.g:2682:5: 
                    {
                    if ( state.backtracking==0 ) {
                              current = forceCreateModelElement(
-                                  grammarAccess.getALSBasicRelationTermAccess().getALSNumberLiteralAction_5_0(),
+                                  grammarAccess.getALSBasicRelationTermAccess().getALSNumberLiteralAction_6_0(),
                                  current);
                          
                    }
                    }
-                    // InternalAlloyLanguage.g:2676:2: ( (lv_value_11_0= RULE_INT ) )
+                    // InternalAlloyLanguage.g:2687:2: ( (lv_value_13_0= RULE_INT ) )
-                    // InternalAlloyLanguage.g:2677:1: (lv_value_11_0= RULE_INT )
+                    // InternalAlloyLanguage.g:2688:1: (lv_value_13_0= RULE_INT )
                    {
-                    // InternalAlloyLanguage.g:2677:1: (lv_value_11_0= RULE_INT )
+                    // InternalAlloyLanguage.g:2688:1: (lv_value_13_0= RULE_INT )
-                    // InternalAlloyLanguage.g:2678:3: lv_value_11_0= RULE_INT
+                    // InternalAlloyLanguage.g:2689:3: lv_value_13_0= RULE_INT
                    {
-                    lv_value_11_0=(Token)match(input,RULE_INT,FOLLOW_2); if (state.failed) return current;
+                    lv_value_13_0=(Token)match(input,RULE_INT,FOLLOW_2); if (state.failed) return current;
                    if ( state.backtracking==0 ) {
-                                        newLeafNode(lv_value_11_0, grammarAccess.getALSBasicRelationTermAccess().getValueINTTerminalRuleCall_5_1_0()); 
+                                        newLeafNode(lv_value_13_0, grammarAccess.getALSBasicRelationTermAccess().getValueINTTerminalRuleCall_6_1_0()); 
                                
                    }
                    if ( state.backtracking==0 ) {
@@ -7620,7 +7664,7 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
                                        setWithLastConsumed(
                                                current, 
                                                "value",
-                                        lv_value_11_0, 
+                                        lv_value_13_0, 
                                        "org.eclipse.xtext.common.Terminals.INT");
                            
                    }
@@ -7636,38 +7680,93 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
                    }
                    break;
-                case 7 :
+                case 8 :
-                    // InternalAlloyLanguage.g:2695:6: (otherlv_12= '(' this_ALSTerm_13= ruleALSTerm otherlv_14= ')' )
+                    // InternalAlloyLanguage.g:2706:6: ( () ( (lv_value_15_0= RULE_STRING ) ) )
                    {
-                    // InternalAlloyLanguage.g:2695:6: (otherlv_12= '(' this_ALSTerm_13= ruleALSTerm otherlv_14= ')' )
+                    // InternalAlloyLanguage.g:2706:6: ( () ( (lv_value_15_0= RULE_STRING ) ) )
-                    // InternalAlloyLanguage.g:2695:8: otherlv_12= '(' this_ALSTerm_13= ruleALSTerm otherlv_14= ')'
+                    // InternalAlloyLanguage.g:2706:7: () ( (lv_value_15_0= RULE_STRING ) )
+                    {
+                    // InternalAlloyLanguage.g:2706:7: ()
+                    // InternalAlloyLanguage.g:2707:5: 
                    {
-                    otherlv_12=(Token)match(input,60,FOLLOW_12); if (state.failed) return current;
                    if ( state.backtracking==0 ) {
-                                newLeafNode(otherlv_12, grammarAccess.getALSBasicRelationTermAccess().getLeftParenthesisKeyword_6_0());
+                              current = forceCreateModelElement(
+                                  grammarAccess.getALSBasicRelationTermAccess().getALSStringLiteralAction_7_0(),
+                                  current);
+                          
+                    }
+                    }
+                    // InternalAlloyLanguage.g:2712:2: ( (lv_value_15_0= RULE_STRING ) )
+                    // InternalAlloyLanguage.g:2713:1: (lv_value_15_0= RULE_STRING )
+                    {
+                    // InternalAlloyLanguage.g:2713:1: (lv_value_15_0= RULE_STRING )
+                    // InternalAlloyLanguage.g:2714:3: lv_value_15_0= RULE_STRING
+                    {
+                    lv_value_15_0=(Token)match(input,RULE_STRING,FOLLOW_2); if (state.failed) return current;
+                    if ( state.backtracking==0 ) {
+                                        newLeafNode(lv_value_15_0, grammarAccess.getALSBasicRelationTermAccess().getValueSTRINGTerminalRuleCall_7_1_0()); 
+                                
+                    }
+                    if ( state.backtracking==0 ) {
+                                if (current==null) {
+                                    current = createModelElement(grammarAccess.getALSBasicRelationTermRule());
+                                }
+                                        setWithLastConsumed(
+                                                current, 
+                                                "value",
+                                        lv_value_15_0, 
+                                        "org.eclipse.xtext.common.Terminals.STRING");
+                            
+                    }
+                    }
+                    }
+                    }
+                    }
+                    break;
+                case 9 :
+                    // InternalAlloyLanguage.g:2731:6: (otherlv_16= '(' this_ALSTerm_17= ruleALSTerm otherlv_18= ')' )
+                    {
+                    // InternalAlloyLanguage.g:2731:6: (otherlv_16= '(' this_ALSTerm_17= ruleALSTerm otherlv_18= ')' )
+                    // InternalAlloyLanguage.g:2731:8: otherlv_16= '(' this_ALSTerm_17= ruleALSTerm otherlv_18= ')'
+                    {
+                    otherlv_16=(Token)match(input,61,FOLLOW_12); if (state.failed) return current;
+                    if ( state.backtracking==0 ) {
+                                newLeafNode(otherlv_16, grammarAccess.getALSBasicRelationTermAccess().getLeftParenthesisKeyword_8_0());
                          
                    }
                    if ( state.backtracking==0 ) {
                       
-                              newCompositeNode(grammarAccess.getALSBasicRelationTermAccess().getALSTermParserRuleCall_6_1()); 
+                              newCompositeNode(grammarAccess.getALSBasicRelationTermAccess().getALSTermParserRuleCall_8_1()); 
                          
                    }
                    pushFollow(FOLLOW_34);
-                    this_ALSTerm_13=ruleALSTerm();
+                    this_ALSTerm_17=ruleALSTerm();
                    state._fsp--;
                    if (state.failed) return current;
                    if ( state.backtracking==0 ) {
                       
-                              current = this_ALSTerm_13; 
+                              current = this_ALSTerm_17; 
                              afterParserOrEnumRuleCall();
                          
                    }
-                    otherlv_14=(Token)match(input,61,FOLLOW_2); if (state.failed) return current;
+                    otherlv_18=(Token)match(input,62,FOLLOW_2); if (state.failed) return current;
                    if ( state.backtracking==0 ) {
-                                newLeafNode(otherlv_14, grammarAccess.getALSBasicRelationTermAccess().getRightParenthesisKeyword_6_2());
+                                newLeafNode(otherlv_18, grammarAccess.getALSBasicRelationTermAccess().getRightParenthesisKeyword_8_2());
                          
                    }
@@ -7699,7 +7798,7 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
    // $ANTLR start "entryRuleALSRunCommand"
-    // InternalAlloyLanguage.g:2720:1: entryRuleALSRunCommand returns [EObject current=null] : iv_ruleALSRunCommand= ruleALSRunCommand EOF ;
+    // InternalAlloyLanguage.g:2756:1: entryRuleALSRunCommand returns [EObject current=null] : iv_ruleALSRunCommand= ruleALSRunCommand EOF ;
    public final EObject entryRuleALSRunCommand() throws RecognitionException {
        EObject current = null;
@@ -7707,8 +7806,8 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
        try {
-            // InternalAlloyLanguage.g:2721:2: (iv_ruleALSRunCommand= ruleALSRunCommand EOF )
+            // InternalAlloyLanguage.g:2757:2: (iv_ruleALSRunCommand= ruleALSRunCommand EOF )
-            // InternalAlloyLanguage.g:2722:2: iv_ruleALSRunCommand= ruleALSRunCommand EOF
+            // InternalAlloyLanguage.g:2758:2: iv_ruleALSRunCommand= ruleALSRunCommand EOF
            {
            if ( state.backtracking==0 ) {
               newCompositeNode(grammarAccess.getALSRunCommandRule()); 
@@ -7739,7 +7838,7 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
    // $ANTLR start "ruleALSRunCommand"
-    // InternalAlloyLanguage.g:2729:1: ruleALSRunCommand returns [EObject current=null] : ( () otherlv_1= 'run' otherlv_2= '{' otherlv_3= '}' (otherlv_4= 'for' ( (lv_typeScopes_5_0= ruleALSTypeScope ) ) (otherlv_6= ',' ( (lv_typeScopes_7_0= ruleALSTypeScope ) ) )* )? ) ;
+    // InternalAlloyLanguage.g:2765:1: ruleALSRunCommand returns [EObject current=null] : ( () otherlv_1= 'run' otherlv_2= '{' otherlv_3= '}' (otherlv_4= 'for' ( (lv_typeScopes_5_0= ruleALSTypeScope ) ) (otherlv_6= ',' ( (lv_typeScopes_7_0= ruleALSTypeScope ) ) )* )? ) ;
    public final EObject ruleALSRunCommand() throws RecognitionException {
        EObject current = null;
@@ -7756,14 +7855,14 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
         enterRule(); 
            
        try {
-            // InternalAlloyLanguage.g:2732:28: ( ( () otherlv_1= 'run' otherlv_2= '{' otherlv_3= '}' (otherlv_4= 'for' ( (lv_typeScopes_5_0= ruleALSTypeScope ) ) (otherlv_6= ',' ( (lv_typeScopes_7_0= ruleALSTypeScope ) ) )* )? ) )
+            // InternalAlloyLanguage.g:2768:28: ( ( () otherlv_1= 'run' otherlv_2= '{' otherlv_3= '}' (otherlv_4= 'for' ( (lv_typeScopes_5_0= ruleALSTypeScope ) ) (otherlv_6= ',' ( (lv_typeScopes_7_0= ruleALSTypeScope ) ) )* )? ) )
-            // InternalAlloyLanguage.g:2733:1: ( () otherlv_1= 'run' otherlv_2= '{' otherlv_3= '}' (otherlv_4= 'for' ( (lv_typeScopes_5_0= ruleALSTypeScope ) ) (otherlv_6= ',' ( (lv_typeScopes_7_0= ruleALSTypeScope ) ) )* )? )
+            // InternalAlloyLanguage.g:2769:1: ( () otherlv_1= 'run' otherlv_2= '{' otherlv_3= '}' (otherlv_4= 'for' ( (lv_typeScopes_5_0= ruleALSTypeScope ) ) (otherlv_6= ',' ( (lv_typeScopes_7_0= ruleALSTypeScope ) ) )* )? )
            {
-            // InternalAlloyLanguage.g:2733:1: ( () otherlv_1= 'run' otherlv_2= '{' otherlv_3= '}' (otherlv_4= 'for' ( (lv_typeScopes_5_0= ruleALSTypeScope ) ) (otherlv_6= ',' ( (lv_typeScopes_7_0= ruleALSTypeScope ) ) )* )? )
+            // InternalAlloyLanguage.g:2769:1: ( () otherlv_1= 'run' otherlv_2= '{' otherlv_3= '}' (otherlv_4= 'for' ( (lv_typeScopes_5_0= ruleALSTypeScope ) ) (otherlv_6= ',' ( (lv_typeScopes_7_0= ruleALSTypeScope ) ) )* )? )
-            // InternalAlloyLanguage.g:2733:2: () otherlv_1= 'run' otherlv_2= '{' otherlv_3= '}' (otherlv_4= 'for' ( (lv_typeScopes_5_0= ruleALSTypeScope ) ) (otherlv_6= ',' ( (lv_typeScopes_7_0= ruleALSTypeScope ) ) )* )?
+            // InternalAlloyLanguage.g:2769:2: () otherlv_1= 'run' otherlv_2= '{' otherlv_3= '}' (otherlv_4= 'for' ( (lv_typeScopes_5_0= ruleALSTypeScope ) ) (otherlv_6= ',' ( (lv_typeScopes_7_0= ruleALSTypeScope ) ) )* )?
            {
-            // InternalAlloyLanguage.g:2733:2: ()
+            // InternalAlloyLanguage.g:2769:2: ()
-            // InternalAlloyLanguage.g:2734:5: 
+            // InternalAlloyLanguage.g:2770:5: 
            {
            if ( state.backtracking==0 ) {
@@ -7775,7 +7874,7 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
            }
-            otherlv_1=(Token)match(input,62,FOLLOW_5); if (state.failed) return current;
+            otherlv_1=(Token)match(input,63,FOLLOW_5); if (state.failed) return current;
            if ( state.backtracking==0 ) {
                        newLeafNode(otherlv_1, grammarAccess.getALSRunCommandAccess().getRunKeyword_1());
@@ -7793,28 +7892,28 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
                        newLeafNode(otherlv_3, grammarAccess.getALSRunCommandAccess().getRightCurlyBracketKeyword_3());
                  
            }
-            // InternalAlloyLanguage.g:2751:1: (otherlv_4= 'for' ( (lv_typeScopes_5_0= ruleALSTypeScope ) ) (otherlv_6= ',' ( (lv_typeScopes_7_0= ruleALSTypeScope ) ) )* )?
+            // InternalAlloyLanguage.g:2787:1: (otherlv_4= 'for' ( (lv_typeScopes_5_0= ruleALSTypeScope ) ) (otherlv_6= ',' ( (lv_typeScopes_7_0= ruleALSTypeScope ) ) )* )?
            int alt45=2;
            int LA45_0 = input.LA(1);
-            if ( (LA45_0==63) ) {
+            if ( (LA45_0==64) ) {
                alt45=1;
            }
            switch (alt45) {
                case 1 :
-                    // InternalAlloyLanguage.g:2751:3: otherlv_4= 'for' ( (lv_typeScopes_5_0= ruleALSTypeScope ) ) (otherlv_6= ',' ( (lv_typeScopes_7_0= ruleALSTypeScope ) ) )*
+                    // InternalAlloyLanguage.g:2787:3: otherlv_4= 'for' ( (lv_typeScopes_5_0= ruleALSTypeScope ) ) (otherlv_6= ',' ( (lv_typeScopes_7_0= ruleALSTypeScope ) ) )*
                    {
-                    otherlv_4=(Token)match(input,63,FOLLOW_36); if (state.failed) return current;
+                    otherlv_4=(Token)match(input,64,FOLLOW_36); if (state.failed) return current;
                    if ( state.backtracking==0 ) {
                                newLeafNode(otherlv_4, grammarAccess.getALSRunCommandAccess().getForKeyword_4_0());
                          
                    }
-                    // InternalAlloyLanguage.g:2755:1: ( (lv_typeScopes_5_0= ruleALSTypeScope ) )
+                    // InternalAlloyLanguage.g:2791:1: ( (lv_typeScopes_5_0= ruleALSTypeScope ) )
-                    // InternalAlloyLanguage.g:2756:1: (lv_typeScopes_5_0= ruleALSTypeScope )
+                    // InternalAlloyLanguage.g:2792:1: (lv_typeScopes_5_0= ruleALSTypeScope )
                    {
-                    // InternalAlloyLanguage.g:2756:1: (lv_typeScopes_5_0= ruleALSTypeScope )
+                    // InternalAlloyLanguage.g:2792:1: (lv_typeScopes_5_0= ruleALSTypeScope )
-                    // InternalAlloyLanguage.g:2757:3: lv_typeScopes_5_0= ruleALSTypeScope
+                    // InternalAlloyLanguage.g:2793:3: lv_typeScopes_5_0= ruleALSTypeScope
                    {
                    if ( state.backtracking==0 ) {
                       
@@ -7845,7 +7944,7 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
                    }
-                    // InternalAlloyLanguage.g:2773:2: (otherlv_6= ',' ( (lv_typeScopes_7_0= ruleALSTypeScope ) ) )*
+                    // InternalAlloyLanguage.g:2809:2: (otherlv_6= ',' ( (lv_typeScopes_7_0= ruleALSTypeScope ) ) )*
                    loop44:
                    do {
                        int alt44=2;
@@ -7858,7 +7957,7 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
                        switch (alt44) {
                        case 1 :
-                            // InternalAlloyLanguage.g:2773:4: otherlv_6= ',' ( (lv_typeScopes_7_0= ruleALSTypeScope ) )
+                            // InternalAlloyLanguage.g:2809:4: otherlv_6= ',' ( (lv_typeScopes_7_0= ruleALSTypeScope ) )
                            {
                            otherlv_6=(Token)match(input,13,FOLLOW_36); if (state.failed) return current;
                            if ( state.backtracking==0 ) {
@@ -7866,11 +7965,11 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
                                        newLeafNode(otherlv_6, grammarAccess.getALSRunCommandAccess().getCommaKeyword_4_2_0());
                                  
                            }
-                            // InternalAlloyLanguage.g:2777:1: ( (lv_typeScopes_7_0= ruleALSTypeScope ) )
+                            // InternalAlloyLanguage.g:2813:1: ( (lv_typeScopes_7_0= ruleALSTypeScope ) )
-                            // InternalAlloyLanguage.g:2778:1: (lv_typeScopes_7_0= ruleALSTypeScope )
+                            // InternalAlloyLanguage.g:2814:1: (lv_typeScopes_7_0= ruleALSTypeScope )
                            {
-                            // InternalAlloyLanguage.g:2778:1: (lv_typeScopes_7_0= ruleALSTypeScope )
+                            // InternalAlloyLanguage.g:2814:1: (lv_typeScopes_7_0= ruleALSTypeScope )
-                            // InternalAlloyLanguage.g:2779:3: lv_typeScopes_7_0= ruleALSTypeScope
+                            // InternalAlloyLanguage.g:2815:3: lv_typeScopes_7_0= ruleALSTypeScope
                            {
                            if ( state.backtracking==0 ) {
                               
@@ -7939,7 +8038,7 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
    // $ANTLR start "entryRuleALSTypeScope"
-    // InternalAlloyLanguage.g:2803:1: entryRuleALSTypeScope returns [EObject current=null] : iv_ruleALSTypeScope= ruleALSTypeScope EOF ;
+    // InternalAlloyLanguage.g:2839:1: entryRuleALSTypeScope returns [EObject current=null] : iv_ruleALSTypeScope= ruleALSTypeScope EOF ;
    public final EObject entryRuleALSTypeScope() throws RecognitionException {
        EObject current = null;
@@ -7947,8 +8046,8 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
        try {
-            // InternalAlloyLanguage.g:2804:2: (iv_ruleALSTypeScope= ruleALSTypeScope EOF )
+            // InternalAlloyLanguage.g:2840:2: (iv_ruleALSTypeScope= ruleALSTypeScope EOF )
-            // InternalAlloyLanguage.g:2805:2: iv_ruleALSTypeScope= ruleALSTypeScope EOF
+            // InternalAlloyLanguage.g:2841:2: iv_ruleALSTypeScope= ruleALSTypeScope EOF
            {
            if ( state.backtracking==0 ) {
               newCompositeNode(grammarAccess.getALSTypeScopeRule()); 
@@ -7979,7 +8078,7 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
    // $ANTLR start "ruleALSTypeScope"
-    // InternalAlloyLanguage.g:2812:1: ruleALSTypeScope returns [EObject current=null] : (this_ALSSigScope_0= ruleALSSigScope | this_ALSIntScope_1= ruleALSIntScope ) ;
+    // InternalAlloyLanguage.g:2848:1: ruleALSTypeScope returns [EObject current=null] : (this_ALSSigScope_0= ruleALSSigScope | this_ALSIntScope_1= ruleALSIntScope | this_ALSStringScope_2= ruleALSStringScope ) ;
    public final EObject ruleALSTypeScope() throws RecognitionException {
        EObject current = null;
@@ -7987,19 +8086,46 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
        EObject this_ALSIntScope_1 = null;
+        EObject this_ALSStringScope_2 = null;
         enterRule(); 
            
        try {
-            // InternalAlloyLanguage.g:2815:28: ( (this_ALSSigScope_0= ruleALSSigScope | this_ALSIntScope_1= ruleALSIntScope ) )
+            // InternalAlloyLanguage.g:2851:28: ( (this_ALSSigScope_0= ruleALSSigScope | this_ALSIntScope_1= ruleALSIntScope | this_ALSStringScope_2= ruleALSStringScope ) )
-            // InternalAlloyLanguage.g:2816:1: (this_ALSSigScope_0= ruleALSSigScope | this_ALSIntScope_1= ruleALSIntScope )
+            // InternalAlloyLanguage.g:2852:1: (this_ALSSigScope_0= ruleALSSigScope | this_ALSIntScope_1= ruleALSIntScope | this_ALSStringScope_2= ruleALSStringScope )
            {
-            // InternalAlloyLanguage.g:2816:1: (this_ALSSigScope_0= ruleALSSigScope | this_ALSIntScope_1= ruleALSIntScope )
+            // InternalAlloyLanguage.g:2852:1: (this_ALSSigScope_0= ruleALSSigScope | this_ALSIntScope_1= ruleALSIntScope | this_ALSStringScope_2= ruleALSStringScope )
-            int alt46=2;
+            int alt46=3;
            int LA46_0 = input.LA(1);
-            if ( (LA46_0==64) ) {
+            if ( (LA46_0==65) ) {
-                alt46=1;
+                int LA46_1 = input.LA(2);
+                if ( (LA46_1==RULE_INT) ) {
+                    int LA46_3 = input.LA(3);
+                    if ( (LA46_3==RULE_ID) ) {
+                        alt46=1;
+                    }
+                    else if ( (LA46_3==60) ) {
+                        alt46=3;
+                    }
+                    else {
+                        if (state.backtracking>0) {state.failed=true; return current;}
+                        NoViableAltException nvae =
+                            new NoViableAltException("", 46, 3, input);
+                        throw nvae;
+                    }
+                }
+                else {
+                    if (state.backtracking>0) {state.failed=true; return current;}
+                    NoViableAltException nvae =
+                        new NoViableAltException("", 46, 1, input);
+                    throw nvae;
+                }
            }
            else if ( (LA46_0==RULE_INT) ) {
                int LA46_2 = input.LA(2);
@@ -8027,7 +8153,7 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
            }
            switch (alt46) {
                case 1 :
-                    // InternalAlloyLanguage.g:2817:5: this_ALSSigScope_0= ruleALSSigScope
+                    // InternalAlloyLanguage.g:2853:5: this_ALSSigScope_0= ruleALSSigScope
                    {
                    if ( state.backtracking==0 ) {
                       
@@ -8049,7 +8175,7 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
                    }
                    break;
                case 2 :
-                    // InternalAlloyLanguage.g:2827:5: this_ALSIntScope_1= ruleALSIntScope
+                    // InternalAlloyLanguage.g:2863:5: this_ALSIntScope_1= ruleALSIntScope
                    {
                    if ( state.backtracking==0 ) {
                       
@@ -8070,6 +8196,28 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
                    }
                    break;
+                case 3 :
+                    // InternalAlloyLanguage.g:2873:5: this_ALSStringScope_2= ruleALSStringScope
+                    {
+                    if ( state.backtracking==0 ) {
+                       
+                              newCompositeNode(grammarAccess.getALSTypeScopeAccess().getALSStringScopeParserRuleCall_2()); 
+                          
+                    }
+                    pushFollow(FOLLOW_2);
+                    this_ALSStringScope_2=ruleALSStringScope();
+                    state._fsp--;
+                    if (state.failed) return current;
+                    if ( state.backtracking==0 ) {
+                       
+                              current = this_ALSStringScope_2; 
+                              afterParserOrEnumRuleCall();
+                          
+                    }
+                    }
+                    break;
            }
@@ -8093,7 +8241,7 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
    // $ANTLR start "entryRuleALSSigScope"
-    // InternalAlloyLanguage.g:2843:1: entryRuleALSSigScope returns [EObject current=null] : iv_ruleALSSigScope= ruleALSSigScope EOF ;
+    // InternalAlloyLanguage.g:2889:1: entryRuleALSSigScope returns [EObject current=null] : iv_ruleALSSigScope= ruleALSSigScope EOF ;
    public final EObject entryRuleALSSigScope() throws RecognitionException {
        EObject current = null;
@@ -8101,8 +8249,8 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
        try {
-            // InternalAlloyLanguage.g:2844:2: (iv_ruleALSSigScope= ruleALSSigScope EOF )
+            // InternalAlloyLanguage.g:2890:2: (iv_ruleALSSigScope= ruleALSSigScope EOF )
-            // InternalAlloyLanguage.g:2845:2: iv_ruleALSSigScope= ruleALSSigScope EOF
+            // InternalAlloyLanguage.g:2891:2: iv_ruleALSSigScope= ruleALSSigScope EOF
            {
            if ( state.backtracking==0 ) {
               newCompositeNode(grammarAccess.getALSSigScopeRule()); 
@@ -8133,7 +8281,7 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
    // $ANTLR start "ruleALSSigScope"
-    // InternalAlloyLanguage.g:2852:1: ruleALSSigScope returns [EObject current=null] : ( ( (lv_exactly_0_0= 'exactly' ) )? ( (lv_number_1_0= RULE_INT ) ) ( (otherlv_2= RULE_ID ) ) ) ;
+    // InternalAlloyLanguage.g:2898:1: ruleALSSigScope returns [EObject current=null] : ( ( (lv_exactly_0_0= 'exactly' ) )? ( (lv_number_1_0= RULE_INT ) ) ( (otherlv_2= RULE_ID ) ) ) ;
    public final EObject ruleALSSigScope() throws RecognitionException {
        EObject current = null;
@@ -8144,27 +8292,27 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
         enterRule(); 
            
        try {
-            // InternalAlloyLanguage.g:2855:28: ( ( ( (lv_exactly_0_0= 'exactly' ) )? ( (lv_number_1_0= RULE_INT ) ) ( (otherlv_2= RULE_ID ) ) ) )
+            // InternalAlloyLanguage.g:2901:28: ( ( ( (lv_exactly_0_0= 'exactly' ) )? ( (lv_number_1_0= RULE_INT ) ) ( (otherlv_2= RULE_ID ) ) ) )
-            // InternalAlloyLanguage.g:2856:1: ( ( (lv_exactly_0_0= 'exactly' ) )? ( (lv_number_1_0= RULE_INT ) ) ( (otherlv_2= RULE_ID ) ) )
+            // InternalAlloyLanguage.g:2902:1: ( ( (lv_exactly_0_0= 'exactly' ) )? ( (lv_number_1_0= RULE_INT ) ) ( (otherlv_2= RULE_ID ) ) )
            {
-            // InternalAlloyLanguage.g:2856:1: ( ( (lv_exactly_0_0= 'exactly' ) )? ( (lv_number_1_0= RULE_INT ) ) ( (otherlv_2= RULE_ID ) ) )
+            // InternalAlloyLanguage.g:2902:1: ( ( (lv_exactly_0_0= 'exactly' ) )? ( (lv_number_1_0= RULE_INT ) ) ( (otherlv_2= RULE_ID ) ) )
-            // InternalAlloyLanguage.g:2856:2: ( (lv_exactly_0_0= 'exactly' ) )? ( (lv_number_1_0= RULE_INT ) ) ( (otherlv_2= RULE_ID ) )
+            // InternalAlloyLanguage.g:2902:2: ( (lv_exactly_0_0= 'exactly' ) )? ( (lv_number_1_0= RULE_INT ) ) ( (otherlv_2= RULE_ID ) )
            {
-            // InternalAlloyLanguage.g:2856:2: ( (lv_exactly_0_0= 'exactly' ) )?
+            // InternalAlloyLanguage.g:2902:2: ( (lv_exactly_0_0= 'exactly' ) )?
            int alt47=2;
            int LA47_0 = input.LA(1);
-            if ( (LA47_0==64) ) {
+            if ( (LA47_0==65) ) {
                alt47=1;
            }
            switch (alt47) {
                case 1 :
-                    // InternalAlloyLanguage.g:2857:1: (lv_exactly_0_0= 'exactly' )
+                    // InternalAlloyLanguage.g:2903:1: (lv_exactly_0_0= 'exactly' )
                    {
-                    // InternalAlloyLanguage.g:2857:1: (lv_exactly_0_0= 'exactly' )
+                    // InternalAlloyLanguage.g:2903:1: (lv_exactly_0_0= 'exactly' )
-                    // InternalAlloyLanguage.g:2858:3: lv_exactly_0_0= 'exactly'
+                    // InternalAlloyLanguage.g:2904:3: lv_exactly_0_0= 'exactly'
                    {
-                    lv_exactly_0_0=(Token)match(input,64,FOLLOW_38); if (state.failed) return current;
+                    lv_exactly_0_0=(Token)match(input,65,FOLLOW_38); if (state.failed) return current;
                    if ( state.backtracking==0 ) {
                              newLeafNode(lv_exactly_0_0, grammarAccess.getALSSigScopeAccess().getExactlyExactlyKeyword_0_0());
@@ -8187,11 +8335,11 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
            }
-            // InternalAlloyLanguage.g:2871:3: ( (lv_number_1_0= RULE_INT ) )
+            // InternalAlloyLanguage.g:2917:3: ( (lv_number_1_0= RULE_INT ) )
-            // InternalAlloyLanguage.g:2872:1: (lv_number_1_0= RULE_INT )
+            // InternalAlloyLanguage.g:2918:1: (lv_number_1_0= RULE_INT )
            {
-            // InternalAlloyLanguage.g:2872:1: (lv_number_1_0= RULE_INT )
+            // InternalAlloyLanguage.g:2918:1: (lv_number_1_0= RULE_INT )
-            // InternalAlloyLanguage.g:2873:3: lv_number_1_0= RULE_INT
+            // InternalAlloyLanguage.g:2919:3: lv_number_1_0= RULE_INT
            {
            lv_number_1_0=(Token)match(input,RULE_INT,FOLLOW_4); if (state.failed) return current;
            if ( state.backtracking==0 ) {
@@ -8217,11 +8365,11 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
            }
-            // InternalAlloyLanguage.g:2889:2: ( (otherlv_2= RULE_ID ) )
+            // InternalAlloyLanguage.g:2935:2: ( (otherlv_2= RULE_ID ) )
-            // InternalAlloyLanguage.g:2890:1: (otherlv_2= RULE_ID )
+            // InternalAlloyLanguage.g:2936:1: (otherlv_2= RULE_ID )
            {
-            // InternalAlloyLanguage.g:2890:1: (otherlv_2= RULE_ID )
+            // InternalAlloyLanguage.g:2936:1: (otherlv_2= RULE_ID )
-            // InternalAlloyLanguage.g:2891:3: otherlv_2= RULE_ID
+            // InternalAlloyLanguage.g:2937:3: otherlv_2= RULE_ID
            {
            if ( state.backtracking==0 ) {
@@ -8265,7 +8413,7 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
    // $ANTLR start "entryRuleALSIntScope"
-    // InternalAlloyLanguage.g:2910:1: entryRuleALSIntScope returns [EObject current=null] : iv_ruleALSIntScope= ruleALSIntScope EOF ;
+    // InternalAlloyLanguage.g:2956:1: entryRuleALSIntScope returns [EObject current=null] : iv_ruleALSIntScope= ruleALSIntScope EOF ;
    public final EObject entryRuleALSIntScope() throws RecognitionException {
        EObject current = null;
@@ -8273,8 +8421,8 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
        try {
-            // InternalAlloyLanguage.g:2911:2: (iv_ruleALSIntScope= ruleALSIntScope EOF )
+            // InternalAlloyLanguage.g:2957:2: (iv_ruleALSIntScope= ruleALSIntScope EOF )
-            // InternalAlloyLanguage.g:2912:2: iv_ruleALSIntScope= ruleALSIntScope EOF
+            // InternalAlloyLanguage.g:2958:2: iv_ruleALSIntScope= ruleALSIntScope EOF
            {
            if ( state.backtracking==0 ) {
               newCompositeNode(grammarAccess.getALSIntScopeRule()); 
@@ -8305,7 +8453,7 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
    // $ANTLR start "ruleALSIntScope"
-    // InternalAlloyLanguage.g:2919:1: ruleALSIntScope returns [EObject current=null] : ( ( (lv_number_0_0= RULE_INT ) ) otherlv_1= 'Int' ) ;
+    // InternalAlloyLanguage.g:2965:1: ruleALSIntScope returns [EObject current=null] : ( ( (lv_number_0_0= RULE_INT ) ) otherlv_1= 'Int' ) ;
    public final EObject ruleALSIntScope() throws RecognitionException {
        EObject current = null;
@@ -8315,17 +8463,17 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
         enterRule(); 
            
        try {
-            // InternalAlloyLanguage.g:2922:28: ( ( ( (lv_number_0_0= RULE_INT ) ) otherlv_1= 'Int' ) )
+            // InternalAlloyLanguage.g:2968:28: ( ( ( (lv_number_0_0= RULE_INT ) ) otherlv_1= 'Int' ) )
-            // InternalAlloyLanguage.g:2923:1: ( ( (lv_number_0_0= RULE_INT ) ) otherlv_1= 'Int' )
+            // InternalAlloyLanguage.g:2969:1: ( ( (lv_number_0_0= RULE_INT ) ) otherlv_1= 'Int' )
            {
-            // InternalAlloyLanguage.g:2923:1: ( ( (lv_number_0_0= RULE_INT ) ) otherlv_1= 'Int' )
+            // InternalAlloyLanguage.g:2969:1: ( ( (lv_number_0_0= RULE_INT ) ) otherlv_1= 'Int' )
-            // InternalAlloyLanguage.g:2923:2: ( (lv_number_0_0= RULE_INT ) ) otherlv_1= 'Int'
+            // InternalAlloyLanguage.g:2969:2: ( (lv_number_0_0= RULE_INT ) ) otherlv_1= 'Int'
            {
-            // InternalAlloyLanguage.g:2923:2: ( (lv_number_0_0= RULE_INT ) )
+            // InternalAlloyLanguage.g:2969:2: ( (lv_number_0_0= RULE_INT ) )
-            // InternalAlloyLanguage.g:2924:1: (lv_number_0_0= RULE_INT )
+            // InternalAlloyLanguage.g:2970:1: (lv_number_0_0= RULE_INT )
            {
-            // InternalAlloyLanguage.g:2924:1: (lv_number_0_0= RULE_INT )
+            // InternalAlloyLanguage.g:2970:1: (lv_number_0_0= RULE_INT )
-            // InternalAlloyLanguage.g:2925:3: lv_number_0_0= RULE_INT
+            // InternalAlloyLanguage.g:2971:3: lv_number_0_0= RULE_INT
            {
            lv_number_0_0=(Token)match(input,RULE_INT,FOLLOW_39); if (state.failed) return current;
            if ( state.backtracking==0 ) {
@@ -8379,8 +8527,130 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
    // $ANTLR end "ruleALSIntScope"
+    // $ANTLR start "entryRuleALSStringScope"
+    // InternalAlloyLanguage.g:2999:1: entryRuleALSStringScope returns [EObject current=null] : iv_ruleALSStringScope= ruleALSStringScope EOF ;
+    public final EObject entryRuleALSStringScope() throws RecognitionException {
+        EObject current = null;
+        EObject iv_ruleALSStringScope = null;
+        try {
+            // InternalAlloyLanguage.g:3000:2: (iv_ruleALSStringScope= ruleALSStringScope EOF )
+            // InternalAlloyLanguage.g:3001:2: iv_ruleALSStringScope= ruleALSStringScope EOF
+            {
+            if ( state.backtracking==0 ) {
+               newCompositeNode(grammarAccess.getALSStringScopeRule()); 
+            }
+            pushFollow(FOLLOW_1);
+            iv_ruleALSStringScope=ruleALSStringScope();
+            state._fsp--;
+            if (state.failed) return current;
+            if ( state.backtracking==0 ) {
+               current =iv_ruleALSStringScope; 
+            }
+            match(input,EOF,FOLLOW_2); if (state.failed) return current;
+            }
+        }
+         
+            catch (RecognitionException re) { 
+                recover(input,re); 
+                appendSkippedTokens();
+            } 
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "entryRuleALSStringScope"
+    // $ANTLR start "ruleALSStringScope"
+    // InternalAlloyLanguage.g:3008:1: ruleALSStringScope returns [EObject current=null] : (otherlv_0= 'exactly' ( (lv_number_1_0= RULE_INT ) ) otherlv_2= 'String' ) ;
+    public final EObject ruleALSStringScope() throws RecognitionException {
+        EObject current = null;
+        Token otherlv_0=null;
+        Token lv_number_1_0=null;
+        Token otherlv_2=null;
+         enterRule(); 
+            
+        try {
+            // InternalAlloyLanguage.g:3011:28: ( (otherlv_0= 'exactly' ( (lv_number_1_0= RULE_INT ) ) otherlv_2= 'String' ) )
+            // InternalAlloyLanguage.g:3012:1: (otherlv_0= 'exactly' ( (lv_number_1_0= RULE_INT ) ) otherlv_2= 'String' )
+            {
+            // InternalAlloyLanguage.g:3012:1: (otherlv_0= 'exactly' ( (lv_number_1_0= RULE_INT ) ) otherlv_2= 'String' )
+            // InternalAlloyLanguage.g:3012:3: otherlv_0= 'exactly' ( (lv_number_1_0= RULE_INT ) ) otherlv_2= 'String'
+            {
+            otherlv_0=(Token)match(input,65,FOLLOW_38); if (state.failed) return current;
+            if ( state.backtracking==0 ) {
+                        newLeafNode(otherlv_0, grammarAccess.getALSStringScopeAccess().getExactlyKeyword_0());
+                  
+            }
+            // InternalAlloyLanguage.g:3016:1: ( (lv_number_1_0= RULE_INT ) )
+            // InternalAlloyLanguage.g:3017:1: (lv_number_1_0= RULE_INT )
+            {
+            // InternalAlloyLanguage.g:3017:1: (lv_number_1_0= RULE_INT )
+            // InternalAlloyLanguage.g:3018:3: lv_number_1_0= RULE_INT
+            {
+            lv_number_1_0=(Token)match(input,RULE_INT,FOLLOW_40); if (state.failed) return current;
+            if ( state.backtracking==0 ) {
+                                newLeafNode(lv_number_1_0, grammarAccess.getALSStringScopeAccess().getNumberINTTerminalRuleCall_1_0()); 
+                        
+            }
+            if ( state.backtracking==0 ) {
+                        if (current==null) {
+                            current = createModelElement(grammarAccess.getALSStringScopeRule());
+                        }
+                                setWithLastConsumed(
+                                        current, 
+                                        "number",
+                                lv_number_1_0, 
+                                "org.eclipse.xtext.common.Terminals.INT");
+                    
+            }
+            }
+            }
+            otherlv_2=(Token)match(input,60,FOLLOW_2); if (state.failed) return current;
+            if ( state.backtracking==0 ) {
+                        newLeafNode(otherlv_2, grammarAccess.getALSStringScopeAccess().getStringKeyword_2());
+                  
+            }
+            }
+            }
+            if ( state.backtracking==0 ) {
+               leaveRule(); 
+            }
+        }
+         
+            catch (RecognitionException re) { 
+                recover(input,re); 
+                appendSkippedTokens();
+            } 
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "ruleALSStringScope"
    // $ANTLR start "ruleALSMultiplicity"
-    // InternalAlloyLanguage.g:2953:1: ruleALSMultiplicity returns [Enumerator current=null] : ( (enumLiteral_0= 'all' ) | (enumLiteral_1= 'no' ) | (enumLiteral_2= 'some' ) | (enumLiteral_3= 'lone' ) | (enumLiteral_4= 'one' ) | (enumLiteral_5= 'set' ) ) ;
+    // InternalAlloyLanguage.g:3046:1: ruleALSMultiplicity returns [Enumerator current=null] : ( (enumLiteral_0= 'all' ) | (enumLiteral_1= 'no' ) | (enumLiteral_2= 'some' ) | (enumLiteral_3= 'lone' ) | (enumLiteral_4= 'one' ) | (enumLiteral_5= 'set' ) ) ;
    public final Enumerator ruleALSMultiplicity() throws RecognitionException {
        Enumerator current = null;
@@ -8393,38 +8663,38 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
         enterRule(); 
        try {
-            // InternalAlloyLanguage.g:2955:28: ( ( (enumLiteral_0= 'all' ) | (enumLiteral_1= 'no' ) | (enumLiteral_2= 'some' ) | (enumLiteral_3= 'lone' ) | (enumLiteral_4= 'one' ) | (enumLiteral_5= 'set' ) ) )
+            // InternalAlloyLanguage.g:3048:28: ( ( (enumLiteral_0= 'all' ) | (enumLiteral_1= 'no' ) | (enumLiteral_2= 'some' ) | (enumLiteral_3= 'lone' ) | (enumLiteral_4= 'one' ) | (enumLiteral_5= 'set' ) ) )
-            // InternalAlloyLanguage.g:2956:1: ( (enumLiteral_0= 'all' ) | (enumLiteral_1= 'no' ) | (enumLiteral_2= 'some' ) | (enumLiteral_3= 'lone' ) | (enumLiteral_4= 'one' ) | (enumLiteral_5= 'set' ) )
+            // InternalAlloyLanguage.g:3049:1: ( (enumLiteral_0= 'all' ) | (enumLiteral_1= 'no' ) | (enumLiteral_2= 'some' ) | (enumLiteral_3= 'lone' ) | (enumLiteral_4= 'one' ) | (enumLiteral_5= 'set' ) )
            {
-            // InternalAlloyLanguage.g:2956:1: ( (enumLiteral_0= 'all' ) | (enumLiteral_1= 'no' ) | (enumLiteral_2= 'some' ) | (enumLiteral_3= 'lone' ) | (enumLiteral_4= 'one' ) | (enumLiteral_5= 'set' ) )
+            // InternalAlloyLanguage.g:3049:1: ( (enumLiteral_0= 'all' ) | (enumLiteral_1= 'no' ) | (enumLiteral_2= 'some' ) | (enumLiteral_3= 'lone' ) | (enumLiteral_4= 'one' ) | (enumLiteral_5= 'set' ) )
            int alt48=6;
            switch ( input.LA(1) ) {
-            case 65:
+            case 66:
                {
                alt48=1;
                }
                break;
-            case 66:
+            case 67:
                {
                alt48=2;
                }
                break;
-            case 67:
+            case 68:
                {
                alt48=3;
                }
                break;
-            case 68:
+            case 69:
                {
                alt48=4;
                }
                break;
-            case 69:
+            case 70:
                {
                alt48=5;
                }
                break;
-            case 70:
+            case 71:
                {
                alt48=6;
                }
@@ -8439,12 +8709,12 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
            switch (alt48) {
                case 1 :
-                    // InternalAlloyLanguage.g:2956:2: (enumLiteral_0= 'all' )
+                    // InternalAlloyLanguage.g:3049:2: (enumLiteral_0= 'all' )
                    {
-                    // InternalAlloyLanguage.g:2956:2: (enumLiteral_0= 'all' )
+                    // InternalAlloyLanguage.g:3049:2: (enumLiteral_0= 'all' )
-                    // InternalAlloyLanguage.g:2956:4: enumLiteral_0= 'all'
+                    // InternalAlloyLanguage.g:3049:4: enumLiteral_0= 'all'
                    {
-                    enumLiteral_0=(Token)match(input,65,FOLLOW_2); if (state.failed) return current;
+                    enumLiteral_0=(Token)match(input,66,FOLLOW_2); if (state.failed) return current;
                    if ( state.backtracking==0 ) {
                              current = grammarAccess.getALSMultiplicityAccess().getAllEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
@@ -8458,12 +8728,12 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
                    }
                    break;
                case 2 :
-                    // InternalAlloyLanguage.g:2962:6: (enumLiteral_1= 'no' )
+                    // InternalAlloyLanguage.g:3055:6: (enumLiteral_1= 'no' )
                    {
-                    // InternalAlloyLanguage.g:2962:6: (enumLiteral_1= 'no' )
+                    // InternalAlloyLanguage.g:3055:6: (enumLiteral_1= 'no' )
-                    // InternalAlloyLanguage.g:2962:8: enumLiteral_1= 'no'
+                    // InternalAlloyLanguage.g:3055:8: enumLiteral_1= 'no'
                    {
-                    enumLiteral_1=(Token)match(input,66,FOLLOW_2); if (state.failed) return current;
+                    enumLiteral_1=(Token)match(input,67,FOLLOW_2); if (state.failed) return current;
                    if ( state.backtracking==0 ) {
                              current = grammarAccess.getALSMultiplicityAccess().getNoEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
@@ -8477,12 +8747,12 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
                    }
                    break;
                case 3 :
-                    // InternalAlloyLanguage.g:2968:6: (enumLiteral_2= 'some' )
+                    // InternalAlloyLanguage.g:3061:6: (enumLiteral_2= 'some' )
                    {
-                    // InternalAlloyLanguage.g:2968:6: (enumLiteral_2= 'some' )
+                    // InternalAlloyLanguage.g:3061:6: (enumLiteral_2= 'some' )
-                    // InternalAlloyLanguage.g:2968:8: enumLiteral_2= 'some'
+                    // InternalAlloyLanguage.g:3061:8: enumLiteral_2= 'some'
                    {
-                    enumLiteral_2=(Token)match(input,67,FOLLOW_2); if (state.failed) return current;
+                    enumLiteral_2=(Token)match(input,68,FOLLOW_2); if (state.failed) return current;
                    if ( state.backtracking==0 ) {
                              current = grammarAccess.getALSMultiplicityAccess().getSomeEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
@@ -8496,12 +8766,12 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
                    }
                    break;
                case 4 :
-                    // InternalAlloyLanguage.g:2974:6: (enumLiteral_3= 'lone' )
+                    // InternalAlloyLanguage.g:3067:6: (enumLiteral_3= 'lone' )
                    {
-                    // InternalAlloyLanguage.g:2974:6: (enumLiteral_3= 'lone' )
+                    // InternalAlloyLanguage.g:3067:6: (enumLiteral_3= 'lone' )
-                    // InternalAlloyLanguage.g:2974:8: enumLiteral_3= 'lone'
+                    // InternalAlloyLanguage.g:3067:8: enumLiteral_3= 'lone'
                    {
-                    enumLiteral_3=(Token)match(input,68,FOLLOW_2); if (state.failed) return current;
+                    enumLiteral_3=(Token)match(input,69,FOLLOW_2); if (state.failed) return current;
                    if ( state.backtracking==0 ) {
                              current = grammarAccess.getALSMultiplicityAccess().getLoneEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
@@ -8515,12 +8785,12 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
                    }
                    break;
                case 5 :
-                    // InternalAlloyLanguage.g:2980:6: (enumLiteral_4= 'one' )
+                    // InternalAlloyLanguage.g:3073:6: (enumLiteral_4= 'one' )
                    {
-                    // InternalAlloyLanguage.g:2980:6: (enumLiteral_4= 'one' )
+                    // InternalAlloyLanguage.g:3073:6: (enumLiteral_4= 'one' )
-                    // InternalAlloyLanguage.g:2980:8: enumLiteral_4= 'one'
+                    // InternalAlloyLanguage.g:3073:8: enumLiteral_4= 'one'
                    {
-                    enumLiteral_4=(Token)match(input,69,FOLLOW_2); if (state.failed) return current;
+                    enumLiteral_4=(Token)match(input,70,FOLLOW_2); if (state.failed) return current;
                    if ( state.backtracking==0 ) {
                              current = grammarAccess.getALSMultiplicityAccess().getOneEnumLiteralDeclaration_4().getEnumLiteral().getInstance();
@@ -8534,12 +8804,12 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
                    }
                    break;
                case 6 :
-                    // InternalAlloyLanguage.g:2986:6: (enumLiteral_5= 'set' )
+                    // InternalAlloyLanguage.g:3079:6: (enumLiteral_5= 'set' )
                    {
-                    // InternalAlloyLanguage.g:2986:6: (enumLiteral_5= 'set' )
+                    // InternalAlloyLanguage.g:3079:6: (enumLiteral_5= 'set' )
-                    // InternalAlloyLanguage.g:2986:8: enumLiteral_5= 'set'
+                    // InternalAlloyLanguage.g:3079:8: enumLiteral_5= 'set'
                    {
-                    enumLiteral_5=(Token)match(input,70,FOLLOW_2); if (state.failed) return current;
+                    enumLiteral_5=(Token)match(input,71,FOLLOW_2); if (state.failed) return current;
                    if ( state.backtracking==0 ) {
                              current = grammarAccess.getALSMultiplicityAccess().getSetEnumLiteralDeclaration_5().getEnumLiteral().getInstance();
@@ -8575,7 +8845,7 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
    // $ANTLR start "ruleALSNumericOperator"
-    // InternalAlloyLanguage.g:2996:1: ruleALSNumericOperator returns [Enumerator current=null] : ( (enumLiteral_0= 'plus' ) | (enumLiteral_1= 'sub' ) | (enumLiteral_2= 'mul' ) | (enumLiteral_3= 'rem' ) | (enumLiteral_4= 'div' ) ) ;
+    // InternalAlloyLanguage.g:3089:1: ruleALSNumericOperator returns [Enumerator current=null] : ( (enumLiteral_0= 'plus' ) | (enumLiteral_1= 'sub' ) | (enumLiteral_2= 'mul' ) | (enumLiteral_3= 'rem' ) | (enumLiteral_4= 'div' ) ) ;
    public final Enumerator ruleALSNumericOperator() throws RecognitionException {
        Enumerator current = null;
@@ -8587,33 +8857,33 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
         enterRule(); 
        try {
-            // InternalAlloyLanguage.g:2998:28: ( ( (enumLiteral_0= 'plus' ) | (enumLiteral_1= 'sub' ) | (enumLiteral_2= 'mul' ) | (enumLiteral_3= 'rem' ) | (enumLiteral_4= 'div' ) ) )
+            // InternalAlloyLanguage.g:3091:28: ( ( (enumLiteral_0= 'plus' ) | (enumLiteral_1= 'sub' ) | (enumLiteral_2= 'mul' ) | (enumLiteral_3= 'rem' ) | (enumLiteral_4= 'div' ) ) )
-            // InternalAlloyLanguage.g:2999:1: ( (enumLiteral_0= 'plus' ) | (enumLiteral_1= 'sub' ) | (enumLiteral_2= 'mul' ) | (enumLiteral_3= 'rem' ) | (enumLiteral_4= 'div' ) )
+            // InternalAlloyLanguage.g:3092:1: ( (enumLiteral_0= 'plus' ) | (enumLiteral_1= 'sub' ) | (enumLiteral_2= 'mul' ) | (enumLiteral_3= 'rem' ) | (enumLiteral_4= 'div' ) )
            {
-            // InternalAlloyLanguage.g:2999:1: ( (enumLiteral_0= 'plus' ) | (enumLiteral_1= 'sub' ) | (enumLiteral_2= 'mul' ) | (enumLiteral_3= 'rem' ) | (enumLiteral_4= 'div' ) )
+            // InternalAlloyLanguage.g:3092:1: ( (enumLiteral_0= 'plus' ) | (enumLiteral_1= 'sub' ) | (enumLiteral_2= 'mul' ) | (enumLiteral_3= 'rem' ) | (enumLiteral_4= 'div' ) )
            int alt49=5;
            switch ( input.LA(1) ) {
-            case 71:
+            case 72:
                {
                alt49=1;
                }
                break;
-            case 72:
+            case 73:
                {
                alt49=2;
                }
                break;
-            case 73:
+            case 74:
                {
                alt49=3;
                }
                break;
-            case 74:
+            case 75:
                {
                alt49=4;
                }
                break;
-            case 75:
+            case 76:
                {
                alt49=5;
                }
@@ -8628,12 +8898,12 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
            switch (alt49) {
                case 1 :
-                    // InternalAlloyLanguage.g:2999:2: (enumLiteral_0= 'plus' )
+                    // InternalAlloyLanguage.g:3092:2: (enumLiteral_0= 'plus' )
                    {
-                    // InternalAlloyLanguage.g:2999:2: (enumLiteral_0= 'plus' )
+                    // InternalAlloyLanguage.g:3092:2: (enumLiteral_0= 'plus' )
-                    // InternalAlloyLanguage.g:2999:4: enumLiteral_0= 'plus'
+                    // InternalAlloyLanguage.g:3092:4: enumLiteral_0= 'plus'
                    {
-                    enumLiteral_0=(Token)match(input,71,FOLLOW_2); if (state.failed) return current;
+                    enumLiteral_0=(Token)match(input,72,FOLLOW_2); if (state.failed) return current;
                    if ( state.backtracking==0 ) {
                              current = grammarAccess.getALSNumericOperatorAccess().getPlusEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
@@ -8647,12 +8917,12 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
                    }
                    break;
                case 2 :
-                    // InternalAlloyLanguage.g:3005:6: (enumLiteral_1= 'sub' )
+                    // InternalAlloyLanguage.g:3098:6: (enumLiteral_1= 'sub' )
                    {
-                    // InternalAlloyLanguage.g:3005:6: (enumLiteral_1= 'sub' )
+                    // InternalAlloyLanguage.g:3098:6: (enumLiteral_1= 'sub' )
-                    // InternalAlloyLanguage.g:3005:8: enumLiteral_1= 'sub'
+                    // InternalAlloyLanguage.g:3098:8: enumLiteral_1= 'sub'
                    {
-                    enumLiteral_1=(Token)match(input,72,FOLLOW_2); if (state.failed) return current;
+                    enumLiteral_1=(Token)match(input,73,FOLLOW_2); if (state.failed) return current;
                    if ( state.backtracking==0 ) {
                              current = grammarAccess.getALSNumericOperatorAccess().getSubEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
@@ -8666,12 +8936,12 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
                    }
                    break;
                case 3 :
-                    // InternalAlloyLanguage.g:3011:6: (enumLiteral_2= 'mul' )
+                    // InternalAlloyLanguage.g:3104:6: (enumLiteral_2= 'mul' )
                    {
-                    // InternalAlloyLanguage.g:3011:6: (enumLiteral_2= 'mul' )
+                    // InternalAlloyLanguage.g:3104:6: (enumLiteral_2= 'mul' )
-                    // InternalAlloyLanguage.g:3011:8: enumLiteral_2= 'mul'
+                    // InternalAlloyLanguage.g:3104:8: enumLiteral_2= 'mul'
                    {
-                    enumLiteral_2=(Token)match(input,73,FOLLOW_2); if (state.failed) return current;
+                    enumLiteral_2=(Token)match(input,74,FOLLOW_2); if (state.failed) return current;
                    if ( state.backtracking==0 ) {
                              current = grammarAccess.getALSNumericOperatorAccess().getMulEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
@@ -8685,12 +8955,12 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
                    }
                    break;
                case 4 :
-                    // InternalAlloyLanguage.g:3017:6: (enumLiteral_3= 'rem' )
+                    // InternalAlloyLanguage.g:3110:6: (enumLiteral_3= 'rem' )
                    {
-                    // InternalAlloyLanguage.g:3017:6: (enumLiteral_3= 'rem' )
+                    // InternalAlloyLanguage.g:3110:6: (enumLiteral_3= 'rem' )
-                    // InternalAlloyLanguage.g:3017:8: enumLiteral_3= 'rem'
+                    // InternalAlloyLanguage.g:3110:8: enumLiteral_3= 'rem'
                    {
-                    enumLiteral_3=(Token)match(input,74,FOLLOW_2); if (state.failed) return current;
+                    enumLiteral_3=(Token)match(input,75,FOLLOW_2); if (state.failed) return current;
                    if ( state.backtracking==0 ) {
                              current = grammarAccess.getALSNumericOperatorAccess().getRemEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
@@ -8704,12 +8974,12 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
                    }
                    break;
                case 5 :
-                    // InternalAlloyLanguage.g:3023:6: (enumLiteral_4= 'div' )
+                    // InternalAlloyLanguage.g:3116:6: (enumLiteral_4= 'div' )
                    {
-                    // InternalAlloyLanguage.g:3023:6: (enumLiteral_4= 'div' )
+                    // InternalAlloyLanguage.g:3116:6: (enumLiteral_4= 'div' )
-                    // InternalAlloyLanguage.g:3023:8: enumLiteral_4= 'div'
+                    // InternalAlloyLanguage.g:3116:8: enumLiteral_4= 'div'
                    {
-                    enumLiteral_4=(Token)match(input,75,FOLLOW_2); if (state.failed) return current;
+                    enumLiteral_4=(Token)match(input,76,FOLLOW_2); if (state.failed) return current;
                    if ( state.backtracking==0 ) {
                              current = grammarAccess.getALSNumericOperatorAccess().getDivEnumLiteralDeclaration_4().getEnumLiteral().getInstance();
@@ -8749,22 +9019,22 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
    protected DFA10 dfa10 = new DFA10(this);
    protected DFA42 dfa42 = new DFA42(this);
    static final String dfa_1s = "\12\uffff";
-    static final String dfa_2s = "\10\uffff\1\11\1\uffff";
+    static final String dfa_2s = "\11\uffff\1\10";
-    static final String dfa_3s = "\7\4\1\uffff\1\15\1\uffff";
+    static final String dfa_3s = "\7\4\2\uffff\1\15";
-    static final String dfa_4s = "\7\113\1\uffff\1\106\1\uffff";
+    static final String dfa_4s = "\7\114\2\uffff\1\107";
-    static final String dfa_5s = "\7\uffff\1\2\1\uffff\1\1";
+    static final String dfa_5s = "\7\uffff\1\2\1\1\1\uffff";
    static final String dfa_6s = "\12\uffff}>";
    static final String[] dfa_7s = {
-            "\2\7\50\uffff\1\7\2\uffff\14\7\4\uffff\1\1\1\2\1\3\1\4\1\5\1\6\5\7",
+            "\3\7\47\uffff\1\7\2\uffff\15\7\4\uffff\1\1\1\2\1\3\1\4\1\5\1\6\5\7",
-            "\1\10\1\11\24\uffff\1\7\23\uffff\1\11\2\uffff\14\11\4\uffff\13\11",
+            "\1\11\2\10\23\uffff\1\7\23\uffff\1\10\2\uffff\15\10\4\uffff\13\10",
-            "\1\10\1\11\24\uffff\1\7\23\uffff\1\11\2\uffff\14\11\4\uffff\13\11",
+            "\1\11\2\10\23\uffff\1\7\23\uffff\1\10\2\uffff\15\10\4\uffff\13\10",
-            "\1\10\1\11\24\uffff\1\7\23\uffff\1\11\2\uffff\14\11\4\uffff\13\11",
+            "\1\11\2\10\23\uffff\1\7\23\uffff\1\10\2\uffff\15\10\4\uffff\13\10",
-            "\1\10\1\11\24\uffff\1\7\23\uffff\1\11\2\uffff\14\11\4\uffff\13\11",
+            "\1\11\2\10\23\uffff\1\7\23\uffff\1\10\2\uffff\15\10\4\uffff\13\10",
-            "\1\10\1\11\24\uffff\1\7\23\uffff\1\11\2\uffff\14\11\4\uffff\13\11",
+            "\1\11\2\10\23\uffff\1\7\23\uffff\1\10\2\uffff\15\10\4\uffff\13\10",
-            "\1\10\1\11\24\uffff\1\7\23\uffff\1\11\2\uffff\14\11\4\uffff\13\11",
+            "\1\11\2\10\23\uffff\1\7\23\uffff\1\10\2\uffff\15\10\4\uffff\13\10",
            "",
-            "\2\11\3\uffff\2\11\1\7\1\uffff\1\11\4\uffff\6\11\1\uffff\17\11\20\uffff\6\11",
+            "",
-            ""
+            "\2\10\3\uffff\2\10\1\7\1\uffff\1\10\4\uffff\6\10\1\uffff\17\10\21\uffff\6\10"
    };
    static final short[] dfa_1 = DFA.unpackEncodedString(dfa_1s);
@@ -8795,11 +9065,11 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
    static final String dfa_8s = "\13\uffff";
    static final String dfa_9s = "\10\uffff\1\12\2\uffff";
    static final String dfa_10s = "\1\4\7\uffff\1\14\2\uffff";
-    static final String dfa_11s = "\1\113\7\uffff\1\106\2\uffff";
+    static final String dfa_11s = "\1\114\7\uffff\1\107\2\uffff";
    static final String dfa_12s = "\1\uffff\1\1\1\2\1\3\1\4\1\5\1\6\1\7\1\uffff\1\10\1\11";
    static final String dfa_13s = "\13\uffff}>";
    static final String[] dfa_14s = {
-            "\1\10\1\12\50\uffff\1\6\2\uffff\2\1\1\2\1\3\1\4\1\5\1\7\5\12\12\uffff\5\11",
+            "\1\10\2\12\47\uffff\1\6\2\uffff\2\1\1\2\1\3\1\4\1\5\1\7\6\12\12\uffff\5\11",
            "",
            "",
            "",
@@ -8807,7 +9077,7 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
            "",
            "",
            "",
-            "\3\12\3\uffff\2\12\2\uffff\1\11\1\12\3\uffff\26\12\14\uffff\1\12\3\uffff\6\12",
+            "\3\12\3\uffff\2\12\2\uffff\1\11\1\12\3\uffff\26\12\15\uffff\1\12\3\uffff\6\12",
            "",
            ""
    };
@@ -8841,16 +9111,16 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
    public static final BitSet FOLLOW_1 = new BitSet(new long[]{0x0000000000000000L});
    public static final BitSet FOLLOW_2 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_3 = new BitSet(new long[]{0x4000000003218800L,0x000000000000007EL});
+    public static final BitSet FOLLOW_3 = new BitSet(new long[]{0x8000000003218800L,0x00000000000000FCL});
    public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000000000000010L});
    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x0000000000001000L});
    public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000000000006000L});
-    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000000000018000L,0x000000000000007EL});
+    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000000000018000L,0x00000000000000FCL});
    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000000000063000L});
    public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000000000081000L});
    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000000004010L});
    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x1FFE400000000030L,0x0000000000000FFEL});
+    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x3FFE400000000070L,0x0000000000001FFCL});
    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000000400000L});
    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000000802000L});
    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000000004000L});
@@ -8870,13 +9140,14 @@ public class InternalAlloyLanguageParser extends AbstractInternalAntlrParser {
    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0000400000000002L});
    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0000000000080002L});
    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0000800000000002L});
-    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0001000000000002L,0x000000000000007EL});
+    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0001000000000002L,0x00000000000000FCL});
    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0001000000000000L});
-    public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x2000000000000000L});
+    public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x4000000000000000L});
-    public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x8000000000000002L});
+    public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000001L});
-    public static final BitSet FOLLOW_36 = new BitSet(new long[]{0x0000000000000020L,0x0000000000000001L});
+    public static final BitSet FOLLOW_36 = new BitSet(new long[]{0x0000000000000020L,0x0000000000000002L});
    public static final BitSet FOLLOW_37 = new BitSet(new long[]{0x0000000000002002L});
    public static final BitSet FOLLOW_38 = new BitSet(new long[]{0x0000000000000020L});
    public static final BitSet FOLLOW_39 = new BitSet(new long[]{0x0800000000000000L});
+    public static final BitSet FOLLOW_40 = new BitSet(new long[]{0x1000000000000000L});
 }
diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/serializer/AlloyLanguageSemanticSequencer.java b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/serializer/AlloyLanguageSemanticSequencer.java
index 9e973316..6f23dc7d 100644
--- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/serializer/AlloyLanguageSemanticSequencer.java
+++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/serializer/AlloyLanguageSemanticSequencer.java
@@ -45,6 +45,9 @@ import hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSRunCommand;
 import hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSSigScope;
 import hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSSignatureBody;
 import hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSSignatureDeclaration;
+import hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSString;
+import hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSStringLiteral;
+import hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSStringScope;
 import hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSSubset;
 import hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSSum;
 import hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSUnaryMinus;
@@ -201,6 +204,15 @@ public class AlloyLanguageSemanticSequencer extends AbstractDelegatingSemanticSe
                        case AlloyLanguagePackage.ALS_SIGNATURE_DECLARATION:
                                sequence_ALSSignatureDeclaration(context, (ALSSignatureDeclaration) semanticObject); 
                                return; 
+                        case AlloyLanguagePackage.ALS_STRING:
+                                sequence_ALSBasicRelationTerm(context, (ALSString) semanticObject); 
+                                return; 
+                        case AlloyLanguagePackage.ALS_STRING_LITERAL:
+                                sequence_ALSBasicRelationTerm(context, (ALSStringLiteral) semanticObject); 
+                                return; 
+                        case AlloyLanguagePackage.ALS_STRING_SCOPE:
+                                sequence_ALSStringScope(context, (ALSStringScope) semanticObject); 
+                                return; 
                        case AlloyLanguagePackage.ALS_SUBSET:
                                sequence_ALSComparison(context, (ALSSubset) semanticObject); 
                                return; 
@@ -469,7 +481,7 @@ public class AlloyLanguageSemanticSequencer extends AbstractDelegatingSemanticSe
                                errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, AlloyLanguagePackage.Literals.ALS_NUMBER_LITERAL__VALUE));
                }
                SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
-                feeder.accept(grammarAccess.getALSBasicRelationTermAccess().getValueINTTerminalRuleCall_5_1_0(), semanticObject.getValue());
+                feeder.accept(grammarAccess.getALSBasicRelationTermAccess().getValueINTTerminalRuleCall_6_1_0(), semanticObject.getValue());
                feeder.finish();
        }
        
@@ -522,7 +534,107 @@ public class AlloyLanguageSemanticSequencer extends AbstractDelegatingSemanticSe
                                errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, AlloyLanguagePackage.Literals.ALS_REFERENCE__REFERRED));
                }
                SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
-                feeder.accept(grammarAccess.getALSBasicRelationTermAccess().getReferredALSRelationDeclarationIDTerminalRuleCall_4_1_0_1(), semanticObject.getReferred());
+                feeder.accept(grammarAccess.getALSBasicRelationTermAccess().getReferredALSRelationDeclarationIDTerminalRuleCall_5_1_0_1(), semanticObject.eGet(AlloyLanguagePackage.Literals.ALS_REFERENCE__REFERRED, false));
+                feeder.finish();
+        }
+        
+        
+        /**
+         * Contexts:
+         *     ALSTerm returns ALSString
+         *     ALSQuantified returns ALSString
+         *     ALSOr returns ALSString
+         *     ALSOr.ALSOr_1_0 returns ALSString
+         *     ALSIff returns ALSString
+         *     ALSIff.ALSIff_1_0 returns ALSString
+         *     ALSImpl returns ALSString
+         *     ALSImpl.ALSImpl_1_0 returns ALSString
+         *     ALSAnd returns ALSString
+         *     ALSAnd.ALSAnd_1_0 returns ALSString
+         *     ALSComparison returns ALSString
+         *     ALSComparison.ALSEquals_1_0_0_0 returns ALSString
+         *     ALSComparison.ALSNotEquals_1_0_1_0 returns ALSString
+         *     ALSComparison.ALSSubset_1_0_2_0 returns ALSString
+         *     ALSComparison.ALSLess_1_0_3_0 returns ALSString
+         *     ALSComparison.ALSLeq_1_0_4_0 returns ALSString
+         *     ALSComparison.ALSMore_1_0_5_0 returns ALSString
+         *     ALSComparison.ALSMeq_1_0_6_0 returns ALSString
+         *     ALSOverride returns ALSString
+         *     ALSOverride.ALSOverride_1_0 returns ALSString
+         *     ALSRangeRestrictionRight returns ALSString
+         *     ALSRangeRestrictionRight.ALSRangeRestrictionRight_1_0 returns ALSString
+         *     ALSRangeRestrictionLeft returns ALSString
+         *     ALSRangeRestrictionLeft.ALSRangeRestrictionLeft_1_0 returns ALSString
+         *     ALSJoin returns ALSString
+         *     ALSJoin.ALSJoin_1_0 returns ALSString
+         *     ALSMinus returns ALSString
+         *     ALSMinus.ALSMinus_1_0 returns ALSString
+         *     ALSPlus returns ALSString
+         *     ALSPlus.ALSPlus_1_0 returns ALSString
+         *     ALSIntersection returns ALSString
+         *     ALSIntersection.ALSIntersection_1_0 returns ALSString
+         *     ALSDirectProduct returns ALSString
+         *     ALSDirectProduct.ALSDirectProduct_1_0 returns ALSString
+         *     ALSPreficed returns ALSString
+         *     ALSBasicRelationTerm returns ALSString
+         *
+         * Constraint:
+         *     {ALSString}
+         */
+        protected void sequence_ALSBasicRelationTerm(ISerializationContext context, ALSString semanticObject) {
+                genericSequencer.createSequence(context, semanticObject);
+        }
+        
+        
+        /**
+         * Contexts:
+         *     ALSTerm returns ALSStringLiteral
+         *     ALSQuantified returns ALSStringLiteral
+         *     ALSOr returns ALSStringLiteral
+         *     ALSOr.ALSOr_1_0 returns ALSStringLiteral
+         *     ALSIff returns ALSStringLiteral
+         *     ALSIff.ALSIff_1_0 returns ALSStringLiteral
+         *     ALSImpl returns ALSStringLiteral
+         *     ALSImpl.ALSImpl_1_0 returns ALSStringLiteral
+         *     ALSAnd returns ALSStringLiteral
+         *     ALSAnd.ALSAnd_1_0 returns ALSStringLiteral
+         *     ALSComparison returns ALSStringLiteral
+         *     ALSComparison.ALSEquals_1_0_0_0 returns ALSStringLiteral
+         *     ALSComparison.ALSNotEquals_1_0_1_0 returns ALSStringLiteral
+         *     ALSComparison.ALSSubset_1_0_2_0 returns ALSStringLiteral
+         *     ALSComparison.ALSLess_1_0_3_0 returns ALSStringLiteral
+         *     ALSComparison.ALSLeq_1_0_4_0 returns ALSStringLiteral
+         *     ALSComparison.ALSMore_1_0_5_0 returns ALSStringLiteral
+         *     ALSComparison.ALSMeq_1_0_6_0 returns ALSStringLiteral
+         *     ALSOverride returns ALSStringLiteral
+         *     ALSOverride.ALSOverride_1_0 returns ALSStringLiteral
+         *     ALSRangeRestrictionRight returns ALSStringLiteral
+         *     ALSRangeRestrictionRight.ALSRangeRestrictionRight_1_0 returns ALSStringLiteral
+         *     ALSRangeRestrictionLeft returns ALSStringLiteral
+         *     ALSRangeRestrictionLeft.ALSRangeRestrictionLeft_1_0 returns ALSStringLiteral
+         *     ALSJoin returns ALSStringLiteral
+         *     ALSJoin.ALSJoin_1_0 returns ALSStringLiteral
+         *     ALSMinus returns ALSStringLiteral
+         *     ALSMinus.ALSMinus_1_0 returns ALSStringLiteral
+         *     ALSPlus returns ALSStringLiteral
+         *     ALSPlus.ALSPlus_1_0 returns ALSStringLiteral
+         *     ALSIntersection returns ALSStringLiteral
+         *     ALSIntersection.ALSIntersection_1_0 returns ALSStringLiteral
+         *     ALSDirectProduct returns ALSStringLiteral
+         *     ALSDirectProduct.ALSDirectProduct_1_0 returns ALSStringLiteral
+         *     ALSPreficed returns ALSStringLiteral
+         *     ALSBasicRelationTerm returns ALSStringLiteral
+         *
+         * Constraint:
+         *     value=STRING
+         */
+        protected void sequence_ALSBasicRelationTerm(ISerializationContext context, ALSStringLiteral semanticObject) {
+                if (errorAcceptor != null) {
+                        if (transientValues.isValueTransient(semanticObject, AlloyLanguagePackage.Literals.ALS_STRING_LITERAL__VALUE) == ValueTransient.YES)
+                                errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, AlloyLanguagePackage.Literals.ALS_STRING_LITERAL__VALUE));
+                }
+                SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
+                feeder.accept(grammarAccess.getALSBasicRelationTermAccess().getValueSTRINGTerminalRuleCall_7_1_0(), semanticObject.getValue());
                feeder.finish();
        }
        
@@ -2212,6 +2324,25 @@ public class AlloyLanguageSemanticSequencer extends AbstractDelegatingSemanticSe
        
        /**
         * Contexts:
+         *     ALSTypeScope returns ALSStringScope
+         *     ALSStringScope returns ALSStringScope
+         *
+         * Constraint:
+         *     number=INT
+         */
+        protected void sequence_ALSStringScope(ISerializationContext context, ALSStringScope semanticObject) {
+                if (errorAcceptor != null) {
+                        if (transientValues.isValueTransient(semanticObject, AlloyLanguagePackage.Literals.ALS_TYPE_SCOPE__NUMBER) == ValueTransient.YES)
+                                errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, AlloyLanguagePackage.Literals.ALS_TYPE_SCOPE__NUMBER));
+                }
+                SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
+                feeder.accept(grammarAccess.getALSStringScopeAccess().getNumberINTTerminalRuleCall_1_0(), semanticObject.getNumber());
+                feeder.finish();
+        }
+        
+        
+        /**
+         * Contexts:
         *     ALSRelationDeclaration returns ALSVariableDeclaration
         *     ALSVariableDeclaration returns ALSVariableDeclaration
         *
diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/serializer/AlloyLanguageSyntacticSequencer.java b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/serializer/AlloyLanguageSyntacticSequencer.java
index cb2da160..4a5cad5d 100644
--- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/serializer/AlloyLanguageSyntacticSequencer.java
+++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/serializer/AlloyLanguageSyntacticSequencer.java
@@ -22,8 +22,8 @@ public class AlloyLanguageSyntacticSequencer extends AbstractSyntacticSequencer
        protected AlloyLanguageGrammarAccess grammarAccess;
        protected AbstractElementAlias match_ALSAnd_AmpersandAmpersandKeyword_1_1_0_or_AndKeyword_1_1_1;
-        protected AbstractElementAlias match_ALSBasicRelationTerm_LeftParenthesisKeyword_6_0_a;
+        protected AbstractElementAlias match_ALSBasicRelationTerm_LeftParenthesisKeyword_8_0_a;
-        protected AbstractElementAlias match_ALSBasicRelationTerm_LeftParenthesisKeyword_6_0_p;
+        protected AbstractElementAlias match_ALSBasicRelationTerm_LeftParenthesisKeyword_8_0_p;
        protected AbstractElementAlias match_ALSIff_IffKeyword_1_1_1_or_LessThanSignEqualsSignGreaterThanSignKeyword_1_1_0;
        protected AbstractElementAlias match_ALSImpl_EqualsSignGreaterThanSignKeyword_1_1_0_or_ImpliesKeyword_1_1_1;
        protected AbstractElementAlias match_ALSOr_OrKeyword_1_1_1_or_VerticalLineVerticalLineKeyword_1_1_0;
@@ -33,8 +33,8 @@ public class AlloyLanguageSyntacticSequencer extends AbstractSyntacticSequencer
        protected void init(IGrammarAccess access) {
                grammarAccess = (AlloyLanguageGrammarAccess) access;
                match_ALSAnd_AmpersandAmpersandKeyword_1_1_0_or_AndKeyword_1_1_1 = new AlternativeAlias(false, false, new TokenAlias(false, false, grammarAccess.getALSAndAccess().getAmpersandAmpersandKeyword_1_1_0()), new TokenAlias(false, false, grammarAccess.getALSAndAccess().getAndKeyword_1_1_1()));
-                match_ALSBasicRelationTerm_LeftParenthesisKeyword_6_0_a = new TokenAlias(true, true, grammarAccess.getALSBasicRelationTermAccess().getLeftParenthesisKeyword_6_0());
+                match_ALSBasicRelationTerm_LeftParenthesisKeyword_8_0_a = new TokenAlias(true, true, grammarAccess.getALSBasicRelationTermAccess().getLeftParenthesisKeyword_8_0());
-                match_ALSBasicRelationTerm_LeftParenthesisKeyword_6_0_p = new TokenAlias(true, false, grammarAccess.getALSBasicRelationTermAccess().getLeftParenthesisKeyword_6_0());
+                match_ALSBasicRelationTerm_LeftParenthesisKeyword_8_0_p = new TokenAlias(true, false, grammarAccess.getALSBasicRelationTermAccess().getLeftParenthesisKeyword_8_0());
                match_ALSIff_IffKeyword_1_1_1_or_LessThanSignEqualsSignGreaterThanSignKeyword_1_1_0 = new AlternativeAlias(false, false, new TokenAlias(false, false, grammarAccess.getALSIffAccess().getIffKeyword_1_1_1()), new TokenAlias(false, false, grammarAccess.getALSIffAccess().getLessThanSignEqualsSignGreaterThanSignKeyword_1_1_0()));
                match_ALSImpl_EqualsSignGreaterThanSignKeyword_1_1_0_or_ImpliesKeyword_1_1_1 = new AlternativeAlias(false, false, new TokenAlias(false, false, grammarAccess.getALSImplAccess().getEqualsSignGreaterThanSignKeyword_1_1_0()), new TokenAlias(false, false, grammarAccess.getALSImplAccess().getImpliesKeyword_1_1_1()));
                match_ALSOr_OrKeyword_1_1_1_or_VerticalLineVerticalLineKeyword_1_1_0 = new AlternativeAlias(false, false, new TokenAlias(false, false, grammarAccess.getALSOrAccess().getOrKeyword_1_1_1()), new TokenAlias(false, false, grammarAccess.getALSOrAccess().getVerticalLineVerticalLineKeyword_1_1_0()));
@@ -55,10 +55,10 @@ public class AlloyLanguageSyntacticSequencer extends AbstractSyntacticSequencer
                        List<INode> syntaxNodes = getNodesFor(transitionNodes, syntax);
                        if (match_ALSAnd_AmpersandAmpersandKeyword_1_1_0_or_AndKeyword_1_1_1.equals(syntax))
                                emit_ALSAnd_AmpersandAmpersandKeyword_1_1_0_or_AndKeyword_1_1_1(semanticObject, getLastNavigableState(), syntaxNodes);
-                        else if (match_ALSBasicRelationTerm_LeftParenthesisKeyword_6_0_a.equals(syntax))
+                        else if (match_ALSBasicRelationTerm_LeftParenthesisKeyword_8_0_a.equals(syntax))
-                                emit_ALSBasicRelationTerm_LeftParenthesisKeyword_6_0_a(semanticObject, getLastNavigableState(), syntaxNodes);
+                                emit_ALSBasicRelationTerm_LeftParenthesisKeyword_8_0_a(semanticObject, getLastNavigableState(), syntaxNodes);
-                        else if (match_ALSBasicRelationTerm_LeftParenthesisKeyword_6_0_p.equals(syntax))
+                        else if (match_ALSBasicRelationTerm_LeftParenthesisKeyword_8_0_p.equals(syntax))
-                                emit_ALSBasicRelationTerm_LeftParenthesisKeyword_6_0_p(semanticObject, getLastNavigableState(), syntaxNodes);
+                                emit_ALSBasicRelationTerm_LeftParenthesisKeyword_8_0_p(semanticObject, getLastNavigableState(), syntaxNodes);
                        else if (match_ALSIff_IffKeyword_1_1_1_or_LessThanSignEqualsSignGreaterThanSignKeyword_1_1_0.equals(syntax))
                                emit_ALSIff_IffKeyword_1_1_1_or_LessThanSignEqualsSignGreaterThanSignKeyword_1_1_0(semanticObject, getLastNavigableState(), syntaxNodes);
                        else if (match_ALSImpl_EqualsSignGreaterThanSignKeyword_1_1_0_or_ImpliesKeyword_1_1_1.equals(syntax))
@@ -73,7 +73,7 @@ public class AlloyLanguageSyntacticSequencer extends AbstractSyntacticSequencer
        /**
         * Ambiguous syntax:
-         *     '&&' | 'and'
+         *     'and' | '&&'
         *
         * This ambiguous syntax occurs at:
         *     {ALSAnd.leftOperand=} (ambiguity) rightOperand=ALSComparison
@@ -91,18 +91,20 @@ public class AlloyLanguageSyntacticSequencer extends AbstractSyntacticSequencer
         *     (rule start) (ambiguity) '*' operand=ALSBasicRelationTerm
         *     (rule start) (ambiguity) '-' operand=ALSBasicRelationTerm
         *     (rule start) (ambiguity) 'Int' (rule start)
+         *     (rule start) (ambiguity) 'String' (rule start)
         *     (rule start) (ambiguity) '^' operand=ALSBasicRelationTerm
         *     (rule start) (ambiguity) 'iden' (rule start)
         *     (rule start) (ambiguity) 'none' (rule start)
         *     (rule start) (ambiguity) 'sum' variables+=ALSVariableDeclaration
         *     (rule start) (ambiguity) 'univ' (rule start)
         *     (rule start) (ambiguity) '~' operand=ALSBasicRelationTerm
-         *     (rule start) (ambiguity) ('!' | 'not') operand=ALSBasicRelationTerm
+         *     (rule start) (ambiguity) ('not' | '!') operand=ALSBasicRelationTerm
         *     (rule start) (ambiguity) referred=[ALSRelationDeclaration|ID]
         *     (rule start) (ambiguity) referredDefinition=[ALSDefinition|ID]
         *     (rule start) (ambiguity) referredNumericOperator=ALSNumericOperator
         *     (rule start) (ambiguity) type=ALSMultiplicity
         *     (rule start) (ambiguity) value=INT
+         *     (rule start) (ambiguity) value=STRING
         *     (rule start) (ambiguity) {ALSAnd.leftOperand=}
         *     (rule start) (ambiguity) {ALSDirectProduct.leftOperand=}
         *     (rule start) (ambiguity) {ALSEquals.leftOperand=}
@@ -123,7 +125,7 @@ public class AlloyLanguageSyntacticSequencer extends AbstractSyntacticSequencer
         *     (rule start) (ambiguity) {ALSRangeRestrictionRight.relation=}
         *     (rule start) (ambiguity) {ALSSubset.leftOperand=}
         */
-        protected void emit_ALSBasicRelationTerm_LeftParenthesisKeyword_6_0_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
+        protected void emit_ALSBasicRelationTerm_LeftParenthesisKeyword_8_0_a(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
                acceptNodes(transition, nodes);
        }
        
@@ -138,7 +140,7 @@ public class AlloyLanguageSyntacticSequencer extends AbstractSyntacticSequencer
         *     (rule start) (ambiguity) '^' operand=ALSBasicRelationTerm
         *     (rule start) (ambiguity) 'sum' variables+=ALSVariableDeclaration
         *     (rule start) (ambiguity) '~' operand=ALSBasicRelationTerm
-         *     (rule start) (ambiguity) ('!' | 'not') operand=ALSBasicRelationTerm
+         *     (rule start) (ambiguity) ('not' | '!') operand=ALSBasicRelationTerm
         *     (rule start) (ambiguity) referredDefinition=[ALSDefinition|ID]
         *     (rule start) (ambiguity) referredNumericOperator=ALSNumericOperator
         *     (rule start) (ambiguity) type=ALSMultiplicity
@@ -162,7 +164,7 @@ public class AlloyLanguageSyntacticSequencer extends AbstractSyntacticSequencer
         *     (rule start) (ambiguity) {ALSRangeRestrictionRight.relation=}
         *     (rule start) (ambiguity) {ALSSubset.leftOperand=}
         */
-        protected void emit_ALSBasicRelationTerm_LeftParenthesisKeyword_6_0_p(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
+        protected void emit_ALSBasicRelationTerm_LeftParenthesisKeyword_8_0_p(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
                acceptNodes(transition, nodes);
        }
        
@@ -190,7 +192,7 @@ public class AlloyLanguageSyntacticSequencer extends AbstractSyntacticSequencer
        
        /**
         * Ambiguous syntax:
-         *     '||' | 'or'
+         *     'or' | '||'
         *
         * This ambiguous syntax occurs at:
         *     {ALSOr.leftOperand=} (ambiguity) rightOperand=ALSIff
@@ -201,7 +203,7 @@ public class AlloyLanguageSyntacticSequencer extends AbstractSyntacticSequencer
        
        /**
         * Ambiguous syntax:
-         *     '!' | 'not'
+         *     'not' | '!'
         *
         * This ambiguous syntax occurs at:
         *     (rule start) '('* (ambiguity) operand=ALSBasicRelationTerm
diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/services/AlloyLanguageGrammarAccess.java b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/services/AlloyLanguageGrammarAccess.java
index 08dd554d..9acc4a39 100644
--- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/services/AlloyLanguageGrammarAccess.java
+++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src-gen/hu/bme/mit/inf/dslreasoner/services/AlloyLanguageGrammarAccess.java
@@ -296,7 +296,7 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
                //fields+=ALSFieldDeclaration)*)? '}'
                public Group getGroup() { return cGroup; }
-                //(multiplicity=ALSMultiplicity? & abstract?='abstract'?)
+                //multiplicity=ALSMultiplicity? & abstract?='abstract'?
                public UnorderedGroup getUnorderedGroup_0() { return cUnorderedGroup_0; }
                //multiplicity=ALSMultiplicity?
@@ -712,7 +712,7 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
                //ALSQuantified ALSTerm:
                //      {ALSQuantifiedEx} type=ALSMultiplicity
                //      disj?='disj'? variables+=ALSVariableDeclaration (',' variables+=ALSVariableDeclaration)* '{' expression=ALSTerm '}' |
-                //      ALSOr
+                //      ALSOr;
                @Override public ParserRule getRule() { return rule; }
                //{ALSQuantifiedEx} type=ALSMultiplicity disj?='disj'? variables+=ALSVariableDeclaration (','
@@ -785,7 +785,7 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
                private final RuleCall cRightOperandALSIffParserRuleCall_1_2_0 = (RuleCall)cRightOperandAssignment_1_2.eContents().get(0);
                
                //ALSOr ALSTerm:
-                //      ALSIff ({ALSOr.leftOperand=current} ("||" | "or") rightOperand=ALSIff)?
+                //      ALSIff ({ALSOr.leftOperand=current} ("||" | "or") rightOperand=ALSIff)?;
                @Override public ParserRule getRule() { return rule; }
                //ALSIff ({ALSOr.leftOperand=current} ("||" | "or") rightOperand=ALSIff)?
@@ -800,7 +800,7 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
                //{ALSOr.leftOperand=current}
                public Action getALSOrLeftOperandAction_1_0() { return cALSOrLeftOperandAction_1_0; }
-                //("||" | "or")
+                //"||" | "or"
                public Alternatives getAlternatives_1_1() { return cAlternatives_1_1; }
                //"||"
@@ -829,7 +829,7 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
                private final RuleCall cRightOperandALSImplParserRuleCall_1_2_0 = (RuleCall)cRightOperandAssignment_1_2.eContents().get(0);
                
                //ALSIff ALSTerm:
-                //      ALSImpl ({ALSIff.leftOperand=current} ("<=>" | "iff") rightOperand=ALSImpl)?
+                //      ALSImpl ({ALSIff.leftOperand=current} ("<=>" | "iff") rightOperand=ALSImpl)?;
                @Override public ParserRule getRule() { return rule; }
                //ALSImpl ({ALSIff.leftOperand=current} ("<=>" | "iff") rightOperand=ALSImpl)?
@@ -844,7 +844,7 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
                //{ALSIff.leftOperand=current}
                public Action getALSIffLeftOperandAction_1_0() { return cALSIffLeftOperandAction_1_0; }
-                //("<=>" | "iff")
+                //"<=>" | "iff"
                public Alternatives getAlternatives_1_1() { return cAlternatives_1_1; }
                //"<=>"
@@ -877,7 +877,7 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
                private final RuleCall cElseOperandALSAndParserRuleCall_1_3_1_0 = (RuleCall)cElseOperandAssignment_1_3_1.eContents().get(0);
                
                //ALSImpl ALSTerm:
-                //      ALSAnd ({ALSImpl.leftOperand=current} ("=>" | "implies") rightOperand=ALSAnd ('else' elseOperand=ALSAnd)?)?
+                //      ALSAnd ({ALSImpl.leftOperand=current} ("=>" | "implies") rightOperand=ALSAnd ('else' elseOperand=ALSAnd)?)?;
                @Override public ParserRule getRule() { return rule; }
                //ALSAnd ({ALSImpl.leftOperand=current} ("=>" | "implies") rightOperand=ALSAnd ('else' elseOperand=ALSAnd)?)?
@@ -892,7 +892,7 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
                //{ALSImpl.leftOperand=current}
                public Action getALSImplLeftOperandAction_1_0() { return cALSImplLeftOperandAction_1_0; }
-                //("=>" | "implies")
+                //"=>" | "implies"
                public Alternatives getAlternatives_1_1() { return cAlternatives_1_1; }
                //"=>"
@@ -933,7 +933,7 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
                private final RuleCall cRightOperandALSComparisonParserRuleCall_1_2_0 = (RuleCall)cRightOperandAssignment_1_2.eContents().get(0);
                
                //ALSAnd ALSTerm:
-                //      ALSComparison ({ALSAnd.leftOperand=current} ("&&" | "and") rightOperand=ALSComparison)?
+                //      ALSComparison ({ALSAnd.leftOperand=current} ("&&" | "and") rightOperand=ALSComparison)?;
                @Override public ParserRule getRule() { return rule; }
                //ALSComparison ({ALSAnd.leftOperand=current} ("&&" | "and") rightOperand=ALSComparison)?
@@ -948,7 +948,7 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
                //{ALSAnd.leftOperand=current}
                public Action getALSAndLeftOperandAction_1_0() { return cALSAndLeftOperandAction_1_0; }
-                //("&&" | "and")
+                //"&&" | "and"
                public Alternatives getAlternatives_1_1() { return cAlternatives_1_1; }
                //"&&"
@@ -997,7 +997,7 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
                //ALSComparison ALSTerm:
                //      ALSOverride (({ALSEquals.leftOperand=current} "=" | {ALSNotEquals.leftOperand=current} "!=" |
                //      {ALSSubset.leftOperand=current} "in" | {ALSLess.leftOperand=current} ">" | {ALSLeq.leftOperand=current} ">=" |
-                //      {ALSMore.leftOperand=current} "<" | {ALSMeq.leftOperand=current} "<=") rightOperand=ALSOverride)?
+                //      {ALSMore.leftOperand=current} "<" | {ALSMeq.leftOperand=current} "<=") rightOperand=ALSOverride)?;
                @Override public ParserRule getRule() { return rule; }
                //ALSOverride (({ALSEquals.leftOperand=current} "=" | {ALSNotEquals.leftOperand=current} "!=" |
@@ -1013,9 +1013,9 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
                //{ALSMeq.leftOperand=current} "<=") rightOperand=ALSOverride)?
                public Group getGroup_1() { return cGroup_1; }
-                //({ALSEquals.leftOperand=current} "=" | {ALSNotEquals.leftOperand=current} "!=" | {ALSSubset.leftOperand=current} "in" |
+                //{ALSEquals.leftOperand=current} "=" | {ALSNotEquals.leftOperand=current} "!=" | {ALSSubset.leftOperand=current} "in" |
                //{ALSLess.leftOperand=current} ">" | {ALSLeq.leftOperand=current} ">=" | {ALSMore.leftOperand=current} "<" |
-                //{ALSMeq.leftOperand=current} "<=")
+                //{ALSMeq.leftOperand=current} "<="
                public Alternatives getAlternatives_1_0() { return cAlternatives_1_0; }
                //{ALSEquals.leftOperand=current} "="
@@ -1099,7 +1099,7 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
                private final RuleCall cRightOperandALSRangeRestrictionRightParserRuleCall_1_2_0 = (RuleCall)cRightOperandAssignment_1_2.eContents().get(0);
                
                //ALSOverride ALSTerm:
-                //      ALSRangeRestrictionRight ({ALSOverride.leftOperand=current} '++' rightOperand=ALSRangeRestrictionRight)?
+                //      ALSRangeRestrictionRight ({ALSOverride.leftOperand=current} '++' rightOperand=ALSRangeRestrictionRight)?;
                @Override public ParserRule getRule() { return rule; }
                //ALSRangeRestrictionRight ({ALSOverride.leftOperand=current} '++' rightOperand=ALSRangeRestrictionRight)?
@@ -1135,7 +1135,7 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
                private final RuleCall cFilterALSRangeRestrictionLeftParserRuleCall_1_2_0 = (RuleCall)cFilterAssignment_1_2.eContents().get(0);
                
                //ALSRangeRestrictionRight ALSTerm:
-                //      ALSRangeRestrictionLeft ({ALSRangeRestrictionRight.relation=current} ':>' filter=ALSRangeRestrictionLeft)?
+                //      ALSRangeRestrictionLeft ({ALSRangeRestrictionRight.relation=current} ':>' filter=ALSRangeRestrictionLeft)?;
                @Override public ParserRule getRule() { return rule; }
                //ALSRangeRestrictionLeft ({ALSRangeRestrictionRight.relation=current} ':>' filter=ALSRangeRestrictionLeft)?
@@ -1171,7 +1171,7 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
                private final RuleCall cRelationALSJoinParserRuleCall_1_2_0 = (RuleCall)cRelationAssignment_1_2.eContents().get(0);
                
                //ALSRangeRestrictionLeft ALSTerm:
-                //      ALSJoin ({ALSRangeRestrictionLeft.filter=current} '<:' relation=ALSJoin)?
+                //      ALSJoin ({ALSRangeRestrictionLeft.filter=current} '<:' relation=ALSJoin)?;
                @Override public ParserRule getRule() { return rule; }
                //ALSJoin ({ALSRangeRestrictionLeft.filter=current} '<:' relation=ALSJoin)?
@@ -1207,7 +1207,7 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
                private final RuleCall cRightOperandALSMinusParserRuleCall_1_2_0 = (RuleCall)cRightOperandAssignment_1_2.eContents().get(0);
                
                //ALSJoin ALSTerm:
-                //      ALSMinus ({ALSJoin.leftOperand=current} '.' rightOperand=ALSMinus)*
+                //      ALSMinus ({ALSJoin.leftOperand=current} '.' rightOperand=ALSMinus)*;
                @Override public ParserRule getRule() { return rule; }
                //ALSMinus ({ALSJoin.leftOperand=current} '.' rightOperand=ALSMinus)*
@@ -1243,7 +1243,7 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
                private final RuleCall cRightOperandALSPlusParserRuleCall_1_2_0 = (RuleCall)cRightOperandAssignment_1_2.eContents().get(0);
                
                //ALSMinus ALSTerm:
-                //      ALSPlus ({ALSMinus.leftOperand=current} '-' rightOperand=ALSPlus)*
+                //      ALSPlus ({ALSMinus.leftOperand=current} '-' rightOperand=ALSPlus)*;
                @Override public ParserRule getRule() { return rule; }
                //ALSPlus ({ALSMinus.leftOperand=current} '-' rightOperand=ALSPlus)*
@@ -1279,7 +1279,7 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
                private final RuleCall cRightOperandALSIntersectionParserRuleCall_1_2_0 = (RuleCall)cRightOperandAssignment_1_2.eContents().get(0);
                
                //ALSPlus ALSTerm:
-                //      ALSIntersection ({ALSPlus.leftOperand=current} '+' rightOperand=ALSIntersection)*
+                //      ALSIntersection ({ALSPlus.leftOperand=current} '+' rightOperand=ALSIntersection)*;
                @Override public ParserRule getRule() { return rule; }
                //ALSIntersection ({ALSPlus.leftOperand=current} '+' rightOperand=ALSIntersection)*
@@ -1315,7 +1315,7 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
                private final RuleCall cRightOperandALSDirectProductParserRuleCall_1_2_0 = (RuleCall)cRightOperandAssignment_1_2.eContents().get(0);
                
                //ALSIntersection ALSTerm:
-                //      ALSDirectProduct ({ALSIntersection.leftOperand=current} '&' rightOperand=ALSDirectProduct)*
+                //      ALSDirectProduct ({ALSIntersection.leftOperand=current} '&' rightOperand=ALSDirectProduct)*;
                @Override public ParserRule getRule() { return rule; }
                //ALSDirectProduct ({ALSIntersection.leftOperand=current} '&' rightOperand=ALSDirectProduct)*
@@ -1359,7 +1359,7 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
                //      ALSPreficed ({ALSDirectProduct.leftOperand=current} leftMultiplicit=ALSMultiplicity?
                //      '->'
                //      rightMultiplicit=ALSMultiplicity?
-                //      rightOperand=ALSPreficed)?
+                //      rightOperand=ALSPreficed)?;
                @Override public ParserRule getRule() { return rule; }
                //ALSPreficed ({ALSDirectProduct.leftOperand=current} leftMultiplicit=ALSMultiplicity? '->'
@@ -1472,7 +1472,7 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
                //      operand=ALSBasicRelationTerm | {ALSSum} 'sum' variables+=ALSVariableDeclaration (','
                //      variables+=ALSVariableDeclaration)* '{' expression=ALSTerm '}' | {ALSFunctionCall}
                //      (referredDefinition=[ALSDefinition] | referredNumericOperator=ALSNumericOperator) '[' params+=ALSTerm (','
-                //      params+=ALSTerm)* ']' | ALSBasicRelationTerm
+                //      params+=ALSTerm)* ']' | ALSBasicRelationTerm;
                @Override public ParserRule getRule() { return rule; }
                //{ALSNot} => ("!" | 'not') operand=ALSBasicRelationTerm | {ALSInverseRelation} => "~" operand=ALSBasicRelationTerm |
@@ -1492,7 +1492,7 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
                //=> ("!" | 'not')
                public Group getGroup_0_1() { return cGroup_0_1; }
-                //("!" | 'not')
+                //"!" | 'not'
                public Alternatives getAlternatives_0_1_0() { return cAlternatives_0_1_0; }
                //"!"
@@ -1628,7 +1628,7 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
                //{ALSFunctionCall}
                public Action getALSFunctionCallAction_7_0() { return cALSFunctionCallAction_7_0; }
-                //(referredDefinition=[ALSDefinition] | referredNumericOperator=ALSNumericOperator)
+                //referredDefinition=[ALSDefinition] | referredNumericOperator=ALSNumericOperator
                public Alternatives getAlternatives_7_1() { return cAlternatives_7_1; }
                //referredDefinition=[ALSDefinition]
@@ -1723,27 +1723,34 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
                private final Action cALSIntAction_3_0 = (Action)cGroup_3.eContents().get(0);
                private final Keyword cIntKeyword_3_1 = (Keyword)cGroup_3.eContents().get(1);
                private final Group cGroup_4 = (Group)cAlternatives.eContents().get(4);
-                private final Action cALSReferenceAction_4_0 = (Action)cGroup_4.eContents().get(0);
+                private final Action cALSStringAction_4_0 = (Action)cGroup_4.eContents().get(0);
-                private final Assignment cReferredAssignment_4_1 = (Assignment)cGroup_4.eContents().get(1);
+                private final Keyword cStringKeyword_4_1 = (Keyword)cGroup_4.eContents().get(1);
-                private final CrossReference cReferredALSRelationDeclarationCrossReference_4_1_0 = (CrossReference)cReferredAssignment_4_1.eContents().get(0);
-                private final RuleCall cReferredALSRelationDeclarationIDTerminalRuleCall_4_1_0_1 = (RuleCall)cReferredALSRelationDeclarationCrossReference_4_1_0.eContents().get(1);
                private final Group cGroup_5 = (Group)cAlternatives.eContents().get(5);
-                private final Action cALSNumberLiteralAction_5_0 = (Action)cGroup_5.eContents().get(0);
+                private final Action cALSReferenceAction_5_0 = (Action)cGroup_5.eContents().get(0);
-                private final Assignment cValueAssignment_5_1 = (Assignment)cGroup_5.eContents().get(1);
+                private final Assignment cReferredAssignment_5_1 = (Assignment)cGroup_5.eContents().get(1);
-                private final RuleCall cValueINTTerminalRuleCall_5_1_0 = (RuleCall)cValueAssignment_5_1.eContents().get(0);
+                private final CrossReference cReferredALSRelationDeclarationCrossReference_5_1_0 = (CrossReference)cReferredAssignment_5_1.eContents().get(0);
+                private final RuleCall cReferredALSRelationDeclarationIDTerminalRuleCall_5_1_0_1 = (RuleCall)cReferredALSRelationDeclarationCrossReference_5_1_0.eContents().get(1);
                private final Group cGroup_6 = (Group)cAlternatives.eContents().get(6);
-                private final Keyword cLeftParenthesisKeyword_6_0 = (Keyword)cGroup_6.eContents().get(0);
+                private final Action cALSNumberLiteralAction_6_0 = (Action)cGroup_6.eContents().get(0);
-                private final RuleCall cALSTermParserRuleCall_6_1 = (RuleCall)cGroup_6.eContents().get(1);
+                private final Assignment cValueAssignment_6_1 = (Assignment)cGroup_6.eContents().get(1);
-                private final Keyword cRightParenthesisKeyword_6_2 = (Keyword)cGroup_6.eContents().get(2);
+                private final RuleCall cValueINTTerminalRuleCall_6_1_0 = (RuleCall)cValueAssignment_6_1.eContents().get(0);
+                private final Group cGroup_7 = (Group)cAlternatives.eContents().get(7);
+                private final Action cALSStringLiteralAction_7_0 = (Action)cGroup_7.eContents().get(0);
+                private final Assignment cValueAssignment_7_1 = (Assignment)cGroup_7.eContents().get(1);
+                private final RuleCall cValueSTRINGTerminalRuleCall_7_1_0 = (RuleCall)cValueAssignment_7_1.eContents().get(0);
+                private final Group cGroup_8 = (Group)cAlternatives.eContents().get(8);
+                private final Keyword cLeftParenthesisKeyword_8_0 = (Keyword)cGroup_8.eContents().get(0);
+                private final RuleCall cALSTermParserRuleCall_8_1 = (RuleCall)cGroup_8.eContents().get(1);
+                private final Keyword cRightParenthesisKeyword_8_2 = (Keyword)cGroup_8.eContents().get(2);
                
                //ALSBasicRelationTerm ALSTerm:
-                //      {ALSNone} 'none' | {ALSIden} 'iden' | {ALSUniv} 'univ' | {ALSInt} 'Int' | {ALSReference}
+                //      {ALSNone} 'none' | {ALSIden} 'iden' | {ALSUniv} 'univ' | {ALSInt} 'Int' | {ALSString} 'String' | {ALSReference}
-                //      referred=[ALSRelationDeclaration] | {ALSNumberLiteral} value=INT |
+                //      referred=[ALSRelationDeclaration] | {ALSNumberLiteral} value=INT | {ALSStringLiteral} value=STRING |
-                //      '(' ALSTerm ')'
+                //      '(' ALSTerm ')';
                @Override public ParserRule getRule() { return rule; }
-                //{ALSNone} 'none' | {ALSIden} 'iden' | {ALSUniv} 'univ' | {ALSInt} 'Int' | {ALSReference}
+                //{ALSNone} 'none' | {ALSIden} 'iden' | {ALSUniv} 'univ' | {ALSInt} 'Int' | {ALSString} 'String' | {ALSReference}
-                //referred=[ALSRelationDeclaration] | {ALSNumberLiteral} value=INT | '(' ALSTerm ')'
+                //referred=[ALSRelationDeclaration] | {ALSNumberLiteral} value=INT | {ALSStringLiteral} value=STRING | '(' ALSTerm ')'
                public Alternatives getAlternatives() { return cAlternatives; }
                //{ALSNone} 'none'
@@ -1782,44 +1789,65 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
                //'Int'
                public Keyword getIntKeyword_3_1() { return cIntKeyword_3_1; }
-                //{ALSReference} referred=[ALSRelationDeclaration]
+                //{ALSString} 'String'
                public Group getGroup_4() { return cGroup_4; }
+                //{ALSString}
+                public Action getALSStringAction_4_0() { return cALSStringAction_4_0; }
+                //'String'
+                public Keyword getStringKeyword_4_1() { return cStringKeyword_4_1; }
+                //{ALSReference} referred=[ALSRelationDeclaration]
+                public Group getGroup_5() { return cGroup_5; }
                //{ALSReference}
-                public Action getALSReferenceAction_4_0() { return cALSReferenceAction_4_0; }
+                public Action getALSReferenceAction_5_0() { return cALSReferenceAction_5_0; }
                //referred=[ALSRelationDeclaration]
-                public Assignment getReferredAssignment_4_1() { return cReferredAssignment_4_1; }
+                public Assignment getReferredAssignment_5_1() { return cReferredAssignment_5_1; }
                //[ALSRelationDeclaration]
-                public CrossReference getReferredALSRelationDeclarationCrossReference_4_1_0() { return cReferredALSRelationDeclarationCrossReference_4_1_0; }
+                public CrossReference getReferredALSRelationDeclarationCrossReference_5_1_0() { return cReferredALSRelationDeclarationCrossReference_5_1_0; }
                //ID
-                public RuleCall getReferredALSRelationDeclarationIDTerminalRuleCall_4_1_0_1() { return cReferredALSRelationDeclarationIDTerminalRuleCall_4_1_0_1; }
+                public RuleCall getReferredALSRelationDeclarationIDTerminalRuleCall_5_1_0_1() { return cReferredALSRelationDeclarationIDTerminalRuleCall_5_1_0_1; }
                //{ALSNumberLiteral} value=INT
-                public Group getGroup_5() { return cGroup_5; }
+                public Group getGroup_6() { return cGroup_6; }
                //{ALSNumberLiteral}
-                public Action getALSNumberLiteralAction_5_0() { return cALSNumberLiteralAction_5_0; }
+                public Action getALSNumberLiteralAction_6_0() { return cALSNumberLiteralAction_6_0; }
                //value=INT
-                public Assignment getValueAssignment_5_1() { return cValueAssignment_5_1; }
+                public Assignment getValueAssignment_6_1() { return cValueAssignment_6_1; }
                //INT
-                public RuleCall getValueINTTerminalRuleCall_5_1_0() { return cValueINTTerminalRuleCall_5_1_0; }
+                public RuleCall getValueINTTerminalRuleCall_6_1_0() { return cValueINTTerminalRuleCall_6_1_0; }
+                //{ALSStringLiteral} value=STRING
+                public Group getGroup_7() { return cGroup_7; }
+                //{ALSStringLiteral}
+                public Action getALSStringLiteralAction_7_0() { return cALSStringLiteralAction_7_0; }
+                //value=STRING
+                public Assignment getValueAssignment_7_1() { return cValueAssignment_7_1; }
+                //STRING
+                public RuleCall getValueSTRINGTerminalRuleCall_7_1_0() { return cValueSTRINGTerminalRuleCall_7_1_0; }
                //'(' ALSTerm ')'
-                public Group getGroup_6() { return cGroup_6; }
+                public Group getGroup_8() { return cGroup_8; }
                //'('
-                public Keyword getLeftParenthesisKeyword_6_0() { return cLeftParenthesisKeyword_6_0; }
+                public Keyword getLeftParenthesisKeyword_8_0() { return cLeftParenthesisKeyword_8_0; }
                //ALSTerm
-                public RuleCall getALSTermParserRuleCall_6_1() { return cALSTermParserRuleCall_6_1; }
+                public RuleCall getALSTermParserRuleCall_8_1() { return cALSTermParserRuleCall_8_1; }
                //')'
-                public Keyword getRightParenthesisKeyword_6_2() { return cRightParenthesisKeyword_6_2; }
+                public Keyword getRightParenthesisKeyword_8_2() { return cRightParenthesisKeyword_8_2; }
        }
        public class ALSRunCommandElements extends AbstractParserRuleElementFinder {
@@ -1890,12 +1918,13 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
                private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
                private final RuleCall cALSSigScopeParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
                private final RuleCall cALSIntScopeParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
+                private final RuleCall cALSStringScopeParserRuleCall_2 = (RuleCall)cAlternatives.eContents().get(2);
                
                //ALSTypeScope:
-                //      ALSSigScope | ALSIntScope;
+                //      ALSSigScope | ALSIntScope | ALSStringScope;
                @Override public ParserRule getRule() { return rule; }
-                //ALSSigScope | ALSIntScope
+                //ALSSigScope | ALSIntScope | ALSStringScope
                public Alternatives getAlternatives() { return cAlternatives; }
                //ALSSigScope
@@ -1903,6 +1932,9 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
                //ALSIntScope
                public RuleCall getALSIntScopeParserRuleCall_1() { return cALSIntScopeParserRuleCall_1; }
+                //ALSStringScope
+                public RuleCall getALSStringScopeParserRuleCall_2() { return cALSStringScopeParserRuleCall_2; }
        }
        public class ALSSigScopeElements extends AbstractParserRuleElementFinder {
@@ -1968,6 +2000,34 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
                //'Int'
                public Keyword getIntKeyword_1() { return cIntKeyword_1; }
        }
+        public class ALSStringScopeElements extends AbstractParserRuleElementFinder {
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "hu.bme.mit.inf.dslreasoner.AlloyLanguage.ALSStringScope");
+                private final Group cGroup = (Group)rule.eContents().get(1);
+                private final Keyword cExactlyKeyword_0 = (Keyword)cGroup.eContents().get(0);
+                private final Assignment cNumberAssignment_1 = (Assignment)cGroup.eContents().get(1);
+                private final RuleCall cNumberINTTerminalRuleCall_1_0 = (RuleCall)cNumberAssignment_1.eContents().get(0);
+                private final Keyword cStringKeyword_2 = (Keyword)cGroup.eContents().get(2);
+                
+                //ALSStringScope:
+                //      'exactly' number=INT 'String';
+                @Override public ParserRule getRule() { return rule; }
+                //'exactly' number=INT 'String'
+                public Group getGroup() { return cGroup; }
+                //'exactly'
+                public Keyword getExactlyKeyword_0() { return cExactlyKeyword_0; }
+                //number=INT
+                public Assignment getNumberAssignment_1() { return cNumberAssignment_1; }
+                //INT
+                public RuleCall getNumberINTTerminalRuleCall_1_0() { return cNumberINTTerminalRuleCall_1_0; }
+                //'String'
+                public Keyword getStringKeyword_2() { return cStringKeyword_2; }
+        }
        
        
        public class ALSMultiplicityElements extends AbstractEnumRuleElementFinder {
@@ -2120,6 +2180,7 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
        private final ALSTypeScopeElements pALSTypeScope;
        private final ALSSigScopeElements pALSSigScope;
        private final ALSIntScopeElements pALSIntScope;
+        private final ALSStringScopeElements pALSStringScope;
        
        private final Grammar grammar;
@@ -2168,6 +2229,7 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
                this.pALSTypeScope = new ALSTypeScopeElements();
                this.pALSSigScope = new ALSSigScopeElements();
                this.pALSIntScope = new ALSIntScopeElements();
+                this.pALSStringScope = new ALSStringScopeElements();
        }
        
        protected Grammar internalFindGrammar(GrammarProvider grammarProvider) {
@@ -2374,7 +2436,7 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
        //ALSQuantified ALSTerm:
        //      {ALSQuantifiedEx} type=ALSMultiplicity
        //      disj?='disj'? variables+=ALSVariableDeclaration (',' variables+=ALSVariableDeclaration)* '{' expression=ALSTerm '}' |
-        //      ALSOr
+        //      ALSOr;
        public ALSQuantifiedElements getALSQuantifiedAccess() {
                return pALSQuantified;
        }
@@ -2384,7 +2446,7 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
        }
        //ALSOr ALSTerm:
-        //      ALSIff ({ALSOr.leftOperand=current} ("||" | "or") rightOperand=ALSIff)?
+        //      ALSIff ({ALSOr.leftOperand=current} ("||" | "or") rightOperand=ALSIff)?;
        public ALSOrElements getALSOrAccess() {
                return pALSOr;
        }
@@ -2394,7 +2456,7 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
        }
        //ALSIff ALSTerm:
-        //      ALSImpl ({ALSIff.leftOperand=current} ("<=>" | "iff") rightOperand=ALSImpl)?
+        //      ALSImpl ({ALSIff.leftOperand=current} ("<=>" | "iff") rightOperand=ALSImpl)?;
        public ALSIffElements getALSIffAccess() {
                return pALSIff;
        }
@@ -2404,7 +2466,7 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
        }
        //ALSImpl ALSTerm:
-        //      ALSAnd ({ALSImpl.leftOperand=current} ("=>" | "implies") rightOperand=ALSAnd ('else' elseOperand=ALSAnd)?)?
+        //      ALSAnd ({ALSImpl.leftOperand=current} ("=>" | "implies") rightOperand=ALSAnd ('else' elseOperand=ALSAnd)?)?;
        public ALSImplElements getALSImplAccess() {
                return pALSImpl;
        }
@@ -2414,7 +2476,7 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
        }
        //ALSAnd ALSTerm:
-        //      ALSComparison ({ALSAnd.leftOperand=current} ("&&" | "and") rightOperand=ALSComparison)?
+        //      ALSComparison ({ALSAnd.leftOperand=current} ("&&" | "and") rightOperand=ALSComparison)?;
        public ALSAndElements getALSAndAccess() {
                return pALSAnd;
        }
@@ -2426,7 +2488,7 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
        //ALSComparison ALSTerm:
        //      ALSOverride (({ALSEquals.leftOperand=current} "=" | {ALSNotEquals.leftOperand=current} "!=" |
        //      {ALSSubset.leftOperand=current} "in" | {ALSLess.leftOperand=current} ">" | {ALSLeq.leftOperand=current} ">=" |
-        //      {ALSMore.leftOperand=current} "<" | {ALSMeq.leftOperand=current} "<=") rightOperand=ALSOverride)?
+        //      {ALSMore.leftOperand=current} "<" | {ALSMeq.leftOperand=current} "<=") rightOperand=ALSOverride)?;
        public ALSComparisonElements getALSComparisonAccess() {
                return pALSComparison;
        }
@@ -2436,7 +2498,7 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
        }
        //ALSOverride ALSTerm:
-        //      ALSRangeRestrictionRight ({ALSOverride.leftOperand=current} '++' rightOperand=ALSRangeRestrictionRight)?
+        //      ALSRangeRestrictionRight ({ALSOverride.leftOperand=current} '++' rightOperand=ALSRangeRestrictionRight)?;
        public ALSOverrideElements getALSOverrideAccess() {
                return pALSOverride;
        }
@@ -2446,7 +2508,7 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
        }
        //ALSRangeRestrictionRight ALSTerm:
-        //      ALSRangeRestrictionLeft ({ALSRangeRestrictionRight.relation=current} ':>' filter=ALSRangeRestrictionLeft)?
+        //      ALSRangeRestrictionLeft ({ALSRangeRestrictionRight.relation=current} ':>' filter=ALSRangeRestrictionLeft)?;
        public ALSRangeRestrictionRightElements getALSRangeRestrictionRightAccess() {
                return pALSRangeRestrictionRight;
        }
@@ -2456,7 +2518,7 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
        }
        //ALSRangeRestrictionLeft ALSTerm:
-        //      ALSJoin ({ALSRangeRestrictionLeft.filter=current} '<:' relation=ALSJoin)?
+        //      ALSJoin ({ALSRangeRestrictionLeft.filter=current} '<:' relation=ALSJoin)?;
        public ALSRangeRestrictionLeftElements getALSRangeRestrictionLeftAccess() {
                return pALSRangeRestrictionLeft;
        }
@@ -2466,7 +2528,7 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
        }
        //ALSJoin ALSTerm:
-        //      ALSMinus ({ALSJoin.leftOperand=current} '.' rightOperand=ALSMinus)*
+        //      ALSMinus ({ALSJoin.leftOperand=current} '.' rightOperand=ALSMinus)*;
        public ALSJoinElements getALSJoinAccess() {
                return pALSJoin;
        }
@@ -2476,7 +2538,7 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
        }
        //ALSMinus ALSTerm:
-        //      ALSPlus ({ALSMinus.leftOperand=current} '-' rightOperand=ALSPlus)*
+        //      ALSPlus ({ALSMinus.leftOperand=current} '-' rightOperand=ALSPlus)*;
        public ALSMinusElements getALSMinusAccess() {
                return pALSMinus;
        }
@@ -2486,7 +2548,7 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
        }
        //ALSPlus ALSTerm:
-        //      ALSIntersection ({ALSPlus.leftOperand=current} '+' rightOperand=ALSIntersection)*
+        //      ALSIntersection ({ALSPlus.leftOperand=current} '+' rightOperand=ALSIntersection)*;
        public ALSPlusElements getALSPlusAccess() {
                return pALSPlus;
        }
@@ -2496,7 +2558,7 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
        }
        //ALSIntersection ALSTerm:
-        //      ALSDirectProduct ({ALSIntersection.leftOperand=current} '&' rightOperand=ALSDirectProduct)*
+        //      ALSDirectProduct ({ALSIntersection.leftOperand=current} '&' rightOperand=ALSDirectProduct)*;
        public ALSIntersectionElements getALSIntersectionAccess() {
                return pALSIntersection;
        }
@@ -2510,7 +2572,7 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
        //      ALSPreficed ({ALSDirectProduct.leftOperand=current} leftMultiplicit=ALSMultiplicity?
        //      '->'
        //      rightMultiplicit=ALSMultiplicity?
-        //      rightOperand=ALSPreficed)?
+        //      rightOperand=ALSPreficed)?;
        public ALSDirectProductElements getALSDirectProductAccess() {
                return pALSDirectProduct;
        }
@@ -2526,7 +2588,7 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
        //      operand=ALSBasicRelationTerm | {ALSSum} 'sum' variables+=ALSVariableDeclaration (','
        //      variables+=ALSVariableDeclaration)* '{' expression=ALSTerm '}' | {ALSFunctionCall}
        //      (referredDefinition=[ALSDefinition] | referredNumericOperator=ALSNumericOperator) '[' params+=ALSTerm (','
-        //      params+=ALSTerm)* ']' | ALSBasicRelationTerm
+        //      params+=ALSTerm)* ']' | ALSBasicRelationTerm;
        public ALSPreficedElements getALSPreficedAccess() {
                return pALSPreficed;
        }
@@ -2557,9 +2619,9 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
        }
        //ALSBasicRelationTerm ALSTerm:
-        //      {ALSNone} 'none' | {ALSIden} 'iden' | {ALSUniv} 'univ' | {ALSInt} 'Int' | {ALSReference}
+        //      {ALSNone} 'none' | {ALSIden} 'iden' | {ALSUniv} 'univ' | {ALSInt} 'Int' | {ALSString} 'String' | {ALSReference}
-        //      referred=[ALSRelationDeclaration] | {ALSNumberLiteral} value=INT |
+        //      referred=[ALSRelationDeclaration] | {ALSNumberLiteral} value=INT | {ALSStringLiteral} value=STRING |
-        //      '(' ALSTerm ')'
+        //      '(' ALSTerm ')';
        public ALSBasicRelationTermElements getALSBasicRelationTermAccess() {
                return pALSBasicRelationTerm;
        }
@@ -2582,7 +2644,7 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
        }
        //ALSTypeScope:
-        //      ALSSigScope | ALSIntScope;
+        //      ALSSigScope | ALSIntScope | ALSStringScope;
        public ALSTypeScopeElements getALSTypeScopeAccess() {
                return pALSTypeScope;
        }
@@ -2611,6 +2673,16 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
                return getALSIntScopeAccess().getRule();
        }
+        //ALSStringScope:
+        //      'exactly' number=INT 'String';
+        public ALSStringScopeElements getALSStringScopeAccess() {
+                return pALSStringScope;
+        }
+        
+        public ParserRule getALSStringScopeRule() {
+                return getALSStringScopeAccess().getRule();
+        }
        //terminal INT returns ecore::EInt:
        //      '0'..'9'+;
        public TerminalRule getINTRule() {
@@ -2624,7 +2696,7 @@ public class AlloyLanguageGrammarAccess extends AbstractGrammarElementFinder {
        } 
        //terminal ML_COMMENT:
-        //      '/ *'->'* /';
+        //      '/*'->'*/';
        public TerminalRule getML_COMMENTRule() {
                return gaTerminals.getML_COMMENTRule();
        } 
diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src/hu/bme/mit/inf/dslreasoner/AlloyLanguage.xtext b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src/hu/bme/mit/inf/dslreasoner/AlloyLanguage.xtext
index 6d5fcf58..468d453a 100644
--- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src/hu/bme/mit/inf/dslreasoner/AlloyLanguage.xtext
+++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src/hu/bme/mit/inf/dslreasoner/AlloyLanguage.xtext
@@ -128,12 +128,14 @@ enum ALSNumericOperator: plus|sub|mul|rem|div;
 ALSVariableDeclaration: name=ALSID ':'  range = ALSTerm;
 ALSBasicRelationTerm returns ALSTerm: 
-        {ALSNone} 'none'|
+        {ALSNone}   'none'|
-        {ALSIden} 'iden'|
+        {ALSIden}   'iden'|
-        {ALSUniv} 'univ'|
+        {ALSUniv}   'univ'|
-        {ALSInt}  'Int' |
+        {ALSInt}    'Int' |
+        {ALSString} 'String' |
        {ALSReference} referred = [ALSRelationDeclaration] |
        {ALSNumberLiteral} value = INT|
+        {ALSStringLiteral} value = STRING|
        '(' ALSTerm ')'
 ;
@@ -143,7 +145,8 @@ ALSBasicRelationTerm returns ALSTerm:
 ALSRunCommand:
        {ALSRunCommand} 'run' '{' '}' ('for' typeScopes+=ALSTypeScope (',' typeScopes+=ALSTypeScope)*)?;
-ALSTypeScope: ALSSigScope | ALSIntScope;
+ALSTypeScope: ALSSigScope | ALSIntScope | ALSStringScope;
 ALSSigScope: (exactly?='exactly')? number = INT type = [ALSSignatureDeclaration];
-ALSIntScope: number = INT 'Int';
-\ No newline at end of file
+ALSIntScope: number = INT 'Int';
+ALSStringScope: 'exactly' number = INT 'String';
+\ No newline at end of file
diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src/hu/bme/mit/inf/dslreasoner/formatting/AlloyLanguageFormatter.xtend b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src/hu/bme/mit/inf/dslreasoner/formatting/AlloyLanguageFormatter.xtend
index 28797bc4..2fe82e0c 100644
--- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src/hu/bme/mit/inf/dslreasoner/formatting/AlloyLanguageFormatter.xtend
+++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/src/hu/bme/mit/inf/dslreasoner/formatting/AlloyLanguageFormatter.xtend
@@ -86,8 +86,8 @@ class AlloyLanguageFormatter extends AbstractDeclarativeFormatter {
 //              c.setLinewrap.before(ALSPreficedAccess.rightCurlyBracketKeyword_5_6)
 //              c.setIndentationDecrement.before(ALSPreficedAccess.rightCurlyBracketKeyword_5_6)
                
-                c.setNoSpace.after(ALSBasicRelationTermAccess.leftParenthesisKeyword_6_0)
+                c.setNoSpace.after(ALSBasicRelationTermAccess.leftParenthesisKeyword_8_0)
-                c.setNoSpace.before(ALSBasicRelationTermAccess.rightParenthesisKeyword_6_2)
+                c.setNoSpace.before(ALSBasicRelationTermAccess.rightParenthesisKeyword_8_2)
                
                // Quantified expression
                c.setNoSpace.before(ALSQuantifiedAccess.commaKeyword_0_4_0)