diff --git a/CDT-software-v0_8_0.xsd b/CDT-software-v0_8_0.xsd
index 5b71405517130e94b31e980bb942b7ae1b30aa50..2ad6b533a7531e7a81ecca0628c499f7b0ea5109 100644
--- a/CDT-software-v0_8_0.xsd
+++ b/CDT-software-v0_8_0.xsd
@@ -24,39 +24,65 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 -->
 
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols" 
-      xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
-	    attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
+	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
 	<xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
 	<xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
 	
-  <xs:element name="software">
-	  <xs:complexType>
-	  	<xs:complexContent>
-		    <!-- Inherit Common Attributes from data type "mgmtResource" -->
-        <xs:extension base="m2m:mgmtResource">
-          <!-- Resource Specific Attributes -->
-          <xs:sequence>
-            <xs:element name="version" type="xs:string" />
-            <xs:element name="name" type="xs:string" />
-            <xs:element name="URL" type="xs:anyURI" />
-            <xs:element name="install" type="xs:boolean" minOccurs="0" />
-            <xs:element name="uninstall" type="xs:boolean" minOccurs="0" />
-            <xs:element name="installStatus" type="m2m:actionStatus" minOccurs="0" />
-            <xs:element name="activate" type="xs:boolean" minOccurs="0"/>
-            <xs:element name="deactivate" type="xs:boolean" minOccurs="0"/>
-            <xs:element name="activeStatus" type="m2m:actionStatus" minOccurs="0"/>
+	<xs:element name="software">
+		<xs:complexType>
+			<xs:complexContent>
+				<!-- Inherit Common Attributes from data type "mgmtResource" -->
+				<xs:extension base="m2m:mgmtResource">
+					<!-- Resource Specific Attributes -->
+					<xs:sequence>
+						<xs:element name="version" type="xs:string" />
+						<xs:element name="name" type="xs:string" />
+						<xs:element name="URL" type="xs:anyURI" />
+						<xs:element name="install" type="xs:boolean" minOccurs="0" />
+						<xs:element name="uninstall" type="xs:boolean" minOccurs="0" />
+						<xs:element name="installStatus" type="m2m:actionStatus" minOccurs="0" />
+						<xs:element name="activate" type="xs:boolean" minOccurs="0"/>
+						<xs:element name="deactivate" type="xs:boolean" minOccurs="0"/>
+						<xs:element name="activeStatus" type="m2m:actionStatus" minOccurs="0"/>
               
-			      <!-- Child Resources -->
-            <xs:choice minOccurs="0" maxOccurs="1">
-              <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-              <xs:choice minOccurs="1" maxOccurs="unbounded">
-                <xs:element ref="m2m:subscription" />   
-              </xs:choice>
-            </xs:choice>
-          </xs:sequence>
-        </xs:extension>
-      </xs:complexContent>
-	  </xs:complexType>
+						<!-- 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>
+		</xs:complexType>
+	</xs:element>
+	
+	<xs:element name="softwareAnnc">
+		<xs:complexType>
+			<xs:complexContent>
+				<!-- Inherit Common Attributes from data type "announcedMgmtResource" -->
+				<xs:extension base="m2m:announcedMgmtResource">
+					<!-- Resource Specific Attributes -->
+					<xs:sequence>
+						<xs:element name="version" type="xs:string" minOccurs="0" />
+						<xs:element name="name" type="xs:string" minOccurs="0" />
+						<xs:element name="URL" type="xs:anyURI" minOccurs="0" />
+						<xs:element name="install" type="xs:boolean" minOccurs="0" />
+						<xs:element name="uninstall" type="xs:boolean" minOccurs="0" />
+						<xs:element name="installStatus" type="m2m:actionStatus" minOccurs="0" />
+						<xs:element name="activate" type="xs:boolean" minOccurs="0"/>
+						<xs:element name="deactivate" type="xs:boolean" minOccurs="0"/>
+						<xs:element name="activeStatus" type="m2m:actionStatus" minOccurs="0"/>
+              
+						<!-- 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>
+		</xs:complexType>
 	</xs:element>
 </xs:schema>