diff --git a/examples/functions/basic/ClassInFrame.xml b/examples/functions/basic/ClassInFrame.xml
index 8d2c3c52b..e20f32feb 100644
--- a/examples/functions/basic/ClassInFrame.xml
+++ b/examples/functions/basic/ClassInFrame.xml
@@ -55,8 +55,8 @@
 									<FrameClassRef nameOfClass="TimeTableFrame"/>
 									<classes>
 										<ClassInFrameRef classRefType="members" nameOfClass="TimeTableFrame">
-											<MemberRef nameOfClass="passingTimes" use="required"/>
-											<MemberRef nameOfClass="calls" use="prohibited"/>
+											<ClassElement nameOfElement="passingTimes" use="required"/>
+											<ClassElement nameOfElement="calls" use="prohibited"/>
 										</ClassInFrameRef>
 										<ClassInFrameRef classRefType="members" nameOfClass="ServiceJourney"/>
 										<ClassInFrameRef classRefType="members" nameOfClass="JourneyPart"/>
@@ -85,7 +85,9 @@
 										<ClassInFrameRef classRefType="memberReferences" nameOfClass="Route"/>
 										<ClassInFrameRef classRefType="memberReferences" nameOfClass="Direction"/>
 										<ClassInFrameRef classRefType="memberReferences" nameOfClass="TariffZone"/>
-										<ClassInFrameRef classRefType="memberReferences" nameOfClass="PassengerStopAssignment"/>
+										<ClassInFrameRef classRefType="memberReferences" nameOfClass="PassengerStopAssignment">
+											<ClassElement nameOfElement="BoardingPosition" use="prohibited"/>
+										</ClassInFrameRef>
 									</classes>
 								</TypeOfFrame>
 								<TypeOfFrame version="01" id="Neptune:TypeOfFrame:SiteFrame">
diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd
index 461878d9c..df8c6b7cb 100644
--- a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd
@@ -123,11 +123,26 @@ Rail transport, Roads and Road transport
 			<xsd:documentation>Type for a reference to the Class of a ENTITY.</xsd:documentation>
 		</xsd:annotation>
 		<xsd:sequence>
-			<xsd:element name="MemberRef" type="ClassRefStructure" minOccurs="0" maxOccurs="unbounded"/>
+			<xsd:element name="ClassElement" type="ClassElementStructure" minOccurs="0" maxOccurs="unbounded"/>
 		</xsd:sequence>
 		<xsd:attribute name="nameOfClass" type="NameOfClass" use="required">
 			<xsd:annotation>
-				<xsd:documentation>Name of referenced Class.</xsd:documentation>
+				<xsd:documentation>Name of referenced class.</xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="use" type="MandatoryEnumeration" default="optional">
+			<xsd:annotation>
+				<xsd:documentation>Whether the member is required, optional or prohibited.</xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>	
+	<xsd:complexType name="ClassElementStructure">
+		<xsd:annotation>
+			<xsd:documentation>An element in an ENTITY.</xsd:documentation>
+		</xsd:annotation>
+		<xsd:attribute name="nameOfElement" type="NameOfClass" use="required">
+			<xsd:annotation>
+				<xsd:documentation>Name of referenced class.</xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="use" type="MandatoryEnumeration" default="optional">
@@ -163,17 +178,17 @@ Rail transport, Roads and Road transport
 		<xsd:restriction base="xsd:normalizedString">
 			<xsd:enumeration value="members">
 				<xsd:annotation>
-					<xsd:documentation source="comment">Include elements that meet selection criteria (e.g. validity condition).</xsd:documentation>
+					<xsd:documentation>Include elements that meet selection criteria (e.g. validity condition).</xsd:documentation>
 				</xsd:annotation>
 			</xsd:enumeration>
 			<xsd:enumeration value="memberReferences">
 				<xsd:annotation>
-					<xsd:documentation source="Comment">Include elements that are referenced by primary element. E.g. TYPES OF VALUE, OPERATOR etc.</xsd:documentation>
+					<xsd:documentation>Include elements that are referenced by primary element. E.g. TYPES OF VALUE, OPERATOR etc.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:enumeration>
 			<xsd:enumeration value="all">
 				<xsd:annotation>
-					<xsd:documentation source="comment">Include all elements.</xsd:documentation>
+					<xsd:documentation>Include all elements.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:enumeration>
 		</xsd:restriction>