diff --git a/schema/RegistryFactory.wsdl b/schema/RegistryFactory.wsdl
index 07f69e9..256ece6 100644
--- a/schema/RegistryFactory.wsdl
+++ b/schema/RegistryFactory.wsdl
@@ -36,15 +36,6 @@
 
 	<!-- REQUESTS AND RESPONSES -->
 
-	
-	<xsd:complexType name="RegistryProperty">	
-		<xsd:sequence>
-				<xsd:element name="uniqueID" type="xsd:string" nillable="true"/> 
-		  		<xsd:element name="operationType" type="xsd:string" nillable="true"/> 
-		  		<xsd:element name="changeTime" type="xsd:dateTime" nillable="true"/> 
-		 </xsd:sequence>
-  	</xsd:complexType>
-
 
 	<xsd:complexType name="UpdateResourceMessage">
 		<xsd:sequence>
@@ -54,20 +45,6 @@
 		</xsd:sequence>
 	</xsd:complexType>
 	
-	<xsd:complexType  name="UpdateScopeInProfileMessage">
-		<xsd:sequence>
-			<xsd:element name="uniqueID" type="xsd:string"/>
-			<xsd:element name="type" type="xsd:string"/>
-			<xsd:element name="scope" type="xsd:string"/>
-		</xsd:sequence>
-	</xsd:complexType>
-	
-	<xsd:complexType  name="UpdateStateMessage">
-		<xsd:sequence>
-			<xsd:element name="uniqueID" type="xsd:string"/>
-			<xsd:element name="state" type="xsd:string"/>
-		</xsd:sequence>
-	</xsd:complexType>
 
 	<xsd:complexType name="CreateResourceMessage">
 			<xsd:sequence>
@@ -82,15 +59,7 @@
 				<xsd:element name="uniqueID" type="xsd:string" minOccurs="1" maxOccurs="1"/>
 				<xsd:element name="type" type="xsd:string" minOccurs="1" maxOccurs="1" />
 			</xsd:sequence>
-	</xsd:complexType>
-	
-	<xsd:complexType name="RemoveScopeInProfileMessage">
-			<xsd:sequence>
-				<xsd:element name="uniqueID" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-				<xsd:element name="type" type="xsd:string"/>
-				<xsd:element name="scope" type="xsd:string"/>
-			</xsd:sequence>
-	</xsd:complexType>
+	</xsd:complexType>		
 
 	 <xsd:element name="createResource" type="tns:CreateResourceMessage"/>
 	
@@ -101,45 +70,24 @@
 	 <xsd:element name="updateResourceResponse">
 		<xsd:complexType/>
 	 </xsd:element>
-	 
-	 <xsd:element name="updateScopeInProfile" type="tns:UpdateScopeInProfileMessage"/>
-	
-	 <xsd:element name="updateScopeInProfileResponse" type="xsd:string"/>
-	
-    <xsd:element name="updateState" type="tns:UpdateStateMessage"/>
-
-	<xsd:element name="updateStateResponse" type="xsd:string"/>
-	
+	 	
 	 <xsd:element name="removeResource" type="tns:RemoveResourceMessage"/>
 	
 	 <xsd:element name="removeResourceResponse">
 		<xsd:complexType/>
-	 </xsd:element>
+	 </xsd:element>		 	
 	
-	 <xsd:element name="removeScopeInProfile" type="tns:RemoveScopeInProfileMessage"/>
-	
-	 <xsd:element name="removeScopeInProfileResponse" type="xsd:string"/>
-		
-	 <xsd:element name="getUniqueIdInputMessage">
-		<xsd:complexType/>
-	 </xsd:element>
-
-	 <xsd:element name="getUniqueIdOutputMessage">
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element name="UUID" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-			</xsd:sequence>
-		</xsd:complexType>
-	</xsd:element>
-
-	<xsd:element name="startRegistration">
-		<xsd:complexType/>
-	</xsd:element>
-	
-	<xsd:element name="startRegistrationResponse">
-		<xsd:complexType/>
-	</xsd:element>
+	<!-- RESOURCE PROPERTIES  -->
 	
+	<xsd:complexType name="RegistryProperty">	
+		<xsd:sequence>
+				<xsd:element name="uniqueID" type="xsd:string" nillable="true"/> 
+		  		<xsd:element name="operationType" type="xsd:string" nillable="true"/> 
+		  		<xsd:element name="changeTime" type="xsd:dateTime" nillable="true"/> 
+		 </xsd:sequence>
+  	</xsd:complexType>
+  	
+  	
 	<xsd:element name="RunningInstance" type="tns:RegistryProperty"/>
 	
 	<xsd:element name="ExternalRunningInstance" type="tns:RegistryProperty"/>
@@ -189,6 +137,7 @@
         </xsd:complexType>
      </xsd:element>
 
+	<!--  FAULT DEFINITIONS  -->
  	<xsd:element name="schemaValidationFault" type="tns:schemaValidationFault" />
     
     <xsd:complexType name="schemaValidationFault">
@@ -250,40 +199,6 @@
 <message name="RemoveResourceResponse">
 	<part name="response" element="tns:removeResourceResponse"/>
 </message>
-<message name="GetUniqueIDRequest">
-	<part name="request" element="tns:getUniqueIdInputMessage"/>
-</message>
-<message name="GetUniqueIDResponse">
-	<part name="response" element="tns:getUniqueIdOutputMessage"/>
-</message>
-
-<message name="StartRegistrationRequest">
-	<part name="request" element="tns:startRegistration"/>
-</message>
-<message name="StartRegistrationResponse">
-	<part name="response" element="tns:startRegistrationResponse"/>
-</message>
-
-<message name="UpdateScopeInProfileRequest">
-	<part name="request" element="tns:updateScopeInProfile"/>
-</message>
-<message name="UpdateScopeInProfileResponse">
-	<part name="response" element="tns:updateScopeInProfileResponse"/>
-</message>
-
-<message name="RemoveScopeInProfileRequest">
-	<part name="request" element="tns:removeScopeInProfile"/>
-</message>
-<message name="RemoveScopeInProfileResponse">
-	<part name="response" element="tns:removeScopeInProfileResponse"/>
-</message>
-
-<message name="UpdateStateRequest">
-	<part name="request" element="tns:updateState"/>
-</message>
-<message name="UpdateStateResponse">
-	<part name="response" element="tns:updateStateResponse"/>
-</message>
 
 <message name="schemaValidationFaultMessage">
 	   <part name="fault" element="tns:schemaValidationFault"/>
@@ -321,27 +236,7 @@
 		<input message="tns:RemoveResourceRequest"/>
 		<output message="tns:RemoveResourceResponse"/>
 		<fault name="fault" message="corefaults:GCUBEFaultMessage"></fault>
-	</operation>
-	<operation name="updateScopeInProfile">
-		<input message="tns:UpdateScopeInProfileRequest"/>
-		<output message="tns:UpdateScopeInProfileResponse"/>
-		<fault name="fault" message="corefaults:GCUBEFaultMessage"></fault>
-	</operation>
-	<operation name="removeScopeInProfile">
-		<input message="tns:RemoveScopeInProfileRequest"/>
-		<output message="tns:RemoveScopeInProfileResponse"/>
-		<fault name="fault" message="corefaults:GCUBEFaultMessage"></fault>
-	</operation>
-	<operation name="updateState">
-		<input message="tns:UpdateStateRequest"/>
-		<output message="tns:UpdateStateResponse"/>
-		<fault name="fault" message="corefaults:GCUBEFaultMessage"></fault>
-	</operation>
-	<operation name="startRegistration">
-		<input message="tns:StartRegistrationRequest"/>
-		<output message="tns:StartRegistrationResponse"/>
-		<fault name="fault" message="corefaults:GCUBEFaultMessage"></fault>
-	</operation>
+	</operation>	
 	
 </portType>