diff --git a/repository/src/main/resources/xsd/repository.xsd b/repository/src/main/resources/xsd/repository.xsd
index a14bc907..23988f75 100644
--- a/repository/src/main/resources/xsd/repository.xsd
+++ b/repository/src/main/resources/xsd/repository.xsd
@@ -244,11 +244,11 @@
 				</xs:annotation>
 			</xs:attribute>
 			<xs:attribute name="applVerId" type="xs:string"/>
-			<xs:attribute name="expressionLanguage" type="xs:string" default="Score">
+			<xs:attributeGroup ref="fixr:expressionGrp">
 				<xs:annotation>
-					<xs:documentation>The syntax of 'expressionType'</xs:documentation>
+					<xs:documentation>Global syntax of 'expressionType'</xs:documentation>
 				</xs:annotation>
-			</xs:attribute>
+			</xs:attributeGroup>
 		</xs:complexType>
 		<xs:key name="typeKey">
 			<xs:selector xpath="fixr:codeSets/fixr:codeSet|fixr:datatypes/fixr:datatype"/>
diff --git a/repository/src/main/resources/xsd/repositorytypes.xsd b/repository/src/main/resources/xsd/repositorytypes.xsd
index 042020ff..d3373706 100644
--- a/repository/src/main/resources/xsd/repositorytypes.xsd
+++ b/repository/src/main/resources/xsd/repositorytypes.xsd
@@ -327,15 +327,28 @@
 	<xs:simpleType name="EP_t">
 		<xs:restriction base="xs:integer"/>
 	</xs:simpleType>
-	<xs:simpleType name="expressionType">
+	<xs:attributeGroup name="expressionGrp">
+		<xs:annotation>
+			<xs:documentation>Attributes of expressions
+			</xs:documentation>
+		</xs:annotation>
+		<xs:attribute name="expressionLanguage" type="xs:string" default="Score">
+			<xs:annotation>
+				<xs:documentation>Name of a scripting language or DSL</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+	</xs:attributeGroup>
+	<xs:complexType name="expressionType">
 		<xs:annotation>
 			<xs:documentation>Expressed in a Domain Specific Language
 			</xs:documentation>
 		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:maxLength value="1024"/>
-		</xs:restriction>
-	</xs:simpleType>
+		<xs:simpleContent>
+			<xs:extension base="xs:string">
+				<xs:attributeGroup ref="fixr:expressionGrp"/>
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
 	<xs:attributeGroup name="fieldAttribGrp">
 		<xs:annotation>
 			<xs:documentation>Attributes of a field that be overridden by a rule
@@ -435,7 +448,6 @@
 					<xs:annotation>
 						<xs:documentation>Content of element holds an assignment expression
 							for a message field or state variable.
-							This can be used for field validation.
 						</xs:documentation>
 					</xs:annotation>
 				</xs:element>