diff --git a/CDT-group-v0_8_0.xsd b/CDT-group-v0_8_0.xsd
index 5618c6d323f5dd30a0b95b1bd2af42d61c6e84a3..7726f5797447cc0accb6dbe3a0005815ae1ff5ce 100644
--- a/CDT-group-v0_8_0.xsd
+++ b/CDT-group-v0_8_0.xsd
@@ -36,21 +36,19 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 				<!-- Inherit common attributes for announceable Resources -->
 				<xs:extension base="m2m:announceableResource">
 					<!-- Resource Specific Attributes -->
-					<xs:sequence>
+					<xs:sequence>					
+                        <xs:element name="creator" type="xs:anyURI" minOccurs="0" />					
 						<xs:element name="memberType" type="m2m:memberType" />
 						<xs:element name="currentNrOfMembers" type="xs:nonNegativeInteger" />
 						<xs:element name="maxNrOfMembers" type="xs:nonNegativeInteger" />
-						<xs:element name="membersList" type="m2m:listOfURIs" />
+						<xs:element name="memberIDs" type="m2m:listOfURIs" />
 						<xs:element name="membersAccessControlPolicyIDs" type="m2m:listOfURIs" minOccurs="0" />
 						<xs:element name="memberTypeValidated" type="xs:boolean" />
 						<xs:element name="consistencyStrategy" type="m2m:consistencyStrategy" minOccurs="0" />
 						<xs:element name="groupName" type="xs:string" minOccurs="0" />
-						<!-- TODO: update TS-0004 to change the name from Creator to creator. Also it's at the start of the list in TS-0001 -->
-						<xs:element name="creator" type="xs:anyURI" minOccurs="0" />
-
+						
 						<!-- Child Resources -->
-						<!-- TODO: should this be fanOutURI? -->
-						<xs:element name="fanOut" type="xs:anyURI" />
+						<xs:element name="fanOutPoint" type="xs:anyURI" />
 
 						<xs:choice minOccurs="0" maxOccurs="1">
 							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
@@ -72,15 +70,18 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 						<xs:element name="memberType" type="m2m:memberType" minOccurs="0" />
 						<xs:element name="currentNrOfMembers" type="xs:nonNegativeInteger" minOccurs="0" />
 						<xs:element name="maxNrOfMembers" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="membersList" type="m2m:listOfURIs" minOccurs="0" />
+						<xs:element name="memberIDs" type="m2m:listOfURIs" minOccurs="0" />
 						<xs:element name="membersAccessControlPolicyIDs" type="m2m:listOfURIs" minOccurs="0" />
 						<xs:element name="memberTypeValidated" type="xs:boolean" minOccurs="0" />
 						<xs:element name="consistencyStrategy" type="m2m:consistencyStrategy" minOccurs="0" />
 						<xs:element name="groupName" type="xs:string" minOccurs="0" />
-						<!-- TODO: update TS-0004 to change the name from Creator to creator. Also it's at the start of the list in TS-0001 -->
-						<xs:element name="creator" type="xs:anyURI" minOccurs="0" />
-
-						<!-- No Child Resources -->
+						
+					    <!-- Child Resources -->
+     
+                        <xs:choice minOccurs="0" maxOccurs="1">
+                            <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+                            <xs:element ref="m2m:subscription" maxOccurs="unbounded" />
+                        </xs:choice>
 					</xs:sequence>
 				</xs:extension>
 			</xs:complexContent>