diff --git a/schema/ModelFactory.wsdl b/schema/ModelerFactory.wsdl
similarity index 92%
rename from schema/ModelFactory.wsdl
rename to schema/ModelerFactory.wsdl
index 5f2a1a4..f8e4050 100644
--- a/schema/ModelFactory.wsdl
+++ b/schema/ModelerFactory.wsdl
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<definitions name="ModelFactory"
+<definitions name="ModelerFactory"
     targetNamespace="http://gcube-system.org/namespaces/vremanagement/vremodeler"
     xmlns:tns="http://gcube-system.org/namespaces/vremanagement/vremodeler"
   	xmlns="http://schemas.xmlsoap.org/wsdl/"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:coretypes="http://gcube-system.org/namespaces/common/core/types"
     xmlns:corefaults="http://gcube-system.org/namespaces/common/core/faults"
     xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing" >
      
@@ -19,15 +20,14 @@
 	<types>
 		<xsd:schema targetNamespace="http://gcube-system.org/namespaces/vremanagement/vremodeler"
     		xmlns:tns="http://gcube-system.org/namespaces/vremanagement/vremodeler">
-		
+		 
+		 <xsd:import namespace="http://gcube-system.org/namespaces/common/core/types" schemaLocation="../gcube/common/core/types/GCUBETypes.xsd"/>	
 		 <xsd:import namespace="http://schemas.xmlsoap.org/ws/2004/03/addressing" schemaLocation="../ws/addressing/WS-Addressing.xsd" />
-				
+		 
 			<!-- REQUESTS AND RESPONSES -->
 			
 						
-			<xsd:element name="createResource">
-				<xsd:complexType/>
-			</xsd:element>
+			<xsd:element name="createResource" type="coretypes:VOID"/>
 			
 			<xsd:element name="createResourceResponse" type="wsa:EndpointReferenceType"/>
 			
@@ -103,7 +103,7 @@
                       
 	============================================================-->
 
-	<portType name="ModelFactoryPortType">
+	<portType name="ModelerFactoryPortType">
 		<operation name="createResource">
 			<input message="tns:CreateResourceRequest"/>
 			<output message="tns:CreateResourceResponse"/>
diff --git a/schema/Model.wsdl b/schema/ModelerService.wsdl
similarity index 68%
rename from schema/Model.wsdl
rename to schema/ModelerService.wsdl
index 1613540..aeda9de 100644
--- a/schema/Model.wsdl
+++ b/schema/ModelerService.wsdl
@@ -1,34 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<definitions name="ModelService"
-    targetNamespace="http://diligentproject.org/namespaces/vdlgeneratorservice/model/ModelService"
-    xmlns="http://schemas.xmlsoap.org/wsdl/"
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+<definitions name="ModelerService"
+    targetNamespace="http://gcube-system.org/namespaces/vremanagement/vremodeler"
+    xmlns:tns="http://gcube-system.org/namespaces/vremanagement/vremodeler"
+  	xmlns="http://schemas.xmlsoap.org/wsdl/"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     xmlns:wsdlpp="http://www.globus.org/namespaces/2004/10/WSDLPreprocessor"
-    xmlns:tns="http://diligentproject.org/namespaces/vdlgeneratorservice/model/ModelService"
-    xmlns:wsrlw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.wsdl"
-    xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing" 
-    xmlns:diligent="http://diligentproject.org/namespaces/common/provider/DILIGENTProvider"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-    xmlns:keepercommon="http://diligentproject.org/namespaces/keeperservice/common"
     xmlns:wsrp="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd"
-    xmlns:wsrpw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    xmlns:coretypes="http://gcube-system.org/namespaces/common/core/types"
+    xmlns:corefaults="http://gcube-system.org/namespaces/common/core/faults"
+    xmlns:provider="http://gcube-system.org/namespaces/common/core/porttypes/GCUBEProvider">
+     
+     
+    <import namespace="http://gcube-system.org/namespaces/common/core/porttypes/GCUBEProvider" location="../gcube/common/core/providers/GCUBEProvider.wsdl"/> 
+    <import namespace="http://gcube-system.org/namespaces/common/core/faults" location="../gcube/common/core/faults/GCUBEFaults.wsdl"/>
   
   
-  
-  <wsdl:import 
-    namespace=
-    "http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl"
-    location="../../../wsrf/properties/WS-ResourceProperties.wsdl" />
+ 
 
-<wsdl:import 
-    namespace=
-    "http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.wsdl"
-    location="../../../wsrf/lifetime/WS-ResourceLifetime.wsdl" /> 
-    
-<wsdl:import namespace=
-   		 "http://diligentproject.org/namespaces/common/provider/DILIGENTProvider"
-   		 location="../../common/provider/DILIGENTProvider/DiligentProvider.wsdl"/>
     
 	<!--============================================================
 
@@ -38,21 +26,15 @@
 	
 	
 	<types>
-		<xsd:schema targetNamespace="http://diligentproject.org/namespaces/vdlgeneratorservice/model/ModelService"
-    		xmlns:tns="http://diligentproject.org/namespaces/vdlgeneratorservice/model/ModelService"
-    		xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing"
-    		xmlns:keepercommon="http://diligentproject.org/namespaces/keeperservice/common"
-    		xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    		<xsd:import namespace="http://diligentproject.org/namespaces/keeperservice/common" schemaLocation="../../../diligentproject/keeperservice/common/KeeperDataTypes.xsd"/>
-    		<xsd:import namespace="http://schemas.xmlsoap.org/ws/2004/03/addressing" schemaLocation="../../../ws/addressing/WS-Addressing.xsd" />
+		<xsd:schema targetNamespace="http://gcube-system.org/namespaces/vremanagement/vremodeler"
+    xmlns:tns="http://gcube-system.org/namespaces/vremanagement/vremodeler">   	
+	    <xsd:import namespace="http://gcube-system.org/namespaces/common/core/types" schemaLocation="../gcube/common/core/types/GCUBETypes.xsd"/>
 			
 			<!-- REQUESTS AND RESPONSES -->
 	
-			<xsd:complexType name="voidType"/>
-				
-			<xsd:element name="getVdlModelRequestMessage" type="tns:voidType"/>
+			<xsd:element name="getVdlModelRequestMessage" type="coretypes:VOID"/>
 			
-			<xsd:element name="getVdlModelResponseMessage" type="xsd:string"/>	
+			<xsd:element name="getVdlModelResponseMessage" type="coretypes:VOID"/>	
 			
 			<xsd:complexType name="vdlRequest">
 				<xsd:sequence>
@@ -67,9 +49,9 @@
 			
 			<xsd:element name="setVdlModelRequestMessage" type="tns:vdlRequest"/>
 			
-			<xsd:element name="setVdlModelResponseMessage" type="tns:voidType"/>
+			<xsd:element name="setVdlModelResponseMessage" type="coretypes:VOID"/>
 
-			<xsd:element name="getCollectionRequestMessage" type="tns:voidType"/>
+			<xsd:element name="getCollectionRequestMessage" type="coretypes:VOID"/>
 			
 			<xsd:element name="getCollectionResponseMessage" type="xsd:string"/>	
 			
@@ -81,9 +63,9 @@
 				
 			<xsd:element name="setCollectionRequestMessage" type="tns:collectionArray"/>
 			
-			<xsd:element name="setCollectionResponseMessage" type="tns:voidType"/>
+			<xsd:element name="setCollectionResponseMessage" type="coretypes:VOID"/>
 			
-			<xsd:element name="getMDCollectionRequestMessage" type="tns:voidType"/>
+			<xsd:element name="getMDCollectionRequestMessage" type="coretypes:VOID"/>
 						
 			<xsd:element name="getMDCollectionResponseMessage" type="xsd:string"/>	
 				
@@ -103,22 +85,22 @@
 					
 			<xsd:element name="setMDCollectionRequestMessage" type="tns:setMDFormatArgs"/>
 						
-			<xsd:element name="setMDCollectionResponseMessage" type="tns:voidType"/>
+			<xsd:element name="setMDCollectionResponseMessage" type="coretypes:VOID"/>
 						
 						
-			<xsd:element name="getQualityRequestMessage" type="tns:voidType"/>
+			<xsd:element name="getQualityRequestMessage" type="coretypes:VOID"/>
 			
 			<xsd:element name="getQualityResponseMessage" type="xsd:string"/>
 			
 			<xsd:element name="setQualityRequestMessage" type="xsd:string"/>
 			
-			<xsd:element name="setQualityResponseMessage" type="tns:voidType"/>
+			<xsd:element name="setQualityResponseMessage" type="coretypes:VOID"/>
 			
 			<xsd:element name="getFunctionalityResponseMessage" type="xsd:string"/>
 			
-			<xsd:element name="getFunctionalityRequestMessage" type="tns:voidType"/>
+			<xsd:element name="getFunctionalityRequestMessage" type="coretypes:VOID"/>
 			
-			<xsd:element name="setFunctionalityResponseMessage" type="tns:voidType"/>
+			<xsd:element name="setFunctionalityResponseMessage" type="coretypes:VOID"/>
 			
 			<xsd:complexType name="functionalityIDArray">
 				<xsd:sequence>
@@ -131,9 +113,9 @@
 			
 			<xsd:element name="getDHNResponseMessage" type="xsd:string"/>
 			
-			<xsd:element name="getDHNRequestMessage" type="tns:voidType"/>
+			<xsd:element name="getDHNRequestMessage" type="coretypes:VOID"/>
 			
-			<xsd:element name="setDHNResponseMessage" type="tns:voidType"/>
+			<xsd:element name="setDHNResponseMessage" type="coretypes:VOID"/>
 			
 			<xsd:complexType name="DHNArray">
 				<xsd:sequence>
@@ -143,30 +125,21 @@
 			
 			<xsd:element name="setDHNRequestMessage" type="tns:DHNArray"/>
 			
-			<xsd:element name="setDLtoPendingStateRequestMessage" type="tns:voidType"/>
+			<xsd:element name="setDLtoPendingStateRequestMessage" type="coretypes:VOID"/>
 			
-			<xsd:element name="setDLtoPendingStateResponseMessage" type="tns:voidType"/>
+			<xsd:element name="setDLtoPendingStateResponseMessage" type="coretypes:VOID"/>
 			
-			<xsd:element name="deployDLRequestMessage" type="tns:voidType"/>
+			<xsd:element name="deployDLRequestMessage" type="coretypes:VOID"/>
 			
-			<xsd:element name="deployDLResponseMessage" type="tns:voidType"/>
+			<xsd:element name="deployDLResponseMessage" type="coretypes:VOID"/>
 			
-			<xsd:element name="checkDLStatus" type="tns:voidType"/>
-	 
-	 		<xsd:element name="checkDLStatusResp">
-	  			<xsd:complexType>
-		 			<xsd:sequence>
-		 				<xsd:element name="statusList" type="keepercommon:PackageInfoStatus" minOccurs="0" maxOccurs="unbounded"/>
-		 				<xsd:element name="serviceList" type="keepercommon:ServiceInfoStatus" minOccurs="0" maxOccurs="unbounded"/>
-		 			</xsd:sequence>
-	  			</xsd:complexType>
-	 		</xsd:element> 
+			 		
 			
 			<!--RESOURCE PROPERTIES -->
 			
 			<xsd:element name="Id" type="xsd:string"/>
 			
-			<xsd:element name="ModelProperties">
+			<xsd:element name="ModelerProperties">
         	<xsd:complexType>
                <xsd:sequence>
                       <xsd:element ref="tns:Id" minOccurs="1" maxOccurs="1"/>
@@ -285,12 +258,7 @@
 		<part name="response" element="tns:deployDLResponseMessage"/>
 	</message>
 	
-	<message name="CheckDLStatusInputMessage">
-		<part name="request" element="tns:checkDLStatus"/>
-	</message>
-	<message name="CheckDLStatusOutputMessage">
-		<part name="response" element="tns:checkDLStatusResp"/>
-	</message>
+	
 	
 	
 	<!--============================================================
@@ -299,14 +267,9 @@
                       
 	============================================================-->
 
-	<portType name="ModelPortType"
-	   wsdlpp:extends="wsrpw:GetResourceProperty
-                    wsrpw:GetMultipleResourceProperties
-                    wsrpw:SetResourceProperties
-                    wsrpw:QueryResourceProperties
-			  wsrlw:ImmediateResourceTermination
-			  diligent:DiligentProviderPortType"
-	  wsrp:ResourceProperties="tns:ModelProperties" >
+	<portType name="ModelerServicePortType"
+	   wsrp:ResourceProperties="tns:ModelerProperties"
+        wsdlpp:extends="provider:GCUBEProvider">
 
 		<operation name="setDLModel">
 			<input message="tns:SetVDLModelInputMessage"/>
@@ -381,10 +344,7 @@
 			<output message="tns:DeployDLOutputMessage"/>
 		</operation>
 		
-		<operation name="checkDLStatus">
-			<input message="tns:CheckDLStatusInputMessage"/>
-			<output message="tns:CheckDLStatusOutputMessage"/>
-		</operation>	
+		
 	
 	</portType>