diff --git a/build.gradle b/build.gradle
index 8f1ec3244bee366fc00d694d612d682f37cc8c2a..e7fb8bcf847f81f8d52c096184518f43cd9696bb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -129,7 +129,7 @@ javadoc {
     failOnError = true
 }
 test {
-    //exclude 'de/ugoe/cs/rwm/mocci/live/**'
+    exclude 'de/ugoe/cs/rwm/mocci/live/**'
     testLogging.showStandardStreams = true
         testLogging {
         exceptionFormat = 'full'
diff --git a/de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/ConnectorFactory.java b/de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/ConnectorFactory.java
index 7824ea7a3bbdb929ed295ca83f893f31b9757e59..c9f4312a2cf97d761b4a29c4e6d9b29530ad7c54 100644
--- a/de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/ConnectorFactory.java
+++ b/de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/ConnectorFactory.java
@@ -14,6 +14,8 @@
  */
 package de.ugoe.cs.rwm.mocci.connector;
 
+import monitoring.Dataprocessor;
+
 /**
  * Connector EFactory for the OCCI extension:
  * - name: monitoring
@@ -50,8 +52,8 @@ public class ConnectorFactory extends monitoring.impl.MonitoringFactoryImpl
 	 * - title: Processor Resource
 	 */
 	@Override
-	public monitoring.Processor createProcessor() {
-		return new ProcessorConnector();
+	public monitoring.Dataprocessor createDataprocessor() {
+		return new DataprocessorConnector();
 	}
 
 	/**
@@ -61,30 +63,30 @@ public class ConnectorFactory extends monitoring.impl.MonitoringFactoryImpl
 	 * - title: Publisher Resource
 	 */
 	@Override
-	public monitoring.Publisher createPublisher() {
-		return new PublisherConnector();
+	public monitoring.Resultprovider createResultprovider() {
+		return new ResultproviderConnector();
 	}
 
 	/**
 	 * EFactory method for OCCI kind:
 	 * - scheme: http://schemas.ugoe.cs.rwm/monitoring#
-	 * - term: monitoringproperty
-	 * - title: MonitoringProperty Component
+	 * - term: martpublisher
+	 * - title: MartPublisher Mixin
 	 */
 	@Override
-	public monitoring.Monitoringproperty createMonitoringproperty() {
-		return new MonitoringpropertyConnector();
+	public monitoring.Occiresultprovider createOcciresultprovider() {
+		return new OcciresultproviderConnector();
 	}
 
+	
 	/**
 	 * EFactory method for OCCI kind:
 	 * - scheme: http://schemas.ugoe.cs.rwm/monitoring#
-	 * - term: martpublisher
-	 * - title: MartPublisher Mixin
+	 * - term: monitoringproperty
+	 * - title: MonitoringProperty Component
 	 */
 	@Override
-	public monitoring.Martpublisher createMartpublisher() {
-		return new MartpublisherConnector();
+	public monitoring.Monitorableproperty createMonitorableproperty() {
+		return new MonitorablepropertyConnector();
 	}
-
 }
diff --git a/de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/ProcessorConnector.java b/de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/DataprocessorConnector.java
similarity index 89%
rename from de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/ProcessorConnector.java
rename to de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/DataprocessorConnector.java
index a0a790e34d5220a9b2cb91585be313468c539cda..60cb80c7a9451eae3ab18a084db7880eb95dac2d 100644
--- a/de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/ProcessorConnector.java
+++ b/de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/DataprocessorConnector.java
@@ -14,6 +14,7 @@
  */
 package de.ugoe.cs.rwm.mocci.connector;
 
+import org.eclipse.cmf.occi.core.AttributeState;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -25,18 +26,18 @@ import org.slf4j.LoggerFactory;
  * - term: processor
  * - title: Processor Resource
  */
-public class ProcessorConnector extends monitoring.impl.ProcessorImpl
+public class DataprocessorConnector extends monitoring.impl.DataprocessorImpl
 {
 	/**
 	 * Initialize the logger.
 	 */
-	private static Logger LOGGER = LoggerFactory.getLogger(ProcessorConnector.class);
+	private static Logger LOGGER = LoggerFactory.getLogger(DataprocessorConnector.class);
 
 	// Start of user code Processorconnector_constructor
 	/**
 	 * Constructs a processor connector.
 	 */
-	ProcessorConnector()
+	DataprocessorConnector()
 	{
 		LOGGER.debug("Constructor called on " + this);
 		// TODO: Implement this constructor.
@@ -169,8 +170,12 @@ public class ProcessorConnector extends monitoring.impl.ProcessorImpl
 	public void start()
 	{
 		LOGGER.debug("Action start() called on " + this);
+		LOGGER.debug("Action start() called on " + this);
 
-		// TODO: Implement how to start this processor.
+		System.out.println(this.attributes);
+		LOGGER.debug("Action start() called on " + this);
+		//this.attributes.remove(sensorlocation);
+		System.out.println(this.attributes);
 	}
 	// End of user code
 		
diff --git a/de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/MonitoringpropertyConnector.java b/de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/MonitorablepropertyConnector.java
similarity index 91%
rename from de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/MonitoringpropertyConnector.java
rename to de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/MonitorablepropertyConnector.java
index b012b524827d3e4e96945c4c3c61b49f644155cf..ac8d9a601124de874d57ee214923ebb0d7b44154 100644
--- a/de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/MonitoringpropertyConnector.java
+++ b/de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/MonitorablepropertyConnector.java
@@ -25,18 +25,18 @@ import org.slf4j.LoggerFactory;
  * - term: monitoringproperty
  * - title: MonitoringProperty Component
  */
-public class MonitoringpropertyConnector extends monitoring.impl.MonitoringpropertyImpl
+public class MonitorablepropertyConnector extends monitoring.impl.MonitorablepropertyImpl
 {
 	/**
 	 * Initialize the logger.
 	 */
-	private static Logger LOGGER = LoggerFactory.getLogger(MonitoringpropertyConnector.class);
+	private static Logger LOGGER = LoggerFactory.getLogger(MonitorablepropertyConnector.class);
 
 	// Start of user code Monitoringpropertyconnector_constructor
 	/**
 	 * Constructs a monitoringproperty connector.
 	 */
-	MonitoringpropertyConnector()
+	MonitorablepropertyConnector()
 	{
 		LOGGER.debug("Constructor called on " + this);
 		// TODO: Implement this constructor.
diff --git a/de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/MartpublisherConnector.java b/de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/OcciresultproviderConnector.java
similarity index 83%
rename from de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/MartpublisherConnector.java
rename to de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/OcciresultproviderConnector.java
index a13a97d92f4d442febbd7ad9e98b302cc721ffb8..6b2ec517c4dcf19d6198793da5c92c966274c6b1 100644
--- a/de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/MartpublisherConnector.java
+++ b/de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/OcciresultproviderConnector.java
@@ -25,18 +25,18 @@ import org.slf4j.LoggerFactory;
  * - term: martpublisher
  * - title: MartPublisher Mixin
  */
-public class MartpublisherConnector extends monitoring.impl.MartpublisherImpl
+public class OcciresultproviderConnector extends monitoring.impl.OcciresultproviderImpl
 {
 	/**
 	 * Initialize the logger.
 	 */
-	private static Logger LOGGER = LoggerFactory.getLogger(MartpublisherConnector.class);
+	private static Logger LOGGER = LoggerFactory.getLogger(OcciresultproviderConnector.class);
 
 	// Start of user code Martpublisherconnector_constructor
 	/**
 	 * Constructs a martpublisher connector.
 	 */
-	MartpublisherConnector()
+	OcciresultproviderConnector()
 	{
 		LOGGER.debug("Constructor called on " + this);
 		// TODO: Implement this constructor.
diff --git a/de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/PublisherConnector.java b/de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/PublisherConnector.java
deleted file mode 100644
index dbb00b3f4219f6deccb36900e4ac58ccc4055c82..0000000000000000000000000000000000000000
--- a/de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/PublisherConnector.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/**
- * Copyright (c) 2016-2017 Inria
- *  
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * - Philippe Merle <philippe.merle@inria.fr>
- * - Faiez Zalila <faiez.zalila@inria.fr>
- *
- * Generated at Wed Dec 19 10:30:40 CET 2018 from platform:/resource/monitoring/model/monitoring.occie by org.eclipse.cmf.occi.core.gen.connector
- */
-package de.ugoe.cs.rwm.mocci.connector;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-
-/**
- * Connector implementation for the OCCI kind:
- * - scheme: http://schemas.ugoe.cs.rwm/monitoring#
- * - term: publisher
- * - title: Publisher Resource
- */
-public class PublisherConnector extends monitoring.impl.PublisherImpl
-{
-	/**
-	 * Initialize the logger.
-	 */
-	private static Logger LOGGER = LoggerFactory.getLogger(PublisherConnector.class);
-
-	// Start of user code Publisherconnector_constructor
-	/**
-	 * Constructs a publisher connector.
-	 */
-	PublisherConnector()
-	{
-		LOGGER.debug("Constructor called on " + this);
-		// TODO: Implement this constructor.
-	}
-	// End of user code
-	//
-	// OCCI CRUD callback operations.
-	//
-	
-	// Start of user code PublisherocciCreate
-	/**
-	 * Called when this Publisher instance is completely created.
-	 */
-	@Override
-	public void occiCreate()
-	{
-		LOGGER.debug("occiCreate() called on " + this);
-		// TODO: Implement this callback or remove this method.
-	}
-	// End of user code
-
-	// Start of user code Publisher_occiRetrieve_method
-	/**
-	 * Called when this Publisher instance must be retrieved.
-	 */
-	@Override
-	public void occiRetrieve()
-	{
-		LOGGER.debug("occiRetrieve() called on " + this);
-		// TODO: Implement this callback or remove this method.
-	}
-	// End of user code
-
-	// Start of user code Publisher_occiUpdate_method
-	/**
-	 * Called when this Publisher instance is completely updated.
-	 */
-	@Override
-	public void occiUpdate()
-	{
-		LOGGER.debug("occiUpdate() called on " + this);
-		// TODO: Implement this callback or remove this method.
-	}
-	// End of user code
-
-	// Start of user code PublisherocciDelete_method
-	/**
-	 * Called when this Publisher instance will be deleted.
-	 */
-	@Override
-	public void occiDelete()
-	{
-		LOGGER.debug("occiDelete() called on " + this);
-		// TODO: Implement this callback or remove this method.
-	}
-	// End of user code
-
-	//
-	// Publisher actions.
-	//
-
-	// Start of user code Publisher_Kind_configure_action
-	/**
-	 * Implement OCCI action:
-     * - scheme: http://schemas.modmacao.org/occi/platform/component/action#
-     * - term: configure
-     * - title: 
-	 */
-	@Override
-	public void configure()
-	{
-		LOGGER.debug("Action configure() called on " + this);
-
-		// TODO: Implement how to configure this publisher.
-	}
-	// End of user code
-	// Start of user code Publisher_Kind_deploy_action
-	/**
-	 * Implement OCCI action:
-     * - scheme: http://schemas.modmacao.org/occi/platform/component/action#
-     * - term: deploy
-     * - title: 
-	 */
-	@Override
-	public void deploy()
-	{
-		LOGGER.debug("Action deploy() called on " + this);
-
-		// TODO: Implement how to deploy this publisher.
-	}
-	// End of user code
-	// Start of user code Publisher_Kind_undeploy_action
-	/**
-	 * Implement OCCI action:
-     * - scheme: http://schemas.modmacao.org/occi/platform/component/action#
-     * - term: undeploy
-     * - title: 
-	 */
-	@Override
-	public void undeploy()
-	{
-		LOGGER.debug("Action undeploy() called on " + this);
-
-		// TODO: Implement how to undeploy this publisher.
-	}
-	// End of user code
-	// Start of user code Publisher_Kind_Stop_action
-	/**
-	 * Implement OCCI action:
-     * - scheme: http://schemas.modmacao.org/occi/platform/component/action#
-     * - term: stop
-     * - title: Stop the application.
-	 */
-	@Override
-	public void stop()
-	{
-		LOGGER.debug("Action stop() called on " + this);
-
-		// TODO: Implement how to stop this publisher.
-	}
-	// End of user code
-	// Start of user code Publisher_Kind_Start_action
-	/**
-	 * Implement OCCI action:
-     * - scheme: http://schemas.modmacao.org/occi/platform/component/action#
-     * - term: start
-     * - title: Start the application.
-	 */
-	@Override
-	public void start()
-	{
-		LOGGER.debug("Action start() called on " + this);
-
-		// TODO: Implement how to start this publisher.
-	}
-	// End of user code
-		
-
-
-}	
diff --git a/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/PublisherConnector.java b/de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/ResultproviderConnector.java
similarity index 63%
rename from de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/PublisherConnector.java
rename to de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/ResultproviderConnector.java
index bbc1b2bfd662c6c83339f68a083524e7ff9e685f..0edcbf5e8fbe91c5e797dd6f02481fd7ce055bc7 100644
--- a/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/PublisherConnector.java
+++ b/de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/ResultproviderConnector.java
@@ -10,17 +10,24 @@
  * - Philippe Merle <philippe.merle@inria.fr>
  * - Faiez Zalila <faiez.zalila@inria.fr>
  *
- * Generated at Wed Dec 19 11:10:50 CET 2018 from platform:/resource/monitoring/model/monitoring.occie by org.eclipse.cmf.occi.core.gen.connector
+ * Generated at Wed Dec 19 10:30:40 CET 2018 from platform:/resource/monitoring/model/monitoring.occie by org.eclipse.cmf.occi.core.gen.connector
  */
 package de.ugoe.cs.rwm.mocci.connector;
 
+import java.util.LinkedList;
+import java.util.List;
+import java.util.NoSuchElementException;
+
 import org.eclipse.cmf.occi.core.AttributeState;
 import org.eclipse.cmf.occi.core.Link;
+import org.eclipse.cmf.occi.core.MixinBase;
+import org.eclipse.cmf.occi.core.Resource;
 import org.eclipse.cmf.occi.core.impl.OCCIFactoryImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import monitoring.Monitoringproperty;
+import monitoring.Monitorableproperty;
+import monitoring.Occiresultprovider;
 import monitoring.Sensor;
 
 
@@ -31,32 +38,34 @@ import monitoring.Sensor;
  * - term: publisher
  * - title: Publisher Resource
  */
-public class PublisherConnector extends monitoring.impl.PublisherImpl
+public class ResultproviderConnector extends monitoring.impl.ResultproviderImpl
 {
 	/**
 	 * Initialize the logger.
 	 */
+	private static Logger LOGGER = LoggerFactory.getLogger(ResultproviderConnector.class);
 	private OCCIFactoryImpl factory = new OCCIFactoryImpl();
-	private static Logger LOGGER = LoggerFactory.getLogger(PublisherConnector.class);
-	private Monitoringproperty monProp;
-	private ComponentManager compMan;
+	private Sensor sensor;
+	private Monitorableproperty monProp;
+	private Resource monObject;
+	//private Occiresultprovider occiResProv;
+	
 
 	// Start of user code Publisherconnector_constructor
 	/**
 	 * Constructs a publisher connector.
 	 */
-	PublisherConnector()
+	ResultproviderConnector()
 	{
 		LOGGER.debug("Constructor called on " + this);
-		this.compMan = new ComponentManager(this);
-		
+		//occiResProv = getMartMixin();
 		// TODO: Implement this constructor.
 	}
 	// End of user code
 	//
 	// OCCI CRUD callback operations.
 	//
-	
+
 	// Start of user code PublisherocciCreate
 	/**
 	 * Called when this Publisher instance is completely created.
@@ -109,6 +118,21 @@ public class PublisherConnector extends monitoring.impl.PublisherImpl
 	// Publisher actions.
 	//
 
+	// Start of user code Publisher_Kind_configure_action
+	/**
+	 * Implement OCCI action:
+     * - scheme: http://schemas.modmacao.org/occi/platform/component/action#
+     * - term: configure
+     * - title: 
+	 */
+	@Override
+	public void configure()
+	{
+		LOGGER.debug("Action configure() called on " + this);
+		setRuntimeInformation();
+		// TODO: Implement how to configure this publisher.
+	}
+	// End of user code
 	// Start of user code Publisher_Kind_deploy_action
 	/**
 	 * Implement OCCI action:
@@ -120,9 +144,27 @@ public class PublisherConnector extends monitoring.impl.PublisherImpl
 	public void deploy()
 	{
 		LOGGER.debug("Action deploy() called on " + this);
-		compMan.deploy();
+			setRuntimeInformation();
+
+			
 		// TODO: Implement how to deploy this publisher.
 	}
+
+	// End of user code
+	// Start of user code Publisher_Kind_undeploy_action
+	/**
+	 * Implement OCCI action:
+     * - scheme: http://schemas.modmacao.org/occi/platform/component/action#
+     * - term: undeploy
+     * - title: 
+	 */
+	@Override
+	public void undeploy()
+	{
+		LOGGER.debug("Action undeploy() called on " + this);
+		setRuntimeInformation();
+		// TODO: Implement how to undeploy this publisher.
+	}
 	// End of user code
 	// Start of user code Publisher_Kind_Stop_action
 	/**
@@ -135,7 +177,7 @@ public class PublisherConnector extends monitoring.impl.PublisherImpl
 	public void stop()
 	{
 		LOGGER.debug("Action stop() called on " + this);
-		compMan.stop();
+		setRuntimeInformation();
 		// TODO: Implement how to stop this publisher.
 	}
 	// End of user code
@@ -149,59 +191,65 @@ public class PublisherConnector extends monitoring.impl.PublisherImpl
 	@Override
 	public void start()
 	{
-		AttributeState sensorlocation = factory.createAttributeState();
-		sensorlocation.setValue(getContainingSensorLocation());
-		sensorlocation.setName("sensor");
-		System.out.println(sensorlocation);
-		this.attributes.add(sensorlocation);
-		System.out.println(this.attributes);
 		LOGGER.debug("Action start() called on " + this);
-		compMan.start();
-		//this.attributes.remove(sensorlocation);
-		System.out.println(this.attributes);
+		setRuntimeInformation();
 	}
 	
 	
-	private String getContainingSensorLocation() {
+	private void setRuntimeInformation() {
+		sensor = getSensor();
+		AttributeState sensorAttr = factory.createAttributeState();
+		sensorAttr.setName("sensor");
+		sensorAttr.setValue(sensor.getLocation());
+		System.out.println("Sensor: " + sensor);
+		this.attributes.add(sensorAttr);
+		
+		monProp = getMonProp(sensor);
+		AttributeState monPropAttr = factory.createAttributeState();
+		monPropAttr.setName("monitorable.property");
+		monPropAttr.setValue(monProp.getLocation());
+		System.out.println("MonProp: " + monProp);
+		this.attributes.add(monPropAttr);
+		
+		AttributeState monPropNameAttr = factory.createAttributeState();
+		monPropNameAttr.setName("monitorable.property.property");
+		monPropNameAttr.setValue(monProp.getMonitoringProperty());
+		this.attributes.add(monPropNameAttr);
+		
+		monObject = monProp.getTarget();
+		AttributeState monObjectAttr = factory.createAttributeState();
+		monObjectAttr.setName("monitorable.property.target");
+		monObjectAttr.setValue(monObject.getLocation());
+		
+	}
+	
+	// End of user code
+	
+	private Occiresultprovider getMartMixin() {
+		for(MixinBase mixinBase: this.getParts()) {
+			if(mixinBase instanceof Occiresultprovider) {
+				LOGGER.info("Occiresultprovider found: " + this.title);
+				return ((Occiresultprovider)mixinBase);
+			}
+		}
+		return null;
+	}
+	
+	private Sensor getSensor() {
 		for(Link link: this.getRlinks()) {
 			if(link.getSource() instanceof Sensor) {
-				return link.getSource().getLocation();
+				return ((Sensor) link.getSource());
 			}
 		}
-		return "No containing sensor found";
-	}
-	// End of user code
-	// Start of user code Publisher_Kind_configure_action
-	/**
-	 * Implement OCCI action:
-     * - scheme: http://schemas.modmacao.org/occi/platform/component/action#
-     * - term: configure
-     * - title: 
-	 */
-	@Override
-	public void configure()
-	{
-		LOGGER.debug("Action configure() called on " + this);
-		compMan.configure();
-		// TODO: Implement how to configure this publisher.
+		throw new NoSuchElementException("No containing sensor found!");
 	}
-	// End of user code
-	// Start of user code Publisher_Kind_undeploy_action
-	/**
-	 * Implement OCCI action:
-     * - scheme: http://schemas.modmacao.org/occi/platform/component/action#
-     * - term: undeploy
-     * - title: 
-	 */
-	@Override
-	public void undeploy()
-	{
-		LOGGER.debug("Action undeploy() called on " + this);
-		compMan.undeploy();
-		// TODO: Implement how to undeploy this publisher.
+	
+	private Monitorableproperty getMonProp(Sensor sensor) {
+		for(Link link: sensor.getLinks()) {
+			if(link instanceof Monitorableproperty) {
+				return ((Monitorableproperty) link);
+			}
+		}
+		throw new NoSuchElementException("No monitorableproperty found in sensor!");
 	}
-	// End of user code
-		
-
-
 }	
diff --git a/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/ConnectorFactory.java b/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/ConnectorFactory.java
index f68ca2ebc412cd474c9f1454b0a306a84d9e01b2..812be75c8b67141a89b3d925e8ec2054538b7882 100644
--- a/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/ConnectorFactory.java
+++ b/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/ConnectorFactory.java
@@ -50,8 +50,8 @@ public class ConnectorFactory extends monitoring.impl.MonitoringFactoryImpl
 	 * - title: Processor Resource
 	 */
 	@Override
-	public monitoring.Processor createProcessor() {
-		return new ProcessorConnector();
+	public monitoring.Dataprocessor createDataprocessor() {
+		return new DataprocessorConnector();
 	}
 
 	/**
@@ -61,8 +61,8 @@ public class ConnectorFactory extends monitoring.impl.MonitoringFactoryImpl
 	 * - title: Publisher Resource
 	 */
 	@Override
-	public monitoring.Publisher createPublisher() {
-		return new PublisherConnector();
+	public monitoring.Resultprovider createResultprovider() {
+		return new ResultproviderConnector();
 	}
 
 	/**
@@ -72,8 +72,8 @@ public class ConnectorFactory extends monitoring.impl.MonitoringFactoryImpl
 	 * - title: MonitoringProperty Component
 	 */
 	@Override
-	public monitoring.Monitoringproperty createMonitoringproperty() {
-		return new MonitoringpropertyConnector();
+	public monitoring.Monitorableproperty createMonitorableproperty() {
+		return new MonitorablepropertyConnector();
 	}
 
 	/**
@@ -83,8 +83,8 @@ public class ConnectorFactory extends monitoring.impl.MonitoringFactoryImpl
 	 * - title: MartPublisher Mixin
 	 */
 	@Override
-	public monitoring.Martpublisher createMartpublisher() {
-		return new MartpublisherConnector();
+	public monitoring.Occiresultprovider createOcciresultprovider() {
+		return new OcciresultproviderConnector();
 	}
 
 }
diff --git a/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/ProcessorConnector.java b/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/DataprocessorConnector.java
similarity index 95%
rename from de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/ProcessorConnector.java
rename to de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/DataprocessorConnector.java
index 4074e4349981f84b8be45c6e696dd9f88c1e703c..3bc593b78de510c5e723e5c38c64577e1fcc5d57 100644
--- a/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/ProcessorConnector.java
+++ b/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/DataprocessorConnector.java
@@ -25,18 +25,18 @@ import org.slf4j.LoggerFactory;
  * - term: processor
  * - title: Processor Resource
  */
-public class ProcessorConnector extends monitoring.impl.ProcessorImpl
+public class DataprocessorConnector extends monitoring.impl.DataprocessorImpl
 {
 	/**
 	 * Initialize the logger.
 	 */
-	private static Logger LOGGER = LoggerFactory.getLogger(ProcessorConnector.class);
+	private static Logger LOGGER = LoggerFactory.getLogger(DataprocessorConnector.class);
 	private ComponentManager compMan;
 	// Start of user code Processorconnector_constructor
 	/**
 	 * Constructs a processor connector.
 	 */
-	ProcessorConnector()
+	DataprocessorConnector()
 	{
 		LOGGER.debug("Constructor called on " + this);
 		this.compMan = new ComponentManager(this);
diff --git a/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/MonitoringpropertyConnector.java b/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/MonitorablepropertyConnector.java
similarity index 91%
rename from de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/MonitoringpropertyConnector.java
rename to de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/MonitorablepropertyConnector.java
index 00b61111cf3b543a0df66f58fe395461f5f124cc..bb67a61a95584536e0dff979cf62b827d3878faf 100644
--- a/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/MonitoringpropertyConnector.java
+++ b/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/MonitorablepropertyConnector.java
@@ -25,18 +25,18 @@ import org.slf4j.LoggerFactory;
  * - term: monitoringproperty
  * - title: MonitoringProperty Component
  */
-public class MonitoringpropertyConnector extends monitoring.impl.MonitoringpropertyImpl
+public class MonitorablepropertyConnector extends monitoring.impl.MonitorablepropertyImpl
 {
 	/**
 	 * Initialize the logger.
 	 */
-	private static Logger LOGGER = LoggerFactory.getLogger(MonitoringpropertyConnector.class);
+	private static Logger LOGGER = LoggerFactory.getLogger(MonitorablepropertyConnector.class);
 
 	// Start of user code Monitoringpropertyconnector_constructor
 	/**
 	 * Constructs a monitoringproperty connector.
 	 */
-	MonitoringpropertyConnector()
+	MonitorablepropertyConnector()
 	{
 		LOGGER.debug("Constructor called on " + this);
 		// TODO: Implement this constructor.
diff --git a/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/MartpublisherConnector.java b/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/OcciresultproviderConnector.java
similarity index 83%
rename from de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/MartpublisherConnector.java
rename to de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/OcciresultproviderConnector.java
index 9edc371b20c33401495d0e14167e0a17900cf14f..7bcf4241f23ce5796f15b1214cb4dfb9b75ac196 100644
--- a/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/MartpublisherConnector.java
+++ b/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/OcciresultproviderConnector.java
@@ -25,18 +25,18 @@ import org.slf4j.LoggerFactory;
  * - term: martpublisher
  * - title: MartPublisher Mixin
  */
-public class MartpublisherConnector extends monitoring.impl.MartpublisherImpl
+public class OcciresultproviderConnector extends monitoring.impl.OcciresultproviderImpl
 {
 	/**
 	 * Initialize the logger.
 	 */
-	private static Logger LOGGER = LoggerFactory.getLogger(MartpublisherConnector.class);
+	private static Logger LOGGER = LoggerFactory.getLogger(OcciresultproviderConnector.class);
 
 	// Start of user code Martpublisherconnector_constructor
 	/**
 	 * Constructs a martpublisher connector.
 	 */
-	MartpublisherConnector()
+	OcciresultproviderConnector()
 	{
 		LOGGER.debug("Constructor called on " + this);
 		// TODO: Implement this constructor.
diff --git a/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/ResultproviderConnector.java b/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/ResultproviderConnector.java
new file mode 100644
index 0000000000000000000000000000000000000000..a2bb2266aa8b0d9f51a4f2b697b3b35e81cae125
--- /dev/null
+++ b/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/ResultproviderConnector.java
@@ -0,0 +1,303 @@
+/**
+ * Copyright (c) 2016-2017 Inria
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ * - Philippe Merle <philippe.merle@inria.fr>
+ * - Faiez Zalila <faiez.zalila@inria.fr>
+ *
+ * Generated at Wed Dec 19 11:10:50 CET 2018 from platform:/resource/monitoring/model/monitoring.occie by org.eclipse.cmf.occi.core.gen.connector
+ */
+package de.ugoe.cs.rwm.mocci.connector;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.NoSuchElementException;
+
+import org.eclipse.cmf.occi.core.AttributeState;
+import org.eclipse.cmf.occi.core.Configuration;
+import org.eclipse.cmf.occi.core.Link;
+import org.eclipse.cmf.occi.core.MixinBase;
+import org.eclipse.cmf.occi.core.OCCIFactory;
+import org.eclipse.cmf.occi.core.Resource;
+import org.eclipse.cmf.occi.core.impl.OCCIFactoryImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import monitoring.Monitorableproperty;
+import monitoring.Occiresultprovider;
+import monitoring.Sensor;
+import monitoring.impl.MonitoringFactoryImpl;
+
+
+
+/**
+ * Connector implementation for the OCCI kind:
+ * - scheme: http://schemas.ugoe.cs.rwm/monitoring#
+ * - term: publisher
+ * - title: Publisher Resource
+ */
+public class ResultproviderConnector extends monitoring.impl.ResultproviderImpl
+{
+	/**
+	 * Initialize the logger.
+	 */
+	private OCCIFactoryImpl factory = new OCCIFactoryImpl();
+	private static Logger LOGGER = LoggerFactory.getLogger(ResultproviderConnector.class);
+	private ComponentManager compMan;
+	private Sensor sensor;
+	private Monitorableproperty monProp;
+	private Resource monObject;
+	private List<AttributeState> workaround = new LinkedList<AttributeState>();
+	
+	// Start of user code Publisherconnector_constructor
+	/**
+	 * Constructs a publisher connector.
+	 */
+	ResultproviderConnector()
+	{
+		LOGGER.debug("Constructor called on " + this);
+		this.compMan = new ComponentManager(this);
+
+	}
+
+
+	// End of user code
+	//
+	// OCCI CRUD callback operations.
+	//
+	
+	// Start of user code PublisherocciCreate
+	/**
+	 * Called when this Publisher instance is completely created.
+	 */
+	@Override
+	public void occiCreate()
+	{
+		LOGGER.debug("occiCreate() called on " + this);
+		// TODO: Implement this callback or remove this method.
+	}
+	// End of user code
+
+	// Start of user code Publisher_occiRetrieve_method
+	/**
+	 * Called when this Publisher instance must be retrieved.
+	 */
+	@Override
+	public void occiRetrieve()
+	{
+		LOGGER.debug("occiRetrieve() called on " + this);
+		// TODO: Implement this callback or remove this method.
+	}
+	// End of user code
+
+	// Start of user code Publisher_occiUpdate_method
+	/**
+	 * Called when this Publisher instance is completely updated.
+	 */
+	@Override
+	public void occiUpdate()
+	{
+		LOGGER.debug("occiUpdate() called on " + this);
+		// TODO: Implement this callback or remove this method.
+	}
+	// End of user code
+
+	// Start of user code PublisherocciDelete_method
+	/**
+	 * Called when this Publisher instance will be deleted.
+	 */
+	@Override
+	public void occiDelete()
+	{
+		LOGGER.debug("occiDelete() called on " + this);
+		// TODO: Implement this callback or remove this method.
+	}
+	// End of user code
+
+	//
+	// Publisher actions.
+	//
+
+	// Start of user code Publisher_Kind_deploy_action
+	/**
+	 * Implement OCCI action:
+     * - scheme: http://schemas.modmacao.org/occi/platform/component/action#
+     * - term: deploy
+     * - title: 
+	 */
+	@Override
+	public void deploy()
+	{
+		LOGGER.debug("Action deploy() called on " + this);
+		compMan.deploy();
+		// TODO: Implement how to deploy this publisher.
+	}
+	// End of user code
+	// Start of user code Publisher_Kind_Stop_action
+	/**
+	 * Implement OCCI action:
+     * - scheme: http://schemas.modmacao.org/occi/platform/component/action#
+     * - term: stop
+     * - title: Stop the application.
+	 */
+	@Override
+	public void stop()
+	{
+		LOGGER.debug("Action stop() called on " + this);
+		compMan.stop();
+		// TODO: Implement how to stop this publisher.
+	}
+	// End of user code
+	// Start of user code Publisher_Kind_Start_action
+	/**
+	 * Implement OCCI action:
+     * - scheme: http://schemas.modmacao.org/occi/platform/component/action#
+     * - term: start
+     * - title: Start the application.
+	 */
+	@Override
+	public void start()
+	{
+		setRuntimeInformation();
+		System.out.println(this.attributes);
+		LOGGER.debug("Action start() called on " + this);
+		compMan.start();
+		removeRuntimeInformation();
+		System.out.println(this.attributes);
+	}
+	
+	
+	// End of user code
+	// Start of user code Publisher_Kind_configure_action
+	/**
+	 * Implement OCCI action:
+     * - scheme: http://schemas.modmacao.org/occi/platform/component/action#
+     * - term: configure
+     * - title: 
+	 */
+	@Override
+	public void configure()
+	{
+		LOGGER.debug("Action configure() called on " + this);
+		compMan.configure();
+		// TODO: Implement how to configure this publisher.
+	}
+	// End of user code
+	// Start of user code Publisher_Kind_undeploy_action
+	/**
+	 * Implement OCCI action:
+     * - scheme: http://schemas.modmacao.org/occi/platform/component/action#
+     * - term: undeploy
+     * - title: 
+	 */
+	@Override
+	public void undeploy()
+	{
+		LOGGER.debug("Action undeploy() called on " + this);
+		compMan.undeploy();
+		// TODO: Implement how to undeploy this publisher.
+	}
+	// End of user code
+		
+	private MixinBase getMartMixin() {
+		for(MixinBase mixinBase: this.getParts()) {
+			if(mixinBase instanceof Occiresultprovider) { 
+				LOGGER.info("MartPublisher Mixin found for Publisher:" + this.title);
+				return mixinBase;
+			}
+		}
+		return null;
+	}
+
+	private List<Monitorableproperty> getMonitoringProperties(Sensor sens) {
+		LinkedList<Monitorableproperty> monProps = new LinkedList<Monitorableproperty>();
+		for(Link link: sens.getLinks()) {
+			if(link instanceof Monitorableproperty) {
+				monProps.add((Monitorableproperty) link);
+			}
+		}
+		return monProps;
+	}
+	
+	private void setRuntimeInformation() {
+		sensor = getSensor();
+		AttributeState sensorAttr = factory.createAttributeState();
+		sensorAttr.setName("sensor");
+		sensorAttr.setValue(sensor.getLocation());
+		System.out.println("Sensor: " + sensor);
+		this.attributes.add(sensorAttr);
+		workaround.add(sensorAttr);
+		
+		monProp = getMonProp(sensor);
+		AttributeState monPropAttr = factory.createAttributeState();
+		monPropAttr.setName("monitorable.property");
+		monPropAttr.setValue(monProp.getLocation());
+		System.out.println("MonProp: " + monProp);
+		this.attributes.add(monPropAttr);
+		workaround.add(monPropAttr);
+		
+		AttributeState monPropNameAttr = factory.createAttributeState();
+		monPropNameAttr.setName("monitorable.property.property");
+		monPropNameAttr.setValue(monProp.getMonitoringProperty());
+		this.attributes.add(monPropNameAttr);
+		workaround.add(monPropNameAttr);
+		
+		monObject = monProp.getTarget();
+		AttributeState monObjectAttr = factory.createAttributeState();
+		monObjectAttr.setName("monitorable.property.target");
+		monObjectAttr.setValue(monObject.getLocation());
+		this.attributes.add(monObjectAttr);
+		workaround.add(monObjectAttr);
+	}
+	
+	private Sensor getSensor() {
+		for(Link link: this.getRlinks()) {
+			if(link.getSource() instanceof Sensor) {
+				return ((Sensor) link.getSource());
+			}
+		}
+		throw new NoSuchElementException("No containing sensor found!");
+	}
+	
+	private Monitorableproperty getMonProp(Sensor sensor) {
+		for(Link link: sensor.getLinks()) {
+			if(link instanceof Monitorableproperty) {
+				return ((Monitorableproperty) link);
+			}
+		}
+		throw new NoSuchElementException("No monitorableproperty found in sensor!");
+	}
+	
+	private void removeRuntimeInformation() {
+		for(AttributeState work: workaround) {
+			this.attributes.remove(work);
+		}
+		
+	}
+
+
+	private String getContainingSensorLocation() {
+		for(Link link: this.getRlinks()) {
+			if(link.getSource() instanceof Sensor) {
+				return link.getSource().getLocation();
+			}
+		}
+		return "No containing sensor found";
+	}
+	
+	
+	private Sensor getContainingSensor() {
+		for(Link link: this.getRlinks()) {
+			if(link.getSource() instanceof Sensor) {
+				return (Sensor) link.getSource();
+			}
+		}
+		LOGGER.info("No containing Sensor found");
+		throw new NoSuchElementException();
+	}
+}	
diff --git a/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/SensorConnector.java b/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/SensorConnector.java
index a08bb833696d65a5c1d6c26ea1210ff2aa7186d8..c9b77025ff5b00a24b2200fd16f0b2c83e599f24 100644
--- a/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/SensorConnector.java
+++ b/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/SensorConnector.java
@@ -28,6 +28,7 @@ import org.slf4j.LoggerFactory;
 
 
 
+
 /**
  * Connector implementation for the OCCI kind:
  * - scheme: http://schemas.ugoe.cs.rwm/monitoring#
@@ -354,6 +355,7 @@ public class SensorConnector extends monitoring.impl.SensorImpl
 		
 	}
 	
+	
 	/*
 	private boolean assertCompsStatusEquals(List<Component> components, Status status) {
 		for (Component component: components) {
diff --git a/de.ugoe.cs.rwm.mocci.model.edit/icons/full/obj16/Dataprocessor.gif b/de.ugoe.cs.rwm.mocci.model.edit/icons/full/obj16/Dataprocessor.gif
new file mode 100644
index 0000000000000000000000000000000000000000..7c2aaac84ee6ea15757df499505e9aa0de4288f9
Binary files /dev/null and b/de.ugoe.cs.rwm.mocci.model.edit/icons/full/obj16/Dataprocessor.gif differ
diff --git a/de.ugoe.cs.rwm.mocci.model.edit/icons/full/obj16/Gatheringservice.gif b/de.ugoe.cs.rwm.mocci.model.edit/icons/full/obj16/Gatheringservice.gif
new file mode 100644
index 0000000000000000000000000000000000000000..136e3b27269e84a045f9b528614d7dfd316e444c
Binary files /dev/null and b/de.ugoe.cs.rwm.mocci.model.edit/icons/full/obj16/Gatheringservice.gif differ
diff --git a/de.ugoe.cs.rwm.mocci.model.edit/icons/full/obj16/Monitorableproperty.gif b/de.ugoe.cs.rwm.mocci.model.edit/icons/full/obj16/Monitorableproperty.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a17dc7d88e993e89a1d5f913ddfab16b1676c5bb
Binary files /dev/null and b/de.ugoe.cs.rwm.mocci.model.edit/icons/full/obj16/Monitorableproperty.gif differ
diff --git a/de.ugoe.cs.rwm.mocci.model.edit/icons/full/obj16/Occiresultprovider.gif b/de.ugoe.cs.rwm.mocci.model.edit/icons/full/obj16/Occiresultprovider.gif
new file mode 100644
index 0000000000000000000000000000000000000000..afb82ea48a50d3fb875ce03cf0ec154e51c97cb7
Binary files /dev/null and b/de.ugoe.cs.rwm.mocci.model.edit/icons/full/obj16/Occiresultprovider.gif differ
diff --git a/de.ugoe.cs.rwm.mocci.model.edit/icons/full/obj16/Resultprovider.gif b/de.ugoe.cs.rwm.mocci.model.edit/icons/full/obj16/Resultprovider.gif
new file mode 100644
index 0000000000000000000000000000000000000000..badaab0664ae45de5d990f64638197daeabf31bf
Binary files /dev/null and b/de.ugoe.cs.rwm.mocci.model.edit/icons/full/obj16/Resultprovider.gif differ
diff --git a/de.ugoe.cs.rwm.mocci.model.edit/plugin.properties b/de.ugoe.cs.rwm.mocci.model.edit/plugin.properties
index e2bbd985d07943c4c5745fb01d94120518798c44..34af8a7657388f62336ab1cdaa199b588aec6c45 100644
--- a/de.ugoe.cs.rwm.mocci.model.edit/plugin.properties
+++ b/de.ugoe.cs.rwm.mocci.model.edit/plugin.properties
@@ -81,3 +81,17 @@ _UI_Martpublisher_monitoringPropertyName_feature = Monitoring Property Name
 _UI_Martpublisher_monitoringPropertyValue_feature = Monitoring Property Value
 _UI_Martpublisher_monitoringPropertyResource_feature = Monitoring Property Resource
 _UI_Martpublisher_monitoringPropertyId_feature = Monitoring Property Id
+_UI_Dataprocessor_type = Dataprocessor
+_UI_Resultprovider_type = Resultprovider
+_UI_Occiresultprovider_type = Occiresultprovider
+_UI_Gatheringservice_type = Gatheringservice
+_UI_Resultprovider_resultProviderEndpoint_feature = Result Provider Endpoint
+_UI_Monitoringproperty_monitoringPropertyResult_feature = Monitoring Property Result
+_UI_Occiresultprovider_monitoringPropertyName_feature = Monitoring Property Name
+_UI_Occiresultprovider_monitoringPropertyId_feature = Monitoring Property Id
+_UI_Occiresultprovider_monitoringPropertyResource_feature = Monitoring Property Resource
+_UI_Gatheringservice_serviceAddress_feature = Service Address
+_UI_Monitorableproperty_type = Monitorableproperty
+_UI_Monitorableproperty_monitoringProperty_feature = Monitoring Property
+_UI_Monitorableproperty_monitoringResult_feature = Monitoring Result
+_UI_Occiresultprovider_resultProviderEndpoint_feature = Result Provider Endpoint
diff --git a/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/DatagathererItemProvider.java b/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/DatagathererItemProvider.java
index 150cb4804573598acac0b3f0ee5d8304bd6c442f..bb7282ee31e13206d8fed2f416aeb2250c753381 100644
--- a/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/DatagathererItemProvider.java
+++ b/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/DatagathererItemProvider.java
@@ -62,79 +62,10 @@ public class DatagathererItemProvider extends ComponentItemProvider {
 		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
-			addOcciCollectorPeriodPropertyDescriptor(object);
-			addOcciCollectorGranularityPropertyDescriptor(object);
-			addOcciCollectorAccuracyPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
 
-	/**
-	 * This adds a property descriptor for the Occi Collector Period feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addOcciCollectorPeriodPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Datagatherer_occiCollectorPeriod_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Datagatherer_occiCollectorPeriod_feature", "_UI_Datagatherer_type"),
-				 MonitoringPackage.Literals.DATAGATHERER__OCCI_COLLECTOR_PERIOD,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Occi Collector Granularity feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addOcciCollectorGranularityPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Datagatherer_occiCollectorGranularity_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Datagatherer_occiCollectorGranularity_feature", "_UI_Datagatherer_type"),
-				 MonitoringPackage.Literals.DATAGATHERER__OCCI_COLLECTOR_GRANULARITY,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Occi Collector Accuracy feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addOcciCollectorAccuracyPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Datagatherer_occiCollectorAccuracy_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Datagatherer_occiCollectorAccuracy_feature", "_UI_Datagatherer_type"),
-				 MonitoringPackage.Literals.DATAGATHERER__OCCI_COLLECTOR_ACCURACY,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
 	/**
 	 * This returns Datagatherer.gif.
 	 * <!-- begin-user-doc -->
@@ -171,14 +102,6 @@ public class DatagathererItemProvider extends ComponentItemProvider {
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(Datagatherer.class)) {
-			case MonitoringPackage.DATAGATHERER__OCCI_COLLECTOR_PERIOD:
-			case MonitoringPackage.DATAGATHERER__OCCI_COLLECTOR_GRANULARITY:
-			case MonitoringPackage.DATAGATHERER__OCCI_COLLECTOR_ACCURACY:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
 		super.notifyChanged(notification);
 	}
 
@@ -196,12 +119,12 @@ public class DatagathererItemProvider extends ComponentItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(OCCIPackage.Literals.ENTITY__PARTS,
-				 MonitoringFactory.eINSTANCE.createMartpublisher()));
+				 MonitoringFactory.eINSTANCE.createOcciresultprovider()));
 
 		newChildDescriptors.add
 			(createChildParameter
 				(OCCIPackage.Literals.RESOURCE__LINKS,
-				 MonitoringFactory.eINSTANCE.createMonitoringproperty()));
+				 MonitoringFactory.eINSTANCE.createMonitorableproperty()));
 	}
 
 	/**
diff --git a/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/DataprocessorItemProvider.java b/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/DataprocessorItemProvider.java
new file mode 100644
index 0000000000000000000000000000000000000000..ee5c361781af5187038df9c82dd865d506212d7a
--- /dev/null
+++ b/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/DataprocessorItemProvider.java
@@ -0,0 +1,137 @@
+/**
+ * Copyright (c) 2015-2017 Obeo, Inria
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 	
+ * Contributors:
+ * - William Piers <william.piers@obeo.fr>
+ * - Philippe Merle <philippe.merle@inria.fr>
+ * - Faiez Zalila <faiez.zalila@inria.fr>
+ */
+package monitoring.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import monitoring.Dataprocessor;
+import monitoring.MonitoringFactory;
+
+import org.eclipse.cmf.occi.core.OCCIPackage;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.common.util.ResourceLocator;
+
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+
+import org.modmacao.occi.platform.provider.ComponentItemProvider;
+
+/**
+ * This is the item provider adapter for a {@link monitoring.Dataprocessor} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class DataprocessorItemProvider extends ComponentItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DataprocessorItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This returns Dataprocessor.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/Dataprocessor"));
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((Dataprocessor)object).getId();
+		return label == null || label.length() == 0 ?
+			getString("_UI_Dataprocessor_type") :
+			getString("_UI_Dataprocessor_type") + " " + label;
+	}
+	
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+
+		newChildDescriptors.add
+			(createChildParameter
+				(OCCIPackage.Literals.ENTITY__PARTS,
+				 MonitoringFactory.eINSTANCE.createOcciresultprovider()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(OCCIPackage.Literals.RESOURCE__LINKS,
+				 MonitoringFactory.eINSTANCE.createMonitorableproperty()));
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return MonitoringEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/MartpublisherItemProvider.java b/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/MartpublisherItemProvider.java
deleted file mode 100644
index ff5c320c4655078b0cfd04c68532b194db877869..0000000000000000000000000000000000000000
--- a/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/MartpublisherItemProvider.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/**
- * Copyright (c) 2015-2017 Obeo, Inria
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 	
- * Contributors:
- * - William Piers <william.piers@obeo.fr>
- * - Philippe Merle <philippe.merle@inria.fr>
- * - Faiez Zalila <faiez.zalila@inria.fr>
- */
-package monitoring.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import monitoring.Martpublisher;
-import monitoring.MonitoringPackage;
-
-import org.eclipse.cmf.occi.core.provider.MixinBaseItemProvider;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link monitoring.Martpublisher} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class MartpublisherItemProvider extends MixinBaseItemProvider {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MartpublisherItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addMonitoringPropertyNamePropertyDescriptor(object);
-			addMonitoringPropertyIdPropertyDescriptor(object);
-			addMonitoringPropertyResourcePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Monitoring Property Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addMonitoringPropertyNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Martpublisher_monitoringPropertyName_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Martpublisher_monitoringPropertyName_feature", "_UI_Martpublisher_type"),
-				 MonitoringPackage.Literals.MARTPUBLISHER__MONITORING_PROPERTY_NAME,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Monitoring Property Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addMonitoringPropertyIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Martpublisher_monitoringPropertyId_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Martpublisher_monitoringPropertyId_feature", "_UI_Martpublisher_type"),
-				 MonitoringPackage.Literals.MARTPUBLISHER__MONITORING_PROPERTY_ID,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Monitoring Property Resource feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addMonitoringPropertyResourcePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Martpublisher_monitoringPropertyResource_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Martpublisher_monitoringPropertyResource_feature", "_UI_Martpublisher_type"),
-				 MonitoringPackage.Literals.MARTPUBLISHER__MONITORING_PROPERTY_RESOURCE,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns Martpublisher.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Martpublisher"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((Martpublisher)object).getMonitoringPropertyName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Martpublisher_type") :
-			getString("_UI_Martpublisher_type") + " " + label;
-	}
-	
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Martpublisher.class)) {
-			case MonitoringPackage.MARTPUBLISHER__MONITORING_PROPERTY_NAME:
-			case MonitoringPackage.MARTPUBLISHER__MONITORING_PROPERTY_ID:
-			case MonitoringPackage.MARTPUBLISHER__MONITORING_PROPERTY_RESOURCE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return MonitoringEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/MonitoringpropertyItemProvider.java b/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/MonitorablepropertyItemProvider.java
similarity index 76%
rename from de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/MonitoringpropertyItemProvider.java
rename to de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/MonitorablepropertyItemProvider.java
index f9a24127ba3c4acbaf6a94769fd022b1324cb485..1d829c56135aa0a060d159da5927b67014c7b579 100644
--- a/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/MonitoringpropertyItemProvider.java
+++ b/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/MonitorablepropertyItemProvider.java
@@ -16,9 +16,9 @@ package monitoring.provider;
 import java.util.Collection;
 import java.util.List;
 
+import monitoring.Monitorableproperty;
 import monitoring.MonitoringFactory;
 import monitoring.MonitoringPackage;
-import monitoring.Monitoringproperty;
 
 import org.eclipse.cmf.occi.core.OCCIPackage;
 
@@ -37,19 +37,19 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.modmacao.occi.platform.PlatformFactory;
 
 /**
- * This is the item provider adapter for a {@link monitoring.Monitoringproperty} object.
+ * This is the item provider adapter for a {@link monitoring.Monitorableproperty} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class MonitoringpropertyItemProvider extends LinkItemProvider {
+public class MonitorablepropertyItemProvider extends LinkItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public MonitoringpropertyItemProvider(AdapterFactory adapterFactory) {
+	public MonitorablepropertyItemProvider(AdapterFactory adapterFactory) {
 		super(adapterFactory);
 	}
 
@@ -64,26 +64,26 @@ public class MonitoringpropertyItemProvider extends LinkItemProvider {
 		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
-			addMonitoringPropertyNamePropertyDescriptor(object);
-			addMonitoringPropertyValuePropertyDescriptor(object);
+			addMonitoringPropertyPropertyDescriptor(object);
+			addMonitoringResultPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
 
 	/**
-	 * This adds a property descriptor for the Monitoring Property Name feature.
+	 * This adds a property descriptor for the Monitoring Property feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected void addMonitoringPropertyNamePropertyDescriptor(Object object) {
+	protected void addMonitoringPropertyPropertyDescriptor(Object object) {
 		itemPropertyDescriptors.add
 			(createItemPropertyDescriptor
 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
 				 getResourceLocator(),
-				 getString("_UI_Monitoringproperty_monitoringPropertyName_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Monitoringproperty_monitoringPropertyName_feature", "_UI_Monitoringproperty_type"),
-				 MonitoringPackage.Literals.MONITORINGPROPERTY__MONITORING_PROPERTY_NAME,
+				 getString("_UI_Monitorableproperty_monitoringProperty_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_Monitorableproperty_monitoringProperty_feature", "_UI_Monitorableproperty_type"),
+				 MonitoringPackage.Literals.MONITORABLEPROPERTY__MONITORING_PROPERTY,
 				 true,
 				 false,
 				 false,
@@ -93,19 +93,19 @@ public class MonitoringpropertyItemProvider extends LinkItemProvider {
 	}
 
 	/**
-	 * This adds a property descriptor for the Monitoring Property Value feature.
+	 * This adds a property descriptor for the Monitoring Result feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected void addMonitoringPropertyValuePropertyDescriptor(Object object) {
+	protected void addMonitoringResultPropertyDescriptor(Object object) {
 		itemPropertyDescriptors.add
 			(createItemPropertyDescriptor
 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
 				 getResourceLocator(),
-				 getString("_UI_Monitoringproperty_monitoringPropertyValue_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Monitoringproperty_monitoringPropertyValue_feature", "_UI_Monitoringproperty_type"),
-				 MonitoringPackage.Literals.MONITORINGPROPERTY__MONITORING_PROPERTY_VALUE,
+				 getString("_UI_Monitorableproperty_monitoringResult_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_Monitorableproperty_monitoringResult_feature", "_UI_Monitorableproperty_type"),
+				 MonitoringPackage.Literals.MONITORABLEPROPERTY__MONITORING_RESULT,
 				 true,
 				 false,
 				 false,
@@ -115,14 +115,14 @@ public class MonitoringpropertyItemProvider extends LinkItemProvider {
 	}
 
 	/**
-	 * This returns Monitoringproperty.gif.
+	 * This returns Monitorableproperty.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Monitoringproperty"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/Monitorableproperty"));
 	}
 
 	/**
@@ -133,10 +133,10 @@ public class MonitoringpropertyItemProvider extends LinkItemProvider {
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((Monitoringproperty)object).getId();
+		String label = ((Monitorableproperty)object).getId();
 		return label == null || label.length() == 0 ?
-			getString("_UI_Monitoringproperty_type") :
-			getString("_UI_Monitoringproperty_type") + " " + label;
+			getString("_UI_Monitorableproperty_type") :
+			getString("_UI_Monitorableproperty_type") + " " + label;
 	}
 	
 
@@ -151,9 +151,9 @@ public class MonitoringpropertyItemProvider extends LinkItemProvider {
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
 
-		switch (notification.getFeatureID(Monitoringproperty.class)) {
-			case MonitoringPackage.MONITORINGPROPERTY__MONITORING_PROPERTY_NAME:
-			case MonitoringPackage.MONITORINGPROPERTY__MONITORING_PROPERTY_VALUE:
+		switch (notification.getFeatureID(Monitorableproperty.class)) {
+			case MonitoringPackage.MONITORABLEPROPERTY__MONITORING_PROPERTY:
+			case MonitoringPackage.MONITORABLEPROPERTY__MONITORING_RESULT:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
 		}
@@ -174,7 +174,7 @@ public class MonitoringpropertyItemProvider extends LinkItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(OCCIPackage.Literals.ENTITY__PARTS,
-				 MonitoringFactory.eINSTANCE.createMartpublisher()));
+				 MonitoringFactory.eINSTANCE.createOcciresultprovider()));
 
 		newChildDescriptors.add
 			(createChildParameter
diff --git a/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/MonitoringItemProviderAdapterFactory.java b/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/MonitoringItemProviderAdapterFactory.java
index 0af5520f9fc71a684577472973d6a7d4484ae7d2..1bd480e3e65801236ab55afa610c30a89c4048eb 100644
--- a/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/MonitoringItemProviderAdapterFactory.java
+++ b/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/MonitoringItemProviderAdapterFactory.java
@@ -128,95 +128,95 @@ public class MonitoringItemProviderAdapterFactory extends MonitoringAdapterFacto
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link monitoring.Processor} instances.
+	 * This keeps track of the one adapter used for all {@link monitoring.Dataprocessor} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected ProcessorItemProvider processorItemProvider;
+	protected DataprocessorItemProvider dataprocessorItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link monitoring.Processor}.
+	 * This creates an adapter for a {@link monitoring.Dataprocessor}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
-	public Adapter createProcessorAdapter() {
-		if (processorItemProvider == null) {
-			processorItemProvider = new ProcessorItemProvider(this);
+	public Adapter createDataprocessorAdapter() {
+		if (dataprocessorItemProvider == null) {
+			dataprocessorItemProvider = new DataprocessorItemProvider(this);
 		}
 
-		return processorItemProvider;
+		return dataprocessorItemProvider;
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link monitoring.Publisher} instances.
+	 * This keeps track of the one adapter used for all {@link monitoring.Resultprovider} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected PublisherItemProvider publisherItemProvider;
+	protected ResultproviderItemProvider resultproviderItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link monitoring.Publisher}.
+	 * This creates an adapter for a {@link monitoring.Resultprovider}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
-	public Adapter createPublisherAdapter() {
-		if (publisherItemProvider == null) {
-			publisherItemProvider = new PublisherItemProvider(this);
+	public Adapter createResultproviderAdapter() {
+		if (resultproviderItemProvider == null) {
+			resultproviderItemProvider = new ResultproviderItemProvider(this);
 		}
 
-		return publisherItemProvider;
+		return resultproviderItemProvider;
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link monitoring.Monitoringproperty} instances.
+	 * This keeps track of the one adapter used for all {@link monitoring.Monitorableproperty} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected MonitoringpropertyItemProvider monitoringpropertyItemProvider;
+	protected MonitorablepropertyItemProvider monitorablepropertyItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link monitoring.Monitoringproperty}.
+	 * This creates an adapter for a {@link monitoring.Monitorableproperty}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
-	public Adapter createMonitoringpropertyAdapter() {
-		if (monitoringpropertyItemProvider == null) {
-			monitoringpropertyItemProvider = new MonitoringpropertyItemProvider(this);
+	public Adapter createMonitorablepropertyAdapter() {
+		if (monitorablepropertyItemProvider == null) {
+			monitorablepropertyItemProvider = new MonitorablepropertyItemProvider(this);
 		}
 
-		return monitoringpropertyItemProvider;
+		return monitorablepropertyItemProvider;
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link monitoring.Martpublisher} instances.
+	 * This keeps track of the one adapter used for all {@link monitoring.Occiresultprovider} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected MartpublisherItemProvider martpublisherItemProvider;
+	protected OcciresultproviderItemProvider occiresultproviderItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link monitoring.Martpublisher}.
+	 * This creates an adapter for a {@link monitoring.Occiresultprovider}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
-	public Adapter createMartpublisherAdapter() {
-		if (martpublisherItemProvider == null) {
-			martpublisherItemProvider = new MartpublisherItemProvider(this);
+	public Adapter createOcciresultproviderAdapter() {
+		if (occiresultproviderItemProvider == null) {
+			occiresultproviderItemProvider = new OcciresultproviderItemProvider(this);
 		}
 
-		return martpublisherItemProvider;
+		return occiresultproviderItemProvider;
 	}
 
 	/**
@@ -320,10 +320,10 @@ public class MonitoringItemProviderAdapterFactory extends MonitoringAdapterFacto
 	public void dispose() {
 		if (sensorItemProvider != null) sensorItemProvider.dispose();
 		if (datagathererItemProvider != null) datagathererItemProvider.dispose();
-		if (processorItemProvider != null) processorItemProvider.dispose();
-		if (publisherItemProvider != null) publisherItemProvider.dispose();
-		if (monitoringpropertyItemProvider != null) monitoringpropertyItemProvider.dispose();
-		if (martpublisherItemProvider != null) martpublisherItemProvider.dispose();
+		if (dataprocessorItemProvider != null) dataprocessorItemProvider.dispose();
+		if (resultproviderItemProvider != null) resultproviderItemProvider.dispose();
+		if (monitorablepropertyItemProvider != null) monitorablepropertyItemProvider.dispose();
+		if (occiresultproviderItemProvider != null) occiresultproviderItemProvider.dispose();
 	}
 
 }
diff --git a/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/ProcessorItemProvider.java b/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/OcciresultproviderItemProvider.java
similarity index 71%
rename from de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/ProcessorItemProvider.java
rename to de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/OcciresultproviderItemProvider.java
index 071a9cdc9e0794dcb608e169efc45009167a5174..ce52301c386be0283639059a05e38ce65bf1a8ab 100644
--- a/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/ProcessorItemProvider.java
+++ b/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/OcciresultproviderItemProvider.java
@@ -16,11 +16,10 @@ package monitoring.provider;
 import java.util.Collection;
 import java.util.List;
 
-import monitoring.MonitoringFactory;
 import monitoring.MonitoringPackage;
-import monitoring.Processor;
+import monitoring.Occiresultprovider;
 
-import org.eclipse.cmf.occi.core.OCCIPackage;
+import org.eclipse.cmf.occi.core.provider.MixinBaseItemProvider;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
@@ -32,22 +31,20 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
-import org.modmacao.occi.platform.provider.ComponentItemProvider;
-
 /**
- * This is the item provider adapter for a {@link monitoring.Processor} object.
+ * This is the item provider adapter for a {@link monitoring.Occiresultprovider} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class ProcessorItemProvider extends ComponentItemProvider {
+public class OcciresultproviderItemProvider extends MixinBaseItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ProcessorItemProvider(AdapterFactory adapterFactory) {
+	public OcciresultproviderItemProvider(AdapterFactory adapterFactory) {
 		super(adapterFactory);
 	}
 
@@ -62,25 +59,25 @@ public class ProcessorItemProvider extends ComponentItemProvider {
 		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
-			addGathererAddressPropertyDescriptor(object);
+			addResultProviderEndpointPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
 
 	/**
-	 * This adds a property descriptor for the Gatherer Address feature.
+	 * This adds a property descriptor for the Result Provider Endpoint feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected void addGathererAddressPropertyDescriptor(Object object) {
+	protected void addResultProviderEndpointPropertyDescriptor(Object object) {
 		itemPropertyDescriptors.add
 			(createItemPropertyDescriptor
 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
 				 getResourceLocator(),
-				 getString("_UI_Processor_gathererAddress_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Processor_gathererAddress_feature", "_UI_Processor_type"),
-				 MonitoringPackage.Literals.PROCESSOR__GATHERER_ADDRESS,
+				 getString("_UI_Occiresultprovider_resultProviderEndpoint_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_Occiresultprovider_resultProviderEndpoint_feature", "_UI_Occiresultprovider_type"),
+				 MonitoringPackage.Literals.OCCIRESULTPROVIDER__RESULT_PROVIDER_ENDPOINT,
 				 true,
 				 false,
 				 false,
@@ -90,14 +87,14 @@ public class ProcessorItemProvider extends ComponentItemProvider {
 	}
 
 	/**
-	 * This returns Processor.gif.
+	 * This returns Occiresultprovider.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Processor"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/Occiresultprovider"));
 	}
 
 	/**
@@ -108,10 +105,10 @@ public class ProcessorItemProvider extends ComponentItemProvider {
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((Processor)object).getId();
+		String label = ((Occiresultprovider)object).getResultProviderEndpoint();
 		return label == null || label.length() == 0 ?
-			getString("_UI_Processor_type") :
-			getString("_UI_Processor_type") + " " + label;
+			getString("_UI_Occiresultprovider_type") :
+			getString("_UI_Occiresultprovider_type") + " " + label;
 	}
 	
 
@@ -126,8 +123,8 @@ public class ProcessorItemProvider extends ComponentItemProvider {
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
 
-		switch (notification.getFeatureID(Processor.class)) {
-			case MonitoringPackage.PROCESSOR__GATHERER_ADDRESS:
+		switch (notification.getFeatureID(Occiresultprovider.class)) {
+			case MonitoringPackage.OCCIRESULTPROVIDER__RESULT_PROVIDER_ENDPOINT:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
 		}
@@ -144,16 +141,6 @@ public class ProcessorItemProvider extends ComponentItemProvider {
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(OCCIPackage.Literals.ENTITY__PARTS,
-				 MonitoringFactory.eINSTANCE.createMartpublisher()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(OCCIPackage.Literals.RESOURCE__LINKS,
-				 MonitoringFactory.eINSTANCE.createMonitoringproperty()));
 	}
 
 	/**
diff --git a/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/PublisherItemProvider.java b/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/ResultproviderItemProvider.java
similarity index 68%
rename from de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/PublisherItemProvider.java
rename to de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/ResultproviderItemProvider.java
index b59182b42fb63622d49fdd7dc60e2f00fd22e866..c5332a8768262d08419071f2ccc8a87f8b662a5d 100644
--- a/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/PublisherItemProvider.java
+++ b/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/ResultproviderItemProvider.java
@@ -18,7 +18,7 @@ import java.util.List;
 
 import monitoring.MonitoringFactory;
 import monitoring.MonitoringPackage;
-import monitoring.Publisher;
+import monitoring.Resultprovider;
 
 import org.eclipse.cmf.occi.core.OCCIPackage;
 
@@ -35,19 +35,19 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.modmacao.occi.platform.provider.ComponentItemProvider;
 
 /**
- * This is the item provider adapter for a {@link monitoring.Publisher} object.
+ * This is the item provider adapter for a {@link monitoring.Resultprovider} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class PublisherItemProvider extends ComponentItemProvider {
+public class ResultproviderItemProvider extends ComponentItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public PublisherItemProvider(AdapterFactory adapterFactory) {
+	public ResultproviderItemProvider(AdapterFactory adapterFactory) {
 		super(adapterFactory);
 	}
 
@@ -62,42 +62,19 @@ public class PublisherItemProvider extends ComponentItemProvider {
 		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
-			addPublisherEndpointPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
 
 	/**
-	 * This adds a property descriptor for the Publisher Endpoint feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addPublisherEndpointPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Publisher_publisherEndpoint_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Publisher_publisherEndpoint_feature", "_UI_Publisher_type"),
-				 MonitoringPackage.Literals.PUBLISHER__PUBLISHER_ENDPOINT,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns Publisher.gif.
+	 * This returns Resultprovider.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Publisher"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/Resultprovider"));
 	}
 
 	/**
@@ -108,10 +85,10 @@ public class PublisherItemProvider extends ComponentItemProvider {
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((Publisher)object).getId();
+		String label = ((Resultprovider)object).getId();
 		return label == null || label.length() == 0 ?
-			getString("_UI_Publisher_type") :
-			getString("_UI_Publisher_type") + " " + label;
+			getString("_UI_Resultprovider_type") :
+			getString("_UI_Resultprovider_type") + " " + label;
 	}
 	
 
@@ -125,12 +102,6 @@ public class PublisherItemProvider extends ComponentItemProvider {
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(Publisher.class)) {
-			case MonitoringPackage.PUBLISHER__PUBLISHER_ENDPOINT:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
 		super.notifyChanged(notification);
 	}
 
@@ -148,12 +119,12 @@ public class PublisherItemProvider extends ComponentItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(OCCIPackage.Literals.ENTITY__PARTS,
-				 MonitoringFactory.eINSTANCE.createMartpublisher()));
+				 MonitoringFactory.eINSTANCE.createOcciresultprovider()));
 
 		newChildDescriptors.add
 			(createChildParameter
 				(OCCIPackage.Literals.RESOURCE__LINKS,
-				 MonitoringFactory.eINSTANCE.createMonitoringproperty()));
+				 MonitoringFactory.eINSTANCE.createMonitorableproperty()));
 	}
 
 	/**
diff --git a/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/SensorItemProvider.java b/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/SensorItemProvider.java
index 04a6eaf98d96f354da540588b5b9c6b42313fe0b..4f61c46bf880c2a7d85fe551bf87b5b9238e28af 100644
--- a/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/SensorItemProvider.java
+++ b/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/SensorItemProvider.java
@@ -62,148 +62,10 @@ public class SensorItemProvider extends ApplicationItemProvider {
 		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
-			addOcciSensorTimebasePropertyDescriptor(object);
-			addOcciSensorTimestartPropertyDescriptor(object);
-			addOcciSensorTimestopPropertyDescriptor(object);
-			addOcciSensorPeriodPropertyDescriptor(object);
-			addOcciSensorGranularityPropertyDescriptor(object);
-			addOcciSensorAccuracyPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
 
-	/**
-	 * This adds a property descriptor for the Occi Sensor Timebase feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addOcciSensorTimebasePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Sensor_occiSensorTimebase_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Sensor_occiSensorTimebase_feature", "_UI_Sensor_type"),
-				 MonitoringPackage.Literals.SENSOR__OCCI_SENSOR_TIMEBASE,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Occi Sensor Timestart feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addOcciSensorTimestartPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Sensor_occiSensorTimestart_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Sensor_occiSensorTimestart_feature", "_UI_Sensor_type"),
-				 MonitoringPackage.Literals.SENSOR__OCCI_SENSOR_TIMESTART,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Occi Sensor Timestop feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addOcciSensorTimestopPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Sensor_occiSensorTimestop_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Sensor_occiSensorTimestop_feature", "_UI_Sensor_type"),
-				 MonitoringPackage.Literals.SENSOR__OCCI_SENSOR_TIMESTOP,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Occi Sensor Period feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addOcciSensorPeriodPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Sensor_occiSensorPeriod_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Sensor_occiSensorPeriod_feature", "_UI_Sensor_type"),
-				 MonitoringPackage.Literals.SENSOR__OCCI_SENSOR_PERIOD,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Occi Sensor Granularity feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addOcciSensorGranularityPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Sensor_occiSensorGranularity_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Sensor_occiSensorGranularity_feature", "_UI_Sensor_type"),
-				 MonitoringPackage.Literals.SENSOR__OCCI_SENSOR_GRANULARITY,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Occi Sensor Accuracy feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addOcciSensorAccuracyPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Sensor_occiSensorAccuracy_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Sensor_occiSensorAccuracy_feature", "_UI_Sensor_type"),
-				 MonitoringPackage.Literals.SENSOR__OCCI_SENSOR_ACCURACY,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
 	/**
 	 * This returns Sensor.gif.
 	 * <!-- begin-user-doc -->
@@ -240,17 +102,6 @@ public class SensorItemProvider extends ApplicationItemProvider {
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(Sensor.class)) {
-			case MonitoringPackage.SENSOR__OCCI_SENSOR_TIMEBASE:
-			case MonitoringPackage.SENSOR__OCCI_SENSOR_TIMESTART:
-			case MonitoringPackage.SENSOR__OCCI_SENSOR_TIMESTOP:
-			case MonitoringPackage.SENSOR__OCCI_SENSOR_PERIOD:
-			case MonitoringPackage.SENSOR__OCCI_SENSOR_GRANULARITY:
-			case MonitoringPackage.SENSOR__OCCI_SENSOR_ACCURACY:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
 		super.notifyChanged(notification);
 	}
 
@@ -268,12 +119,12 @@ public class SensorItemProvider extends ApplicationItemProvider {
 		newChildDescriptors.add
 			(createChildParameter
 				(OCCIPackage.Literals.ENTITY__PARTS,
-				 MonitoringFactory.eINSTANCE.createMartpublisher()));
+				 MonitoringFactory.eINSTANCE.createOcciresultprovider()));
 
 		newChildDescriptors.add
 			(createChildParameter
 				(OCCIPackage.Literals.RESOURCE__LINKS,
-				 MonitoringFactory.eINSTANCE.createMonitoringproperty()));
+				 MonitoringFactory.eINSTANCE.createMonitorableproperty()));
 	}
 
 	/**
diff --git a/de.ugoe.cs.rwm.mocci.model/model/monitoring.ecore b/de.ugoe.cs.rwm.mocci.model/model/monitoring.ecore
index a76cef0408b852f216a16e08cf061963312d742e..5164b96adb8611c26d7e277d1e6ebb091477f39d 100644
--- a/de.ugoe.cs.rwm.mocci.model/model/monitoring.ecore
+++ b/de.ugoe.cs.rwm.mocci.model/model/monitoring.ecore
@@ -11,97 +11,30 @@
     <details key="platform" value="http://schemas.modmacao.org/occi/platform/ecore"/>
     <details key="occi" value="http://schemas.ogf.org/occi/core/ecore"/>
   </eAnnotations>
-  <eClassifiers xsi:type="ecore:EDataType" name="DateTime" instanceClassName="java.lang.String">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="pattern" value="^(\d{4}((-)?(0[1-9]|1[0-2])((-)?(0[1-9]|[1-2][0-9]|3[0-1])(T(24:00(:00(\.[0]+)?)?|(([0-1][0-9]|2[0-3])(:)[0-5][0-9])((:)[0-5][0-9](\.[\d]+)?)?)((\+|-)(14:00|(0[0-9]|1[0-3])(:)[0-5][0-9])|Z))?)?)?)$"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="Second" instanceClassName="java.lang.String"/>
   <eClassifiers xsi:type="ecore:EDataType" name="String" instanceClassName="java.lang.String"/>
   <eClassifiers xsi:type="ecore:EClass" name="Sensor" eSuperTypes="platform:/plugin/org.modmacao.occi.platform/model/platform.ecore#//Application">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Sensor Component"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="occiSensorTimebase" eType="#//DateTime">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Base time reference (ISO8601)"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="occiSensorTimestart" eType="#//Second">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Start time offset (seconds)"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="occiSensorTimestop" eType="#//Second">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value=""/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="occiSensorPeriod" lowerBound="1"
-        eType="#//Second">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Time between two following measurements (seconds)"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="occiSensorGranularity"
-        eType="#//Second">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Granularity of time measument (seconds)"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="occiSensorAccuracy" eType="#//Second">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Accuracy of time measument (seconds)"/>
-      </eAnnotations>
-    </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Datagatherer" eSuperTypes="platform:/plugin/org.modmacao.occi.platform/model/platform.ecore#//Component">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="DataGatherer Resource"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="occiCollectorPeriod" lowerBound="1"
-        eType="#//Second">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Time between two following measurements (seconds)."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="occiCollectorGranularity"
-        eType="#//Second">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Granularity of time measurement (seconds)."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="occiCollectorAccuracy"
-        eType="#//Second">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Accuracy of time measurement (seconds)."/>
-      </eAnnotations>
-    </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Processor" eSuperTypes="platform:/plugin/org.modmacao.occi.platform/model/platform.ecore#//Component">
+  <eClassifiers xsi:type="ecore:EClass" name="Dataprocessor" eSuperTypes="platform:/plugin/org.modmacao.occi.platform/model/platform.ecore#//Component">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Processor Resource"/>
+      <details key="documentation" value="DataProcessor Resource"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="gathererAddress" eType="#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value=""/>
-      </eAnnotations>
-    </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Publisher" eSuperTypes="platform:/plugin/org.modmacao.occi.platform/model/platform.ecore#//Component">
+  <eClassifiers xsi:type="ecore:EClass" name="Resultprovider" eSuperTypes="platform:/plugin/org.modmacao.occi.platform/model/platform.ecore#//Component">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Publisher Resource"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="publisherEndpoint" lowerBound="1"
-        eType="#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value=""/>
-      </eAnnotations>
-    </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Monitoringproperty" eSuperTypes="platform:/plugin/org.eclipse.cmf.occi.core/model/OCCI.ecore#//Link">
+  <eClassifiers xsi:type="ecore:EClass" name="Monitorableproperty" eSuperTypes="platform:/plugin/org.eclipse.cmf.occi.core/model/OCCI.ecore#//Link">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="MonitoringProperty Component"/>
+      <details key="documentation" value="MonitorableProperty Component"/>
     </eAnnotations>
     <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
       <details key="constraints" value="targetConstraint"/>
@@ -109,41 +42,29 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
       <details key="targetConstraint" value="self.target.oclIsKindOf(monitoring::Sensor)"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="monitoringPropertyName"
-        lowerBound="1" eType="#//String">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="monitoringProperty" lowerBound="1"
+        eType="#//String">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value=""/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="monitoringPropertyValue"
-        eType="#//String">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="monitoringResult" eType="#//String">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value=""/>
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Martpublisher" eSuperTypes="platform:/plugin/org.eclipse.cmf.occi.core/model/OCCI.ecore#//MixinBase">
+  <eClassifiers xsi:type="ecore:EClass" name="Occiresultprovider" eSuperTypes="platform:/plugin/org.eclipse.cmf.occi.core/model/OCCI.ecore#//MixinBase">
     <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
       <details key="constraints" value="appliesConstraint"/>
     </eAnnotations>
     <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
-      <details key="appliesConstraint" value="self.entity.oclIsKindOf(monitoring::Publisher)"/>
+      <details key="appliesConstraint" value="self.entity.oclIsKindOf(monitoring::Resultprovider)"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="monitoringPropertyName"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resultProviderEndpoint"
         lowerBound="1" eType="#//String">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value=""/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="monitoringPropertyId" eType="#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value=""/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="monitoringPropertyResource"
-        lowerBound="1" eType="#//String">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value=""/>
+        <details key="documentation" value="Genereic address to be used by the result provider."/>
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
diff --git a/de.ugoe.cs.rwm.mocci.model/model/monitoring.genmodel b/de.ugoe.cs.rwm.mocci.model/model/monitoring.genmodel
index 9b30c56be358009fee5f9e123433778a96fe8647..6c7e2764b16a7149ea9ae4863806ec7fcfde07b4 100644
--- a/de.ugoe.cs.rwm.mocci.model/model/monitoring.genmodel
+++ b/de.ugoe.cs.rwm.mocci.model/model/monitoring.genmodel
@@ -6,79 +6,34 @@
   <foreignModel>monitoring.ecore</foreignModel>
   <genPackages prefix="Monitoring" disposableProviderFactory="true">
     <ecorePackage href="monitoring.ecore#/"/>
-    <genDataTypes>
-      <ecoreDataType href="monitoring.ecore#//DateTime"/>
-    </genDataTypes>
-    <genDataTypes>
-      <ecoreDataType href="monitoring.ecore#//Second"/>
-    </genDataTypes>
     <genDataTypes>
       <ecoreDataType href="monitoring.ecore#//String"/>
     </genDataTypes>
     <genClasses>
       <ecoreClass href="monitoring.ecore#//Sensor"/>
-      <genFeatures createChild="false">
-        <ecoreFeature xsi:type="ecore:EAttribute" href="monitoring.ecore#//Sensor/occiSensorTimebase"/>
-      </genFeatures>
-      <genFeatures createChild="false">
-        <ecoreFeature xsi:type="ecore:EAttribute" href="monitoring.ecore#//Sensor/occiSensorTimestart"/>
-      </genFeatures>
-      <genFeatures createChild="false">
-        <ecoreFeature xsi:type="ecore:EAttribute" href="monitoring.ecore#//Sensor/occiSensorTimestop"/>
-      </genFeatures>
-      <genFeatures createChild="false">
-        <ecoreFeature xsi:type="ecore:EAttribute" href="monitoring.ecore#//Sensor/occiSensorPeriod"/>
-      </genFeatures>
-      <genFeatures createChild="false">
-        <ecoreFeature xsi:type="ecore:EAttribute" href="monitoring.ecore#//Sensor/occiSensorGranularity"/>
-      </genFeatures>
-      <genFeatures createChild="false">
-        <ecoreFeature xsi:type="ecore:EAttribute" href="monitoring.ecore#//Sensor/occiSensorAccuracy"/>
-      </genFeatures>
     </genClasses>
     <genClasses>
       <ecoreClass href="monitoring.ecore#//Datagatherer"/>
-      <genFeatures createChild="false">
-        <ecoreFeature xsi:type="ecore:EAttribute" href="monitoring.ecore#//Datagatherer/occiCollectorPeriod"/>
-      </genFeatures>
-      <genFeatures createChild="false">
-        <ecoreFeature xsi:type="ecore:EAttribute" href="monitoring.ecore#//Datagatherer/occiCollectorGranularity"/>
-      </genFeatures>
-      <genFeatures createChild="false">
-        <ecoreFeature xsi:type="ecore:EAttribute" href="monitoring.ecore#//Datagatherer/occiCollectorAccuracy"/>
-      </genFeatures>
     </genClasses>
     <genClasses>
-      <ecoreClass href="monitoring.ecore#//Processor"/>
-      <genFeatures createChild="false">
-        <ecoreFeature xsi:type="ecore:EAttribute" href="monitoring.ecore#//Processor/gathererAddress"/>
-      </genFeatures>
+      <ecoreClass href="monitoring.ecore#//Dataprocessor"/>
     </genClasses>
     <genClasses>
-      <ecoreClass href="monitoring.ecore#//Publisher"/>
-      <genFeatures createChild="false">
-        <ecoreFeature xsi:type="ecore:EAttribute" href="monitoring.ecore#//Publisher/publisherEndpoint"/>
-      </genFeatures>
+      <ecoreClass href="monitoring.ecore#//Resultprovider"/>
     </genClasses>
     <genClasses>
-      <ecoreClass href="monitoring.ecore#//Monitoringproperty"/>
+      <ecoreClass href="monitoring.ecore#//Monitorableproperty"/>
       <genFeatures createChild="false">
-        <ecoreFeature xsi:type="ecore:EAttribute" href="monitoring.ecore#//Monitoringproperty/monitoringPropertyName"/>
+        <ecoreFeature xsi:type="ecore:EAttribute" href="monitoring.ecore#//Monitorableproperty/monitoringProperty"/>
       </genFeatures>
       <genFeatures createChild="false">
-        <ecoreFeature xsi:type="ecore:EAttribute" href="monitoring.ecore#//Monitoringproperty/monitoringPropertyValue"/>
+        <ecoreFeature xsi:type="ecore:EAttribute" href="monitoring.ecore#//Monitorableproperty/monitoringResult"/>
       </genFeatures>
     </genClasses>
     <genClasses>
-      <ecoreClass href="monitoring.ecore#//Martpublisher"/>
-      <genFeatures createChild="false">
-        <ecoreFeature xsi:type="ecore:EAttribute" href="monitoring.ecore#//Martpublisher/monitoringPropertyName"/>
-      </genFeatures>
-      <genFeatures createChild="false">
-        <ecoreFeature xsi:type="ecore:EAttribute" href="monitoring.ecore#//Martpublisher/monitoringPropertyId"/>
-      </genFeatures>
+      <ecoreClass href="monitoring.ecore#//Occiresultprovider"/>
       <genFeatures createChild="false">
-        <ecoreFeature xsi:type="ecore:EAttribute" href="monitoring.ecore#//Martpublisher/monitoringPropertyResource"/>
+        <ecoreFeature xsi:type="ecore:EAttribute" href="monitoring.ecore#//Occiresultprovider/resultProviderEndpoint"/>
       </genFeatures>
     </genClasses>
   </genPackages>
diff --git a/de.ugoe.cs.rwm.mocci.model/model/monitoring.occie b/de.ugoe.cs.rwm.mocci.model/model/monitoring.occie
index a8d07fa81967bbf5992445f7d373216d4df34881..50658e2e70d5246aede87f548c4c68ed65856115 100644
--- a/de.ugoe.cs.rwm.mocci.model/model/monitoring.occie
+++ b/de.ugoe.cs.rwm.mocci.model/model/monitoring.occie
@@ -3,40 +3,25 @@
   <import href="http://schemas.modmacao.org/occi/platform#/"/>
   <import href="http://schemas.ogf.org/occi/core#/"/>
   <kinds name="Sensor" scheme="http://schemas.ugoe.cs.rwm/monitoring#" title="Sensor Component">
-    <attributes name="occi.sensor.timebase" description="Base time reference (ISO8601)" type="//@types.0"/>
-    <attributes name="occi.sensor.timestart" description="Start time offset (seconds)" type="//@types.1"/>
-    <attributes name="occi.sensor.timestop" type="//@types.1"/>
-    <attributes name="occi.sensor.period" required="true" description="Time between two following measurements (seconds)" type="//@types.1"/>
-    <attributes name="occi.sensor.granularity" description="Granularity of time measument (seconds)" type="//@types.1"/>
-    <attributes name="occi.sensor.accuracy" description="Accuracy of time measument (seconds)" type="//@types.1"/>
     <parent href="http://schemas.modmacao.org/occi/platform#//@kinds[term='application']"/>
   </kinds>
   <kinds name="DataGatherer" scheme="http://schemas.ugoe.cs.rwm/monitoring#" title="DataGatherer Resource">
-    <attributes name="occi.collector.period" required="true" description="Time between two following measurements (seconds)." type="//@types.1"/>
-    <attributes name="occi.collector.granularity" description="Granularity of time measurement (seconds)." type="//@types.1"/>
-    <attributes name="occi.collector.accuracy" description="Accuracy of time measurement (seconds)." type="//@types.1"/>
     <parent href="http://schemas.modmacao.org/occi/platform#//@kinds[term='component']"/>
   </kinds>
-  <kinds name="Processor" scheme="http://schemas.ugoe.cs.rwm/monitoring#" title="Processor Resource">
-    <attributes name="gatherer.address" type="//@types.2"/>
+  <kinds name="DataProcessor" scheme="http://schemas.ugoe.cs.rwm/monitoring#" title="DataProcessor Resource">
     <parent href="http://schemas.modmacao.org/occi/platform#//@kinds[term='component']"/>
   </kinds>
-  <kinds name="Publisher" scheme="http://schemas.ugoe.cs.rwm/monitoring#" title="Publisher Resource">
-    <attributes name="publisher.endpoint" required="true" type="//@types.2"/>
+  <kinds name="ResultProvider" scheme="http://schemas.ugoe.cs.rwm/monitoring#" title="Publisher Resource">
     <parent href="http://schemas.modmacao.org/occi/platform#//@kinds[term='component']"/>
   </kinds>
-  <kinds name="MonitoringProperty" scheme="http://schemas.ugoe.cs.rwm/monitoring#" title="MonitoringProperty Component" target="//@kinds[term='sensor']">
-    <attributes name="monitoring.property.name" mutable="false" required="true" description="" type="//@types.2"/>
-    <attributes name="monitoring.property.value" description="" type="//@types.2"/>
+  <kinds name="MonitorableProperty" scheme="http://schemas.ugoe.cs.rwm/monitoring#" title="MonitorableProperty Component" target="//@kinds[term='sensor']">
+    <attributes name="monitoring.property" mutable="false" required="true" description="" type="//@types.0"/>
+    <attributes name="monitoring.result" mutable="true" description="" type="//@types.0"/>
     <parent href="http://schemas.ogf.org/occi/core#//@kinds[term='link']"/>
     <source href="http://schemas.ogf.org/occi/core#//@kinds[term='resource']"/>
   </kinds>
-  <mixins name="MartPublisher" scheme="http://schemas.ugoe.cs.rwm/monitoring#" title="MartPublisher Mixin" applies="//@kinds[term='publisher']">
-    <attributes name="monitoring.property.name" mutable="false" required="true" description="" type="//@types.2"/>
-    <attributes name="monitoring.property.id" description="" type="//@types.2"/>
-    <attributes name="monitoring.property.resource" mutable="false" required="true" description="" type="//@types.2"/>
+  <mixins name="OCCIResultProvider" scheme="http://schemas.ugoe.cs.rwm/monitoring#" title="OCCIResultProvider Mixin" applies="//@kinds[term='resultprovider']">
+    <attributes name="result.provider.endpoint" mutable="true" required="true" description="Genereic address to be used by the result provider." type="//@types.0"/>
   </mixins>
-  <types xsi:type="occi:StringType" name="DateTime" pattern="^(\d{4}((-)?(0[1-9]|1[0-2])((-)?(0[1-9]|[1-2][0-9]|3[0-1])(T(24:00(:00(\.[0]+)?)?|(([0-1][0-9]|2[0-3])(:)[0-5][0-9])((:)[0-5][0-9](\.[\d]+)?)?)((\+|-)(14:00|(0[0-9]|1[0-3])(:)[0-5][0-9])|Z))?)?)?)$"/>
-  <types xsi:type="occi:StringType" name="Second"/>
   <types xsi:type="occi:StringType" name="String"/>
 </occi:Extension>
diff --git a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/Datagatherer.java b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/Datagatherer.java
index 8e3ba9619deea1c1afe9516edc085de5de4dafd5..7598466d7992a09fc82232219296f45d2c72dc8f 100644
--- a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/Datagatherer.java
+++ b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/Datagatherer.java
@@ -23,96 +23,11 @@ import org.modmacao.occi.platform.Component;
  * DataGatherer Resource
  * <!-- end-model-doc -->
  *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link monitoring.Datagatherer#getOcciCollectorPeriod <em>Occi Collector Period</em>}</li>
- *   <li>{@link monitoring.Datagatherer#getOcciCollectorGranularity <em>Occi Collector Granularity</em>}</li>
- *   <li>{@link monitoring.Datagatherer#getOcciCollectorAccuracy <em>Occi Collector Accuracy</em>}</li>
- * </ul>
  *
  * @see monitoring.MonitoringPackage#getDatagatherer()
  * @model
  * @generated
  */
 public interface Datagatherer extends Component {
-	/**
-	 * Returns the value of the '<em><b>Occi Collector Period</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Time between two following measurements (seconds).
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Occi Collector Period</em>' attribute.
-	 * @see #setOcciCollectorPeriod(String)
-	 * @see monitoring.MonitoringPackage#getDatagatherer_OcciCollectorPeriod()
-	 * @model dataType="monitoring.Second" required="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel get='throw new UnsupportedOperationException();  // FIXME Unimplemented http://schemas.ugoe.cs.rwm/monitoring/ecore!Datagatherer!occiCollectorPeriod'"
-	 * @generated
-	 */
-	String getOcciCollectorPeriod();
-
-	/**
-	 * Sets the value of the '{@link monitoring.Datagatherer#getOcciCollectorPeriod <em>Occi Collector Period</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Occi Collector Period</em>' attribute.
-	 * @see #getOcciCollectorPeriod()
-	 * @generated
-	 */
-	void setOcciCollectorPeriod(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Occi Collector Granularity</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Granularity of time measurement (seconds).
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Occi Collector Granularity</em>' attribute.
-	 * @see #setOcciCollectorGranularity(String)
-	 * @see monitoring.MonitoringPackage#getDatagatherer_OcciCollectorGranularity()
-	 * @model dataType="monitoring.Second"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel get='throw new UnsupportedOperationException();  // FIXME Unimplemented http://schemas.ugoe.cs.rwm/monitoring/ecore!Datagatherer!occiCollectorGranularity'"
-	 * @generated
-	 */
-	String getOcciCollectorGranularity();
-
-	/**
-	 * Sets the value of the '{@link monitoring.Datagatherer#getOcciCollectorGranularity <em>Occi Collector Granularity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Occi Collector Granularity</em>' attribute.
-	 * @see #getOcciCollectorGranularity()
-	 * @generated
-	 */
-	void setOcciCollectorGranularity(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Occi Collector Accuracy</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Accuracy of time measurement (seconds).
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Occi Collector Accuracy</em>' attribute.
-	 * @see #setOcciCollectorAccuracy(String)
-	 * @see monitoring.MonitoringPackage#getDatagatherer_OcciCollectorAccuracy()
-	 * @model dataType="monitoring.Second"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel get='throw new UnsupportedOperationException();  // FIXME Unimplemented http://schemas.ugoe.cs.rwm/monitoring/ecore!Datagatherer!occiCollectorAccuracy'"
-	 * @generated
-	 */
-	String getOcciCollectorAccuracy();
-
-	/**
-	 * Sets the value of the '{@link monitoring.Datagatherer#getOcciCollectorAccuracy <em>Occi Collector Accuracy</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Occi Collector Accuracy</em>' attribute.
-	 * @see #getOcciCollectorAccuracy()
-	 * @generated
-	 */
-	void setOcciCollectorAccuracy(String value);
 
 } // Datagatherer
diff --git a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/Dataprocessor.java b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/Dataprocessor.java
new file mode 100644
index 0000000000000000000000000000000000000000..5ebaa25c86e72ae98a9a0027daa32b47c51d2d34
--- /dev/null
+++ b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/Dataprocessor.java
@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) 2015-2017 Obeo, Inria
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 	
+ * Contributors:
+ * - William Piers <william.piers@obeo.fr>
+ * - Philippe Merle <philippe.merle@inria.fr>
+ * - Faiez Zalila <faiez.zalila@inria.fr>
+ */
+package monitoring;
+
+import org.modmacao.occi.platform.Component;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Dataprocessor</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * DataProcessor Resource
+ * <!-- end-model-doc -->
+ *
+ *
+ * @see monitoring.MonitoringPackage#getDataprocessor()
+ * @model
+ * @generated
+ */
+public interface Dataprocessor extends Component {
+} // Dataprocessor
diff --git a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/Gatheringservice.java b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/Gatheringservice.java
new file mode 100644
index 0000000000000000000000000000000000000000..a5b4edc410a78626dea75f64eaddd81cd415ac09
--- /dev/null
+++ b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/Gatheringservice.java
@@ -0,0 +1,72 @@
+/**
+ * Copyright (c) 2015-2017 Obeo, Inria
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 	
+ * Contributors:
+ * - William Piers <william.piers@obeo.fr>
+ * - Philippe Merle <philippe.merle@inria.fr>
+ * - Faiez Zalila <faiez.zalila@inria.fr>
+ */
+package monitoring;
+
+import java.util.Map;
+
+import org.eclipse.cmf.occi.core.MixinBase;
+
+import org.eclipse.emf.common.util.DiagnosticChain;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Gatheringservice</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link monitoring.Gatheringservice#getServiceAddress <em>Service Address</em>}</li>
+ * </ul>
+ *
+ * @see monitoring.MonitoringPackage#getGatheringservice()
+ * @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='appliesConstraint'"
+ * @generated
+ */
+public interface Gatheringservice extends MixinBase {
+	/**
+	 * Returns the value of the '<em><b>Service Address</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * 
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Service Address</em>' attribute.
+	 * @see #setServiceAddress(String)
+	 * @see monitoring.MonitoringPackage#getGatheringservice_ServiceAddress()
+	 * @model dataType="monitoring.String" required="true"
+	 *        annotation="http://www.eclipse.org/emf/2002/GenModel get='throw new UnsupportedOperationException();  // FIXME Unimplemented http://schemas.ugoe.cs.rwm/monitoring/ecore!Gatheringservice!serviceAddress'"
+	 * @generated
+	 */
+	String getServiceAddress();
+
+	/**
+	 * Sets the value of the '{@link monitoring.Gatheringservice#getServiceAddress <em>Service Address</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Service Address</em>' attribute.
+	 * @see #getServiceAddress()
+	 * @generated
+	 */
+	void setServiceAddress(String value);
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model annotation="http://www.eclipse.org/emf/2002/GenModel body='/**\n *\n * inv appliesConstraint:\n *   let\n *     severity : Integer[1] = \'Gatheringservice::appliesConstraint\'.getSeverity()\n *   in\n *     if severity &lt;= 0\n *     then true\n *     else\n *       let\n *         result : occi::Boolean[1] = self.entity.oclIsKindOf(Datagatherer)\n *       in\n *         \'Gatheringservice::appliesConstraint\'.logDiagnostic(self, null, diagnostics, context, null, severity, result, 0)\n *     endif\n \052/\nfinal /*@NonInvalid\052/ &lt;%org.eclipse.ocl.pivot.evaluation.Executor%&gt; executor = &lt;%org.eclipse.ocl.pivot.internal.utilities.PivotUtilInternal%&gt;.getExecutor(this);\nfinal /*@NonInvalid\052/ &lt;%org.eclipse.ocl.pivot.ids.IdResolver%&gt; idResolver = executor.getIdResolver();\nfinal /*@NonInvalid\052/ &lt;%org.eclipse.ocl.pivot.values.IntegerValue%&gt; severity_0 = &lt;%org.eclipse.ocl.pivot.library.string.CGStringGetSeverityOperation%&gt;.INSTANCE.evaluate(executor, &lt;%monitoring.MonitoringTables%&gt;.STR_Gatheringservice_c_c_appliesConstraint);\nfinal /*@NonInvalid\052/ boolean le = &lt;%org.eclipse.ocl.pivot.library.oclany.OclComparableLessThanEqualOperation%&gt;.INSTANCE.evaluate(executor, severity_0, &lt;%monitoring.MonitoringTables%&gt;.INT_0).booleanValue();\n/*@NonInvalid\052/ boolean symbol_0;\nif (le) {\n\tsymbol_0 = &lt;%org.eclipse.ocl.pivot.utilities.ValueUtil%&gt;.TRUE_VALUE;\n}\nelse {\n\tfinal /*@NonInvalid\052/ &lt;%org.eclipse.ocl.pivot.Class%&gt; TYP_monitoring_c_c_Datagatherer = idResolver.getClass(&lt;%monitoring.MonitoringTables%&gt;.CLSSid_Datagatherer, null);\n\tfinal /*@NonInvalid\052/ &lt;%org.eclipse.cmf.occi.core.Entity%&gt; entity = this.getEntity();\n\tfinal /*@NonInvalid\052/ boolean result = &lt;%org.eclipse.ocl.pivot.library.oclany.OclAnyOclIsKindOfOperation%&gt;.INSTANCE.evaluate(executor, entity, TYP_monitoring_c_c_Datagatherer).booleanValue();\n\tfinal /*@NonInvalid\052/ boolean logDiagnostic = &lt;%org.eclipse.ocl.pivot.library.string.CGStringLogDiagnosticOperation%&gt;.INSTANCE.evaluate(executor, &lt;%org.eclipse.ocl.pivot.ids.TypeId%&gt;.BOOLEAN, &lt;%monitoring.MonitoringTables%&gt;.STR_Gatheringservice_c_c_appliesConstraint, this, (Object)null, diagnostics, context, (Object)null, severity_0, result, &lt;%monitoring.MonitoringTables%&gt;.INT_0).booleanValue();\n\tsymbol_0 = logDiagnostic;\n}\nreturn Boolean.TRUE == symbol_0;'"
+	 * @generated
+	 */
+	boolean appliesConstraint(DiagnosticChain diagnostics, Map<Object, Object> context);
+
+} // Gatheringservice
diff --git a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/Martpublisher.java b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/Martpublisher.java
deleted file mode 100644
index b180ac74ccf4a95191d282a497821d25157c3b37..0000000000000000000000000000000000000000
--- a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/Martpublisher.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/**
- * Copyright (c) 2015-2017 Obeo, Inria
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 	
- * Contributors:
- * - William Piers <william.piers@obeo.fr>
- * - Philippe Merle <philippe.merle@inria.fr>
- * - Faiez Zalila <faiez.zalila@inria.fr>
- */
-package monitoring;
-
-import java.util.Map;
-
-import org.eclipse.cmf.occi.core.MixinBase;
-
-import org.eclipse.emf.common.util.DiagnosticChain;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Martpublisher</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link monitoring.Martpublisher#getMonitoringPropertyName <em>Monitoring Property Name</em>}</li>
- *   <li>{@link monitoring.Martpublisher#getMonitoringPropertyId <em>Monitoring Property Id</em>}</li>
- *   <li>{@link monitoring.Martpublisher#getMonitoringPropertyResource <em>Monitoring Property Resource</em>}</li>
- * </ul>
- *
- * @see monitoring.MonitoringPackage#getMartpublisher()
- * @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='appliesConstraint'"
- * @generated
- */
-public interface Martpublisher extends MixinBase {
-	/**
-	 * Returns the value of the '<em><b>Monitoring Property Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Monitoring Property Name</em>' attribute.
-	 * @see #setMonitoringPropertyName(String)
-	 * @see monitoring.MonitoringPackage#getMartpublisher_MonitoringPropertyName()
-	 * @model dataType="monitoring.String" required="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel get='throw new UnsupportedOperationException();  // FIXME Unimplemented http://schemas.ugoe.cs.rwm/monitoring/ecore!Martpublisher!monitoringPropertyName'"
-	 * @generated
-	 */
-	String getMonitoringPropertyName();
-
-	/**
-	 * Sets the value of the '{@link monitoring.Martpublisher#getMonitoringPropertyName <em>Monitoring Property Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Monitoring Property Name</em>' attribute.
-	 * @see #getMonitoringPropertyName()
-	 * @generated
-	 */
-	void setMonitoringPropertyName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Monitoring Property Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Monitoring Property Id</em>' attribute.
-	 * @see #setMonitoringPropertyId(String)
-	 * @see monitoring.MonitoringPackage#getMartpublisher_MonitoringPropertyId()
-	 * @model dataType="monitoring.String"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel get='throw new UnsupportedOperationException();  // FIXME Unimplemented http://schemas.ugoe.cs.rwm/monitoring/ecore!Martpublisher!monitoringPropertyId'"
-	 * @generated
-	 */
-	String getMonitoringPropertyId();
-
-	/**
-	 * Sets the value of the '{@link monitoring.Martpublisher#getMonitoringPropertyId <em>Monitoring Property Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Monitoring Property Id</em>' attribute.
-	 * @see #getMonitoringPropertyId()
-	 * @generated
-	 */
-	void setMonitoringPropertyId(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Monitoring Property Resource</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Monitoring Property Resource</em>' attribute.
-	 * @see #setMonitoringPropertyResource(String)
-	 * @see monitoring.MonitoringPackage#getMartpublisher_MonitoringPropertyResource()
-	 * @model dataType="monitoring.String" required="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel get='throw new UnsupportedOperationException();  // FIXME Unimplemented http://schemas.ugoe.cs.rwm/monitoring/ecore!Martpublisher!monitoringPropertyResource'"
-	 * @generated
-	 */
-	String getMonitoringPropertyResource();
-
-	/**
-	 * Sets the value of the '{@link monitoring.Martpublisher#getMonitoringPropertyResource <em>Monitoring Property Resource</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Monitoring Property Resource</em>' attribute.
-	 * @see #getMonitoringPropertyResource()
-	 * @generated
-	 */
-	void setMonitoringPropertyResource(String value);
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model annotation="http://www.eclipse.org/emf/2002/GenModel body='/**\n *\n * inv appliesConstraint:\n *   let severity : Integer[1] = \'Martpublisher::appliesConstraint\'.getSeverity()\n *   in\n *     if severity &lt;= 0\n *     then true\n *     else\n *       let\n *         result : occi::Boolean[1] = self.entity.oclIsKindOf(Publisher)\n *       in\n *         \'Martpublisher::appliesConstraint\'.logDiagnostic(self, null, diagnostics, context, null, severity, result, 0)\n *     endif\n \052/\nfinal /*@NonInvalid\052/ &lt;%org.eclipse.ocl.pivot.evaluation.Executor%&gt; executor = &lt;%org.eclipse.ocl.pivot.internal.utilities.PivotUtilInternal%&gt;.getExecutor(this);\nfinal /*@NonInvalid\052/ &lt;%org.eclipse.ocl.pivot.ids.IdResolver%&gt; idResolver = executor.getIdResolver();\nfinal /*@NonInvalid\052/ &lt;%org.eclipse.ocl.pivot.values.IntegerValue%&gt; severity_0 = &lt;%org.eclipse.ocl.pivot.library.string.CGStringGetSeverityOperation%&gt;.INSTANCE.evaluate(executor, &lt;%monitoring.MonitoringTables%&gt;.STR_Martpublisher_c_c_appliesConstraint);\nfinal /*@NonInvalid\052/ boolean le = &lt;%org.eclipse.ocl.pivot.library.oclany.OclComparableLessThanEqualOperation%&gt;.INSTANCE.evaluate(executor, severity_0, &lt;%monitoring.MonitoringTables%&gt;.INT_0).booleanValue();\n/*@NonInvalid\052/ boolean symbol_0;\nif (le) {\n\tsymbol_0 = &lt;%org.eclipse.ocl.pivot.utilities.ValueUtil%&gt;.TRUE_VALUE;\n}\nelse {\n\tfinal /*@NonInvalid\052/ &lt;%org.eclipse.ocl.pivot.Class%&gt; TYP_monitoring_c_c_Publisher = idResolver.getClass(&lt;%monitoring.MonitoringTables%&gt;.CLSSid_Publisher, null);\n\tfinal /*@NonInvalid\052/ &lt;%org.eclipse.cmf.occi.core.Entity%&gt; entity = this.getEntity();\n\tfinal /*@NonInvalid\052/ boolean result = &lt;%org.eclipse.ocl.pivot.library.oclany.OclAnyOclIsKindOfOperation%&gt;.INSTANCE.evaluate(executor, entity, TYP_monitoring_c_c_Publisher).booleanValue();\n\tfinal /*@NonInvalid\052/ boolean logDiagnostic = &lt;%org.eclipse.ocl.pivot.library.string.CGStringLogDiagnosticOperation%&gt;.INSTANCE.evaluate(executor, &lt;%org.eclipse.ocl.pivot.ids.TypeId%&gt;.BOOLEAN, &lt;%monitoring.MonitoringTables%&gt;.STR_Martpublisher_c_c_appliesConstraint, this, (Object)null, diagnostics, context, (Object)null, severity_0, result, &lt;%monitoring.MonitoringTables%&gt;.INT_0).booleanValue();\n\tsymbol_0 = logDiagnostic;\n}\nreturn Boolean.TRUE == symbol_0;'"
-	 * @generated
-	 */
-	boolean appliesConstraint(DiagnosticChain diagnostics, Map<Object, Object> context);
-
-} // Martpublisher
diff --git a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/Monitorableproperty.java b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/Monitorableproperty.java
new file mode 100644
index 0000000000000000000000000000000000000000..19cbd6058b2c674e2c4eff927697bf76d57b0fa7
--- /dev/null
+++ b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/Monitorableproperty.java
@@ -0,0 +1,103 @@
+/**
+ * Copyright (c) 2015-2017 Obeo, Inria
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 	
+ * Contributors:
+ * - William Piers <william.piers@obeo.fr>
+ * - Philippe Merle <philippe.merle@inria.fr>
+ * - Faiez Zalila <faiez.zalila@inria.fr>
+ */
+package monitoring;
+
+import java.util.Map;
+
+import org.eclipse.cmf.occi.core.Link;
+
+import org.eclipse.emf.common.util.DiagnosticChain;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Monitorableproperty</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * MonitorableProperty Component
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link monitoring.Monitorableproperty#getMonitoringProperty <em>Monitoring Property</em>}</li>
+ *   <li>{@link monitoring.Monitorableproperty#getMonitoringResult <em>Monitoring Result</em>}</li>
+ * </ul>
+ *
+ * @see monitoring.MonitoringPackage#getMonitorableproperty()
+ * @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='targetConstraint'"
+ * @generated
+ */
+public interface Monitorableproperty extends Link {
+	/**
+	 * Returns the value of the '<em><b>Monitoring Property</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * 
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Monitoring Property</em>' attribute.
+	 * @see #setMonitoringProperty(String)
+	 * @see monitoring.MonitoringPackage#getMonitorableproperty_MonitoringProperty()
+	 * @model dataType="monitoring.String" required="true"
+	 *        annotation="http://www.eclipse.org/emf/2002/GenModel get='throw new UnsupportedOperationException();  // FIXME Unimplemented http://schemas.ugoe.cs.rwm/monitoring/ecore!Monitorableproperty!monitoringProperty'"
+	 * @generated
+	 */
+	String getMonitoringProperty();
+
+	/**
+	 * Sets the value of the '{@link monitoring.Monitorableproperty#getMonitoringProperty <em>Monitoring Property</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Monitoring Property</em>' attribute.
+	 * @see #getMonitoringProperty()
+	 * @generated
+	 */
+	void setMonitoringProperty(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Monitoring Result</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * 
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Monitoring Result</em>' attribute.
+	 * @see #setMonitoringResult(String)
+	 * @see monitoring.MonitoringPackage#getMonitorableproperty_MonitoringResult()
+	 * @model dataType="monitoring.String"
+	 *        annotation="http://www.eclipse.org/emf/2002/GenModel get='throw new UnsupportedOperationException();  // FIXME Unimplemented http://schemas.ugoe.cs.rwm/monitoring/ecore!Monitorableproperty!monitoringResult'"
+	 * @generated
+	 */
+	String getMonitoringResult();
+
+	/**
+	 * Sets the value of the '{@link monitoring.Monitorableproperty#getMonitoringResult <em>Monitoring Result</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Monitoring Result</em>' attribute.
+	 * @see #getMonitoringResult()
+	 * @generated
+	 */
+	void setMonitoringResult(String value);
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model annotation="http://www.eclipse.org/emf/2002/GenModel body='/**\n *\n * inv targetConstraint:\n *   let\n *     severity : Integer[1] = \'Monitorableproperty::targetConstraint\'.getSeverity()\n *   in\n *     if severity &lt;= 0\n *     then true\n *     else\n *       let result : occi::Boolean[1] = self.target.oclIsKindOf(Sensor)\n *       in\n *         \'Monitorableproperty::targetConstraint\'.logDiagnostic(self, null, diagnostics, context, null, severity, result, 0)\n *     endif\n \052/\nfinal /*@NonInvalid\052/ &lt;%org.eclipse.ocl.pivot.evaluation.Executor%&gt; executor = &lt;%org.eclipse.ocl.pivot.internal.utilities.PivotUtilInternal%&gt;.getExecutor(this);\nfinal /*@NonInvalid\052/ &lt;%org.eclipse.ocl.pivot.ids.IdResolver%&gt; idResolver = executor.getIdResolver();\nfinal /*@NonInvalid\052/ &lt;%org.eclipse.ocl.pivot.values.IntegerValue%&gt; severity_0 = &lt;%org.eclipse.ocl.pivot.library.string.CGStringGetSeverityOperation%&gt;.INSTANCE.evaluate(executor, &lt;%monitoring.MonitoringTables%&gt;.STR_Monitorableproperty_c_c_targetConstraint);\nfinal /*@NonInvalid\052/ boolean le = &lt;%org.eclipse.ocl.pivot.library.oclany.OclComparableLessThanEqualOperation%&gt;.INSTANCE.evaluate(executor, severity_0, &lt;%monitoring.MonitoringTables%&gt;.INT_0).booleanValue();\n/*@NonInvalid\052/ boolean symbol_0;\nif (le) {\n\tsymbol_0 = &lt;%org.eclipse.ocl.pivot.utilities.ValueUtil%&gt;.TRUE_VALUE;\n}\nelse {\n\tfinal /*@NonInvalid\052/ &lt;%org.eclipse.ocl.pivot.Class%&gt; TYP_monitoring_c_c_Sensor = idResolver.getClass(&lt;%monitoring.MonitoringTables%&gt;.CLSSid_Sensor, null);\n\tfinal /*@NonInvalid\052/ &lt;%org.eclipse.cmf.occi.core.Resource%&gt; target = this.getTarget();\n\tfinal /*@NonInvalid\052/ boolean result = &lt;%org.eclipse.ocl.pivot.library.oclany.OclAnyOclIsKindOfOperation%&gt;.INSTANCE.evaluate(executor, target, TYP_monitoring_c_c_Sensor).booleanValue();\n\tfinal /*@NonInvalid\052/ boolean logDiagnostic = &lt;%org.eclipse.ocl.pivot.library.string.CGStringLogDiagnosticOperation%&gt;.INSTANCE.evaluate(executor, &lt;%org.eclipse.ocl.pivot.ids.TypeId%&gt;.BOOLEAN, &lt;%monitoring.MonitoringTables%&gt;.STR_Monitorableproperty_c_c_targetConstraint, this, (Object)null, diagnostics, context, (Object)null, severity_0, result, &lt;%monitoring.MonitoringTables%&gt;.INT_0).booleanValue();\n\tsymbol_0 = logDiagnostic;\n}\nreturn Boolean.TRUE == symbol_0;'"
+	 * @generated
+	 */
+	boolean targetConstraint(DiagnosticChain diagnostics, Map<Object, Object> context);
+
+} // Monitorableproperty
diff --git a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/MonitoringFactory.java b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/MonitoringFactory.java
index a7ed41c06a1213f2ef73e24cd4f3f63f1a6fb923..89ecb05c29b9d8de29c8e3ab42fe6b7911e880fc 100644
--- a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/MonitoringFactory.java
+++ b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/MonitoringFactory.java
@@ -50,40 +50,40 @@ public interface MonitoringFactory extends EFactory {
 	Datagatherer createDatagatherer();
 
 	/**
-	 * Returns a new object of class '<em>Processor</em>'.
+	 * Returns a new object of class '<em>Dataprocessor</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Processor</em>'.
+	 * @return a new object of class '<em>Dataprocessor</em>'.
 	 * @generated
 	 */
-	Processor createProcessor();
+	Dataprocessor createDataprocessor();
 
 	/**
-	 * Returns a new object of class '<em>Publisher</em>'.
+	 * Returns a new object of class '<em>Resultprovider</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Publisher</em>'.
+	 * @return a new object of class '<em>Resultprovider</em>'.
 	 * @generated
 	 */
-	Publisher createPublisher();
+	Resultprovider createResultprovider();
 
 	/**
-	 * Returns a new object of class '<em>Monitoringproperty</em>'.
+	 * Returns a new object of class '<em>Monitorableproperty</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Monitoringproperty</em>'.
+	 * @return a new object of class '<em>Monitorableproperty</em>'.
 	 * @generated
 	 */
-	Monitoringproperty createMonitoringproperty();
+	Monitorableproperty createMonitorableproperty();
 
 	/**
-	 * Returns a new object of class '<em>Martpublisher</em>'.
+	 * Returns a new object of class '<em>Occiresultprovider</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Martpublisher</em>'.
+	 * @return a new object of class '<em>Occiresultprovider</em>'.
 	 * @generated
 	 */
-	Martpublisher createMartpublisher();
+	Occiresultprovider createOcciresultprovider();
 
 	/**
 	 * Returns the package supported by this factory.
diff --git a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/MonitoringPackage.java b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/MonitoringPackage.java
index eae2d2d4f136a2a6605ecb4739e37060a7e97b6b..f239b496355b1021275c985e11aa6f317eeb22da 100644
--- a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/MonitoringPackage.java
+++ b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/MonitoringPackage.java
@@ -216,60 +216,6 @@ public interface MonitoringPackage extends EPackage {
 	 */
 	int SENSOR__OCCI_APP_STATE_MESSAGE = PlatformPackage.APPLICATION__OCCI_APP_STATE_MESSAGE;
 
-	/**
-	 * The feature id for the '<em><b>Occi Sensor Timebase</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SENSOR__OCCI_SENSOR_TIMEBASE = PlatformPackage.APPLICATION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Occi Sensor Timestart</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SENSOR__OCCI_SENSOR_TIMESTART = PlatformPackage.APPLICATION_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Occi Sensor Timestop</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SENSOR__OCCI_SENSOR_TIMESTOP = PlatformPackage.APPLICATION_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Occi Sensor Period</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SENSOR__OCCI_SENSOR_PERIOD = PlatformPackage.APPLICATION_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Occi Sensor Granularity</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SENSOR__OCCI_SENSOR_GRANULARITY = PlatformPackage.APPLICATION_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Occi Sensor Accuracy</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SENSOR__OCCI_SENSOR_ACCURACY = PlatformPackage.APPLICATION_FEATURE_COUNT + 5;
-
 	/**
 	 * The number of structural features of the '<em>Sensor</em>' class.
 	 * <!-- begin-user-doc -->
@@ -277,7 +223,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int SENSOR_FEATURE_COUNT = PlatformPackage.APPLICATION_FEATURE_COUNT + 6;
+	int SENSOR_FEATURE_COUNT = PlatformPackage.APPLICATION_FEATURE_COUNT + 0;
 
 	/**
 	 * The operation id for the '<em>Occi Create</em>' operation.
@@ -487,33 +433,6 @@ public interface MonitoringPackage extends EPackage {
 	 */
 	int DATAGATHERER__OCCI_COMPONENT_STATE_MESSAGE = PlatformPackage.COMPONENT__OCCI_COMPONENT_STATE_MESSAGE;
 
-	/**
-	 * The feature id for the '<em><b>Occi Collector Period</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DATAGATHERER__OCCI_COLLECTOR_PERIOD = PlatformPackage.COMPONENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Occi Collector Granularity</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DATAGATHERER__OCCI_COLLECTOR_GRANULARITY = PlatformPackage.COMPONENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Occi Collector Accuracy</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DATAGATHERER__OCCI_COLLECTOR_ACCURACY = PlatformPackage.COMPONENT_FEATURE_COUNT + 2;
-
 	/**
 	 * The number of structural features of the '<em>Datagatherer</em>' class.
 	 * <!-- begin-user-doc -->
@@ -521,7 +440,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int DATAGATHERER_FEATURE_COUNT = PlatformPackage.COMPONENT_FEATURE_COUNT + 3;
+	int DATAGATHERER_FEATURE_COUNT = PlatformPackage.COMPONENT_FEATURE_COUNT + 0;
 
 	/**
 	 * The operation id for the '<em>Occi Create</em>' operation.
@@ -614,14 +533,14 @@ public interface MonitoringPackage extends EPackage {
 	int DATAGATHERER_OPERATION_COUNT = PlatformPackage.COMPONENT_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link monitoring.impl.ProcessorImpl <em>Processor</em>}' class.
+	 * The meta object id for the '{@link monitoring.impl.DataprocessorImpl <em>Dataprocessor</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see monitoring.impl.ProcessorImpl
-	 * @see monitoring.impl.MonitoringPackageImpl#getProcessor()
+	 * @see monitoring.impl.DataprocessorImpl
+	 * @see monitoring.impl.MonitoringPackageImpl#getDataprocessor()
 	 * @generated
 	 */
-	int PROCESSOR = 2;
+	int DATAPROCESSOR = 2;
 
 	/**
 	 * The feature id for the '<em><b>Id</b></em>' attribute.
@@ -630,7 +549,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PROCESSOR__ID = PlatformPackage.COMPONENT__ID;
+	int DATAPROCESSOR__ID = PlatformPackage.COMPONENT__ID;
 
 	/**
 	 * The feature id for the '<em><b>Title</b></em>' attribute.
@@ -639,7 +558,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PROCESSOR__TITLE = PlatformPackage.COMPONENT__TITLE;
+	int DATAPROCESSOR__TITLE = PlatformPackage.COMPONENT__TITLE;
 
 	/**
 	 * The feature id for the '<em><b>Kind</b></em>' reference.
@@ -648,7 +567,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PROCESSOR__KIND = PlatformPackage.COMPONENT__KIND;
+	int DATAPROCESSOR__KIND = PlatformPackage.COMPONENT__KIND;
 
 	/**
 	 * The feature id for the '<em><b>Location</b></em>' attribute.
@@ -657,7 +576,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PROCESSOR__LOCATION = PlatformPackage.COMPONENT__LOCATION;
+	int DATAPROCESSOR__LOCATION = PlatformPackage.COMPONENT__LOCATION;
 
 	/**
 	 * The feature id for the '<em><b>Attributes</b></em>' containment reference list.
@@ -666,7 +585,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PROCESSOR__ATTRIBUTES = PlatformPackage.COMPONENT__ATTRIBUTES;
+	int DATAPROCESSOR__ATTRIBUTES = PlatformPackage.COMPONENT__ATTRIBUTES;
 
 	/**
 	 * The feature id for the '<em><b>Mixins</b></em>' reference list.
@@ -675,7 +594,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PROCESSOR__MIXINS = PlatformPackage.COMPONENT__MIXINS;
+	int DATAPROCESSOR__MIXINS = PlatformPackage.COMPONENT__MIXINS;
 
 	/**
 	 * The feature id for the '<em><b>Parts</b></em>' containment reference list.
@@ -684,7 +603,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PROCESSOR__PARTS = PlatformPackage.COMPONENT__PARTS;
+	int DATAPROCESSOR__PARTS = PlatformPackage.COMPONENT__PARTS;
 
 	/**
 	 * The feature id for the '<em><b>Summary</b></em>' attribute.
@@ -693,7 +612,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PROCESSOR__SUMMARY = PlatformPackage.COMPONENT__SUMMARY;
+	int DATAPROCESSOR__SUMMARY = PlatformPackage.COMPONENT__SUMMARY;
 
 	/**
 	 * The feature id for the '<em><b>Links</b></em>' containment reference list.
@@ -702,7 +621,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PROCESSOR__LINKS = PlatformPackage.COMPONENT__LINKS;
+	int DATAPROCESSOR__LINKS = PlatformPackage.COMPONENT__LINKS;
 
 	/**
 	 * The feature id for the '<em><b>Rlinks</b></em>' reference list.
@@ -711,7 +630,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PROCESSOR__RLINKS = PlatformPackage.COMPONENT__RLINKS;
+	int DATAPROCESSOR__RLINKS = PlatformPackage.COMPONENT__RLINKS;
 
 	/**
 	 * The feature id for the '<em><b>Occi Component State</b></em>' attribute.
@@ -720,7 +639,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PROCESSOR__OCCI_COMPONENT_STATE = PlatformPackage.COMPONENT__OCCI_COMPONENT_STATE;
+	int DATAPROCESSOR__OCCI_COMPONENT_STATE = PlatformPackage.COMPONENT__OCCI_COMPONENT_STATE;
 
 	/**
 	 * The feature id for the '<em><b>Occi Component State Message</b></em>' attribute.
@@ -729,25 +648,16 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PROCESSOR__OCCI_COMPONENT_STATE_MESSAGE = PlatformPackage.COMPONENT__OCCI_COMPONENT_STATE_MESSAGE;
-
-	/**
-	 * The feature id for the '<em><b>Gatherer Address</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROCESSOR__GATHERER_ADDRESS = PlatformPackage.COMPONENT_FEATURE_COUNT + 0;
+	int DATAPROCESSOR__OCCI_COMPONENT_STATE_MESSAGE = PlatformPackage.COMPONENT__OCCI_COMPONENT_STATE_MESSAGE;
 
 	/**
-	 * The number of structural features of the '<em>Processor</em>' class.
+	 * The number of structural features of the '<em>Dataprocessor</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int PROCESSOR_FEATURE_COUNT = PlatformPackage.COMPONENT_FEATURE_COUNT + 1;
+	int DATAPROCESSOR_FEATURE_COUNT = PlatformPackage.COMPONENT_FEATURE_COUNT + 0;
 
 	/**
 	 * The operation id for the '<em>Occi Create</em>' operation.
@@ -756,7 +666,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PROCESSOR___OCCI_CREATE = PlatformPackage.COMPONENT___OCCI_CREATE;
+	int DATAPROCESSOR___OCCI_CREATE = PlatformPackage.COMPONENT___OCCI_CREATE;
 
 	/**
 	 * The operation id for the '<em>Occi Retrieve</em>' operation.
@@ -765,7 +675,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PROCESSOR___OCCI_RETRIEVE = PlatformPackage.COMPONENT___OCCI_RETRIEVE;
+	int DATAPROCESSOR___OCCI_RETRIEVE = PlatformPackage.COMPONENT___OCCI_RETRIEVE;
 
 	/**
 	 * The operation id for the '<em>Occi Update</em>' operation.
@@ -774,7 +684,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PROCESSOR___OCCI_UPDATE = PlatformPackage.COMPONENT___OCCI_UPDATE;
+	int DATAPROCESSOR___OCCI_UPDATE = PlatformPackage.COMPONENT___OCCI_UPDATE;
 
 	/**
 	 * The operation id for the '<em>Occi Delete</em>' operation.
@@ -783,7 +693,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PROCESSOR___OCCI_DELETE = PlatformPackage.COMPONENT___OCCI_DELETE;
+	int DATAPROCESSOR___OCCI_DELETE = PlatformPackage.COMPONENT___OCCI_DELETE;
 
 	/**
 	 * The operation id for the '<em>Deploy</em>' operation.
@@ -792,7 +702,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PROCESSOR___DEPLOY = PlatformPackage.COMPONENT___DEPLOY;
+	int DATAPROCESSOR___DEPLOY = PlatformPackage.COMPONENT___DEPLOY;
 
 	/**
 	 * The operation id for the '<em>Undeploy</em>' operation.
@@ -801,7 +711,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PROCESSOR___UNDEPLOY = PlatformPackage.COMPONENT___UNDEPLOY;
+	int DATAPROCESSOR___UNDEPLOY = PlatformPackage.COMPONENT___UNDEPLOY;
 
 	/**
 	 * The operation id for the '<em>Configure</em>' operation.
@@ -810,7 +720,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PROCESSOR___CONFIGURE = PlatformPackage.COMPONENT___CONFIGURE;
+	int DATAPROCESSOR___CONFIGURE = PlatformPackage.COMPONENT___CONFIGURE;
 
 	/**
 	 * The operation id for the '<em>Start</em>' operation.
@@ -819,7 +729,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PROCESSOR___START = PlatformPackage.COMPONENT___START;
+	int DATAPROCESSOR___START = PlatformPackage.COMPONENT___START;
 
 	/**
 	 * The operation id for the '<em>Stop</em>' operation.
@@ -828,26 +738,26 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PROCESSOR___STOP = PlatformPackage.COMPONENT___STOP;
+	int DATAPROCESSOR___STOP = PlatformPackage.COMPONENT___STOP;
 
 	/**
-	 * The number of operations of the '<em>Processor</em>' class.
+	 * The number of operations of the '<em>Dataprocessor</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int PROCESSOR_OPERATION_COUNT = PlatformPackage.COMPONENT_OPERATION_COUNT + 0;
+	int DATAPROCESSOR_OPERATION_COUNT = PlatformPackage.COMPONENT_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link monitoring.impl.PublisherImpl <em>Publisher</em>}' class.
+	 * The meta object id for the '{@link monitoring.impl.ResultproviderImpl <em>Resultprovider</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see monitoring.impl.PublisherImpl
-	 * @see monitoring.impl.MonitoringPackageImpl#getPublisher()
+	 * @see monitoring.impl.ResultproviderImpl
+	 * @see monitoring.impl.MonitoringPackageImpl#getResultprovider()
 	 * @generated
 	 */
-	int PUBLISHER = 3;
+	int RESULTPROVIDER = 3;
 
 	/**
 	 * The feature id for the '<em><b>Id</b></em>' attribute.
@@ -856,7 +766,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PUBLISHER__ID = PlatformPackage.COMPONENT__ID;
+	int RESULTPROVIDER__ID = PlatformPackage.COMPONENT__ID;
 
 	/**
 	 * The feature id for the '<em><b>Title</b></em>' attribute.
@@ -865,7 +775,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PUBLISHER__TITLE = PlatformPackage.COMPONENT__TITLE;
+	int RESULTPROVIDER__TITLE = PlatformPackage.COMPONENT__TITLE;
 
 	/**
 	 * The feature id for the '<em><b>Kind</b></em>' reference.
@@ -874,7 +784,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PUBLISHER__KIND = PlatformPackage.COMPONENT__KIND;
+	int RESULTPROVIDER__KIND = PlatformPackage.COMPONENT__KIND;
 
 	/**
 	 * The feature id for the '<em><b>Location</b></em>' attribute.
@@ -883,7 +793,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PUBLISHER__LOCATION = PlatformPackage.COMPONENT__LOCATION;
+	int RESULTPROVIDER__LOCATION = PlatformPackage.COMPONENT__LOCATION;
 
 	/**
 	 * The feature id for the '<em><b>Attributes</b></em>' containment reference list.
@@ -892,7 +802,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PUBLISHER__ATTRIBUTES = PlatformPackage.COMPONENT__ATTRIBUTES;
+	int RESULTPROVIDER__ATTRIBUTES = PlatformPackage.COMPONENT__ATTRIBUTES;
 
 	/**
 	 * The feature id for the '<em><b>Mixins</b></em>' reference list.
@@ -901,7 +811,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PUBLISHER__MIXINS = PlatformPackage.COMPONENT__MIXINS;
+	int RESULTPROVIDER__MIXINS = PlatformPackage.COMPONENT__MIXINS;
 
 	/**
 	 * The feature id for the '<em><b>Parts</b></em>' containment reference list.
@@ -910,7 +820,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PUBLISHER__PARTS = PlatformPackage.COMPONENT__PARTS;
+	int RESULTPROVIDER__PARTS = PlatformPackage.COMPONENT__PARTS;
 
 	/**
 	 * The feature id for the '<em><b>Summary</b></em>' attribute.
@@ -919,7 +829,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PUBLISHER__SUMMARY = PlatformPackage.COMPONENT__SUMMARY;
+	int RESULTPROVIDER__SUMMARY = PlatformPackage.COMPONENT__SUMMARY;
 
 	/**
 	 * The feature id for the '<em><b>Links</b></em>' containment reference list.
@@ -928,7 +838,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PUBLISHER__LINKS = PlatformPackage.COMPONENT__LINKS;
+	int RESULTPROVIDER__LINKS = PlatformPackage.COMPONENT__LINKS;
 
 	/**
 	 * The feature id for the '<em><b>Rlinks</b></em>' reference list.
@@ -937,7 +847,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PUBLISHER__RLINKS = PlatformPackage.COMPONENT__RLINKS;
+	int RESULTPROVIDER__RLINKS = PlatformPackage.COMPONENT__RLINKS;
 
 	/**
 	 * The feature id for the '<em><b>Occi Component State</b></em>' attribute.
@@ -946,7 +856,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PUBLISHER__OCCI_COMPONENT_STATE = PlatformPackage.COMPONENT__OCCI_COMPONENT_STATE;
+	int RESULTPROVIDER__OCCI_COMPONENT_STATE = PlatformPackage.COMPONENT__OCCI_COMPONENT_STATE;
 
 	/**
 	 * The feature id for the '<em><b>Occi Component State Message</b></em>' attribute.
@@ -955,25 +865,16 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PUBLISHER__OCCI_COMPONENT_STATE_MESSAGE = PlatformPackage.COMPONENT__OCCI_COMPONENT_STATE_MESSAGE;
-
-	/**
-	 * The feature id for the '<em><b>Publisher Endpoint</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PUBLISHER__PUBLISHER_ENDPOINT = PlatformPackage.COMPONENT_FEATURE_COUNT + 0;
+	int RESULTPROVIDER__OCCI_COMPONENT_STATE_MESSAGE = PlatformPackage.COMPONENT__OCCI_COMPONENT_STATE_MESSAGE;
 
 	/**
-	 * The number of structural features of the '<em>Publisher</em>' class.
+	 * The number of structural features of the '<em>Resultprovider</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int PUBLISHER_FEATURE_COUNT = PlatformPackage.COMPONENT_FEATURE_COUNT + 1;
+	int RESULTPROVIDER_FEATURE_COUNT = PlatformPackage.COMPONENT_FEATURE_COUNT + 0;
 
 	/**
 	 * The operation id for the '<em>Occi Create</em>' operation.
@@ -982,7 +883,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PUBLISHER___OCCI_CREATE = PlatformPackage.COMPONENT___OCCI_CREATE;
+	int RESULTPROVIDER___OCCI_CREATE = PlatformPackage.COMPONENT___OCCI_CREATE;
 
 	/**
 	 * The operation id for the '<em>Occi Retrieve</em>' operation.
@@ -991,7 +892,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PUBLISHER___OCCI_RETRIEVE = PlatformPackage.COMPONENT___OCCI_RETRIEVE;
+	int RESULTPROVIDER___OCCI_RETRIEVE = PlatformPackage.COMPONENT___OCCI_RETRIEVE;
 
 	/**
 	 * The operation id for the '<em>Occi Update</em>' operation.
@@ -1000,7 +901,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PUBLISHER___OCCI_UPDATE = PlatformPackage.COMPONENT___OCCI_UPDATE;
+	int RESULTPROVIDER___OCCI_UPDATE = PlatformPackage.COMPONENT___OCCI_UPDATE;
 
 	/**
 	 * The operation id for the '<em>Occi Delete</em>' operation.
@@ -1009,7 +910,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PUBLISHER___OCCI_DELETE = PlatformPackage.COMPONENT___OCCI_DELETE;
+	int RESULTPROVIDER___OCCI_DELETE = PlatformPackage.COMPONENT___OCCI_DELETE;
 
 	/**
 	 * The operation id for the '<em>Deploy</em>' operation.
@@ -1018,7 +919,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PUBLISHER___DEPLOY = PlatformPackage.COMPONENT___DEPLOY;
+	int RESULTPROVIDER___DEPLOY = PlatformPackage.COMPONENT___DEPLOY;
 
 	/**
 	 * The operation id for the '<em>Undeploy</em>' operation.
@@ -1027,7 +928,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PUBLISHER___UNDEPLOY = PlatformPackage.COMPONENT___UNDEPLOY;
+	int RESULTPROVIDER___UNDEPLOY = PlatformPackage.COMPONENT___UNDEPLOY;
 
 	/**
 	 * The operation id for the '<em>Configure</em>' operation.
@@ -1036,7 +937,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PUBLISHER___CONFIGURE = PlatformPackage.COMPONENT___CONFIGURE;
+	int RESULTPROVIDER___CONFIGURE = PlatformPackage.COMPONENT___CONFIGURE;
 
 	/**
 	 * The operation id for the '<em>Start</em>' operation.
@@ -1045,7 +946,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PUBLISHER___START = PlatformPackage.COMPONENT___START;
+	int RESULTPROVIDER___START = PlatformPackage.COMPONENT___START;
 
 	/**
 	 * The operation id for the '<em>Stop</em>' operation.
@@ -1054,26 +955,26 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int PUBLISHER___STOP = PlatformPackage.COMPONENT___STOP;
+	int RESULTPROVIDER___STOP = PlatformPackage.COMPONENT___STOP;
 
 	/**
-	 * The number of operations of the '<em>Publisher</em>' class.
+	 * The number of operations of the '<em>Resultprovider</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int PUBLISHER_OPERATION_COUNT = PlatformPackage.COMPONENT_OPERATION_COUNT + 0;
+	int RESULTPROVIDER_OPERATION_COUNT = PlatformPackage.COMPONENT_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link monitoring.impl.MonitoringpropertyImpl <em>Monitoringproperty</em>}' class.
+	 * The meta object id for the '{@link monitoring.impl.MonitorablepropertyImpl <em>Monitorableproperty</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see monitoring.impl.MonitoringpropertyImpl
-	 * @see monitoring.impl.MonitoringPackageImpl#getMonitoringproperty()
+	 * @see monitoring.impl.MonitorablepropertyImpl
+	 * @see monitoring.impl.MonitoringPackageImpl#getMonitorableproperty()
 	 * @generated
 	 */
-	int MONITORINGPROPERTY = 4;
+	int MONITORABLEPROPERTY = 4;
 
 	/**
 	 * The feature id for the '<em><b>Id</b></em>' attribute.
@@ -1082,7 +983,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int MONITORINGPROPERTY__ID = OCCIPackage.LINK__ID;
+	int MONITORABLEPROPERTY__ID = OCCIPackage.LINK__ID;
 
 	/**
 	 * The feature id for the '<em><b>Title</b></em>' attribute.
@@ -1091,7 +992,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int MONITORINGPROPERTY__TITLE = OCCIPackage.LINK__TITLE;
+	int MONITORABLEPROPERTY__TITLE = OCCIPackage.LINK__TITLE;
 
 	/**
 	 * The feature id for the '<em><b>Kind</b></em>' reference.
@@ -1100,7 +1001,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int MONITORINGPROPERTY__KIND = OCCIPackage.LINK__KIND;
+	int MONITORABLEPROPERTY__KIND = OCCIPackage.LINK__KIND;
 
 	/**
 	 * The feature id for the '<em><b>Location</b></em>' attribute.
@@ -1109,7 +1010,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int MONITORINGPROPERTY__LOCATION = OCCIPackage.LINK__LOCATION;
+	int MONITORABLEPROPERTY__LOCATION = OCCIPackage.LINK__LOCATION;
 
 	/**
 	 * The feature id for the '<em><b>Attributes</b></em>' containment reference list.
@@ -1118,7 +1019,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int MONITORINGPROPERTY__ATTRIBUTES = OCCIPackage.LINK__ATTRIBUTES;
+	int MONITORABLEPROPERTY__ATTRIBUTES = OCCIPackage.LINK__ATTRIBUTES;
 
 	/**
 	 * The feature id for the '<em><b>Mixins</b></em>' reference list.
@@ -1127,7 +1028,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int MONITORINGPROPERTY__MIXINS = OCCIPackage.LINK__MIXINS;
+	int MONITORABLEPROPERTY__MIXINS = OCCIPackage.LINK__MIXINS;
 
 	/**
 	 * The feature id for the '<em><b>Parts</b></em>' containment reference list.
@@ -1136,7 +1037,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int MONITORINGPROPERTY__PARTS = OCCIPackage.LINK__PARTS;
+	int MONITORABLEPROPERTY__PARTS = OCCIPackage.LINK__PARTS;
 
 	/**
 	 * The feature id for the '<em><b>Source</b></em>' container reference.
@@ -1145,7 +1046,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int MONITORINGPROPERTY__SOURCE = OCCIPackage.LINK__SOURCE;
+	int MONITORABLEPROPERTY__SOURCE = OCCIPackage.LINK__SOURCE;
 
 	/**
 	 * The feature id for the '<em><b>Target</b></em>' reference.
@@ -1154,34 +1055,34 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int MONITORINGPROPERTY__TARGET = OCCIPackage.LINK__TARGET;
+	int MONITORABLEPROPERTY__TARGET = OCCIPackage.LINK__TARGET;
 
 	/**
-	 * The feature id for the '<em><b>Monitoring Property Name</b></em>' attribute.
+	 * The feature id for the '<em><b>Monitoring Property</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MONITORINGPROPERTY__MONITORING_PROPERTY_NAME = OCCIPackage.LINK_FEATURE_COUNT + 0;
+	int MONITORABLEPROPERTY__MONITORING_PROPERTY = OCCIPackage.LINK_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Monitoring Property Value</b></em>' attribute.
+	 * The feature id for the '<em><b>Monitoring Result</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MONITORINGPROPERTY__MONITORING_PROPERTY_VALUE = OCCIPackage.LINK_FEATURE_COUNT + 1;
+	int MONITORABLEPROPERTY__MONITORING_RESULT = OCCIPackage.LINK_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Monitoringproperty</em>' class.
+	 * The number of structural features of the '<em>Monitorableproperty</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MONITORINGPROPERTY_FEATURE_COUNT = OCCIPackage.LINK_FEATURE_COUNT + 2;
+	int MONITORABLEPROPERTY_FEATURE_COUNT = OCCIPackage.LINK_FEATURE_COUNT + 2;
 
 	/**
 	 * The operation id for the '<em>Occi Create</em>' operation.
@@ -1190,7 +1091,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int MONITORINGPROPERTY___OCCI_CREATE = OCCIPackage.LINK___OCCI_CREATE;
+	int MONITORABLEPROPERTY___OCCI_CREATE = OCCIPackage.LINK___OCCI_CREATE;
 
 	/**
 	 * The operation id for the '<em>Occi Retrieve</em>' operation.
@@ -1199,7 +1100,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int MONITORINGPROPERTY___OCCI_RETRIEVE = OCCIPackage.LINK___OCCI_RETRIEVE;
+	int MONITORABLEPROPERTY___OCCI_RETRIEVE = OCCIPackage.LINK___OCCI_RETRIEVE;
 
 	/**
 	 * The operation id for the '<em>Occi Update</em>' operation.
@@ -1208,7 +1109,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int MONITORINGPROPERTY___OCCI_UPDATE = OCCIPackage.LINK___OCCI_UPDATE;
+	int MONITORABLEPROPERTY___OCCI_UPDATE = OCCIPackage.LINK___OCCI_UPDATE;
 
 	/**
 	 * The operation id for the '<em>Occi Delete</em>' operation.
@@ -1217,7 +1118,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int MONITORINGPROPERTY___OCCI_DELETE = OCCIPackage.LINK___OCCI_DELETE;
+	int MONITORABLEPROPERTY___OCCI_DELETE = OCCIPackage.LINK___OCCI_DELETE;
 
 	/**
 	 * The operation id for the '<em>Link Target Invariant</em>' operation.
@@ -1226,7 +1127,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int MONITORINGPROPERTY___LINK_TARGET_INVARIANT__KIND_KIND = OCCIPackage.LINK___LINK_TARGET_INVARIANT__KIND_KIND;
+	int MONITORABLEPROPERTY___LINK_TARGET_INVARIANT__KIND_KIND = OCCIPackage.LINK___LINK_TARGET_INVARIANT__KIND_KIND;
 
 	/**
 	 * The operation id for the '<em>Link Source Invariant</em>' operation.
@@ -1235,7 +1136,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int MONITORINGPROPERTY___LINK_SOURCE_INVARIANT__KIND_KIND = OCCIPackage.LINK___LINK_SOURCE_INVARIANT__KIND_KIND;
+	int MONITORABLEPROPERTY___LINK_SOURCE_INVARIANT__KIND_KIND = OCCIPackage.LINK___LINK_SOURCE_INVARIANT__KIND_KIND;
 
 	/**
 	 * The operation id for the '<em>Target Constraint</em>' operation.
@@ -1244,26 +1145,26 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int MONITORINGPROPERTY___TARGET_CONSTRAINT__DIAGNOSTICCHAIN_MAP = OCCIPackage.LINK_OPERATION_COUNT + 0;
+	int MONITORABLEPROPERTY___TARGET_CONSTRAINT__DIAGNOSTICCHAIN_MAP = OCCIPackage.LINK_OPERATION_COUNT + 0;
 
 	/**
-	 * The number of operations of the '<em>Monitoringproperty</em>' class.
+	 * The number of operations of the '<em>Monitorableproperty</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MONITORINGPROPERTY_OPERATION_COUNT = OCCIPackage.LINK_OPERATION_COUNT + 1;
+	int MONITORABLEPROPERTY_OPERATION_COUNT = OCCIPackage.LINK_OPERATION_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link monitoring.impl.MartpublisherImpl <em>Martpublisher</em>}' class.
+	 * The meta object id for the '{@link monitoring.impl.OcciresultproviderImpl <em>Occiresultprovider</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see monitoring.impl.MartpublisherImpl
-	 * @see monitoring.impl.MonitoringPackageImpl#getMartpublisher()
+	 * @see monitoring.impl.OcciresultproviderImpl
+	 * @see monitoring.impl.MonitoringPackageImpl#getOcciresultprovider()
 	 * @generated
 	 */
-	int MARTPUBLISHER = 5;
+	int OCCIRESULTPROVIDER = 5;
 
 	/**
 	 * The feature id for the '<em><b>Mixin</b></em>' reference.
@@ -1272,7 +1173,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int MARTPUBLISHER__MIXIN = OCCIPackage.MIXIN_BASE__MIXIN;
+	int OCCIRESULTPROVIDER__MIXIN = OCCIPackage.MIXIN_BASE__MIXIN;
 
 	/**
 	 * The feature id for the '<em><b>Entity</b></em>' container reference.
@@ -1281,7 +1182,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int MARTPUBLISHER__ENTITY = OCCIPackage.MIXIN_BASE__ENTITY;
+	int OCCIRESULTPROVIDER__ENTITY = OCCIPackage.MIXIN_BASE__ENTITY;
 
 	/**
 	 * The feature id for the '<em><b>Attributes</b></em>' containment reference list.
@@ -1290,43 +1191,25 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int MARTPUBLISHER__ATTRIBUTES = OCCIPackage.MIXIN_BASE__ATTRIBUTES;
+	int OCCIRESULTPROVIDER__ATTRIBUTES = OCCIPackage.MIXIN_BASE__ATTRIBUTES;
 
 	/**
-	 * The feature id for the '<em><b>Monitoring Property Name</b></em>' attribute.
+	 * The feature id for the '<em><b>Result Provider Endpoint</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MARTPUBLISHER__MONITORING_PROPERTY_NAME = OCCIPackage.MIXIN_BASE_FEATURE_COUNT + 0;
+	int OCCIRESULTPROVIDER__RESULT_PROVIDER_ENDPOINT = OCCIPackage.MIXIN_BASE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Monitoring Property Id</b></em>' attribute.
+	 * The number of structural features of the '<em>Occiresultprovider</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MARTPUBLISHER__MONITORING_PROPERTY_ID = OCCIPackage.MIXIN_BASE_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Monitoring Property Resource</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MARTPUBLISHER__MONITORING_PROPERTY_RESOURCE = OCCIPackage.MIXIN_BASE_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Martpublisher</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MARTPUBLISHER_FEATURE_COUNT = OCCIPackage.MIXIN_BASE_FEATURE_COUNT + 3;
+	int OCCIRESULTPROVIDER_FEATURE_COUNT = OCCIPackage.MIXIN_BASE_FEATURE_COUNT + 1;
 
 	/**
 	 * The operation id for the '<em>Applies Constraint</em>' operation.
@@ -1335,36 +1218,16 @@ public interface MonitoringPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int MARTPUBLISHER___APPLIES_CONSTRAINT__DIAGNOSTICCHAIN_MAP = OCCIPackage.MIXIN_BASE_OPERATION_COUNT + 0;
+	int OCCIRESULTPROVIDER___APPLIES_CONSTRAINT__DIAGNOSTICCHAIN_MAP = OCCIPackage.MIXIN_BASE_OPERATION_COUNT + 0;
 
 	/**
-	 * The number of operations of the '<em>Martpublisher</em>' class.
+	 * The number of operations of the '<em>Occiresultprovider</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MARTPUBLISHER_OPERATION_COUNT = OCCIPackage.MIXIN_BASE_OPERATION_COUNT + 1;
-
-	/**
-	 * The meta object id for the '<em>Date Time</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see monitoring.impl.MonitoringPackageImpl#getDateTime()
-	 * @generated
-	 */
-	int DATE_TIME = 6;
-
-	/**
-	 * The meta object id for the '<em>Second</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see java.lang.String
-	 * @see monitoring.impl.MonitoringPackageImpl#getSecond()
-	 * @generated
-	 */
-	int SECOND = 7;
+	int OCCIRESULTPROVIDER_OPERATION_COUNT = OCCIPackage.MIXIN_BASE_OPERATION_COUNT + 1;
 
 	/**
 	 * The meta object id for the '<em>String</em>' data type.
@@ -1374,7 +1237,7 @@ public interface MonitoringPackage extends EPackage {
 	 * @see monitoring.impl.MonitoringPackageImpl#getString()
 	 * @generated
 	 */
-	int STRING = 8;
+	int STRING = 6;
 
 
 	/**
@@ -1387,72 +1250,6 @@ public interface MonitoringPackage extends EPackage {
 	 */
 	EClass getSensor();
 
-	/**
-	 * Returns the meta object for the attribute '{@link monitoring.Sensor#getOcciSensorTimebase <em>Occi Sensor Timebase</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Occi Sensor Timebase</em>'.
-	 * @see monitoring.Sensor#getOcciSensorTimebase()
-	 * @see #getSensor()
-	 * @generated
-	 */
-	EAttribute getSensor_OcciSensorTimebase();
-
-	/**
-	 * Returns the meta object for the attribute '{@link monitoring.Sensor#getOcciSensorTimestart <em>Occi Sensor Timestart</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Occi Sensor Timestart</em>'.
-	 * @see monitoring.Sensor#getOcciSensorTimestart()
-	 * @see #getSensor()
-	 * @generated
-	 */
-	EAttribute getSensor_OcciSensorTimestart();
-
-	/**
-	 * Returns the meta object for the attribute '{@link monitoring.Sensor#getOcciSensorTimestop <em>Occi Sensor Timestop</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Occi Sensor Timestop</em>'.
-	 * @see monitoring.Sensor#getOcciSensorTimestop()
-	 * @see #getSensor()
-	 * @generated
-	 */
-	EAttribute getSensor_OcciSensorTimestop();
-
-	/**
-	 * Returns the meta object for the attribute '{@link monitoring.Sensor#getOcciSensorPeriod <em>Occi Sensor Period</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Occi Sensor Period</em>'.
-	 * @see monitoring.Sensor#getOcciSensorPeriod()
-	 * @see #getSensor()
-	 * @generated
-	 */
-	EAttribute getSensor_OcciSensorPeriod();
-
-	/**
-	 * Returns the meta object for the attribute '{@link monitoring.Sensor#getOcciSensorGranularity <em>Occi Sensor Granularity</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Occi Sensor Granularity</em>'.
-	 * @see monitoring.Sensor#getOcciSensorGranularity()
-	 * @see #getSensor()
-	 * @generated
-	 */
-	EAttribute getSensor_OcciSensorGranularity();
-
-	/**
-	 * Returns the meta object for the attribute '{@link monitoring.Sensor#getOcciSensorAccuracy <em>Occi Sensor Accuracy</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Occi Sensor Accuracy</em>'.
-	 * @see monitoring.Sensor#getOcciSensorAccuracy()
-	 * @see #getSensor()
-	 * @generated
-	 */
-	EAttribute getSensor_OcciSensorAccuracy();
-
 	/**
 	 * Returns the meta object for class '{@link monitoring.Datagatherer <em>Datagatherer</em>}'.
 	 * <!-- begin-user-doc -->
@@ -1464,197 +1261,97 @@ public interface MonitoringPackage extends EPackage {
 	EClass getDatagatherer();
 
 	/**
-	 * Returns the meta object for the attribute '{@link monitoring.Datagatherer#getOcciCollectorPeriod <em>Occi Collector Period</em>}'.
+	 * Returns the meta object for class '{@link monitoring.Dataprocessor <em>Dataprocessor</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Occi Collector Period</em>'.
-	 * @see monitoring.Datagatherer#getOcciCollectorPeriod()
-	 * @see #getDatagatherer()
+	 * @return the meta object for class '<em>Dataprocessor</em>'.
+	 * @see monitoring.Dataprocessor
 	 * @generated
 	 */
-	EAttribute getDatagatherer_OcciCollectorPeriod();
+	EClass getDataprocessor();
 
 	/**
-	 * Returns the meta object for the attribute '{@link monitoring.Datagatherer#getOcciCollectorGranularity <em>Occi Collector Granularity</em>}'.
+	 * Returns the meta object for class '{@link monitoring.Resultprovider <em>Resultprovider</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Occi Collector Granularity</em>'.
-	 * @see monitoring.Datagatherer#getOcciCollectorGranularity()
-	 * @see #getDatagatherer()
+	 * @return the meta object for class '<em>Resultprovider</em>'.
+	 * @see monitoring.Resultprovider
 	 * @generated
 	 */
-	EAttribute getDatagatherer_OcciCollectorGranularity();
+	EClass getResultprovider();
 
 	/**
-	 * Returns the meta object for the attribute '{@link monitoring.Datagatherer#getOcciCollectorAccuracy <em>Occi Collector Accuracy</em>}'.
+	 * Returns the meta object for class '{@link monitoring.Monitorableproperty <em>Monitorableproperty</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Occi Collector Accuracy</em>'.
-	 * @see monitoring.Datagatherer#getOcciCollectorAccuracy()
-	 * @see #getDatagatherer()
+	 * @return the meta object for class '<em>Monitorableproperty</em>'.
+	 * @see monitoring.Monitorableproperty
 	 * @generated
 	 */
-	EAttribute getDatagatherer_OcciCollectorAccuracy();
+	EClass getMonitorableproperty();
 
 	/**
-	 * Returns the meta object for class '{@link monitoring.Processor <em>Processor</em>}'.
+	 * Returns the meta object for the attribute '{@link monitoring.Monitorableproperty#getMonitoringProperty <em>Monitoring Property</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Processor</em>'.
-	 * @see monitoring.Processor
+	 * @return the meta object for the attribute '<em>Monitoring Property</em>'.
+	 * @see monitoring.Monitorableproperty#getMonitoringProperty()
+	 * @see #getMonitorableproperty()
 	 * @generated
 	 */
-	EClass getProcessor();
+	EAttribute getMonitorableproperty_MonitoringProperty();
 
 	/**
-	 * Returns the meta object for the attribute '{@link monitoring.Processor#getGathererAddress <em>Gatherer Address</em>}'.
+	 * Returns the meta object for the attribute '{@link monitoring.Monitorableproperty#getMonitoringResult <em>Monitoring Result</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Gatherer Address</em>'.
-	 * @see monitoring.Processor#getGathererAddress()
-	 * @see #getProcessor()
+	 * @return the meta object for the attribute '<em>Monitoring Result</em>'.
+	 * @see monitoring.Monitorableproperty#getMonitoringResult()
+	 * @see #getMonitorableproperty()
 	 * @generated
 	 */
-	EAttribute getProcessor_GathererAddress();
+	EAttribute getMonitorableproperty_MonitoringResult();
 
 	/**
-	 * Returns the meta object for class '{@link monitoring.Publisher <em>Publisher</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Publisher</em>'.
-	 * @see monitoring.Publisher
-	 * @generated
-	 */
-	EClass getPublisher();
-
-	/**
-	 * Returns the meta object for the attribute '{@link monitoring.Publisher#getPublisherEndpoint <em>Publisher Endpoint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Publisher Endpoint</em>'.
-	 * @see monitoring.Publisher#getPublisherEndpoint()
-	 * @see #getPublisher()
-	 * @generated
-	 */
-	EAttribute getPublisher_PublisherEndpoint();
-
-	/**
-	 * Returns the meta object for class '{@link monitoring.Monitoringproperty <em>Monitoringproperty</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Monitoringproperty</em>'.
-	 * @see monitoring.Monitoringproperty
-	 * @generated
-	 */
-	EClass getMonitoringproperty();
-
-	/**
-	 * Returns the meta object for the attribute '{@link monitoring.Monitoringproperty#getMonitoringPropertyName <em>Monitoring Property Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Monitoring Property Name</em>'.
-	 * @see monitoring.Monitoringproperty#getMonitoringPropertyName()
-	 * @see #getMonitoringproperty()
-	 * @generated
-	 */
-	EAttribute getMonitoringproperty_MonitoringPropertyName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link monitoring.Monitoringproperty#getMonitoringPropertyValue <em>Monitoring Property Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Monitoring Property Value</em>'.
-	 * @see monitoring.Monitoringproperty#getMonitoringPropertyValue()
-	 * @see #getMonitoringproperty()
-	 * @generated
-	 */
-	EAttribute getMonitoringproperty_MonitoringPropertyValue();
-
-	/**
-	 * Returns the meta object for the '{@link monitoring.Monitoringproperty#targetConstraint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Target Constraint</em>}' operation.
+	 * Returns the meta object for the '{@link monitoring.Monitorableproperty#targetConstraint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Target Constraint</em>}' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the '<em>Target Constraint</em>' operation.
-	 * @see monitoring.Monitoringproperty#targetConstraint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * @generated
-	 */
-	EOperation getMonitoringproperty__TargetConstraint__DiagnosticChain_Map();
-
-	/**
-	 * Returns the meta object for class '{@link monitoring.Martpublisher <em>Martpublisher</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Martpublisher</em>'.
-	 * @see monitoring.Martpublisher
-	 * @generated
-	 */
-	EClass getMartpublisher();
-
-	/**
-	 * Returns the meta object for the attribute '{@link monitoring.Martpublisher#getMonitoringPropertyName <em>Monitoring Property Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Monitoring Property Name</em>'.
-	 * @see monitoring.Martpublisher#getMonitoringPropertyName()
-	 * @see #getMartpublisher()
+	 * @see monitoring.Monitorableproperty#targetConstraint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 */
-	EAttribute getMartpublisher_MonitoringPropertyName();
+	EOperation getMonitorableproperty__TargetConstraint__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for the attribute '{@link monitoring.Martpublisher#getMonitoringPropertyId <em>Monitoring Property Id</em>}'.
+	 * Returns the meta object for class '{@link monitoring.Occiresultprovider <em>Occiresultprovider</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Monitoring Property Id</em>'.
-	 * @see monitoring.Martpublisher#getMonitoringPropertyId()
-	 * @see #getMartpublisher()
+	 * @return the meta object for class '<em>Occiresultprovider</em>'.
+	 * @see monitoring.Occiresultprovider
 	 * @generated
 	 */
-	EAttribute getMartpublisher_MonitoringPropertyId();
+	EClass getOcciresultprovider();
 
 	/**
-	 * Returns the meta object for the attribute '{@link monitoring.Martpublisher#getMonitoringPropertyResource <em>Monitoring Property Resource</em>}'.
+	 * Returns the meta object for the attribute '{@link monitoring.Occiresultprovider#getResultProviderEndpoint <em>Result Provider Endpoint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Monitoring Property Resource</em>'.
-	 * @see monitoring.Martpublisher#getMonitoringPropertyResource()
-	 * @see #getMartpublisher()
+	 * @return the meta object for the attribute '<em>Result Provider Endpoint</em>'.
+	 * @see monitoring.Occiresultprovider#getResultProviderEndpoint()
+	 * @see #getOcciresultprovider()
 	 * @generated
 	 */
-	EAttribute getMartpublisher_MonitoringPropertyResource();
+	EAttribute getOcciresultprovider_ResultProviderEndpoint();
 
 	/**
-	 * Returns the meta object for the '{@link monitoring.Martpublisher#appliesConstraint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Applies Constraint</em>}' operation.
+	 * Returns the meta object for the '{@link monitoring.Occiresultprovider#appliesConstraint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Applies Constraint</em>}' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the '<em>Applies Constraint</em>' operation.
-	 * @see monitoring.Martpublisher#appliesConstraint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * @see monitoring.Occiresultprovider#appliesConstraint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 */
-	EOperation getMartpublisher__AppliesConstraint__DiagnosticChain_Map();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Date Time</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Date Time</em>'.
-	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 *        extendedMetaData="pattern='^(\\d{4}((-)?(0[1-9]|1[0-2])((-)?(0[1-9]|[1-2][0-9]|3[0-1])(T(24:00(:00(\\.[0]+)?)?|(([0-1][0-9]|2[0-3])(:)[0-5][0-9])((:)[0-5][0-9](\\.[\\d]+)?)?)((\\+|-)(14:00|(0[0-9]|1[0-3])(:)[0-5][0-9])|Z))?)?)?)$'"
-	 * @generated
-	 */
-	EDataType getDateTime();
-
-	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Second</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Second</em>'.
-	 * @see java.lang.String
-	 * @model instanceClass="java.lang.String"
-	 * @generated
-	 */
-	EDataType getSecond();
+	EOperation getOcciresultprovider__AppliesConstraint__DiagnosticChain_Map();
 
 	/**
 	 * Returns the meta object for data type '{@link java.lang.String <em>String</em>}'.
@@ -1700,54 +1397,6 @@ public interface MonitoringPackage extends EPackage {
 		 */
 		EClass SENSOR = eINSTANCE.getSensor();
 
-		/**
-		 * The meta object literal for the '<em><b>Occi Sensor Timebase</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SENSOR__OCCI_SENSOR_TIMEBASE = eINSTANCE.getSensor_OcciSensorTimebase();
-
-		/**
-		 * The meta object literal for the '<em><b>Occi Sensor Timestart</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SENSOR__OCCI_SENSOR_TIMESTART = eINSTANCE.getSensor_OcciSensorTimestart();
-
-		/**
-		 * The meta object literal for the '<em><b>Occi Sensor Timestop</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SENSOR__OCCI_SENSOR_TIMESTOP = eINSTANCE.getSensor_OcciSensorTimestop();
-
-		/**
-		 * The meta object literal for the '<em><b>Occi Sensor Period</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SENSOR__OCCI_SENSOR_PERIOD = eINSTANCE.getSensor_OcciSensorPeriod();
-
-		/**
-		 * The meta object literal for the '<em><b>Occi Sensor Granularity</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SENSOR__OCCI_SENSOR_GRANULARITY = eINSTANCE.getSensor_OcciSensorGranularity();
-
-		/**
-		 * The meta object literal for the '<em><b>Occi Sensor Accuracy</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SENSOR__OCCI_SENSOR_ACCURACY = eINSTANCE.getSensor_OcciSensorAccuracy();
-
 		/**
 		 * The meta object literal for the '{@link monitoring.impl.DatagathererImpl <em>Datagatherer</em>}' class.
 		 * <!-- begin-user-doc -->
@@ -1759,90 +1408,50 @@ public interface MonitoringPackage extends EPackage {
 		EClass DATAGATHERER = eINSTANCE.getDatagatherer();
 
 		/**
-		 * The meta object literal for the '<em><b>Occi Collector Period</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DATAGATHERER__OCCI_COLLECTOR_PERIOD = eINSTANCE.getDatagatherer_OcciCollectorPeriod();
-
-		/**
-		 * The meta object literal for the '<em><b>Occi Collector Granularity</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DATAGATHERER__OCCI_COLLECTOR_GRANULARITY = eINSTANCE.getDatagatherer_OcciCollectorGranularity();
-
-		/**
-		 * The meta object literal for the '<em><b>Occi Collector Accuracy</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DATAGATHERER__OCCI_COLLECTOR_ACCURACY = eINSTANCE.getDatagatherer_OcciCollectorAccuracy();
-
-		/**
-		 * The meta object literal for the '{@link monitoring.impl.ProcessorImpl <em>Processor</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see monitoring.impl.ProcessorImpl
-		 * @see monitoring.impl.MonitoringPackageImpl#getProcessor()
-		 * @generated
-		 */
-		EClass PROCESSOR = eINSTANCE.getProcessor();
-
-		/**
-		 * The meta object literal for the '<em><b>Gatherer Address</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PROCESSOR__GATHERER_ADDRESS = eINSTANCE.getProcessor_GathererAddress();
-
-		/**
-		 * The meta object literal for the '{@link monitoring.impl.PublisherImpl <em>Publisher</em>}' class.
+		 * The meta object literal for the '{@link monitoring.impl.DataprocessorImpl <em>Dataprocessor</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see monitoring.impl.PublisherImpl
-		 * @see monitoring.impl.MonitoringPackageImpl#getPublisher()
+		 * @see monitoring.impl.DataprocessorImpl
+		 * @see monitoring.impl.MonitoringPackageImpl#getDataprocessor()
 		 * @generated
 		 */
-		EClass PUBLISHER = eINSTANCE.getPublisher();
+		EClass DATAPROCESSOR = eINSTANCE.getDataprocessor();
 
 		/**
-		 * The meta object literal for the '<em><b>Publisher Endpoint</b></em>' attribute feature.
+		 * The meta object literal for the '{@link monitoring.impl.ResultproviderImpl <em>Resultprovider</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * @see monitoring.impl.ResultproviderImpl
+		 * @see monitoring.impl.MonitoringPackageImpl#getResultprovider()
 		 * @generated
 		 */
-		EAttribute PUBLISHER__PUBLISHER_ENDPOINT = eINSTANCE.getPublisher_PublisherEndpoint();
+		EClass RESULTPROVIDER = eINSTANCE.getResultprovider();
 
 		/**
-		 * The meta object literal for the '{@link monitoring.impl.MonitoringpropertyImpl <em>Monitoringproperty</em>}' class.
+		 * The meta object literal for the '{@link monitoring.impl.MonitorablepropertyImpl <em>Monitorableproperty</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see monitoring.impl.MonitoringpropertyImpl
-		 * @see monitoring.impl.MonitoringPackageImpl#getMonitoringproperty()
+		 * @see monitoring.impl.MonitorablepropertyImpl
+		 * @see monitoring.impl.MonitoringPackageImpl#getMonitorableproperty()
 		 * @generated
 		 */
-		EClass MONITORINGPROPERTY = eINSTANCE.getMonitoringproperty();
+		EClass MONITORABLEPROPERTY = eINSTANCE.getMonitorableproperty();
 
 		/**
-		 * The meta object literal for the '<em><b>Monitoring Property Name</b></em>' attribute feature.
+		 * The meta object literal for the '<em><b>Monitoring Property</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute MONITORINGPROPERTY__MONITORING_PROPERTY_NAME = eINSTANCE.getMonitoringproperty_MonitoringPropertyName();
+		EAttribute MONITORABLEPROPERTY__MONITORING_PROPERTY = eINSTANCE.getMonitorableproperty_MonitoringProperty();
 
 		/**
-		 * The meta object literal for the '<em><b>Monitoring Property Value</b></em>' attribute feature.
+		 * The meta object literal for the '<em><b>Monitoring Result</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute MONITORINGPROPERTY__MONITORING_PROPERTY_VALUE = eINSTANCE.getMonitoringproperty_MonitoringPropertyValue();
+		EAttribute MONITORABLEPROPERTY__MONITORING_RESULT = eINSTANCE.getMonitorableproperty_MonitoringResult();
 
 		/**
 		 * The meta object literal for the '<em><b>Target Constraint</b></em>' operation.
@@ -1850,41 +1459,25 @@ public interface MonitoringPackage extends EPackage {
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EOperation MONITORINGPROPERTY___TARGET_CONSTRAINT__DIAGNOSTICCHAIN_MAP = eINSTANCE.getMonitoringproperty__TargetConstraint__DiagnosticChain_Map();
-
-		/**
-		 * The meta object literal for the '{@link monitoring.impl.MartpublisherImpl <em>Martpublisher</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see monitoring.impl.MartpublisherImpl
-		 * @see monitoring.impl.MonitoringPackageImpl#getMartpublisher()
-		 * @generated
-		 */
-		EClass MARTPUBLISHER = eINSTANCE.getMartpublisher();
-
-		/**
-		 * The meta object literal for the '<em><b>Monitoring Property Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MARTPUBLISHER__MONITORING_PROPERTY_NAME = eINSTANCE.getMartpublisher_MonitoringPropertyName();
+		EOperation MONITORABLEPROPERTY___TARGET_CONSTRAINT__DIAGNOSTICCHAIN_MAP = eINSTANCE.getMonitorableproperty__TargetConstraint__DiagnosticChain_Map();
 
 		/**
-		 * The meta object literal for the '<em><b>Monitoring Property Id</b></em>' attribute feature.
+		 * The meta object literal for the '{@link monitoring.impl.OcciresultproviderImpl <em>Occiresultprovider</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * @see monitoring.impl.OcciresultproviderImpl
+		 * @see monitoring.impl.MonitoringPackageImpl#getOcciresultprovider()
 		 * @generated
 		 */
-		EAttribute MARTPUBLISHER__MONITORING_PROPERTY_ID = eINSTANCE.getMartpublisher_MonitoringPropertyId();
+		EClass OCCIRESULTPROVIDER = eINSTANCE.getOcciresultprovider();
 
 		/**
-		 * The meta object literal for the '<em><b>Monitoring Property Resource</b></em>' attribute feature.
+		 * The meta object literal for the '<em><b>Result Provider Endpoint</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute MARTPUBLISHER__MONITORING_PROPERTY_RESOURCE = eINSTANCE.getMartpublisher_MonitoringPropertyResource();
+		EAttribute OCCIRESULTPROVIDER__RESULT_PROVIDER_ENDPOINT = eINSTANCE.getOcciresultprovider_ResultProviderEndpoint();
 
 		/**
 		 * The meta object literal for the '<em><b>Applies Constraint</b></em>' operation.
@@ -1892,27 +1485,7 @@ public interface MonitoringPackage extends EPackage {
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EOperation MARTPUBLISHER___APPLIES_CONSTRAINT__DIAGNOSTICCHAIN_MAP = eINSTANCE.getMartpublisher__AppliesConstraint__DiagnosticChain_Map();
-
-		/**
-		 * The meta object literal for the '<em>Date Time</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.lang.String
-		 * @see monitoring.impl.MonitoringPackageImpl#getDateTime()
-		 * @generated
-		 */
-		EDataType DATE_TIME = eINSTANCE.getDateTime();
-
-		/**
-		 * The meta object literal for the '<em>Second</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see java.lang.String
-		 * @see monitoring.impl.MonitoringPackageImpl#getSecond()
-		 * @generated
-		 */
-		EDataType SECOND = eINSTANCE.getSecond();
+		EOperation OCCIRESULTPROVIDER___APPLIES_CONSTRAINT__DIAGNOSTICCHAIN_MAP = eINSTANCE.getOcciresultprovider__AppliesConstraint__DiagnosticChain_Map();
 
 		/**
 		 * The meta object literal for the '<em>String</em>' data type.
diff --git a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/MonitoringTables.java b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/MonitoringTables.java
index 57a1073f7fbceb12fa3c52e31b154e4218a8bcb5..43e85896ecb13fe966e219fc17dac16341e8d508 100644
--- a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/MonitoringTables.java
+++ b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/MonitoringTables.java
@@ -68,16 +68,14 @@ public class MonitoringTables
 	public static final /*@NonInvalid*/ org.eclipse.ocl.pivot.ids.NsURIPackageId PACKid_http_c_s_s_schemas_ugoe_cs_rwm_s_monitoring_s_ecore = org.eclipse.ocl.pivot.ids.IdManager.getNsURIPackageId("http://schemas.ugoe.cs.rwm/monitoring/ecore", null, monitoring.MonitoringPackage.eINSTANCE);
 	public static final /*@NonInvalid*/ org.eclipse.ocl.pivot.ids.ClassId CLSSid_Class = monitoring.MonitoringTables.PACKid_$metamodel$.getClassId("Class", 0);
 	public static final /*@NonInvalid*/ org.eclipse.ocl.pivot.ids.ClassId CLSSid_Entity = monitoring.MonitoringTables.PACKid_http_c_s_s_schemas_ogf_org_s_occi_s_core_s_ecore.getClassId("Entity", 0);
-	public static final /*@NonInvalid*/ org.eclipse.ocl.pivot.ids.ClassId CLSSid_Martpublisher = monitoring.MonitoringTables.PACKid_http_c_s_s_schemas_ugoe_cs_rwm_s_monitoring_s_ecore.getClassId("Martpublisher", 0);
-	public static final /*@NonInvalid*/ org.eclipse.ocl.pivot.ids.ClassId CLSSid_Monitoringproperty = monitoring.MonitoringTables.PACKid_http_c_s_s_schemas_ugoe_cs_rwm_s_monitoring_s_ecore.getClassId("Monitoringproperty", 0);
-	public static final /*@NonInvalid*/ org.eclipse.ocl.pivot.ids.ClassId CLSSid_Publisher = monitoring.MonitoringTables.PACKid_http_c_s_s_schemas_ugoe_cs_rwm_s_monitoring_s_ecore.getClassId("Publisher", 0);
+	public static final /*@NonInvalid*/ org.eclipse.ocl.pivot.ids.ClassId CLSSid_Monitorableproperty = monitoring.MonitoringTables.PACKid_http_c_s_s_schemas_ugoe_cs_rwm_s_monitoring_s_ecore.getClassId("Monitorableproperty", 0);
+	public static final /*@NonInvalid*/ org.eclipse.ocl.pivot.ids.ClassId CLSSid_Occiresultprovider = monitoring.MonitoringTables.PACKid_http_c_s_s_schemas_ugoe_cs_rwm_s_monitoring_s_ecore.getClassId("Occiresultprovider", 0);
 	public static final /*@NonInvalid*/ org.eclipse.ocl.pivot.ids.ClassId CLSSid_Resource = monitoring.MonitoringTables.PACKid_http_c_s_s_schemas_ogf_org_s_occi_s_core_s_ecore.getClassId("Resource", 0);
+	public static final /*@NonInvalid*/ org.eclipse.ocl.pivot.ids.ClassId CLSSid_Resultprovider = monitoring.MonitoringTables.PACKid_http_c_s_s_schemas_ugoe_cs_rwm_s_monitoring_s_ecore.getClassId("Resultprovider", 0);
 	public static final /*@NonInvalid*/ org.eclipse.ocl.pivot.ids.ClassId CLSSid_Sensor = monitoring.MonitoringTables.PACKid_http_c_s_s_schemas_ugoe_cs_rwm_s_monitoring_s_ecore.getClassId("Sensor", 0);
-	public static final /*@NonInvalid*/ org.eclipse.ocl.pivot.ids.DataTypeId DATAid_DateTime = monitoring.MonitoringTables.PACKid_http_c_s_s_schemas_ugoe_cs_rwm_s_monitoring_s_ecore.getDataTypeId("DateTime", 0);
-	public static final /*@NonInvalid*/ org.eclipse.ocl.pivot.ids.DataTypeId DATAid_Second = monitoring.MonitoringTables.PACKid_http_c_s_s_schemas_ugoe_cs_rwm_s_monitoring_s_ecore.getDataTypeId("Second", 0);
 	public static final /*@NonInvalid*/ org.eclipse.ocl.pivot.values.IntegerValue INT_0 = org.eclipse.ocl.pivot.utilities.ValueUtil.integerValueOf("0");
-	public static final /*@NonInvalid*/ java.lang.String STR_Martpublisher_c_c_appliesConstraint = "Martpublisher::appliesConstraint";
-	public static final /*@NonInvalid*/ java.lang.String STR_Monitoringproperty_c_c_targetConstraint = "Monitoringproperty::targetConstraint";
+	public static final /*@NonInvalid*/ java.lang.String STR_Monitorableproperty_c_c_targetConstraint = "Monitorableproperty::targetConstraint";
+	public static final /*@NonInvalid*/ java.lang.String STR_Occiresultprovider_c_c_appliesConstraint = "Occiresultprovider::appliesConstraint";
 
 	/**
 	 *	The type parameters for templated types and operations.
@@ -108,23 +106,19 @@ public class MonitoringTables
 		}
 
 		public static final /*@NonNull*/ EcoreExecutorType _Datagatherer = new EcoreExecutorType(MonitoringPackage.Literals.DATAGATHERER, PACKAGE, 0);
-		public static final /*@NonNull*/ EcoreExecutorType _DateTime = new EcoreExecutorType("DateTime", PACKAGE, 0);
-		public static final /*@NonNull*/ EcoreExecutorType _Martpublisher = new EcoreExecutorType(MonitoringPackage.Literals.MARTPUBLISHER, PACKAGE, 0);
-		public static final /*@NonNull*/ EcoreExecutorType _Monitoringproperty = new EcoreExecutorType(MonitoringPackage.Literals.MONITORINGPROPERTY, PACKAGE, 0);
-		public static final /*@NonNull*/ EcoreExecutorType _Processor = new EcoreExecutorType(MonitoringPackage.Literals.PROCESSOR, PACKAGE, 0);
-		public static final /*@NonNull*/ EcoreExecutorType _Publisher = new EcoreExecutorType(MonitoringPackage.Literals.PUBLISHER, PACKAGE, 0);
-		public static final /*@NonNull*/ EcoreExecutorType _Second = new EcoreExecutorType("Second", PACKAGE, 0);
+		public static final /*@NonNull*/ EcoreExecutorType _Dataprocessor = new EcoreExecutorType(MonitoringPackage.Literals.DATAPROCESSOR, PACKAGE, 0);
+		public static final /*@NonNull*/ EcoreExecutorType _Monitorableproperty = new EcoreExecutorType(MonitoringPackage.Literals.MONITORABLEPROPERTY, PACKAGE, 0);
+		public static final /*@NonNull*/ EcoreExecutorType _Occiresultprovider = new EcoreExecutorType(MonitoringPackage.Literals.OCCIRESULTPROVIDER, PACKAGE, 0);
+		public static final /*@NonNull*/ EcoreExecutorType _Resultprovider = new EcoreExecutorType(MonitoringPackage.Literals.RESULTPROVIDER, PACKAGE, 0);
 		public static final /*@NonNull*/ EcoreExecutorType _Sensor = new EcoreExecutorType(MonitoringPackage.Literals.SENSOR, PACKAGE, 0);
 		public static final /*@NonNull*/ EcoreExecutorType _String = new EcoreExecutorType(TypeId.STRING, PACKAGE, 0);
 
 		private static final /*@NonNull*/ EcoreExecutorType /*@NonNull*/ [] types = {
 			_Datagatherer,
-			_DateTime,
-			_Martpublisher,
-			_Monitoringproperty,
-			_Processor,
-			_Publisher,
-			_Second,
+			_Dataprocessor,
+			_Monitorableproperty,
+			_Occiresultprovider,
+			_Resultprovider,
 			_Sensor,
 			_String
 		};
@@ -159,36 +153,30 @@ public class MonitoringTables
 		private static final /*@NonNull*/ ExecutorFragment _Datagatherer__OclElement = new ExecutorFragment(Types._Datagatherer, OCLstdlibTables.Types._OclElement);
 		private static final /*@NonNull*/ ExecutorFragment _Datagatherer__Resource = new ExecutorFragment(Types._Datagatherer, OCCITables.Types._Resource);
 
-		private static final /*@NonNull*/ ExecutorFragment _DateTime__DateTime = new ExecutorFragment(Types._DateTime, MonitoringTables.Types._DateTime);
-		private static final /*@NonNull*/ ExecutorFragment _DateTime__OclAny = new ExecutorFragment(Types._DateTime, OCLstdlibTables.Types._OclAny);
-
-		private static final /*@NonNull*/ ExecutorFragment _Martpublisher__Martpublisher = new ExecutorFragment(Types._Martpublisher, MonitoringTables.Types._Martpublisher);
-		private static final /*@NonNull*/ ExecutorFragment _Martpublisher__MixinBase = new ExecutorFragment(Types._Martpublisher, OCCITables.Types._MixinBase);
-		private static final /*@NonNull*/ ExecutorFragment _Martpublisher__OclAny = new ExecutorFragment(Types._Martpublisher, OCLstdlibTables.Types._OclAny);
-		private static final /*@NonNull*/ ExecutorFragment _Martpublisher__OclElement = new ExecutorFragment(Types._Martpublisher, OCLstdlibTables.Types._OclElement);
-
-		private static final /*@NonNull*/ ExecutorFragment _Monitoringproperty__Entity = new ExecutorFragment(Types._Monitoringproperty, OCCITables.Types._Entity);
-		private static final /*@NonNull*/ ExecutorFragment _Monitoringproperty__Link = new ExecutorFragment(Types._Monitoringproperty, OCCITables.Types._Link);
-		private static final /*@NonNull*/ ExecutorFragment _Monitoringproperty__Monitoringproperty = new ExecutorFragment(Types._Monitoringproperty, MonitoringTables.Types._Monitoringproperty);
-		private static final /*@NonNull*/ ExecutorFragment _Monitoringproperty__OclAny = new ExecutorFragment(Types._Monitoringproperty, OCLstdlibTables.Types._OclAny);
-		private static final /*@NonNull*/ ExecutorFragment _Monitoringproperty__OclElement = new ExecutorFragment(Types._Monitoringproperty, OCLstdlibTables.Types._OclElement);
-
-		private static final /*@NonNull*/ ExecutorFragment _Processor__Component = new ExecutorFragment(Types._Processor, PlatformTables.Types._Component);
-		private static final /*@NonNull*/ ExecutorFragment _Processor__Entity = new ExecutorFragment(Types._Processor, OCCITables.Types._Entity);
-		private static final /*@NonNull*/ ExecutorFragment _Processor__OclAny = new ExecutorFragment(Types._Processor, OCLstdlibTables.Types._OclAny);
-		private static final /*@NonNull*/ ExecutorFragment _Processor__OclElement = new ExecutorFragment(Types._Processor, OCLstdlibTables.Types._OclElement);
-		private static final /*@NonNull*/ ExecutorFragment _Processor__Processor = new ExecutorFragment(Types._Processor, MonitoringTables.Types._Processor);
-		private static final /*@NonNull*/ ExecutorFragment _Processor__Resource = new ExecutorFragment(Types._Processor, OCCITables.Types._Resource);
-
-		private static final /*@NonNull*/ ExecutorFragment _Publisher__Component = new ExecutorFragment(Types._Publisher, PlatformTables.Types._Component);
-		private static final /*@NonNull*/ ExecutorFragment _Publisher__Entity = new ExecutorFragment(Types._Publisher, OCCITables.Types._Entity);
-		private static final /*@NonNull*/ ExecutorFragment _Publisher__OclAny = new ExecutorFragment(Types._Publisher, OCLstdlibTables.Types._OclAny);
-		private static final /*@NonNull*/ ExecutorFragment _Publisher__OclElement = new ExecutorFragment(Types._Publisher, OCLstdlibTables.Types._OclElement);
-		private static final /*@NonNull*/ ExecutorFragment _Publisher__Publisher = new ExecutorFragment(Types._Publisher, MonitoringTables.Types._Publisher);
-		private static final /*@NonNull*/ ExecutorFragment _Publisher__Resource = new ExecutorFragment(Types._Publisher, OCCITables.Types._Resource);
-
-		private static final /*@NonNull*/ ExecutorFragment _Second__OclAny = new ExecutorFragment(Types._Second, OCLstdlibTables.Types._OclAny);
-		private static final /*@NonNull*/ ExecutorFragment _Second__Second = new ExecutorFragment(Types._Second, MonitoringTables.Types._Second);
+		private static final /*@NonNull*/ ExecutorFragment _Dataprocessor__Component = new ExecutorFragment(Types._Dataprocessor, PlatformTables.Types._Component);
+		private static final /*@NonNull*/ ExecutorFragment _Dataprocessor__Dataprocessor = new ExecutorFragment(Types._Dataprocessor, MonitoringTables.Types._Dataprocessor);
+		private static final /*@NonNull*/ ExecutorFragment _Dataprocessor__Entity = new ExecutorFragment(Types._Dataprocessor, OCCITables.Types._Entity);
+		private static final /*@NonNull*/ ExecutorFragment _Dataprocessor__OclAny = new ExecutorFragment(Types._Dataprocessor, OCLstdlibTables.Types._OclAny);
+		private static final /*@NonNull*/ ExecutorFragment _Dataprocessor__OclElement = new ExecutorFragment(Types._Dataprocessor, OCLstdlibTables.Types._OclElement);
+		private static final /*@NonNull*/ ExecutorFragment _Dataprocessor__Resource = new ExecutorFragment(Types._Dataprocessor, OCCITables.Types._Resource);
+
+		private static final /*@NonNull*/ ExecutorFragment _Monitorableproperty__Entity = new ExecutorFragment(Types._Monitorableproperty, OCCITables.Types._Entity);
+		private static final /*@NonNull*/ ExecutorFragment _Monitorableproperty__Link = new ExecutorFragment(Types._Monitorableproperty, OCCITables.Types._Link);
+		private static final /*@NonNull*/ ExecutorFragment _Monitorableproperty__Monitorableproperty = new ExecutorFragment(Types._Monitorableproperty, MonitoringTables.Types._Monitorableproperty);
+		private static final /*@NonNull*/ ExecutorFragment _Monitorableproperty__OclAny = new ExecutorFragment(Types._Monitorableproperty, OCLstdlibTables.Types._OclAny);
+		private static final /*@NonNull*/ ExecutorFragment _Monitorableproperty__OclElement = new ExecutorFragment(Types._Monitorableproperty, OCLstdlibTables.Types._OclElement);
+
+		private static final /*@NonNull*/ ExecutorFragment _Occiresultprovider__MixinBase = new ExecutorFragment(Types._Occiresultprovider, OCCITables.Types._MixinBase);
+		private static final /*@NonNull*/ ExecutorFragment _Occiresultprovider__Occiresultprovider = new ExecutorFragment(Types._Occiresultprovider, MonitoringTables.Types._Occiresultprovider);
+		private static final /*@NonNull*/ ExecutorFragment _Occiresultprovider__OclAny = new ExecutorFragment(Types._Occiresultprovider, OCLstdlibTables.Types._OclAny);
+		private static final /*@NonNull*/ ExecutorFragment _Occiresultprovider__OclElement = new ExecutorFragment(Types._Occiresultprovider, OCLstdlibTables.Types._OclElement);
+
+		private static final /*@NonNull*/ ExecutorFragment _Resultprovider__Component = new ExecutorFragment(Types._Resultprovider, PlatformTables.Types._Component);
+		private static final /*@NonNull*/ ExecutorFragment _Resultprovider__Entity = new ExecutorFragment(Types._Resultprovider, OCCITables.Types._Entity);
+		private static final /*@NonNull*/ ExecutorFragment _Resultprovider__OclAny = new ExecutorFragment(Types._Resultprovider, OCLstdlibTables.Types._OclAny);
+		private static final /*@NonNull*/ ExecutorFragment _Resultprovider__OclElement = new ExecutorFragment(Types._Resultprovider, OCLstdlibTables.Types._OclElement);
+		private static final /*@NonNull*/ ExecutorFragment _Resultprovider__Resource = new ExecutorFragment(Types._Resultprovider, OCCITables.Types._Resource);
+		private static final /*@NonNull*/ ExecutorFragment _Resultprovider__Resultprovider = new ExecutorFragment(Types._Resultprovider, MonitoringTables.Types._Resultprovider);
 
 		private static final /*@NonNull*/ ExecutorFragment _Sensor__Application = new ExecutorFragment(Types._Sensor, PlatformTables.Types._Application);
 		private static final /*@NonNull*/ ExecutorFragment _Sensor__Entity = new ExecutorFragment(Types._Sensor, OCCITables.Types._Entity);
@@ -357,27 +345,11 @@ public class MonitoringTables
 			Operations.init();
 		}
 
-		public static final /*@NonNull*/ ExecutorProperty _Datagatherer__occiCollectorAccuracy = new EcoreExecutorProperty(MonitoringPackage.Literals.DATAGATHERER__OCCI_COLLECTOR_ACCURACY, Types._Datagatherer, 0);
-		public static final /*@NonNull*/ ExecutorProperty _Datagatherer__occiCollectorGranularity = new EcoreExecutorProperty(MonitoringPackage.Literals.DATAGATHERER__OCCI_COLLECTOR_GRANULARITY, Types._Datagatherer, 1);
-		public static final /*@NonNull*/ ExecutorProperty _Datagatherer__occiCollectorPeriod = new EcoreExecutorProperty(MonitoringPackage.Literals.DATAGATHERER__OCCI_COLLECTOR_PERIOD, Types._Datagatherer, 2);
 
-		public static final /*@NonNull*/ ExecutorProperty _Martpublisher__monitoringPropertyId = new EcoreExecutorProperty(MonitoringPackage.Literals.MARTPUBLISHER__MONITORING_PROPERTY_ID, Types._Martpublisher, 0);
-		public static final /*@NonNull*/ ExecutorProperty _Martpublisher__monitoringPropertyName = new EcoreExecutorProperty(MonitoringPackage.Literals.MARTPUBLISHER__MONITORING_PROPERTY_NAME, Types._Martpublisher, 1);
-		public static final /*@NonNull*/ ExecutorProperty _Martpublisher__monitoringPropertyResource = new EcoreExecutorProperty(MonitoringPackage.Literals.MARTPUBLISHER__MONITORING_PROPERTY_RESOURCE, Types._Martpublisher, 2);
+		public static final /*@NonNull*/ ExecutorProperty _Monitorableproperty__monitoringProperty = new EcoreExecutorProperty(MonitoringPackage.Literals.MONITORABLEPROPERTY__MONITORING_PROPERTY, Types._Monitorableproperty, 0);
+		public static final /*@NonNull*/ ExecutorProperty _Monitorableproperty__monitoringResult = new EcoreExecutorProperty(MonitoringPackage.Literals.MONITORABLEPROPERTY__MONITORING_RESULT, Types._Monitorableproperty, 1);
 
-		public static final /*@NonNull*/ ExecutorProperty _Monitoringproperty__monitoringPropertyName = new EcoreExecutorProperty(MonitoringPackage.Literals.MONITORINGPROPERTY__MONITORING_PROPERTY_NAME, Types._Monitoringproperty, 0);
-		public static final /*@NonNull*/ ExecutorProperty _Monitoringproperty__monitoringPropertyValue = new EcoreExecutorProperty(MonitoringPackage.Literals.MONITORINGPROPERTY__MONITORING_PROPERTY_VALUE, Types._Monitoringproperty, 1);
-
-		public static final /*@NonNull*/ ExecutorProperty _Processor__gathererAddress = new EcoreExecutorProperty(MonitoringPackage.Literals.PROCESSOR__GATHERER_ADDRESS, Types._Processor, 0);
-
-		public static final /*@NonNull*/ ExecutorProperty _Publisher__publisherEndpoint = new EcoreExecutorProperty(MonitoringPackage.Literals.PUBLISHER__PUBLISHER_ENDPOINT, Types._Publisher, 0);
-
-		public static final /*@NonNull*/ ExecutorProperty _Sensor__occiSensorAccuracy = new EcoreExecutorProperty(MonitoringPackage.Literals.SENSOR__OCCI_SENSOR_ACCURACY, Types._Sensor, 0);
-		public static final /*@NonNull*/ ExecutorProperty _Sensor__occiSensorGranularity = new EcoreExecutorProperty(MonitoringPackage.Literals.SENSOR__OCCI_SENSOR_GRANULARITY, Types._Sensor, 1);
-		public static final /*@NonNull*/ ExecutorProperty _Sensor__occiSensorPeriod = new EcoreExecutorProperty(MonitoringPackage.Literals.SENSOR__OCCI_SENSOR_PERIOD, Types._Sensor, 2);
-		public static final /*@NonNull*/ ExecutorProperty _Sensor__occiSensorTimebase = new EcoreExecutorProperty(MonitoringPackage.Literals.SENSOR__OCCI_SENSOR_TIMEBASE, Types._Sensor, 3);
-		public static final /*@NonNull*/ ExecutorProperty _Sensor__occiSensorTimestart = new EcoreExecutorProperty(MonitoringPackage.Literals.SENSOR__OCCI_SENSOR_TIMESTART, Types._Sensor, 4);
-		public static final /*@NonNull*/ ExecutorProperty _Sensor__occiSensorTimestop = new EcoreExecutorProperty(MonitoringPackage.Literals.SENSOR__OCCI_SENSOR_TIMESTOP, Types._Sensor, 5);
+		public static final /*@NonNull*/ ExecutorProperty _Occiresultprovider__resultProviderEndpoint = new EcoreExecutorProperty(MonitoringPackage.Literals.OCCIRESULTPROVIDER__RESULT_PROVIDER_ENDPOINT, Types._Occiresultprovider, 0);
 		static {
 			Init.initEnd();
 		}
@@ -408,60 +380,46 @@ public class MonitoringTables
 		};
 		private static final int /*@NonNull*/ [] __Datagatherer = { 1,1,1,1,1,1 };
 
-		private static final /*@NonNull*/ ExecutorFragment /*@NonNull*/ [] _DateTime =
-		{
-			Fragments._DateTime__OclAny /* 0 */,
-			Fragments._DateTime__DateTime /* 1 */
-		};
-		private static final int /*@NonNull*/ [] __DateTime = { 1,1 };
-
-		private static final /*@NonNull*/ ExecutorFragment /*@NonNull*/ [] _Martpublisher =
+		private static final /*@NonNull*/ ExecutorFragment /*@NonNull*/ [] _Dataprocessor =
 		{
-			Fragments._Martpublisher__OclAny /* 0 */,
-			Fragments._Martpublisher__OclElement /* 1 */,
-			Fragments._Martpublisher__MixinBase /* 2 */,
-			Fragments._Martpublisher__Martpublisher /* 3 */
+			Fragments._Dataprocessor__OclAny /* 0 */,
+			Fragments._Dataprocessor__OclElement /* 1 */,
+			Fragments._Dataprocessor__Entity /* 2 */,
+			Fragments._Dataprocessor__Resource /* 3 */,
+			Fragments._Dataprocessor__Component /* 4 */,
+			Fragments._Dataprocessor__Dataprocessor /* 5 */
 		};
-		private static final int /*@NonNull*/ [] __Martpublisher = { 1,1,1,1 };
+		private static final int /*@NonNull*/ [] __Dataprocessor = { 1,1,1,1,1,1 };
 
-		private static final /*@NonNull*/ ExecutorFragment /*@NonNull*/ [] _Monitoringproperty =
+		private static final /*@NonNull*/ ExecutorFragment /*@NonNull*/ [] _Monitorableproperty =
 		{
-			Fragments._Monitoringproperty__OclAny /* 0 */,
-			Fragments._Monitoringproperty__OclElement /* 1 */,
-			Fragments._Monitoringproperty__Entity /* 2 */,
-			Fragments._Monitoringproperty__Link /* 3 */,
-			Fragments._Monitoringproperty__Monitoringproperty /* 4 */
+			Fragments._Monitorableproperty__OclAny /* 0 */,
+			Fragments._Monitorableproperty__OclElement /* 1 */,
+			Fragments._Monitorableproperty__Entity /* 2 */,
+			Fragments._Monitorableproperty__Link /* 3 */,
+			Fragments._Monitorableproperty__Monitorableproperty /* 4 */
 		};
-		private static final int /*@NonNull*/ [] __Monitoringproperty = { 1,1,1,1,1 };
+		private static final int /*@NonNull*/ [] __Monitorableproperty = { 1,1,1,1,1 };
 
-		private static final /*@NonNull*/ ExecutorFragment /*@NonNull*/ [] _Processor =
+		private static final /*@NonNull*/ ExecutorFragment /*@NonNull*/ [] _Occiresultprovider =
 		{
-			Fragments._Processor__OclAny /* 0 */,
-			Fragments._Processor__OclElement /* 1 */,
-			Fragments._Processor__Entity /* 2 */,
-			Fragments._Processor__Resource /* 3 */,
-			Fragments._Processor__Component /* 4 */,
-			Fragments._Processor__Processor /* 5 */
+			Fragments._Occiresultprovider__OclAny /* 0 */,
+			Fragments._Occiresultprovider__OclElement /* 1 */,
+			Fragments._Occiresultprovider__MixinBase /* 2 */,
+			Fragments._Occiresultprovider__Occiresultprovider /* 3 */
 		};
-		private static final int /*@NonNull*/ [] __Processor = { 1,1,1,1,1,1 };
+		private static final int /*@NonNull*/ [] __Occiresultprovider = { 1,1,1,1 };
 
-		private static final /*@NonNull*/ ExecutorFragment /*@NonNull*/ [] _Publisher =
+		private static final /*@NonNull*/ ExecutorFragment /*@NonNull*/ [] _Resultprovider =
 		{
-			Fragments._Publisher__OclAny /* 0 */,
-			Fragments._Publisher__OclElement /* 1 */,
-			Fragments._Publisher__Entity /* 2 */,
-			Fragments._Publisher__Resource /* 3 */,
-			Fragments._Publisher__Component /* 4 */,
-			Fragments._Publisher__Publisher /* 5 */
+			Fragments._Resultprovider__OclAny /* 0 */,
+			Fragments._Resultprovider__OclElement /* 1 */,
+			Fragments._Resultprovider__Entity /* 2 */,
+			Fragments._Resultprovider__Resource /* 3 */,
+			Fragments._Resultprovider__Component /* 4 */,
+			Fragments._Resultprovider__Resultprovider /* 5 */
 		};
-		private static final int /*@NonNull*/ [] __Publisher = { 1,1,1,1,1,1 };
-
-		private static final /*@NonNull*/ ExecutorFragment /*@NonNull*/ [] _Second =
-		{
-			Fragments._Second__OclAny /* 0 */,
-			Fragments._Second__Second /* 1 */
-		};
-		private static final int /*@NonNull*/ [] __Second = { 1,1 };
+		private static final int /*@NonNull*/ [] __Resultprovider = { 1,1,1,1,1,1 };
 
 		private static final /*@NonNull*/ ExecutorFragment /*@NonNull*/ [] _Sensor =
 		{
@@ -488,12 +446,10 @@ public class MonitoringTables
 		 */
 		static {
 			Types._Datagatherer.initFragments(_Datagatherer, __Datagatherer);
-			Types._DateTime.initFragments(_DateTime, __DateTime);
-			Types._Martpublisher.initFragments(_Martpublisher, __Martpublisher);
-			Types._Monitoringproperty.initFragments(_Monitoringproperty, __Monitoringproperty);
-			Types._Processor.initFragments(_Processor, __Processor);
-			Types._Publisher.initFragments(_Publisher, __Publisher);
-			Types._Second.initFragments(_Second, __Second);
+			Types._Dataprocessor.initFragments(_Dataprocessor, __Dataprocessor);
+			Types._Monitorableproperty.initFragments(_Monitorableproperty, __Monitorableproperty);
+			Types._Occiresultprovider.initFragments(_Occiresultprovider, __Occiresultprovider);
+			Types._Resultprovider.initFragments(_Resultprovider, __Resultprovider);
 			Types._Sensor.initFragments(_Sensor, __Sensor);
 			Types._String.initFragments(_String, __String);
 
@@ -561,28 +517,25 @@ public class MonitoringTables
 		};
 		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Datagatherer__Resource = {};
 
-		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _DateTime__DateTime = {};
-		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _DateTime__OclAny = {
-			OCLstdlibTables.Operations._OclAny___lt__gt_ /* _'<>'(OclSelf[?]) */,
-			OCLstdlibTables.Operations._OclAny___eq_ /* _'='(OclSelf[?]) */,
-			OCLstdlibTables.Operations._OclAny__oclAsSet /* oclAsSet() */,
-			OCLstdlibTables.Operations._OclAny__oclAsType /* oclAsType(TT)(TT[?]) */,
-			OCLstdlibTables.Operations._OclAny__oclIsInState /* oclIsInState(OclState[?]) */,
-			OCLstdlibTables.Operations._OclAny__oclIsInvalid /* oclIsInvalid() */,
-			OCLstdlibTables.Operations._OclAny__oclIsKindOf /* oclIsKindOf(OclType[?]) */,
-			OCLstdlibTables.Operations._OclAny__oclIsNew /* oclIsNew() */,
-			OCLstdlibTables.Operations._OclAny__oclIsTypeOf /* oclIsTypeOf(OclType[?]) */,
-			OCLstdlibTables.Operations._OclAny__oclIsUndefined /* oclIsUndefined() */,
-			OCLstdlibTables.Operations._OclAny__0_oclLog /* oclLog() */,
-			OCLstdlibTables.Operations._OclAny__1_oclLog /* oclLog(String[?]) */,
-			OCLstdlibTables.Operations._OclAny__oclType /* oclType() */,
-			OCLstdlibTables.Operations._OclAny__oclTypes /* oclTypes() */,
-			OCLstdlibTables.Operations._OclAny__toString /* toString() */
+		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Dataprocessor__Dataprocessor = {};
+		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Dataprocessor__Component = {
+			PlatformTables.Operations._Component__configure /* configure() */,
+			PlatformTables.Operations._Component__deploy /* deploy() */,
+			PlatformTables.Operations._Component__start /* start() */,
+			PlatformTables.Operations._Component__stop /* stop() */,
+			PlatformTables.Operations._Component__undeploy /* undeploy() */
 		};
-
-		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Martpublisher__Martpublisher = {};
-		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Martpublisher__MixinBase = {};
-		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Martpublisher__OclAny = {
+		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Dataprocessor__Entity = {
+			OCCITables.Operations._Entity__occiCreate /* occiCreate() */,
+			OCCITables.Operations._Entity__occiCreate /* occiCreate() */,
+			OCCITables.Operations._Entity__occiDelete /* occiDelete() */,
+			OCCITables.Operations._Entity__occiDelete /* occiDelete() */,
+			OCCITables.Operations._Entity__occiRetrieve /* occiRetrieve() */,
+			OCCITables.Operations._Entity__occiRetrieve /* occiRetrieve() */,
+			OCCITables.Operations._Entity__occiUpdate /* occiUpdate() */,
+			OCCITables.Operations._Entity__occiUpdate /* occiUpdate() */
+		};
+		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Dataprocessor__OclAny = {
 			OCLstdlibTables.Operations._OclAny___lt__gt_ /* _'<>'(OclSelf[?]) */,
 			OCLstdlibTables.Operations._OclAny___eq_ /* _'='(OclSelf[?]) */,
 			OCLstdlibTables.Operations._OclAny__oclAsSet /* oclAsSet() */,
@@ -599,7 +552,7 @@ public class MonitoringTables
 			OCLstdlibTables.Operations._OclAny__oclTypes /* oclTypes() */,
 			OCLstdlibTables.Operations._OclAny__toString /* toString() */
 		};
-		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Martpublisher__OclElement = {
+		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Dataprocessor__OclElement = {
 			OCLstdlibTables.Operations._OclElement__allInstances /* allInstances() */,
 			OCLstdlibTables.Operations._OclElement__oclAsModelType /* oclAsModelType(TT)(TT[?]) */,
 			OCLstdlibTables.Operations._OclElement__oclContainer /* oclContainer() */,
@@ -608,9 +561,10 @@ public class MonitoringTables
 			OCLstdlibTables.Operations._OclElement__oclModelType /* oclModelType() */,
 			OCLstdlibTables.Operations._OclElement__oclModelTypes /* oclModelTypes() */
 		};
+		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Dataprocessor__Resource = {};
 
-		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Monitoringproperty__Monitoringproperty = {};
-		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Monitoringproperty__Entity = {
+		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Monitorableproperty__Monitorableproperty = {};
+		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Monitorableproperty__Entity = {
 			OCCITables.Operations._Entity__occiCreate /* occiCreate() */,
 			OCCITables.Operations._Entity__occiCreate /* occiCreate() */,
 			OCCITables.Operations._Entity__occiDelete /* occiDelete() */,
@@ -620,13 +574,13 @@ public class MonitoringTables
 			OCCITables.Operations._Entity__occiUpdate /* occiUpdate() */,
 			OCCITables.Operations._Entity__occiUpdate /* occiUpdate() */
 		};
-		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Monitoringproperty__Link = {
+		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Monitorableproperty__Link = {
 			OCCITables.Operations._Link__LinkSourceInvariant /* LinkSourceInvariant(Kind[?],Kind[?]) */,
 			OCCITables.Operations._Link__LinkSourceInvariant /* LinkSourceInvariant(Kind[?],Kind[?]) */,
 			OCCITables.Operations._Link__LinkTargetInvariant /* LinkTargetInvariant(Kind[?],Kind[?]) */,
 			OCCITables.Operations._Link__LinkTargetInvariant /* LinkTargetInvariant(Kind[?],Kind[?]) */
 		};
-		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Monitoringproperty__OclAny = {
+		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Monitorableproperty__OclAny = {
 			OCLstdlibTables.Operations._OclAny___lt__gt_ /* _'<>'(OclSelf[?]) */,
 			OCLstdlibTables.Operations._OclAny___eq_ /* _'='(OclSelf[?]) */,
 			OCLstdlibTables.Operations._OclAny__oclAsSet /* oclAsSet() */,
@@ -643,7 +597,7 @@ public class MonitoringTables
 			OCLstdlibTables.Operations._OclAny__oclTypes /* oclTypes() */,
 			OCLstdlibTables.Operations._OclAny__toString /* toString() */
 		};
-		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Monitoringproperty__OclElement = {
+		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Monitorableproperty__OclElement = {
 			OCLstdlibTables.Operations._OclElement__allInstances /* allInstances() */,
 			OCLstdlibTables.Operations._OclElement__oclAsModelType /* oclAsModelType(TT)(TT[?]) */,
 			OCLstdlibTables.Operations._OclElement__oclContainer /* oclContainer() */,
@@ -653,25 +607,9 @@ public class MonitoringTables
 			OCLstdlibTables.Operations._OclElement__oclModelTypes /* oclModelTypes() */
 		};
 
-		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Processor__Processor = {};
-		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Processor__Component = {
-			PlatformTables.Operations._Component__configure /* configure() */,
-			PlatformTables.Operations._Component__deploy /* deploy() */,
-			PlatformTables.Operations._Component__start /* start() */,
-			PlatformTables.Operations._Component__stop /* stop() */,
-			PlatformTables.Operations._Component__undeploy /* undeploy() */
-		};
-		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Processor__Entity = {
-			OCCITables.Operations._Entity__occiCreate /* occiCreate() */,
-			OCCITables.Operations._Entity__occiCreate /* occiCreate() */,
-			OCCITables.Operations._Entity__occiDelete /* occiDelete() */,
-			OCCITables.Operations._Entity__occiDelete /* occiDelete() */,
-			OCCITables.Operations._Entity__occiRetrieve /* occiRetrieve() */,
-			OCCITables.Operations._Entity__occiRetrieve /* occiRetrieve() */,
-			OCCITables.Operations._Entity__occiUpdate /* occiUpdate() */,
-			OCCITables.Operations._Entity__occiUpdate /* occiUpdate() */
-		};
-		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Processor__OclAny = {
+		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Occiresultprovider__Occiresultprovider = {};
+		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Occiresultprovider__MixinBase = {};
+		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Occiresultprovider__OclAny = {
 			OCLstdlibTables.Operations._OclAny___lt__gt_ /* _'<>'(OclSelf[?]) */,
 			OCLstdlibTables.Operations._OclAny___eq_ /* _'='(OclSelf[?]) */,
 			OCLstdlibTables.Operations._OclAny__oclAsSet /* oclAsSet() */,
@@ -688,7 +626,7 @@ public class MonitoringTables
 			OCLstdlibTables.Operations._OclAny__oclTypes /* oclTypes() */,
 			OCLstdlibTables.Operations._OclAny__toString /* toString() */
 		};
-		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Processor__OclElement = {
+		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Occiresultprovider__OclElement = {
 			OCLstdlibTables.Operations._OclElement__allInstances /* allInstances() */,
 			OCLstdlibTables.Operations._OclElement__oclAsModelType /* oclAsModelType(TT)(TT[?]) */,
 			OCLstdlibTables.Operations._OclElement__oclContainer /* oclContainer() */,
@@ -697,17 +635,16 @@ public class MonitoringTables
 			OCLstdlibTables.Operations._OclElement__oclModelType /* oclModelType() */,
 			OCLstdlibTables.Operations._OclElement__oclModelTypes /* oclModelTypes() */
 		};
-		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Processor__Resource = {};
 
-		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Publisher__Publisher = {};
-		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Publisher__Component = {
+		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Resultprovider__Resultprovider = {};
+		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Resultprovider__Component = {
 			PlatformTables.Operations._Component__configure /* configure() */,
 			PlatformTables.Operations._Component__deploy /* deploy() */,
 			PlatformTables.Operations._Component__start /* start() */,
 			PlatformTables.Operations._Component__stop /* stop() */,
 			PlatformTables.Operations._Component__undeploy /* undeploy() */
 		};
-		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Publisher__Entity = {
+		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Resultprovider__Entity = {
 			OCCITables.Operations._Entity__occiCreate /* occiCreate() */,
 			OCCITables.Operations._Entity__occiCreate /* occiCreate() */,
 			OCCITables.Operations._Entity__occiDelete /* occiDelete() */,
@@ -717,7 +654,7 @@ public class MonitoringTables
 			OCCITables.Operations._Entity__occiUpdate /* occiUpdate() */,
 			OCCITables.Operations._Entity__occiUpdate /* occiUpdate() */
 		};
-		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Publisher__OclAny = {
+		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Resultprovider__OclAny = {
 			OCLstdlibTables.Operations._OclAny___lt__gt_ /* _'<>'(OclSelf[?]) */,
 			OCLstdlibTables.Operations._OclAny___eq_ /* _'='(OclSelf[?]) */,
 			OCLstdlibTables.Operations._OclAny__oclAsSet /* oclAsSet() */,
@@ -734,7 +671,7 @@ public class MonitoringTables
 			OCLstdlibTables.Operations._OclAny__oclTypes /* oclTypes() */,
 			OCLstdlibTables.Operations._OclAny__toString /* toString() */
 		};
-		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Publisher__OclElement = {
+		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Resultprovider__OclElement = {
 			OCLstdlibTables.Operations._OclElement__allInstances /* allInstances() */,
 			OCLstdlibTables.Operations._OclElement__oclAsModelType /* oclAsModelType(TT)(TT[?]) */,
 			OCLstdlibTables.Operations._OclElement__oclContainer /* oclContainer() */,
@@ -743,26 +680,7 @@ public class MonitoringTables
 			OCLstdlibTables.Operations._OclElement__oclModelType /* oclModelType() */,
 			OCLstdlibTables.Operations._OclElement__oclModelTypes /* oclModelTypes() */
 		};
-		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Publisher__Resource = {};
-
-		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Second__Second = {};
-		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Second__OclAny = {
-			OCLstdlibTables.Operations._OclAny___lt__gt_ /* _'<>'(OclSelf[?]) */,
-			OCLstdlibTables.Operations._OclAny___eq_ /* _'='(OclSelf[?]) */,
-			OCLstdlibTables.Operations._OclAny__oclAsSet /* oclAsSet() */,
-			OCLstdlibTables.Operations._OclAny__oclAsType /* oclAsType(TT)(TT[?]) */,
-			OCLstdlibTables.Operations._OclAny__oclIsInState /* oclIsInState(OclState[?]) */,
-			OCLstdlibTables.Operations._OclAny__oclIsInvalid /* oclIsInvalid() */,
-			OCLstdlibTables.Operations._OclAny__oclIsKindOf /* oclIsKindOf(OclType[?]) */,
-			OCLstdlibTables.Operations._OclAny__oclIsNew /* oclIsNew() */,
-			OCLstdlibTables.Operations._OclAny__oclIsTypeOf /* oclIsTypeOf(OclType[?]) */,
-			OCLstdlibTables.Operations._OclAny__oclIsUndefined /* oclIsUndefined() */,
-			OCLstdlibTables.Operations._OclAny__0_oclLog /* oclLog() */,
-			OCLstdlibTables.Operations._OclAny__1_oclLog /* oclLog(String[?]) */,
-			OCLstdlibTables.Operations._OclAny__oclType /* oclType() */,
-			OCLstdlibTables.Operations._OclAny__oclTypes /* oclTypes() */,
-			OCLstdlibTables.Operations._OclAny__toString /* toString() */
-		};
+		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Resultprovider__Resource = {};
 
 		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Sensor__Sensor = {};
 		private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Sensor__Application = {
@@ -890,36 +808,30 @@ public class MonitoringTables
 			Fragments._Datagatherer__OclElement.initOperations(_Datagatherer__OclElement);
 			Fragments._Datagatherer__Resource.initOperations(_Datagatherer__Resource);
 
-			Fragments._DateTime__DateTime.initOperations(_DateTime__DateTime);
-			Fragments._DateTime__OclAny.initOperations(_DateTime__OclAny);
-
-			Fragments._Martpublisher__Martpublisher.initOperations(_Martpublisher__Martpublisher);
-			Fragments._Martpublisher__MixinBase.initOperations(_Martpublisher__MixinBase);
-			Fragments._Martpublisher__OclAny.initOperations(_Martpublisher__OclAny);
-			Fragments._Martpublisher__OclElement.initOperations(_Martpublisher__OclElement);
-
-			Fragments._Monitoringproperty__Entity.initOperations(_Monitoringproperty__Entity);
-			Fragments._Monitoringproperty__Link.initOperations(_Monitoringproperty__Link);
-			Fragments._Monitoringproperty__Monitoringproperty.initOperations(_Monitoringproperty__Monitoringproperty);
-			Fragments._Monitoringproperty__OclAny.initOperations(_Monitoringproperty__OclAny);
-			Fragments._Monitoringproperty__OclElement.initOperations(_Monitoringproperty__OclElement);
-
-			Fragments._Processor__Component.initOperations(_Processor__Component);
-			Fragments._Processor__Entity.initOperations(_Processor__Entity);
-			Fragments._Processor__OclAny.initOperations(_Processor__OclAny);
-			Fragments._Processor__OclElement.initOperations(_Processor__OclElement);
-			Fragments._Processor__Processor.initOperations(_Processor__Processor);
-			Fragments._Processor__Resource.initOperations(_Processor__Resource);
-
-			Fragments._Publisher__Component.initOperations(_Publisher__Component);
-			Fragments._Publisher__Entity.initOperations(_Publisher__Entity);
-			Fragments._Publisher__OclAny.initOperations(_Publisher__OclAny);
-			Fragments._Publisher__OclElement.initOperations(_Publisher__OclElement);
-			Fragments._Publisher__Publisher.initOperations(_Publisher__Publisher);
-			Fragments._Publisher__Resource.initOperations(_Publisher__Resource);
-
-			Fragments._Second__OclAny.initOperations(_Second__OclAny);
-			Fragments._Second__Second.initOperations(_Second__Second);
+			Fragments._Dataprocessor__Component.initOperations(_Dataprocessor__Component);
+			Fragments._Dataprocessor__Dataprocessor.initOperations(_Dataprocessor__Dataprocessor);
+			Fragments._Dataprocessor__Entity.initOperations(_Dataprocessor__Entity);
+			Fragments._Dataprocessor__OclAny.initOperations(_Dataprocessor__OclAny);
+			Fragments._Dataprocessor__OclElement.initOperations(_Dataprocessor__OclElement);
+			Fragments._Dataprocessor__Resource.initOperations(_Dataprocessor__Resource);
+
+			Fragments._Monitorableproperty__Entity.initOperations(_Monitorableproperty__Entity);
+			Fragments._Monitorableproperty__Link.initOperations(_Monitorableproperty__Link);
+			Fragments._Monitorableproperty__Monitorableproperty.initOperations(_Monitorableproperty__Monitorableproperty);
+			Fragments._Monitorableproperty__OclAny.initOperations(_Monitorableproperty__OclAny);
+			Fragments._Monitorableproperty__OclElement.initOperations(_Monitorableproperty__OclElement);
+
+			Fragments._Occiresultprovider__MixinBase.initOperations(_Occiresultprovider__MixinBase);
+			Fragments._Occiresultprovider__Occiresultprovider.initOperations(_Occiresultprovider__Occiresultprovider);
+			Fragments._Occiresultprovider__OclAny.initOperations(_Occiresultprovider__OclAny);
+			Fragments._Occiresultprovider__OclElement.initOperations(_Occiresultprovider__OclElement);
+
+			Fragments._Resultprovider__Component.initOperations(_Resultprovider__Component);
+			Fragments._Resultprovider__Entity.initOperations(_Resultprovider__Entity);
+			Fragments._Resultprovider__OclAny.initOperations(_Resultprovider__OclAny);
+			Fragments._Resultprovider__OclElement.initOperations(_Resultprovider__OclElement);
+			Fragments._Resultprovider__Resource.initOperations(_Resultprovider__Resource);
+			Fragments._Resultprovider__Resultprovider.initOperations(_Resultprovider__Resultprovider);
 
 			Fragments._Sensor__Application.initOperations(_Sensor__Application);
 			Fragments._Sensor__Entity.initOperations(_Sensor__Entity);
@@ -951,43 +863,22 @@ public class MonitoringTables
 			FragmentOperations.init();
 		}
 
-		private static final /*@NonNull*/ ExecutorProperty /*@NonNull*/ [] _Datagatherer = {
-			MonitoringTables.Properties._Datagatherer__occiCollectorAccuracy,
-			MonitoringTables.Properties._Datagatherer__occiCollectorGranularity,
-			MonitoringTables.Properties._Datagatherer__occiCollectorPeriod
-		};
+		private static final /*@NonNull*/ ExecutorProperty /*@NonNull*/ [] _Datagatherer = {};
 
-		private static final /*@NonNull*/ ExecutorProperty /*@NonNull*/ [] _DateTime = {};
+		private static final /*@NonNull*/ ExecutorProperty /*@NonNull*/ [] _Dataprocessor = {};
 
-		private static final /*@NonNull*/ ExecutorProperty /*@NonNull*/ [] _Martpublisher = {
-			MonitoringTables.Properties._Martpublisher__monitoringPropertyId,
-			MonitoringTables.Properties._Martpublisher__monitoringPropertyName,
-			MonitoringTables.Properties._Martpublisher__monitoringPropertyResource
+		private static final /*@NonNull*/ ExecutorProperty /*@NonNull*/ [] _Monitorableproperty = {
+			MonitoringTables.Properties._Monitorableproperty__monitoringProperty,
+			MonitoringTables.Properties._Monitorableproperty__monitoringResult
 		};
 
-		private static final /*@NonNull*/ ExecutorProperty /*@NonNull*/ [] _Monitoringproperty = {
-			MonitoringTables.Properties._Monitoringproperty__monitoringPropertyName,
-			MonitoringTables.Properties._Monitoringproperty__monitoringPropertyValue
+		private static final /*@NonNull*/ ExecutorProperty /*@NonNull*/ [] _Occiresultprovider = {
+			MonitoringTables.Properties._Occiresultprovider__resultProviderEndpoint
 		};
 
-		private static final /*@NonNull*/ ExecutorProperty /*@NonNull*/ [] _Processor = {
-			MonitoringTables.Properties._Processor__gathererAddress
-		};
+		private static final /*@NonNull*/ ExecutorProperty /*@NonNull*/ [] _Resultprovider = {};
 
-		private static final /*@NonNull*/ ExecutorProperty /*@NonNull*/ [] _Publisher = {
-			MonitoringTables.Properties._Publisher__publisherEndpoint
-		};
-
-		private static final /*@NonNull*/ ExecutorProperty /*@NonNull*/ [] _Second = {};
-
-		private static final /*@NonNull*/ ExecutorProperty /*@NonNull*/ [] _Sensor = {
-			MonitoringTables.Properties._Sensor__occiSensorAccuracy,
-			MonitoringTables.Properties._Sensor__occiSensorGranularity,
-			MonitoringTables.Properties._Sensor__occiSensorPeriod,
-			MonitoringTables.Properties._Sensor__occiSensorTimebase,
-			MonitoringTables.Properties._Sensor__occiSensorTimestart,
-			MonitoringTables.Properties._Sensor__occiSensorTimestop
-		};
+		private static final /*@NonNull*/ ExecutorProperty /*@NonNull*/ [] _Sensor = {};
 
 		private static final /*@NonNull*/ ExecutorProperty /*@NonNull*/ [] _String = {};
 
@@ -996,12 +887,10 @@ public class MonitoringTables
 		 */
 		static {
 			Fragments._Datagatherer__Datagatherer.initProperties(_Datagatherer);
-			Fragments._DateTime__DateTime.initProperties(_DateTime);
-			Fragments._Martpublisher__Martpublisher.initProperties(_Martpublisher);
-			Fragments._Monitoringproperty__Monitoringproperty.initProperties(_Monitoringproperty);
-			Fragments._Processor__Processor.initProperties(_Processor);
-			Fragments._Publisher__Publisher.initProperties(_Publisher);
-			Fragments._Second__Second.initProperties(_Second);
+			Fragments._Dataprocessor__Dataprocessor.initProperties(_Dataprocessor);
+			Fragments._Monitorableproperty__Monitorableproperty.initProperties(_Monitorableproperty);
+			Fragments._Occiresultprovider__Occiresultprovider.initProperties(_Occiresultprovider);
+			Fragments._Resultprovider__Resultprovider.initProperties(_Resultprovider);
 			Fragments._Sensor__Sensor.initProperties(_Sensor);
 			Fragments._String__String.initProperties(_String);
 
diff --git a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/Monitoringproperty.java b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/Monitoringproperty.java
deleted file mode 100644
index e02c5308f3b6f43022187f2c2822df7d27a942b6..0000000000000000000000000000000000000000
--- a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/Monitoringproperty.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/**
- * Copyright (c) 2015-2017 Obeo, Inria
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 	
- * Contributors:
- * - William Piers <william.piers@obeo.fr>
- * - Philippe Merle <philippe.merle@inria.fr>
- * - Faiez Zalila <faiez.zalila@inria.fr>
- */
-package monitoring;
-
-import java.util.Map;
-
-import org.eclipse.cmf.occi.core.Link;
-
-import org.eclipse.emf.common.util.DiagnosticChain;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Monitoringproperty</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * MonitoringProperty Component
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link monitoring.Monitoringproperty#getMonitoringPropertyName <em>Monitoring Property Name</em>}</li>
- *   <li>{@link monitoring.Monitoringproperty#getMonitoringPropertyValue <em>Monitoring Property Value</em>}</li>
- * </ul>
- *
- * @see monitoring.MonitoringPackage#getMonitoringproperty()
- * @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='targetConstraint'"
- * @generated
- */
-public interface Monitoringproperty extends Link {
-	/**
-	 * Returns the value of the '<em><b>Monitoring Property Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Monitoring Property Name</em>' attribute.
-	 * @see #setMonitoringPropertyName(String)
-	 * @see monitoring.MonitoringPackage#getMonitoringproperty_MonitoringPropertyName()
-	 * @model dataType="monitoring.String" required="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel get='throw new UnsupportedOperationException();  // FIXME Unimplemented http://schemas.ugoe.cs.rwm/monitoring/ecore!Monitoringproperty!monitoringPropertyName'"
-	 * @generated
-	 */
-	String getMonitoringPropertyName();
-
-	/**
-	 * Sets the value of the '{@link monitoring.Monitoringproperty#getMonitoringPropertyName <em>Monitoring Property Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Monitoring Property Name</em>' attribute.
-	 * @see #getMonitoringPropertyName()
-	 * @generated
-	 */
-	void setMonitoringPropertyName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Monitoring Property Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Monitoring Property Value</em>' attribute.
-	 * @see #setMonitoringPropertyValue(String)
-	 * @see monitoring.MonitoringPackage#getMonitoringproperty_MonitoringPropertyValue()
-	 * @model dataType="monitoring.String"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel get='throw new UnsupportedOperationException();  // FIXME Unimplemented http://schemas.ugoe.cs.rwm/monitoring/ecore!Monitoringproperty!monitoringPropertyValue'"
-	 * @generated
-	 */
-	String getMonitoringPropertyValue();
-
-	/**
-	 * Sets the value of the '{@link monitoring.Monitoringproperty#getMonitoringPropertyValue <em>Monitoring Property Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Monitoring Property Value</em>' attribute.
-	 * @see #getMonitoringPropertyValue()
-	 * @generated
-	 */
-	void setMonitoringPropertyValue(String value);
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model annotation="http://www.eclipse.org/emf/2002/GenModel body='/**\n *\n * inv targetConstraint:\n *   let\n *     severity : Integer[1] = \'Monitoringproperty::targetConstraint\'.getSeverity()\n *   in\n *     if severity &lt;= 0\n *     then true\n *     else\n *       let result : occi::Boolean[1] = self.target.oclIsKindOf(Sensor)\n *       in\n *         \'Monitoringproperty::targetConstraint\'.logDiagnostic(self, null, diagnostics, context, null, severity, result, 0)\n *     endif\n \052/\nfinal /*@NonInvalid\052/ &lt;%org.eclipse.ocl.pivot.evaluation.Executor%&gt; executor = &lt;%org.eclipse.ocl.pivot.internal.utilities.PivotUtilInternal%&gt;.getExecutor(this);\nfinal /*@NonInvalid\052/ &lt;%org.eclipse.ocl.pivot.ids.IdResolver%&gt; idResolver = executor.getIdResolver();\nfinal /*@NonInvalid\052/ &lt;%org.eclipse.ocl.pivot.values.IntegerValue%&gt; severity_0 = &lt;%org.eclipse.ocl.pivot.library.string.CGStringGetSeverityOperation%&gt;.INSTANCE.evaluate(executor, &lt;%monitoring.MonitoringTables%&gt;.STR_Monitoringproperty_c_c_targetConstraint);\nfinal /*@NonInvalid\052/ boolean le = &lt;%org.eclipse.ocl.pivot.library.oclany.OclComparableLessThanEqualOperation%&gt;.INSTANCE.evaluate(executor, severity_0, &lt;%monitoring.MonitoringTables%&gt;.INT_0).booleanValue();\n/*@NonInvalid\052/ boolean symbol_0;\nif (le) {\n\tsymbol_0 = &lt;%org.eclipse.ocl.pivot.utilities.ValueUtil%&gt;.TRUE_VALUE;\n}\nelse {\n\tfinal /*@NonInvalid\052/ &lt;%org.eclipse.ocl.pivot.Class%&gt; TYP_monitoring_c_c_Sensor = idResolver.getClass(&lt;%monitoring.MonitoringTables%&gt;.CLSSid_Sensor, null);\n\tfinal /*@NonInvalid\052/ &lt;%org.eclipse.cmf.occi.core.Resource%&gt; target = this.getTarget();\n\tfinal /*@NonInvalid\052/ boolean result = &lt;%org.eclipse.ocl.pivot.library.oclany.OclAnyOclIsKindOfOperation%&gt;.INSTANCE.evaluate(executor, target, TYP_monitoring_c_c_Sensor).booleanValue();\n\tfinal /*@NonInvalid\052/ boolean logDiagnostic = &lt;%org.eclipse.ocl.pivot.library.string.CGStringLogDiagnosticOperation%&gt;.INSTANCE.evaluate(executor, &lt;%org.eclipse.ocl.pivot.ids.TypeId%&gt;.BOOLEAN, &lt;%monitoring.MonitoringTables%&gt;.STR_Monitoringproperty_c_c_targetConstraint, this, (Object)null, diagnostics, context, (Object)null, severity_0, result, &lt;%monitoring.MonitoringTables%&gt;.INT_0).booleanValue();\n\tsymbol_0 = logDiagnostic;\n}\nreturn Boolean.TRUE == symbol_0;'"
-	 * @generated
-	 */
-	boolean targetConstraint(DiagnosticChain diagnostics, Map<Object, Object> context);
-
-} // Monitoringproperty
diff --git a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/Occiresultprovider.java b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/Occiresultprovider.java
new file mode 100644
index 0000000000000000000000000000000000000000..3eace77a9c30b92981a1f7c786647efb80ede734
--- /dev/null
+++ b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/Occiresultprovider.java
@@ -0,0 +1,72 @@
+/**
+ * Copyright (c) 2015-2017 Obeo, Inria
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 	
+ * Contributors:
+ * - William Piers <william.piers@obeo.fr>
+ * - Philippe Merle <philippe.merle@inria.fr>
+ * - Faiez Zalila <faiez.zalila@inria.fr>
+ */
+package monitoring;
+
+import java.util.Map;
+
+import org.eclipse.cmf.occi.core.MixinBase;
+
+import org.eclipse.emf.common.util.DiagnosticChain;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Occiresultprovider</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link monitoring.Occiresultprovider#getResultProviderEndpoint <em>Result Provider Endpoint</em>}</li>
+ * </ul>
+ *
+ * @see monitoring.MonitoringPackage#getOcciresultprovider()
+ * @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='appliesConstraint'"
+ * @generated
+ */
+public interface Occiresultprovider extends MixinBase {
+	/**
+	 * Returns the value of the '<em><b>Result Provider Endpoint</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * Genereic address to be used by the result provider.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Result Provider Endpoint</em>' attribute.
+	 * @see #setResultProviderEndpoint(String)
+	 * @see monitoring.MonitoringPackage#getOcciresultprovider_ResultProviderEndpoint()
+	 * @model dataType="monitoring.String" required="true"
+	 *        annotation="http://www.eclipse.org/emf/2002/GenModel get='throw new UnsupportedOperationException();  // FIXME Unimplemented http://schemas.ugoe.cs.rwm/monitoring/ecore!Occiresultprovider!resultProviderEndpoint'"
+	 * @generated
+	 */
+	String getResultProviderEndpoint();
+
+	/**
+	 * Sets the value of the '{@link monitoring.Occiresultprovider#getResultProviderEndpoint <em>Result Provider Endpoint</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Result Provider Endpoint</em>' attribute.
+	 * @see #getResultProviderEndpoint()
+	 * @generated
+	 */
+	void setResultProviderEndpoint(String value);
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model annotation="http://www.eclipse.org/emf/2002/GenModel body='/**\n *\n * inv appliesConstraint:\n *   let\n *     severity : Integer[1] = \'Occiresultprovider::appliesConstraint\'.getSeverity()\n *   in\n *     if severity &lt;= 0\n *     then true\n *     else\n *       let\n *         result : occi::Boolean[1] = self.entity.oclIsKindOf(Resultprovider)\n *       in\n *         \'Occiresultprovider::appliesConstraint\'.logDiagnostic(self, null, diagnostics, context, null, severity, result, 0)\n *     endif\n \052/\nfinal /*@NonInvalid\052/ &lt;%org.eclipse.ocl.pivot.evaluation.Executor%&gt; executor = &lt;%org.eclipse.ocl.pivot.internal.utilities.PivotUtilInternal%&gt;.getExecutor(this);\nfinal /*@NonInvalid\052/ &lt;%org.eclipse.ocl.pivot.ids.IdResolver%&gt; idResolver = executor.getIdResolver();\nfinal /*@NonInvalid\052/ &lt;%org.eclipse.ocl.pivot.values.IntegerValue%&gt; severity_0 = &lt;%org.eclipse.ocl.pivot.library.string.CGStringGetSeverityOperation%&gt;.INSTANCE.evaluate(executor, &lt;%monitoring.MonitoringTables%&gt;.STR_Occiresultprovider_c_c_appliesConstraint);\nfinal /*@NonInvalid\052/ boolean le = &lt;%org.eclipse.ocl.pivot.library.oclany.OclComparableLessThanEqualOperation%&gt;.INSTANCE.evaluate(executor, severity_0, &lt;%monitoring.MonitoringTables%&gt;.INT_0).booleanValue();\n/*@NonInvalid\052/ boolean symbol_0;\nif (le) {\n\tsymbol_0 = &lt;%org.eclipse.ocl.pivot.utilities.ValueUtil%&gt;.TRUE_VALUE;\n}\nelse {\n\tfinal /*@NonInvalid\052/ &lt;%org.eclipse.ocl.pivot.Class%&gt; TYP_monitoring_c_c_Resultprovider = idResolver.getClass(&lt;%monitoring.MonitoringTables%&gt;.CLSSid_Resultprovider, null);\n\tfinal /*@NonInvalid\052/ &lt;%org.eclipse.cmf.occi.core.Entity%&gt; entity = this.getEntity();\n\tfinal /*@NonInvalid\052/ boolean result = &lt;%org.eclipse.ocl.pivot.library.oclany.OclAnyOclIsKindOfOperation%&gt;.INSTANCE.evaluate(executor, entity, TYP_monitoring_c_c_Resultprovider).booleanValue();\n\tfinal /*@NonInvalid\052/ boolean logDiagnostic = &lt;%org.eclipse.ocl.pivot.library.string.CGStringLogDiagnosticOperation%&gt;.INSTANCE.evaluate(executor, &lt;%org.eclipse.ocl.pivot.ids.TypeId%&gt;.BOOLEAN, &lt;%monitoring.MonitoringTables%&gt;.STR_Occiresultprovider_c_c_appliesConstraint, this, (Object)null, diagnostics, context, (Object)null, severity_0, result, &lt;%monitoring.MonitoringTables%&gt;.INT_0).booleanValue();\n\tsymbol_0 = logDiagnostic;\n}\nreturn Boolean.TRUE == symbol_0;'"
+	 * @generated
+	 */
+	boolean appliesConstraint(DiagnosticChain diagnostics, Map<Object, Object> context);
+
+} // Occiresultprovider
diff --git a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/Processor.java b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/Processor.java
deleted file mode 100644
index 3c09509cd0603cc218bcd8a5ff3508c39a1b793a..0000000000000000000000000000000000000000
--- a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/Processor.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * Copyright (c) 2015-2017 Obeo, Inria
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 	
- * Contributors:
- * - William Piers <william.piers@obeo.fr>
- * - Philippe Merle <philippe.merle@inria.fr>
- * - Faiez Zalila <faiez.zalila@inria.fr>
- */
-package monitoring;
-
-import org.modmacao.occi.platform.Component;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Processor</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Processor Resource
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link monitoring.Processor#getGathererAddress <em>Gatherer Address</em>}</li>
- * </ul>
- *
- * @see monitoring.MonitoringPackage#getProcessor()
- * @model
- * @generated
- */
-public interface Processor extends Component {
-	/**
-	 * Returns the value of the '<em><b>Gatherer Address</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Gatherer Address</em>' attribute.
-	 * @see #setGathererAddress(String)
-	 * @see monitoring.MonitoringPackage#getProcessor_GathererAddress()
-	 * @model dataType="monitoring.String"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel get='throw new UnsupportedOperationException();  // FIXME Unimplemented http://schemas.ugoe.cs.rwm/monitoring/ecore!Processor!gathererAddress'"
-	 * @generated
-	 */
-	String getGathererAddress();
-
-	/**
-	 * Sets the value of the '{@link monitoring.Processor#getGathererAddress <em>Gatherer Address</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Gatherer Address</em>' attribute.
-	 * @see #getGathererAddress()
-	 * @generated
-	 */
-	void setGathererAddress(String value);
-
-} // Processor
diff --git a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/Publisher.java b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/Publisher.java
deleted file mode 100644
index e00ebcbce11990ceec5b968666ac9da076463fba..0000000000000000000000000000000000000000
--- a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/Publisher.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * Copyright (c) 2015-2017 Obeo, Inria
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 	
- * Contributors:
- * - William Piers <william.piers@obeo.fr>
- * - Philippe Merle <philippe.merle@inria.fr>
- * - Faiez Zalila <faiez.zalila@inria.fr>
- */
-package monitoring;
-
-import org.modmacao.occi.platform.Component;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Publisher</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Publisher Resource
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link monitoring.Publisher#getPublisherEndpoint <em>Publisher Endpoint</em>}</li>
- * </ul>
- *
- * @see monitoring.MonitoringPackage#getPublisher()
- * @model
- * @generated
- */
-public interface Publisher extends Component {
-	/**
-	 * Returns the value of the '<em><b>Publisher Endpoint</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Publisher Endpoint</em>' attribute.
-	 * @see #setPublisherEndpoint(String)
-	 * @see monitoring.MonitoringPackage#getPublisher_PublisherEndpoint()
-	 * @model dataType="monitoring.String" required="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel get='throw new UnsupportedOperationException();  // FIXME Unimplemented http://schemas.ugoe.cs.rwm/monitoring/ecore!Publisher!publisherEndpoint'"
-	 * @generated
-	 */
-	String getPublisherEndpoint();
-
-	/**
-	 * Sets the value of the '{@link monitoring.Publisher#getPublisherEndpoint <em>Publisher Endpoint</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Publisher Endpoint</em>' attribute.
-	 * @see #getPublisherEndpoint()
-	 * @generated
-	 */
-	void setPublisherEndpoint(String value);
-
-} // Publisher
diff --git a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/Resultprovider.java b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/Resultprovider.java
new file mode 100644
index 0000000000000000000000000000000000000000..0e21b6bba6e44511afd4656151629d1a5617801b
--- /dev/null
+++ b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/Resultprovider.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright (c) 2015-2017 Obeo, Inria
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 	
+ * Contributors:
+ * - William Piers <william.piers@obeo.fr>
+ * - Philippe Merle <philippe.merle@inria.fr>
+ * - Faiez Zalila <faiez.zalila@inria.fr>
+ */
+package monitoring;
+
+import org.modmacao.occi.platform.Component;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Resultprovider</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Publisher Resource
+ * <!-- end-model-doc -->
+ *
+ *
+ * @see monitoring.MonitoringPackage#getResultprovider()
+ * @model
+ * @generated
+ */
+public interface Resultprovider extends Component {
+
+} // Resultprovider
diff --git a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/Sensor.java b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/Sensor.java
index df8d42b2461bc80a63abce8e8bdb87670abeaede..76843b5aa977e302b218746f85a74d42183195c7 100644
--- a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/Sensor.java
+++ b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/Sensor.java
@@ -23,177 +23,11 @@ import org.modmacao.occi.platform.Application;
  * Sensor Component
  * <!-- end-model-doc -->
  *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link monitoring.Sensor#getOcciSensorTimebase <em>Occi Sensor Timebase</em>}</li>
- *   <li>{@link monitoring.Sensor#getOcciSensorTimestart <em>Occi Sensor Timestart</em>}</li>
- *   <li>{@link monitoring.Sensor#getOcciSensorTimestop <em>Occi Sensor Timestop</em>}</li>
- *   <li>{@link monitoring.Sensor#getOcciSensorPeriod <em>Occi Sensor Period</em>}</li>
- *   <li>{@link monitoring.Sensor#getOcciSensorGranularity <em>Occi Sensor Granularity</em>}</li>
- *   <li>{@link monitoring.Sensor#getOcciSensorAccuracy <em>Occi Sensor Accuracy</em>}</li>
- * </ul>
  *
  * @see monitoring.MonitoringPackage#getSensor()
  * @model
  * @generated
  */
 public interface Sensor extends Application {
-	/**
-	 * Returns the value of the '<em><b>Occi Sensor Timebase</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Base time reference (ISO8601)
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Occi Sensor Timebase</em>' attribute.
-	 * @see #setOcciSensorTimebase(String)
-	 * @see monitoring.MonitoringPackage#getSensor_OcciSensorTimebase()
-	 * @model dataType="monitoring.DateTime"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel get='throw new UnsupportedOperationException();  // FIXME Unimplemented http://schemas.ugoe.cs.rwm/monitoring/ecore!Sensor!occiSensorTimebase'"
-	 * @generated
-	 */
-	String getOcciSensorTimebase();
-
-	/**
-	 * Sets the value of the '{@link monitoring.Sensor#getOcciSensorTimebase <em>Occi Sensor Timebase</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Occi Sensor Timebase</em>' attribute.
-	 * @see #getOcciSensorTimebase()
-	 * @generated
-	 */
-	void setOcciSensorTimebase(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Occi Sensor Timestart</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Start time offset (seconds)
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Occi Sensor Timestart</em>' attribute.
-	 * @see #setOcciSensorTimestart(String)
-	 * @see monitoring.MonitoringPackage#getSensor_OcciSensorTimestart()
-	 * @model dataType="monitoring.Second"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel get='throw new UnsupportedOperationException();  // FIXME Unimplemented http://schemas.ugoe.cs.rwm/monitoring/ecore!Sensor!occiSensorTimestart'"
-	 * @generated
-	 */
-	String getOcciSensorTimestart();
-
-	/**
-	 * Sets the value of the '{@link monitoring.Sensor#getOcciSensorTimestart <em>Occi Sensor Timestart</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Occi Sensor Timestart</em>' attribute.
-	 * @see #getOcciSensorTimestart()
-	 * @generated
-	 */
-	void setOcciSensorTimestart(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Occi Sensor Timestop</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Occi Sensor Timestop</em>' attribute.
-	 * @see #setOcciSensorTimestop(String)
-	 * @see monitoring.MonitoringPackage#getSensor_OcciSensorTimestop()
-	 * @model dataType="monitoring.Second"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel get='throw new UnsupportedOperationException();  // FIXME Unimplemented http://schemas.ugoe.cs.rwm/monitoring/ecore!Sensor!occiSensorTimestop'"
-	 * @generated
-	 */
-	String getOcciSensorTimestop();
-
-	/**
-	 * Sets the value of the '{@link monitoring.Sensor#getOcciSensorTimestop <em>Occi Sensor Timestop</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Occi Sensor Timestop</em>' attribute.
-	 * @see #getOcciSensorTimestop()
-	 * @generated
-	 */
-	void setOcciSensorTimestop(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Occi Sensor Period</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Time between two following measurements (seconds)
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Occi Sensor Period</em>' attribute.
-	 * @see #setOcciSensorPeriod(String)
-	 * @see monitoring.MonitoringPackage#getSensor_OcciSensorPeriod()
-	 * @model dataType="monitoring.Second" required="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel get='throw new UnsupportedOperationException();  // FIXME Unimplemented http://schemas.ugoe.cs.rwm/monitoring/ecore!Sensor!occiSensorPeriod'"
-	 * @generated
-	 */
-	String getOcciSensorPeriod();
-
-	/**
-	 * Sets the value of the '{@link monitoring.Sensor#getOcciSensorPeriod <em>Occi Sensor Period</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Occi Sensor Period</em>' attribute.
-	 * @see #getOcciSensorPeriod()
-	 * @generated
-	 */
-	void setOcciSensorPeriod(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Occi Sensor Granularity</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Granularity of time measument (seconds)
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Occi Sensor Granularity</em>' attribute.
-	 * @see #setOcciSensorGranularity(String)
-	 * @see monitoring.MonitoringPackage#getSensor_OcciSensorGranularity()
-	 * @model dataType="monitoring.Second"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel get='throw new UnsupportedOperationException();  // FIXME Unimplemented http://schemas.ugoe.cs.rwm/monitoring/ecore!Sensor!occiSensorGranularity'"
-	 * @generated
-	 */
-	String getOcciSensorGranularity();
-
-	/**
-	 * Sets the value of the '{@link monitoring.Sensor#getOcciSensorGranularity <em>Occi Sensor Granularity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Occi Sensor Granularity</em>' attribute.
-	 * @see #getOcciSensorGranularity()
-	 * @generated
-	 */
-	void setOcciSensorGranularity(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Occi Sensor Accuracy</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Accuracy of time measument (seconds)
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Occi Sensor Accuracy</em>' attribute.
-	 * @see #setOcciSensorAccuracy(String)
-	 * @see monitoring.MonitoringPackage#getSensor_OcciSensorAccuracy()
-	 * @model dataType="monitoring.Second"
-	 *        annotation="http://www.eclipse.org/emf/2002/GenModel get='throw new UnsupportedOperationException();  // FIXME Unimplemented http://schemas.ugoe.cs.rwm/monitoring/ecore!Sensor!occiSensorAccuracy'"
-	 * @generated
-	 */
-	String getOcciSensorAccuracy();
-
-	/**
-	 * Sets the value of the '{@link monitoring.Sensor#getOcciSensorAccuracy <em>Occi Sensor Accuracy</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Occi Sensor Accuracy</em>' attribute.
-	 * @see #getOcciSensorAccuracy()
-	 * @generated
-	 */
-	void setOcciSensorAccuracy(String value);
 
 } // Sensor
diff --git a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/DatagathererImpl.java b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/DatagathererImpl.java
index 9cab11f7f5d4c381a134ab6db0a975230d61421f..2222d68363b29e0c6f9a861a5ef1296025070451 100644
--- a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/DatagathererImpl.java
+++ b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/DatagathererImpl.java
@@ -27,78 +27,10 @@ import org.modmacao.occi.platform.impl.ComponentImpl;
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Datagatherer</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link monitoring.impl.DatagathererImpl#getOcciCollectorPeriod <em>Occi Collector Period</em>}</li>
- *   <li>{@link monitoring.impl.DatagathererImpl#getOcciCollectorGranularity <em>Occi Collector Granularity</em>}</li>
- *   <li>{@link monitoring.impl.DatagathererImpl#getOcciCollectorAccuracy <em>Occi Collector Accuracy</em>}</li>
- * </ul>
  *
  * @generated
  */
 public class DatagathererImpl extends ComponentImpl implements Datagatherer {
-	/**
-	 * The default value of the '{@link #getOcciCollectorPeriod() <em>Occi Collector Period</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOcciCollectorPeriod()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String OCCI_COLLECTOR_PERIOD_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getOcciCollectorPeriod() <em>Occi Collector Period</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOcciCollectorPeriod()
-	 * @generated
-	 * @ordered
-	 */
-	protected String occiCollectorPeriod = OCCI_COLLECTOR_PERIOD_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getOcciCollectorGranularity() <em>Occi Collector Granularity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOcciCollectorGranularity()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String OCCI_COLLECTOR_GRANULARITY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getOcciCollectorGranularity() <em>Occi Collector Granularity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOcciCollectorGranularity()
-	 * @generated
-	 * @ordered
-	 */
-	protected String occiCollectorGranularity = OCCI_COLLECTOR_GRANULARITY_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getOcciCollectorAccuracy() <em>Occi Collector Accuracy</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOcciCollectorAccuracy()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String OCCI_COLLECTOR_ACCURACY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getOcciCollectorAccuracy() <em>Occi Collector Accuracy</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOcciCollectorAccuracy()
-	 * @generated
-	 * @ordered
-	 */
-	protected String occiCollectorAccuracy = OCCI_COLLECTOR_ACCURACY_EDEFAULT;
-
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -118,165 +50,4 @@ public class DatagathererImpl extends ComponentImpl implements Datagatherer {
 		return MonitoringPackage.Literals.DATAGATHERER;
 	}
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getOcciCollectorPeriod() {
-		return occiCollectorPeriod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOcciCollectorPeriod(String newOcciCollectorPeriod) {
-		String oldOcciCollectorPeriod = occiCollectorPeriod;
-		occiCollectorPeriod = newOcciCollectorPeriod;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MonitoringPackage.DATAGATHERER__OCCI_COLLECTOR_PERIOD, oldOcciCollectorPeriod, occiCollectorPeriod));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getOcciCollectorGranularity() {
-		return occiCollectorGranularity;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOcciCollectorGranularity(String newOcciCollectorGranularity) {
-		String oldOcciCollectorGranularity = occiCollectorGranularity;
-		occiCollectorGranularity = newOcciCollectorGranularity;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MonitoringPackage.DATAGATHERER__OCCI_COLLECTOR_GRANULARITY, oldOcciCollectorGranularity, occiCollectorGranularity));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getOcciCollectorAccuracy() {
-		return occiCollectorAccuracy;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOcciCollectorAccuracy(String newOcciCollectorAccuracy) {
-		String oldOcciCollectorAccuracy = occiCollectorAccuracy;
-		occiCollectorAccuracy = newOcciCollectorAccuracy;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MonitoringPackage.DATAGATHERER__OCCI_COLLECTOR_ACCURACY, oldOcciCollectorAccuracy, occiCollectorAccuracy));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case MonitoringPackage.DATAGATHERER__OCCI_COLLECTOR_PERIOD:
-				return getOcciCollectorPeriod();
-			case MonitoringPackage.DATAGATHERER__OCCI_COLLECTOR_GRANULARITY:
-				return getOcciCollectorGranularity();
-			case MonitoringPackage.DATAGATHERER__OCCI_COLLECTOR_ACCURACY:
-				return getOcciCollectorAccuracy();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case MonitoringPackage.DATAGATHERER__OCCI_COLLECTOR_PERIOD:
-				setOcciCollectorPeriod((String)newValue);
-				return;
-			case MonitoringPackage.DATAGATHERER__OCCI_COLLECTOR_GRANULARITY:
-				setOcciCollectorGranularity((String)newValue);
-				return;
-			case MonitoringPackage.DATAGATHERER__OCCI_COLLECTOR_ACCURACY:
-				setOcciCollectorAccuracy((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case MonitoringPackage.DATAGATHERER__OCCI_COLLECTOR_PERIOD:
-				setOcciCollectorPeriod(OCCI_COLLECTOR_PERIOD_EDEFAULT);
-				return;
-			case MonitoringPackage.DATAGATHERER__OCCI_COLLECTOR_GRANULARITY:
-				setOcciCollectorGranularity(OCCI_COLLECTOR_GRANULARITY_EDEFAULT);
-				return;
-			case MonitoringPackage.DATAGATHERER__OCCI_COLLECTOR_ACCURACY:
-				setOcciCollectorAccuracy(OCCI_COLLECTOR_ACCURACY_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case MonitoringPackage.DATAGATHERER__OCCI_COLLECTOR_PERIOD:
-				return OCCI_COLLECTOR_PERIOD_EDEFAULT == null ? occiCollectorPeriod != null : !OCCI_COLLECTOR_PERIOD_EDEFAULT.equals(occiCollectorPeriod);
-			case MonitoringPackage.DATAGATHERER__OCCI_COLLECTOR_GRANULARITY:
-				return OCCI_COLLECTOR_GRANULARITY_EDEFAULT == null ? occiCollectorGranularity != null : !OCCI_COLLECTOR_GRANULARITY_EDEFAULT.equals(occiCollectorGranularity);
-			case MonitoringPackage.DATAGATHERER__OCCI_COLLECTOR_ACCURACY:
-				return OCCI_COLLECTOR_ACCURACY_EDEFAULT == null ? occiCollectorAccuracy != null : !OCCI_COLLECTOR_ACCURACY_EDEFAULT.equals(occiCollectorAccuracy);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (occiCollectorPeriod: ");
-		result.append(occiCollectorPeriod);
-		result.append(", occiCollectorGranularity: ");
-		result.append(occiCollectorGranularity);
-		result.append(", occiCollectorAccuracy: ");
-		result.append(occiCollectorAccuracy);
-		result.append(')');
-		return result.toString();
-	}
-
 } //DatagathererImpl
diff --git a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/DataprocessorImpl.java b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/DataprocessorImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..360a1a3277d06377c2e770ab3170af17724233f0
--- /dev/null
+++ b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/DataprocessorImpl.java
@@ -0,0 +1,49 @@
+/**
+ * Copyright (c) 2015-2017 Obeo, Inria
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 	
+ * Contributors:
+ * - William Piers <william.piers@obeo.fr>
+ * - Philippe Merle <philippe.merle@inria.fr>
+ * - Faiez Zalila <faiez.zalila@inria.fr>
+ */
+package monitoring.impl;
+
+import monitoring.Dataprocessor;
+import monitoring.MonitoringPackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.modmacao.occi.platform.impl.ComponentImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Dataprocessor</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class DataprocessorImpl extends ComponentImpl implements Dataprocessor {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DataprocessorImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return MonitoringPackage.Literals.DATAPROCESSOR;
+	}
+
+} //DataprocessorImpl
diff --git a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/MartpublisherImpl.java b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/MartpublisherImpl.java
deleted file mode 100644
index 1b3206b655a82af6b72b861a5c33efd86f9f77c9..0000000000000000000000000000000000000000
--- a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/MartpublisherImpl.java
+++ /dev/null
@@ -1,357 +0,0 @@
-/**
- * Copyright (c) 2015-2017 Obeo, Inria
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 	
- * Contributors:
- * - William Piers <william.piers@obeo.fr>
- * - Philippe Merle <philippe.merle@inria.fr>
- * - Faiez Zalila <faiez.zalila@inria.fr>
- */
-package monitoring.impl;
-
-import java.lang.reflect.InvocationTargetException;
-
-import java.util.Map;
-
-import monitoring.Martpublisher;
-import monitoring.MonitoringPackage;
-
-import monitoring.MonitoringTables;
-import monitoring.util.MonitoringValidator;
-
-import org.eclipse.cmf.occi.core.Entity;
-import org.eclipse.cmf.occi.core.impl.MixinBaseImpl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.emf.common.util.DiagnosticChain;
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.ocl.pivot.evaluation.Executor;
-import org.eclipse.ocl.pivot.ids.IdResolver;
-import org.eclipse.ocl.pivot.ids.TypeId;
-import org.eclipse.ocl.pivot.internal.utilities.PivotUtilInternal;
-import org.eclipse.ocl.pivot.library.oclany.OclAnyOclIsKindOfOperation;
-import org.eclipse.ocl.pivot.library.oclany.OclComparableLessThanEqualOperation;
-import org.eclipse.ocl.pivot.library.string.CGStringGetSeverityOperation;
-import org.eclipse.ocl.pivot.library.string.CGStringLogDiagnosticOperation;
-import org.eclipse.ocl.pivot.utilities.ValueUtil;
-import org.eclipse.ocl.pivot.values.IntegerValue;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Martpublisher</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link monitoring.impl.MartpublisherImpl#getMonitoringPropertyName <em>Monitoring Property Name</em>}</li>
- *   <li>{@link monitoring.impl.MartpublisherImpl#getMonitoringPropertyId <em>Monitoring Property Id</em>}</li>
- *   <li>{@link monitoring.impl.MartpublisherImpl#getMonitoringPropertyResource <em>Monitoring Property Resource</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class MartpublisherImpl extends MixinBaseImpl implements Martpublisher {
-	/**
-	 * The default value of the '{@link #getMonitoringPropertyName() <em>Monitoring Property Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMonitoringPropertyName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MONITORING_PROPERTY_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMonitoringPropertyName() <em>Monitoring Property Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMonitoringPropertyName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String monitoringPropertyName = MONITORING_PROPERTY_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getMonitoringPropertyId() <em>Monitoring Property Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMonitoringPropertyId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MONITORING_PROPERTY_ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMonitoringPropertyId() <em>Monitoring Property Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMonitoringPropertyId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String monitoringPropertyId = MONITORING_PROPERTY_ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getMonitoringPropertyResource() <em>Monitoring Property Resource</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMonitoringPropertyResource()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MONITORING_PROPERTY_RESOURCE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMonitoringPropertyResource() <em>Monitoring Property Resource</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMonitoringPropertyResource()
-	 * @generated
-	 * @ordered
-	 */
-	protected String monitoringPropertyResource = MONITORING_PROPERTY_RESOURCE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MartpublisherImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return MonitoringPackage.Literals.MARTPUBLISHER;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getMonitoringPropertyName() {
-		return monitoringPropertyName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMonitoringPropertyName(String newMonitoringPropertyName) {
-		String oldMonitoringPropertyName = monitoringPropertyName;
-		monitoringPropertyName = newMonitoringPropertyName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MonitoringPackage.MARTPUBLISHER__MONITORING_PROPERTY_NAME, oldMonitoringPropertyName, monitoringPropertyName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getMonitoringPropertyId() {
-		return monitoringPropertyId;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMonitoringPropertyId(String newMonitoringPropertyId) {
-		String oldMonitoringPropertyId = monitoringPropertyId;
-		monitoringPropertyId = newMonitoringPropertyId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MonitoringPackage.MARTPUBLISHER__MONITORING_PROPERTY_ID, oldMonitoringPropertyId, monitoringPropertyId));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getMonitoringPropertyResource() {
-		return monitoringPropertyResource;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMonitoringPropertyResource(String newMonitoringPropertyResource) {
-		String oldMonitoringPropertyResource = monitoringPropertyResource;
-		monitoringPropertyResource = newMonitoringPropertyResource;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MonitoringPackage.MARTPUBLISHER__MONITORING_PROPERTY_RESOURCE, oldMonitoringPropertyResource, monitoringPropertyResource));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean appliesConstraint(final DiagnosticChain diagnostics, final Map<Object, Object> context) {
-		/**
-		 *
-		 * inv appliesConstraint:
-		 *   let severity : Integer[1] = 'Martpublisher::appliesConstraint'.getSeverity()
-		 *   in
-		 *     if severity <= 0
-		 *     then true
-		 *     else
-		 *       let
-		 *         result : occi::Boolean[1] = self.entity.oclIsKindOf(Publisher)
-		 *       in
-		 *         'Martpublisher::appliesConstraint'.logDiagnostic(self, null, diagnostics, context, null, severity, result, 0)
-		 *     endif
-		 */
-		final /*@NonInvalid*/ Executor executor = PivotUtilInternal.getExecutor(this);
-		final /*@NonInvalid*/ IdResolver idResolver = executor.getIdResolver();
-		final /*@NonInvalid*/ IntegerValue severity_0 = CGStringGetSeverityOperation.INSTANCE.evaluate(executor, MonitoringTables.STR_Martpublisher_c_c_appliesConstraint);
-		final /*@NonInvalid*/ boolean le = OclComparableLessThanEqualOperation.INSTANCE.evaluate(executor, severity_0, MonitoringTables.INT_0).booleanValue();
-		/*@NonInvalid*/ boolean symbol_0;
-		if (le) {
-			symbol_0 = ValueUtil.TRUE_VALUE;
-		}
-		else {
-			final /*@NonInvalid*/ org.eclipse.ocl.pivot.Class TYP_monitoring_c_c_Publisher = idResolver.getClass(MonitoringTables.CLSSid_Publisher, null);
-			final /*@NonInvalid*/ Entity entity = this.getEntity();
-			final /*@NonInvalid*/ boolean result = OclAnyOclIsKindOfOperation.INSTANCE.evaluate(executor, entity, TYP_monitoring_c_c_Publisher).booleanValue();
-			final /*@NonInvalid*/ boolean logDiagnostic = CGStringLogDiagnosticOperation.INSTANCE.evaluate(executor, TypeId.BOOLEAN, MonitoringTables.STR_Martpublisher_c_c_appliesConstraint, this, (Object)null, diagnostics, context, (Object)null, severity_0, result, MonitoringTables.INT_0).booleanValue();
-			symbol_0 = logDiagnostic;
-		}
-		return Boolean.TRUE == symbol_0;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case MonitoringPackage.MARTPUBLISHER__MONITORING_PROPERTY_NAME:
-				return getMonitoringPropertyName();
-			case MonitoringPackage.MARTPUBLISHER__MONITORING_PROPERTY_ID:
-				return getMonitoringPropertyId();
-			case MonitoringPackage.MARTPUBLISHER__MONITORING_PROPERTY_RESOURCE:
-				return getMonitoringPropertyResource();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case MonitoringPackage.MARTPUBLISHER__MONITORING_PROPERTY_NAME:
-				setMonitoringPropertyName((String)newValue);
-				return;
-			case MonitoringPackage.MARTPUBLISHER__MONITORING_PROPERTY_ID:
-				setMonitoringPropertyId((String)newValue);
-				return;
-			case MonitoringPackage.MARTPUBLISHER__MONITORING_PROPERTY_RESOURCE:
-				setMonitoringPropertyResource((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case MonitoringPackage.MARTPUBLISHER__MONITORING_PROPERTY_NAME:
-				setMonitoringPropertyName(MONITORING_PROPERTY_NAME_EDEFAULT);
-				return;
-			case MonitoringPackage.MARTPUBLISHER__MONITORING_PROPERTY_ID:
-				setMonitoringPropertyId(MONITORING_PROPERTY_ID_EDEFAULT);
-				return;
-			case MonitoringPackage.MARTPUBLISHER__MONITORING_PROPERTY_RESOURCE:
-				setMonitoringPropertyResource(MONITORING_PROPERTY_RESOURCE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case MonitoringPackage.MARTPUBLISHER__MONITORING_PROPERTY_NAME:
-				return MONITORING_PROPERTY_NAME_EDEFAULT == null ? monitoringPropertyName != null : !MONITORING_PROPERTY_NAME_EDEFAULT.equals(monitoringPropertyName);
-			case MonitoringPackage.MARTPUBLISHER__MONITORING_PROPERTY_ID:
-				return MONITORING_PROPERTY_ID_EDEFAULT == null ? monitoringPropertyId != null : !MONITORING_PROPERTY_ID_EDEFAULT.equals(monitoringPropertyId);
-			case MonitoringPackage.MARTPUBLISHER__MONITORING_PROPERTY_RESOURCE:
-				return MONITORING_PROPERTY_RESOURCE_EDEFAULT == null ? monitoringPropertyResource != null : !MONITORING_PROPERTY_RESOURCE_EDEFAULT.equals(monitoringPropertyResource);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	@SuppressWarnings("unchecked")
-	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
-		switch (operationID) {
-			case MonitoringPackage.MARTPUBLISHER___APPLIES_CONSTRAINT__DIAGNOSTICCHAIN_MAP:
-				return appliesConstraint((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
-		}
-		return super.eInvoke(operationID, arguments);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (monitoringPropertyName: ");
-		result.append(monitoringPropertyName);
-		result.append(", monitoringPropertyId: ");
-		result.append(monitoringPropertyId);
-		result.append(", monitoringPropertyResource: ");
-		result.append(monitoringPropertyResource);
-		result.append(')');
-		return result.toString();
-	}
-
-} //MartpublisherImpl
diff --git a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/MonitoringpropertyImpl.java b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/MonitorablepropertyImpl.java
similarity index 58%
rename from de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/MonitoringpropertyImpl.java
rename to de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/MonitorablepropertyImpl.java
index 56b753221ba77b471214f658a1c6a1ef614ccccc..dc5539390c371e680ecf06d857588c4976576a37 100644
--- a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/MonitoringpropertyImpl.java
+++ b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/MonitorablepropertyImpl.java
@@ -16,96 +16,101 @@ import java.lang.reflect.InvocationTargetException;
 
 import java.util.Map;
 
+import monitoring.Monitorableproperty;
 import monitoring.MonitoringPackage;
 import monitoring.MonitoringTables;
-import monitoring.Monitoringproperty;
-
-import monitoring.util.MonitoringValidator;
 
 import org.eclipse.cmf.occi.core.Resource;
+
 import org.eclipse.cmf.occi.core.impl.LinkImpl;
 
 import org.eclipse.emf.common.notify.Notification;
 
-import org.eclipse.emf.common.util.Diagnostic;
 import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.emf.common.util.EList;
 
 import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
 import org.eclipse.ocl.pivot.evaluation.Executor;
+
 import org.eclipse.ocl.pivot.ids.IdResolver;
 import org.eclipse.ocl.pivot.ids.TypeId;
+
 import org.eclipse.ocl.pivot.internal.utilities.PivotUtilInternal;
+
 import org.eclipse.ocl.pivot.library.oclany.OclAnyOclIsKindOfOperation;
 import org.eclipse.ocl.pivot.library.oclany.OclComparableLessThanEqualOperation;
+
 import org.eclipse.ocl.pivot.library.string.CGStringGetSeverityOperation;
 import org.eclipse.ocl.pivot.library.string.CGStringLogDiagnosticOperation;
+
 import org.eclipse.ocl.pivot.utilities.ValueUtil;
+
 import org.eclipse.ocl.pivot.values.IntegerValue;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Monitoringproperty</b></em>'.
+ * An implementation of the model object '<em><b>Monitorableproperty</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link monitoring.impl.MonitoringpropertyImpl#getMonitoringPropertyName <em>Monitoring Property Name</em>}</li>
- *   <li>{@link monitoring.impl.MonitoringpropertyImpl#getMonitoringPropertyValue <em>Monitoring Property Value</em>}</li>
+ *   <li>{@link monitoring.impl.MonitorablepropertyImpl#getMonitoringProperty <em>Monitoring Property</em>}</li>
+ *   <li>{@link monitoring.impl.MonitorablepropertyImpl#getMonitoringResult <em>Monitoring Result</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class MonitoringpropertyImpl extends LinkImpl implements Monitoringproperty {
+public class MonitorablepropertyImpl extends LinkImpl implements Monitorableproperty {
 	/**
-	 * The default value of the '{@link #getMonitoringPropertyName() <em>Monitoring Property Name</em>}' attribute.
+	 * The default value of the '{@link #getMonitoringProperty() <em>Monitoring Property</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getMonitoringPropertyName()
+	 * @see #getMonitoringProperty()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final String MONITORING_PROPERTY_NAME_EDEFAULT = null;
+	protected static final String MONITORING_PROPERTY_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getMonitoringPropertyName() <em>Monitoring Property Name</em>}' attribute.
+	 * The cached value of the '{@link #getMonitoringProperty() <em>Monitoring Property</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getMonitoringPropertyName()
+	 * @see #getMonitoringProperty()
 	 * @generated
 	 * @ordered
 	 */
-	protected String monitoringPropertyName = MONITORING_PROPERTY_NAME_EDEFAULT;
+	protected String monitoringProperty = MONITORING_PROPERTY_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getMonitoringPropertyValue() <em>Monitoring Property Value</em>}' attribute.
+	 * The default value of the '{@link #getMonitoringResult() <em>Monitoring Result</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getMonitoringPropertyValue()
+	 * @see #getMonitoringResult()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final String MONITORING_PROPERTY_VALUE_EDEFAULT = null;
+	protected static final String MONITORING_RESULT_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getMonitoringPropertyValue() <em>Monitoring Property Value</em>}' attribute.
+	 * The cached value of the '{@link #getMonitoringResult() <em>Monitoring Result</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getMonitoringPropertyValue()
+	 * @see #getMonitoringResult()
 	 * @generated
 	 * @ordered
 	 */
-	protected String monitoringPropertyValue = MONITORING_PROPERTY_VALUE_EDEFAULT;
+	protected String monitoringResult = MONITORING_RESULT_EDEFAULT;
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected MonitoringpropertyImpl() {
+	protected MonitorablepropertyImpl() {
 		super();
 	}
 
@@ -116,7 +121,7 @@ public class MonitoringpropertyImpl extends LinkImpl implements Monitoringproper
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return MonitoringPackage.Literals.MONITORINGPROPERTY;
+		return MonitoringPackage.Literals.MONITORABLEPROPERTY;
 	}
 
 	/**
@@ -124,8 +129,8 @@ public class MonitoringpropertyImpl extends LinkImpl implements Monitoringproper
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public String getMonitoringPropertyName() {
-		return monitoringPropertyName;
+	public String getMonitoringProperty() {
+		return monitoringProperty;
 	}
 
 	/**
@@ -133,11 +138,11 @@ public class MonitoringpropertyImpl extends LinkImpl implements Monitoringproper
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setMonitoringPropertyName(String newMonitoringPropertyName) {
-		String oldMonitoringPropertyName = monitoringPropertyName;
-		monitoringPropertyName = newMonitoringPropertyName;
+	public void setMonitoringProperty(String newMonitoringProperty) {
+		String oldMonitoringProperty = monitoringProperty;
+		monitoringProperty = newMonitoringProperty;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MonitoringPackage.MONITORINGPROPERTY__MONITORING_PROPERTY_NAME, oldMonitoringPropertyName, monitoringPropertyName));
+			eNotify(new ENotificationImpl(this, Notification.SET, MonitoringPackage.MONITORABLEPROPERTY__MONITORING_PROPERTY, oldMonitoringProperty, monitoringProperty));
 	}
 
 	/**
@@ -145,8 +150,8 @@ public class MonitoringpropertyImpl extends LinkImpl implements Monitoringproper
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public String getMonitoringPropertyValue() {
-		return monitoringPropertyValue;
+	public String getMonitoringResult() {
+		return monitoringResult;
 	}
 
 	/**
@@ -154,11 +159,11 @@ public class MonitoringpropertyImpl extends LinkImpl implements Monitoringproper
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setMonitoringPropertyValue(String newMonitoringPropertyValue) {
-		String oldMonitoringPropertyValue = monitoringPropertyValue;
-		monitoringPropertyValue = newMonitoringPropertyValue;
+	public void setMonitoringResult(String newMonitoringResult) {
+		String oldMonitoringResult = monitoringResult;
+		monitoringResult = newMonitoringResult;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MonitoringPackage.MONITORINGPROPERTY__MONITORING_PROPERTY_VALUE, oldMonitoringPropertyValue, monitoringPropertyValue));
+			eNotify(new ENotificationImpl(this, Notification.SET, MonitoringPackage.MONITORABLEPROPERTY__MONITORING_RESULT, oldMonitoringResult, monitoringResult));
 	}
 
 	/**
@@ -171,19 +176,19 @@ public class MonitoringpropertyImpl extends LinkImpl implements Monitoringproper
 		 *
 		 * inv targetConstraint:
 		 *   let
-		 *     severity : Integer[1] = 'Monitoringproperty::targetConstraint'.getSeverity()
+		 *     severity : Integer[1] = 'Monitorableproperty::targetConstraint'.getSeverity()
 		 *   in
 		 *     if severity <= 0
 		 *     then true
 		 *     else
 		 *       let result : occi::Boolean[1] = self.target.oclIsKindOf(Sensor)
 		 *       in
-		 *         'Monitoringproperty::targetConstraint'.logDiagnostic(self, null, diagnostics, context, null, severity, result, 0)
+		 *         'Monitorableproperty::targetConstraint'.logDiagnostic(self, null, diagnostics, context, null, severity, result, 0)
 		 *     endif
 		 */
 		final /*@NonInvalid*/ Executor executor = PivotUtilInternal.getExecutor(this);
 		final /*@NonInvalid*/ IdResolver idResolver = executor.getIdResolver();
-		final /*@NonInvalid*/ IntegerValue severity_0 = CGStringGetSeverityOperation.INSTANCE.evaluate(executor, MonitoringTables.STR_Monitoringproperty_c_c_targetConstraint);
+		final /*@NonInvalid*/ IntegerValue severity_0 = CGStringGetSeverityOperation.INSTANCE.evaluate(executor, MonitoringTables.STR_Monitorableproperty_c_c_targetConstraint);
 		final /*@NonInvalid*/ boolean le = OclComparableLessThanEqualOperation.INSTANCE.evaluate(executor, severity_0, MonitoringTables.INT_0).booleanValue();
 		/*@NonInvalid*/ boolean symbol_0;
 		if (le) {
@@ -193,7 +198,7 @@ public class MonitoringpropertyImpl extends LinkImpl implements Monitoringproper
 			final /*@NonInvalid*/ org.eclipse.ocl.pivot.Class TYP_monitoring_c_c_Sensor = idResolver.getClass(MonitoringTables.CLSSid_Sensor, null);
 			final /*@NonInvalid*/ Resource target = this.getTarget();
 			final /*@NonInvalid*/ boolean result = OclAnyOclIsKindOfOperation.INSTANCE.evaluate(executor, target, TYP_monitoring_c_c_Sensor).booleanValue();
-			final /*@NonInvalid*/ boolean logDiagnostic = CGStringLogDiagnosticOperation.INSTANCE.evaluate(executor, TypeId.BOOLEAN, MonitoringTables.STR_Monitoringproperty_c_c_targetConstraint, this, (Object)null, diagnostics, context, (Object)null, severity_0, result, MonitoringTables.INT_0).booleanValue();
+			final /*@NonInvalid*/ boolean logDiagnostic = CGStringLogDiagnosticOperation.INSTANCE.evaluate(executor, TypeId.BOOLEAN, MonitoringTables.STR_Monitorableproperty_c_c_targetConstraint, this, (Object)null, diagnostics, context, (Object)null, severity_0, result, MonitoringTables.INT_0).booleanValue();
 			symbol_0 = logDiagnostic;
 		}
 		return Boolean.TRUE == symbol_0;
@@ -207,10 +212,10 @@ public class MonitoringpropertyImpl extends LinkImpl implements Monitoringproper
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case MonitoringPackage.MONITORINGPROPERTY__MONITORING_PROPERTY_NAME:
-				return getMonitoringPropertyName();
-			case MonitoringPackage.MONITORINGPROPERTY__MONITORING_PROPERTY_VALUE:
-				return getMonitoringPropertyValue();
+			case MonitoringPackage.MONITORABLEPROPERTY__MONITORING_PROPERTY:
+				return getMonitoringProperty();
+			case MonitoringPackage.MONITORABLEPROPERTY__MONITORING_RESULT:
+				return getMonitoringResult();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -223,11 +228,11 @@ public class MonitoringpropertyImpl extends LinkImpl implements Monitoringproper
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case MonitoringPackage.MONITORINGPROPERTY__MONITORING_PROPERTY_NAME:
-				setMonitoringPropertyName((String)newValue);
+			case MonitoringPackage.MONITORABLEPROPERTY__MONITORING_PROPERTY:
+				setMonitoringProperty((String)newValue);
 				return;
-			case MonitoringPackage.MONITORINGPROPERTY__MONITORING_PROPERTY_VALUE:
-				setMonitoringPropertyValue((String)newValue);
+			case MonitoringPackage.MONITORABLEPROPERTY__MONITORING_RESULT:
+				setMonitoringResult((String)newValue);
 				return;
 		}
 		super.eSet(featureID, newValue);
@@ -241,11 +246,11 @@ public class MonitoringpropertyImpl extends LinkImpl implements Monitoringproper
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case MonitoringPackage.MONITORINGPROPERTY__MONITORING_PROPERTY_NAME:
-				setMonitoringPropertyName(MONITORING_PROPERTY_NAME_EDEFAULT);
+			case MonitoringPackage.MONITORABLEPROPERTY__MONITORING_PROPERTY:
+				setMonitoringProperty(MONITORING_PROPERTY_EDEFAULT);
 				return;
-			case MonitoringPackage.MONITORINGPROPERTY__MONITORING_PROPERTY_VALUE:
-				setMonitoringPropertyValue(MONITORING_PROPERTY_VALUE_EDEFAULT);
+			case MonitoringPackage.MONITORABLEPROPERTY__MONITORING_RESULT:
+				setMonitoringResult(MONITORING_RESULT_EDEFAULT);
 				return;
 		}
 		super.eUnset(featureID);
@@ -259,10 +264,10 @@ public class MonitoringpropertyImpl extends LinkImpl implements Monitoringproper
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case MonitoringPackage.MONITORINGPROPERTY__MONITORING_PROPERTY_NAME:
-				return MONITORING_PROPERTY_NAME_EDEFAULT == null ? monitoringPropertyName != null : !MONITORING_PROPERTY_NAME_EDEFAULT.equals(monitoringPropertyName);
-			case MonitoringPackage.MONITORINGPROPERTY__MONITORING_PROPERTY_VALUE:
-				return MONITORING_PROPERTY_VALUE_EDEFAULT == null ? monitoringPropertyValue != null : !MONITORING_PROPERTY_VALUE_EDEFAULT.equals(monitoringPropertyValue);
+			case MonitoringPackage.MONITORABLEPROPERTY__MONITORING_PROPERTY:
+				return MONITORING_PROPERTY_EDEFAULT == null ? monitoringProperty != null : !MONITORING_PROPERTY_EDEFAULT.equals(monitoringProperty);
+			case MonitoringPackage.MONITORABLEPROPERTY__MONITORING_RESULT:
+				return MONITORING_RESULT_EDEFAULT == null ? monitoringResult != null : !MONITORING_RESULT_EDEFAULT.equals(monitoringResult);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -276,7 +281,7 @@ public class MonitoringpropertyImpl extends LinkImpl implements Monitoringproper
 	@SuppressWarnings("unchecked")
 	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
 		switch (operationID) {
-			case MonitoringPackage.MONITORINGPROPERTY___TARGET_CONSTRAINT__DIAGNOSTICCHAIN_MAP:
+			case MonitoringPackage.MONITORABLEPROPERTY___TARGET_CONSTRAINT__DIAGNOSTICCHAIN_MAP:
 				return targetConstraint((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
@@ -292,12 +297,12 @@ public class MonitoringpropertyImpl extends LinkImpl implements Monitoringproper
 		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (monitoringPropertyName: ");
-		result.append(monitoringPropertyName);
-		result.append(", monitoringPropertyValue: ");
-		result.append(monitoringPropertyValue);
+		result.append(" (monitoringProperty: ");
+		result.append(monitoringProperty);
+		result.append(", monitoringResult: ");
+		result.append(monitoringResult);
 		result.append(')');
 		return result.toString();
 	}
 
-} //MonitoringpropertyImpl
+} //MonitorablepropertyImpl
diff --git a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/MonitoringFactoryImpl.java b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/MonitoringFactoryImpl.java
index cf98693f1244d201d95622a0086d33b0a3a48d88..6e1f93f801eb279cf5501ec69909504392ba5f98 100644
--- a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/MonitoringFactoryImpl.java
+++ b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/MonitoringFactoryImpl.java
@@ -69,10 +69,10 @@ public class MonitoringFactoryImpl extends EFactoryImpl implements MonitoringFac
 		switch (eClass.getClassifierID()) {
 			case MonitoringPackage.SENSOR: return createSensor();
 			case MonitoringPackage.DATAGATHERER: return createDatagatherer();
-			case MonitoringPackage.PROCESSOR: return createProcessor();
-			case MonitoringPackage.PUBLISHER: return createPublisher();
-			case MonitoringPackage.MONITORINGPROPERTY: return createMonitoringproperty();
-			case MonitoringPackage.MARTPUBLISHER: return createMartpublisher();
+			case MonitoringPackage.DATAPROCESSOR: return createDataprocessor();
+			case MonitoringPackage.RESULTPROVIDER: return createResultprovider();
+			case MonitoringPackage.MONITORABLEPROPERTY: return createMonitorableproperty();
+			case MonitoringPackage.OCCIRESULTPROVIDER: return createOcciresultprovider();
 			default:
 				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
@@ -86,10 +86,6 @@ public class MonitoringFactoryImpl extends EFactoryImpl implements MonitoringFac
 	@Override
 	public Object createFromString(EDataType eDataType, String initialValue) {
 		switch (eDataType.getClassifierID()) {
-			case MonitoringPackage.DATE_TIME:
-				return createDateTimeFromString(eDataType, initialValue);
-			case MonitoringPackage.SECOND:
-				return createSecondFromString(eDataType, initialValue);
 			case MonitoringPackage.STRING:
 				return createStringFromString(eDataType, initialValue);
 			default:
@@ -105,10 +101,6 @@ public class MonitoringFactoryImpl extends EFactoryImpl implements MonitoringFac
 	@Override
 	public String convertToString(EDataType eDataType, Object instanceValue) {
 		switch (eDataType.getClassifierID()) {
-			case MonitoringPackage.DATE_TIME:
-				return convertDateTimeToString(eDataType, instanceValue);
-			case MonitoringPackage.SECOND:
-				return convertSecondToString(eDataType, instanceValue);
 			case MonitoringPackage.STRING:
 				return convertStringToString(eDataType, instanceValue);
 			default:
@@ -141,9 +133,9 @@ public class MonitoringFactoryImpl extends EFactoryImpl implements MonitoringFac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Processor createProcessor() {
-		ProcessorImpl processor = new ProcessorImpl();
-		return processor;
+	public Dataprocessor createDataprocessor() {
+		DataprocessorImpl dataprocessor = new DataprocessorImpl();
+		return dataprocessor;
 	}
 
 	/**
@@ -151,9 +143,9 @@ public class MonitoringFactoryImpl extends EFactoryImpl implements MonitoringFac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Publisher createPublisher() {
-		PublisherImpl publisher = new PublisherImpl();
-		return publisher;
+	public Resultprovider createResultprovider() {
+		ResultproviderImpl resultprovider = new ResultproviderImpl();
+		return resultprovider;
 	}
 
 	/**
@@ -161,9 +153,9 @@ public class MonitoringFactoryImpl extends EFactoryImpl implements MonitoringFac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Monitoringproperty createMonitoringproperty() {
-		MonitoringpropertyImpl monitoringproperty = new MonitoringpropertyImpl();
-		return monitoringproperty;
+	public Monitorableproperty createMonitorableproperty() {
+		MonitorablepropertyImpl monitorableproperty = new MonitorablepropertyImpl();
+		return monitorableproperty;
 	}
 
 	/**
@@ -171,45 +163,9 @@ public class MonitoringFactoryImpl extends EFactoryImpl implements MonitoringFac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Martpublisher createMartpublisher() {
-		MartpublisherImpl martpublisher = new MartpublisherImpl();
-		return martpublisher;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createDateTimeFromString(EDataType eDataType, String initialValue) {
-		return (String)super.createFromString(eDataType, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertDateTimeToString(EDataType eDataType, Object instanceValue) {
-		return super.convertToString(eDataType, instanceValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String createSecondFromString(EDataType eDataType, String initialValue) {
-		return (String)super.createFromString(eDataType, initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertSecondToString(EDataType eDataType, Object instanceValue) {
-		return super.convertToString(eDataType, instanceValue);
+	public Occiresultprovider createOcciresultprovider() {
+		OcciresultproviderImpl occiresultprovider = new OcciresultproviderImpl();
+		return occiresultprovider;
 	}
 
 	/**
diff --git a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/MonitoringPackageImpl.java b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/MonitoringPackageImpl.java
index 83c528d7db226c1e033716a002cd9456119ddeaf..fcbecc7879da6903840dd36433f398d902489adc 100644
--- a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/MonitoringPackageImpl.java
+++ b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/MonitoringPackageImpl.java
@@ -13,12 +13,13 @@
 package monitoring.impl;
 
 import monitoring.Datagatherer;
-import monitoring.Martpublisher;
+import monitoring.Dataprocessor;
+import monitoring.Gatheringservice;
+import monitoring.Monitorableproperty;
 import monitoring.MonitoringFactory;
 import monitoring.MonitoringPackage;
-import monitoring.Monitoringproperty;
-import monitoring.Processor;
-import monitoring.Publisher;
+import monitoring.Occiresultprovider;
+import monitoring.Resultprovider;
 import monitoring.Sensor;
 
 import monitoring.util.MonitoringValidator;
@@ -63,42 +64,28 @@ public class MonitoringPackageImpl extends EPackageImpl implements MonitoringPac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private EClass processorEClass = null;
+	private EClass dataprocessorEClass = null;
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private EClass publisherEClass = null;
+	private EClass resultproviderEClass = null;
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private EClass monitoringpropertyEClass = null;
+	private EClass monitorablepropertyEClass = null;
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private EClass martpublisherEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType dateTimeEDataType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType secondEDataType = null;
+	private EClass occiresultproviderEClass = null;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -190,60 +177,6 @@ public class MonitoringPackageImpl extends EPackageImpl implements MonitoringPac
 		return sensorEClass;
 	}
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSensor_OcciSensorTimebase() {
-		return (EAttribute)sensorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSensor_OcciSensorTimestart() {
-		return (EAttribute)sensorEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSensor_OcciSensorTimestop() {
-		return (EAttribute)sensorEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSensor_OcciSensorPeriod() {
-		return (EAttribute)sensorEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSensor_OcciSensorGranularity() {
-		return (EAttribute)sensorEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSensor_OcciSensorAccuracy() {
-		return (EAttribute)sensorEClass.getEStructuralFeatures().get(5);
-	}
-
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -258,62 +191,8 @@ public class MonitoringPackageImpl extends EPackageImpl implements MonitoringPac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getDatagatherer_OcciCollectorPeriod() {
-		return (EAttribute)datagathererEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDatagatherer_OcciCollectorGranularity() {
-		return (EAttribute)datagathererEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDatagatherer_OcciCollectorAccuracy() {
-		return (EAttribute)datagathererEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getProcessor() {
-		return processorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getProcessor_GathererAddress() {
-		return (EAttribute)processorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPublisher() {
-		return publisherEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPublisher_PublisherEndpoint() {
-		return (EAttribute)publisherEClass.getEStructuralFeatures().get(0);
+	public EClass getDataprocessor() {
+		return dataprocessorEClass;
 	}
 
 	/**
@@ -321,8 +200,8 @@ public class MonitoringPackageImpl extends EPackageImpl implements MonitoringPac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EClass getMonitoringproperty() {
-		return monitoringpropertyEClass;
+	public EClass getResultprovider() {
+		return resultproviderEClass;
 	}
 
 	/**
@@ -330,8 +209,8 @@ public class MonitoringPackageImpl extends EPackageImpl implements MonitoringPac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getMonitoringproperty_MonitoringPropertyName() {
-		return (EAttribute)monitoringpropertyEClass.getEStructuralFeatures().get(0);
+	public EClass getMonitorableproperty() {
+		return monitorablepropertyEClass;
 	}
 
 	/**
@@ -339,8 +218,8 @@ public class MonitoringPackageImpl extends EPackageImpl implements MonitoringPac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getMonitoringproperty_MonitoringPropertyValue() {
-		return (EAttribute)monitoringpropertyEClass.getEStructuralFeatures().get(1);
+	public EAttribute getMonitorableproperty_MonitoringProperty() {
+		return (EAttribute)monitorablepropertyEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -348,8 +227,8 @@ public class MonitoringPackageImpl extends EPackageImpl implements MonitoringPac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EOperation getMonitoringproperty__TargetConstraint__DiagnosticChain_Map() {
-		return monitoringpropertyEClass.getEOperations().get(0);
+	public EAttribute getMonitorableproperty_MonitoringResult() {
+		return (EAttribute)monitorablepropertyEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -357,8 +236,8 @@ public class MonitoringPackageImpl extends EPackageImpl implements MonitoringPac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EClass getMartpublisher() {
-		return martpublisherEClass;
+	public EOperation getMonitorableproperty__TargetConstraint__DiagnosticChain_Map() {
+		return monitorablepropertyEClass.getEOperations().get(0);
 	}
 
 	/**
@@ -366,8 +245,8 @@ public class MonitoringPackageImpl extends EPackageImpl implements MonitoringPac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getMartpublisher_MonitoringPropertyName() {
-		return (EAttribute)martpublisherEClass.getEStructuralFeatures().get(0);
+	public EClass getOcciresultprovider() {
+		return occiresultproviderEClass;
 	}
 
 	/**
@@ -375,8 +254,8 @@ public class MonitoringPackageImpl extends EPackageImpl implements MonitoringPac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getMartpublisher_MonitoringPropertyId() {
-		return (EAttribute)martpublisherEClass.getEStructuralFeatures().get(1);
+	public EAttribute getOcciresultprovider_ResultProviderEndpoint() {
+		return (EAttribute)occiresultproviderEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -384,35 +263,8 @@ public class MonitoringPackageImpl extends EPackageImpl implements MonitoringPac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getMartpublisher_MonitoringPropertyResource() {
-		return (EAttribute)martpublisherEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EOperation getMartpublisher__AppliesConstraint__DiagnosticChain_Map() {
-		return martpublisherEClass.getEOperations().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getDateTime() {
-		return dateTimeEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getSecond() {
-		return secondEDataType;
+	public EOperation getOcciresultprovider__AppliesConstraint__DiagnosticChain_Map() {
+		return occiresultproviderEClass.getEOperations().get(0);
 	}
 
 	/**
@@ -453,38 +305,23 @@ public class MonitoringPackageImpl extends EPackageImpl implements MonitoringPac
 
 		// Create classes and their features
 		sensorEClass = createEClass(SENSOR);
-		createEAttribute(sensorEClass, SENSOR__OCCI_SENSOR_TIMEBASE);
-		createEAttribute(sensorEClass, SENSOR__OCCI_SENSOR_TIMESTART);
-		createEAttribute(sensorEClass, SENSOR__OCCI_SENSOR_TIMESTOP);
-		createEAttribute(sensorEClass, SENSOR__OCCI_SENSOR_PERIOD);
-		createEAttribute(sensorEClass, SENSOR__OCCI_SENSOR_GRANULARITY);
-		createEAttribute(sensorEClass, SENSOR__OCCI_SENSOR_ACCURACY);
 
 		datagathererEClass = createEClass(DATAGATHERER);
-		createEAttribute(datagathererEClass, DATAGATHERER__OCCI_COLLECTOR_PERIOD);
-		createEAttribute(datagathererEClass, DATAGATHERER__OCCI_COLLECTOR_GRANULARITY);
-		createEAttribute(datagathererEClass, DATAGATHERER__OCCI_COLLECTOR_ACCURACY);
 
-		processorEClass = createEClass(PROCESSOR);
-		createEAttribute(processorEClass, PROCESSOR__GATHERER_ADDRESS);
+		dataprocessorEClass = createEClass(DATAPROCESSOR);
 
-		publisherEClass = createEClass(PUBLISHER);
-		createEAttribute(publisherEClass, PUBLISHER__PUBLISHER_ENDPOINT);
+		resultproviderEClass = createEClass(RESULTPROVIDER);
 
-		monitoringpropertyEClass = createEClass(MONITORINGPROPERTY);
-		createEAttribute(monitoringpropertyEClass, MONITORINGPROPERTY__MONITORING_PROPERTY_NAME);
-		createEAttribute(monitoringpropertyEClass, MONITORINGPROPERTY__MONITORING_PROPERTY_VALUE);
-		createEOperation(monitoringpropertyEClass, MONITORINGPROPERTY___TARGET_CONSTRAINT__DIAGNOSTICCHAIN_MAP);
+		monitorablepropertyEClass = createEClass(MONITORABLEPROPERTY);
+		createEAttribute(monitorablepropertyEClass, MONITORABLEPROPERTY__MONITORING_PROPERTY);
+		createEAttribute(monitorablepropertyEClass, MONITORABLEPROPERTY__MONITORING_RESULT);
+		createEOperation(monitorablepropertyEClass, MONITORABLEPROPERTY___TARGET_CONSTRAINT__DIAGNOSTICCHAIN_MAP);
 
-		martpublisherEClass = createEClass(MARTPUBLISHER);
-		createEAttribute(martpublisherEClass, MARTPUBLISHER__MONITORING_PROPERTY_NAME);
-		createEAttribute(martpublisherEClass, MARTPUBLISHER__MONITORING_PROPERTY_ID);
-		createEAttribute(martpublisherEClass, MARTPUBLISHER__MONITORING_PROPERTY_RESOURCE);
-		createEOperation(martpublisherEClass, MARTPUBLISHER___APPLIES_CONSTRAINT__DIAGNOSTICCHAIN_MAP);
+		occiresultproviderEClass = createEClass(OCCIRESULTPROVIDER);
+		createEAttribute(occiresultproviderEClass, OCCIRESULTPROVIDER__RESULT_PROVIDER_ENDPOINT);
+		createEOperation(occiresultproviderEClass, OCCIRESULTPROVIDER___APPLIES_CONSTRAINT__DIAGNOSTICCHAIN_MAP);
 
 		// Create data types
-		dateTimeEDataType = createEDataType(DATE_TIME);
-		secondEDataType = createEDataType(SECOND);
 		stringEDataType = createEDataType(STRING);
 	}
 
@@ -522,36 +359,25 @@ public class MonitoringPackageImpl extends EPackageImpl implements MonitoringPac
 		// Add supertypes to classes
 		sensorEClass.getESuperTypes().add(thePlatformPackage.getApplication());
 		datagathererEClass.getESuperTypes().add(thePlatformPackage.getComponent());
-		processorEClass.getESuperTypes().add(thePlatformPackage.getComponent());
-		publisherEClass.getESuperTypes().add(thePlatformPackage.getComponent());
-		monitoringpropertyEClass.getESuperTypes().add(theOCCIPackage.getLink());
-		martpublisherEClass.getESuperTypes().add(theOCCIPackage.getMixinBase());
+		dataprocessorEClass.getESuperTypes().add(thePlatformPackage.getComponent());
+		resultproviderEClass.getESuperTypes().add(thePlatformPackage.getComponent());
+		monitorablepropertyEClass.getESuperTypes().add(theOCCIPackage.getLink());
+		occiresultproviderEClass.getESuperTypes().add(theOCCIPackage.getMixinBase());
 
 		// Initialize classes, features, and operations; add parameters
 		initEClass(sensorEClass, Sensor.class, "Sensor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getSensor_OcciSensorTimebase(), this.getDateTime(), "occiSensorTimebase", null, 0, 1, Sensor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getSensor_OcciSensorTimestart(), this.getSecond(), "occiSensorTimestart", null, 0, 1, Sensor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getSensor_OcciSensorTimestop(), this.getSecond(), "occiSensorTimestop", null, 0, 1, Sensor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getSensor_OcciSensorPeriod(), this.getSecond(), "occiSensorPeriod", null, 1, 1, Sensor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getSensor_OcciSensorGranularity(), this.getSecond(), "occiSensorGranularity", null, 0, 1, Sensor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getSensor_OcciSensorAccuracy(), this.getSecond(), "occiSensorAccuracy", null, 0, 1, Sensor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(datagathererEClass, Datagatherer.class, "Datagatherer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getDatagatherer_OcciCollectorPeriod(), this.getSecond(), "occiCollectorPeriod", null, 1, 1, Datagatherer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getDatagatherer_OcciCollectorGranularity(), this.getSecond(), "occiCollectorGranularity", null, 0, 1, Datagatherer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getDatagatherer_OcciCollectorAccuracy(), this.getSecond(), "occiCollectorAccuracy", null, 0, 1, Datagatherer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(processorEClass, Processor.class, "Processor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getProcessor_GathererAddress(), this.getString(), "gathererAddress", null, 0, 1, Processor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEClass(dataprocessorEClass, Dataprocessor.class, "Dataprocessor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
-		initEClass(publisherEClass, Publisher.class, "Publisher", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getPublisher_PublisherEndpoint(), this.getString(), "publisherEndpoint", null, 1, 1, Publisher.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEClass(resultproviderEClass, Resultprovider.class, "Resultprovider", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
-		initEClass(monitoringpropertyEClass, Monitoringproperty.class, "Monitoringproperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getMonitoringproperty_MonitoringPropertyName(), this.getString(), "monitoringPropertyName", null, 1, 1, Monitoringproperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMonitoringproperty_MonitoringPropertyValue(), this.getString(), "monitoringPropertyValue", null, 0, 1, Monitoringproperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEClass(monitorablepropertyEClass, Monitorableproperty.class, "Monitorableproperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getMonitorableproperty_MonitoringProperty(), this.getString(), "monitoringProperty", null, 1, 1, Monitorableproperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getMonitorableproperty_MonitoringResult(), this.getString(), "monitoringResult", null, 0, 1, Monitorableproperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		EOperation op = initEOperation(getMonitoringproperty__TargetConstraint__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "targetConstraint", 0, 1, IS_UNIQUE, IS_ORDERED);
+		EOperation op = initEOperation(getMonitorableproperty__TargetConstraint__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "targetConstraint", 0, 1, IS_UNIQUE, IS_ORDERED);
 		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		EGenericType g1 = createEGenericType(ecorePackage.getEMap());
 		EGenericType g2 = createEGenericType(ecorePackage.getEJavaObject());
@@ -560,12 +386,10 @@ public class MonitoringPackageImpl extends EPackageImpl implements MonitoringPac
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
 
-		initEClass(martpublisherEClass, Martpublisher.class, "Martpublisher", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getMartpublisher_MonitoringPropertyName(), this.getString(), "monitoringPropertyName", null, 1, 1, Martpublisher.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMartpublisher_MonitoringPropertyId(), this.getString(), "monitoringPropertyId", null, 0, 1, Martpublisher.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMartpublisher_MonitoringPropertyResource(), this.getString(), "monitoringPropertyResource", null, 1, 1, Martpublisher.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEClass(occiresultproviderEClass, Occiresultprovider.class, "Occiresultprovider", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getOcciresultprovider_ResultProviderEndpoint(), this.getString(), "resultProviderEndpoint", null, 1, 1, Occiresultprovider.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		op = initEOperation(getMartpublisher__AppliesConstraint__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "appliesConstraint", 0, 1, IS_UNIQUE, IS_ORDERED);
+		op = initEOperation(getOcciresultprovider__AppliesConstraint__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "appliesConstraint", 0, 1, IS_UNIQUE, IS_ORDERED);
 		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
@@ -575,8 +399,6 @@ public class MonitoringPackageImpl extends EPackageImpl implements MonitoringPac
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
 
 		// Initialize data types
-		initEDataType(dateTimeEDataType, String.class, "DateTime", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(secondEDataType, String.class, "Second", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
 		initEDataType(stringEDataType, String.class, "String", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
 
 		// Create resource
@@ -585,8 +407,6 @@ public class MonitoringPackageImpl extends EPackageImpl implements MonitoringPac
 		// Create annotations
 		// http://www.eclipse.org/emf/2002/Ecore
 		createEcoreAnnotations();
-		// http:///org/eclipse/emf/ecore/util/ExtendedMetaData
-		createExtendedMetaDataAnnotations();
 	}
 
 	/**
@@ -603,33 +423,17 @@ public class MonitoringPackageImpl extends EPackageImpl implements MonitoringPac
 		   new String[] {
 		   });	
 		addAnnotation
-		  (monitoringpropertyEClass, 
+		  (monitorablepropertyEClass, 
 		   source, 
 		   new String[] {
 			 "constraints", "targetConstraint"
 		   });	
 		addAnnotation
-		  (martpublisherEClass, 
+		  (occiresultproviderEClass, 
 		   source, 
 		   new String[] {
 			 "constraints", "appliesConstraint"
 		   });
 	}
 
-	/**
-	 * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void createExtendedMetaDataAnnotations() {
-		String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";	
-		addAnnotation
-		  (dateTimeEDataType, 
-		   source, 
-		   new String[] {
-			 "pattern", "^(\\d{4}((-)?(0[1-9]|1[0-2])((-)?(0[1-9]|[1-2][0-9]|3[0-1])(T(24:00(:00(\\.[0]+)?)?|(([0-1][0-9]|2[0-3])(:)[0-5][0-9])((:)[0-5][0-9](\\.[\\d]+)?)?)((\\+|-)(14:00|(0[0-9]|1[0-3])(:)[0-5][0-9])|Z))?)?)?)$"
-		   });
-	}
-
 } //MonitoringPackageImpl
diff --git a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/OcciresultproviderImpl.java b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/OcciresultproviderImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..667ac2e15ca40fa157b9afe150d3db4eaf708ee9
--- /dev/null
+++ b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/OcciresultproviderImpl.java
@@ -0,0 +1,255 @@
+/**
+ * Copyright (c) 2015-2017 Obeo, Inria
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 	
+ * Contributors:
+ * - William Piers <william.piers@obeo.fr>
+ * - Philippe Merle <philippe.merle@inria.fr>
+ * - Faiez Zalila <faiez.zalila@inria.fr>
+ */
+package monitoring.impl;
+
+import java.lang.reflect.InvocationTargetException;
+
+import java.util.Map;
+
+import monitoring.MonitoringPackage;
+import monitoring.MonitoringTables;
+import monitoring.Occiresultprovider;
+
+import org.eclipse.cmf.occi.core.Entity;
+
+import org.eclipse.cmf.occi.core.impl.MixinBaseImpl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.common.util.DiagnosticChain;
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.ocl.pivot.evaluation.Executor;
+
+import org.eclipse.ocl.pivot.ids.IdResolver;
+import org.eclipse.ocl.pivot.ids.TypeId;
+
+import org.eclipse.ocl.pivot.internal.utilities.PivotUtilInternal;
+
+import org.eclipse.ocl.pivot.library.oclany.OclAnyOclIsKindOfOperation;
+import org.eclipse.ocl.pivot.library.oclany.OclComparableLessThanEqualOperation;
+
+import org.eclipse.ocl.pivot.library.string.CGStringGetSeverityOperation;
+import org.eclipse.ocl.pivot.library.string.CGStringLogDiagnosticOperation;
+
+import org.eclipse.ocl.pivot.utilities.ValueUtil;
+
+import org.eclipse.ocl.pivot.values.IntegerValue;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Occiresultprovider</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link monitoring.impl.OcciresultproviderImpl#getResultProviderEndpoint <em>Result Provider Endpoint</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class OcciresultproviderImpl extends MixinBaseImpl implements Occiresultprovider {
+	/**
+	 * The default value of the '{@link #getResultProviderEndpoint() <em>Result Provider Endpoint</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getResultProviderEndpoint()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String RESULT_PROVIDER_ENDPOINT_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getResultProviderEndpoint() <em>Result Provider Endpoint</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getResultProviderEndpoint()
+	 * @generated
+	 * @ordered
+	 */
+	protected String resultProviderEndpoint = RESULT_PROVIDER_ENDPOINT_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected OcciresultproviderImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return MonitoringPackage.Literals.OCCIRESULTPROVIDER;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getResultProviderEndpoint() {
+		return resultProviderEndpoint;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setResultProviderEndpoint(String newResultProviderEndpoint) {
+		String oldResultProviderEndpoint = resultProviderEndpoint;
+		resultProviderEndpoint = newResultProviderEndpoint;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, MonitoringPackage.OCCIRESULTPROVIDER__RESULT_PROVIDER_ENDPOINT, oldResultProviderEndpoint, resultProviderEndpoint));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean appliesConstraint(final DiagnosticChain diagnostics, final Map<Object, Object> context) {
+		/**
+		 *
+		 * inv appliesConstraint:
+		 *   let
+		 *     severity : Integer[1] = 'Occiresultprovider::appliesConstraint'.getSeverity()
+		 *   in
+		 *     if severity <= 0
+		 *     then true
+		 *     else
+		 *       let
+		 *         result : occi::Boolean[1] = self.entity.oclIsKindOf(Resultprovider)
+		 *       in
+		 *         'Occiresultprovider::appliesConstraint'.logDiagnostic(self, null, diagnostics, context, null, severity, result, 0)
+		 *     endif
+		 */
+		final /*@NonInvalid*/ Executor executor = PivotUtilInternal.getExecutor(this);
+		final /*@NonInvalid*/ IdResolver idResolver = executor.getIdResolver();
+		final /*@NonInvalid*/ IntegerValue severity_0 = CGStringGetSeverityOperation.INSTANCE.evaluate(executor, MonitoringTables.STR_Occiresultprovider_c_c_appliesConstraint);
+		final /*@NonInvalid*/ boolean le = OclComparableLessThanEqualOperation.INSTANCE.evaluate(executor, severity_0, MonitoringTables.INT_0).booleanValue();
+		/*@NonInvalid*/ boolean symbol_0;
+		if (le) {
+			symbol_0 = ValueUtil.TRUE_VALUE;
+		}
+		else {
+			final /*@NonInvalid*/ org.eclipse.ocl.pivot.Class TYP_monitoring_c_c_Resultprovider = idResolver.getClass(MonitoringTables.CLSSid_Resultprovider, null);
+			final /*@NonInvalid*/ Entity entity = this.getEntity();
+			final /*@NonInvalid*/ boolean result = OclAnyOclIsKindOfOperation.INSTANCE.evaluate(executor, entity, TYP_monitoring_c_c_Resultprovider).booleanValue();
+			final /*@NonInvalid*/ boolean logDiagnostic = CGStringLogDiagnosticOperation.INSTANCE.evaluate(executor, TypeId.BOOLEAN, MonitoringTables.STR_Occiresultprovider_c_c_appliesConstraint, this, (Object)null, diagnostics, context, (Object)null, severity_0, result, MonitoringTables.INT_0).booleanValue();
+			symbol_0 = logDiagnostic;
+		}
+		return Boolean.TRUE == symbol_0;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case MonitoringPackage.OCCIRESULTPROVIDER__RESULT_PROVIDER_ENDPOINT:
+				return getResultProviderEndpoint();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case MonitoringPackage.OCCIRESULTPROVIDER__RESULT_PROVIDER_ENDPOINT:
+				setResultProviderEndpoint((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case MonitoringPackage.OCCIRESULTPROVIDER__RESULT_PROVIDER_ENDPOINT:
+				setResultProviderEndpoint(RESULT_PROVIDER_ENDPOINT_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case MonitoringPackage.OCCIRESULTPROVIDER__RESULT_PROVIDER_ENDPOINT:
+				return RESULT_PROVIDER_ENDPOINT_EDEFAULT == null ? resultProviderEndpoint != null : !RESULT_PROVIDER_ENDPOINT_EDEFAULT.equals(resultProviderEndpoint);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	@SuppressWarnings("unchecked")
+	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
+		switch (operationID) {
+			case MonitoringPackage.OCCIRESULTPROVIDER___APPLIES_CONSTRAINT__DIAGNOSTICCHAIN_MAP:
+				return appliesConstraint((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+		}
+		return super.eInvoke(operationID, arguments);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (resultProviderEndpoint: ");
+		result.append(resultProviderEndpoint);
+		result.append(')');
+		return result.toString();
+	}
+
+} //OcciresultproviderImpl
diff --git a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/ProcessorImpl.java b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/ProcessorImpl.java
deleted file mode 100644
index 8f0cd631c50e31e5ac7f12776f80dd83685fda2f..0000000000000000000000000000000000000000
--- a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/ProcessorImpl.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/**
- * Copyright (c) 2015-2017 Obeo, Inria
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 	
- * Contributors:
- * - William Piers <william.piers@obeo.fr>
- * - Philippe Merle <philippe.merle@inria.fr>
- * - Faiez Zalila <faiez.zalila@inria.fr>
- */
-package monitoring.impl;
-
-import monitoring.MonitoringPackage;
-import monitoring.Processor;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.modmacao.occi.platform.impl.ComponentImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Processor</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link monitoring.impl.ProcessorImpl#getGathererAddress <em>Gatherer Address</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class ProcessorImpl extends ComponentImpl implements Processor {
-	/**
-	 * The default value of the '{@link #getGathererAddress() <em>Gatherer Address</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGathererAddress()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String GATHERER_ADDRESS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getGathererAddress() <em>Gatherer Address</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGathererAddress()
-	 * @generated
-	 * @ordered
-	 */
-	protected String gathererAddress = GATHERER_ADDRESS_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ProcessorImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return MonitoringPackage.Literals.PROCESSOR;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getGathererAddress() {
-		return gathererAddress;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setGathererAddress(String newGathererAddress) {
-		String oldGathererAddress = gathererAddress;
-		gathererAddress = newGathererAddress;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MonitoringPackage.PROCESSOR__GATHERER_ADDRESS, oldGathererAddress, gathererAddress));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case MonitoringPackage.PROCESSOR__GATHERER_ADDRESS:
-				return getGathererAddress();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case MonitoringPackage.PROCESSOR__GATHERER_ADDRESS:
-				setGathererAddress((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case MonitoringPackage.PROCESSOR__GATHERER_ADDRESS:
-				setGathererAddress(GATHERER_ADDRESS_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case MonitoringPackage.PROCESSOR__GATHERER_ADDRESS:
-				return GATHERER_ADDRESS_EDEFAULT == null ? gathererAddress != null : !GATHERER_ADDRESS_EDEFAULT.equals(gathererAddress);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (gathererAddress: ");
-		result.append(gathererAddress);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ProcessorImpl
diff --git a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/PublisherImpl.java b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/PublisherImpl.java
deleted file mode 100644
index 68bd44ad80295e5f00fb5bb6feaa4b340d69609f..0000000000000000000000000000000000000000
--- a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/PublisherImpl.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/**
- * Copyright (c) 2015-2017 Obeo, Inria
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 	
- * Contributors:
- * - William Piers <william.piers@obeo.fr>
- * - Philippe Merle <philippe.merle@inria.fr>
- * - Faiez Zalila <faiez.zalila@inria.fr>
- */
-package monitoring.impl;
-
-import monitoring.MonitoringPackage;
-import monitoring.Publisher;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.modmacao.occi.platform.impl.ComponentImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Publisher</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link monitoring.impl.PublisherImpl#getPublisherEndpoint <em>Publisher Endpoint</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class PublisherImpl extends ComponentImpl implements Publisher {
-	/**
-	 * The default value of the '{@link #getPublisherEndpoint() <em>Publisher Endpoint</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPublisherEndpoint()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PUBLISHER_ENDPOINT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPublisherEndpoint() <em>Publisher Endpoint</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPublisherEndpoint()
-	 * @generated
-	 * @ordered
-	 */
-	protected String publisherEndpoint = PUBLISHER_ENDPOINT_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PublisherImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return MonitoringPackage.Literals.PUBLISHER;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPublisherEndpoint() {
-		return publisherEndpoint;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPublisherEndpoint(String newPublisherEndpoint) {
-		String oldPublisherEndpoint = publisherEndpoint;
-		publisherEndpoint = newPublisherEndpoint;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MonitoringPackage.PUBLISHER__PUBLISHER_ENDPOINT, oldPublisherEndpoint, publisherEndpoint));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case MonitoringPackage.PUBLISHER__PUBLISHER_ENDPOINT:
-				return getPublisherEndpoint();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case MonitoringPackage.PUBLISHER__PUBLISHER_ENDPOINT:
-				setPublisherEndpoint((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case MonitoringPackage.PUBLISHER__PUBLISHER_ENDPOINT:
-				setPublisherEndpoint(PUBLISHER_ENDPOINT_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case MonitoringPackage.PUBLISHER__PUBLISHER_ENDPOINT:
-				return PUBLISHER_ENDPOINT_EDEFAULT == null ? publisherEndpoint != null : !PUBLISHER_ENDPOINT_EDEFAULT.equals(publisherEndpoint);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (publisherEndpoint: ");
-		result.append(publisherEndpoint);
-		result.append(')');
-		return result.toString();
-	}
-
-} //PublisherImpl
diff --git a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/ResultproviderImpl.java b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/ResultproviderImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..1ccbd2e50027138633e26b44ce8a8f500dfed4c2
--- /dev/null
+++ b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/ResultproviderImpl.java
@@ -0,0 +1,53 @@
+/**
+ * Copyright (c) 2015-2017 Obeo, Inria
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 	
+ * Contributors:
+ * - William Piers <william.piers@obeo.fr>
+ * - Philippe Merle <philippe.merle@inria.fr>
+ * - Faiez Zalila <faiez.zalila@inria.fr>
+ */
+package monitoring.impl;
+
+import monitoring.MonitoringPackage;
+import monitoring.Resultprovider;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.modmacao.occi.platform.impl.ComponentImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Resultprovider</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class ResultproviderImpl extends ComponentImpl implements Resultprovider {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ResultproviderImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return MonitoringPackage.Literals.RESULTPROVIDER;
+	}
+
+} //ResultproviderImpl
diff --git a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/SensorImpl.java b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/SensorImpl.java
index d824030691f626318ccba468771336827785ffaa..7967a306410820e81bda1482463008b1f0cfdb67 100644
--- a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/SensorImpl.java
+++ b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/SensorImpl.java
@@ -27,141 +27,10 @@ import org.modmacao.occi.platform.impl.ApplicationImpl;
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Sensor</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link monitoring.impl.SensorImpl#getOcciSensorTimebase <em>Occi Sensor Timebase</em>}</li>
- *   <li>{@link monitoring.impl.SensorImpl#getOcciSensorTimestart <em>Occi Sensor Timestart</em>}</li>
- *   <li>{@link monitoring.impl.SensorImpl#getOcciSensorTimestop <em>Occi Sensor Timestop</em>}</li>
- *   <li>{@link monitoring.impl.SensorImpl#getOcciSensorPeriod <em>Occi Sensor Period</em>}</li>
- *   <li>{@link monitoring.impl.SensorImpl#getOcciSensorGranularity <em>Occi Sensor Granularity</em>}</li>
- *   <li>{@link monitoring.impl.SensorImpl#getOcciSensorAccuracy <em>Occi Sensor Accuracy</em>}</li>
- * </ul>
  *
  * @generated
  */
 public class SensorImpl extends ApplicationImpl implements Sensor {
-	/**
-	 * The default value of the '{@link #getOcciSensorTimebase() <em>Occi Sensor Timebase</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOcciSensorTimebase()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String OCCI_SENSOR_TIMEBASE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getOcciSensorTimebase() <em>Occi Sensor Timebase</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOcciSensorTimebase()
-	 * @generated
-	 * @ordered
-	 */
-	protected String occiSensorTimebase = OCCI_SENSOR_TIMEBASE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getOcciSensorTimestart() <em>Occi Sensor Timestart</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOcciSensorTimestart()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String OCCI_SENSOR_TIMESTART_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getOcciSensorTimestart() <em>Occi Sensor Timestart</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOcciSensorTimestart()
-	 * @generated
-	 * @ordered
-	 */
-	protected String occiSensorTimestart = OCCI_SENSOR_TIMESTART_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getOcciSensorTimestop() <em>Occi Sensor Timestop</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOcciSensorTimestop()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String OCCI_SENSOR_TIMESTOP_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getOcciSensorTimestop() <em>Occi Sensor Timestop</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOcciSensorTimestop()
-	 * @generated
-	 * @ordered
-	 */
-	protected String occiSensorTimestop = OCCI_SENSOR_TIMESTOP_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getOcciSensorPeriod() <em>Occi Sensor Period</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOcciSensorPeriod()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String OCCI_SENSOR_PERIOD_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getOcciSensorPeriod() <em>Occi Sensor Period</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOcciSensorPeriod()
-	 * @generated
-	 * @ordered
-	 */
-	protected String occiSensorPeriod = OCCI_SENSOR_PERIOD_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getOcciSensorGranularity() <em>Occi Sensor Granularity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOcciSensorGranularity()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String OCCI_SENSOR_GRANULARITY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getOcciSensorGranularity() <em>Occi Sensor Granularity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOcciSensorGranularity()
-	 * @generated
-	 * @ordered
-	 */
-	protected String occiSensorGranularity = OCCI_SENSOR_GRANULARITY_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getOcciSensorAccuracy() <em>Occi Sensor Accuracy</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOcciSensorAccuracy()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String OCCI_SENSOR_ACCURACY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getOcciSensorAccuracy() <em>Occi Sensor Accuracy</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOcciSensorAccuracy()
-	 * @generated
-	 * @ordered
-	 */
-	protected String occiSensorAccuracy = OCCI_SENSOR_ACCURACY_EDEFAULT;
-
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -181,264 +50,4 @@ public class SensorImpl extends ApplicationImpl implements Sensor {
 		return MonitoringPackage.Literals.SENSOR;
 	}
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getOcciSensorTimebase() {
-		return occiSensorTimebase;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOcciSensorTimebase(String newOcciSensorTimebase) {
-		String oldOcciSensorTimebase = occiSensorTimebase;
-		occiSensorTimebase = newOcciSensorTimebase;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MonitoringPackage.SENSOR__OCCI_SENSOR_TIMEBASE, oldOcciSensorTimebase, occiSensorTimebase));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getOcciSensorTimestart() {
-		return occiSensorTimestart;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOcciSensorTimestart(String newOcciSensorTimestart) {
-		String oldOcciSensorTimestart = occiSensorTimestart;
-		occiSensorTimestart = newOcciSensorTimestart;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MonitoringPackage.SENSOR__OCCI_SENSOR_TIMESTART, oldOcciSensorTimestart, occiSensorTimestart));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getOcciSensorTimestop() {
-		return occiSensorTimestop;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOcciSensorTimestop(String newOcciSensorTimestop) {
-		String oldOcciSensorTimestop = occiSensorTimestop;
-		occiSensorTimestop = newOcciSensorTimestop;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MonitoringPackage.SENSOR__OCCI_SENSOR_TIMESTOP, oldOcciSensorTimestop, occiSensorTimestop));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getOcciSensorPeriod() {
-		return occiSensorPeriod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOcciSensorPeriod(String newOcciSensorPeriod) {
-		String oldOcciSensorPeriod = occiSensorPeriod;
-		occiSensorPeriod = newOcciSensorPeriod;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MonitoringPackage.SENSOR__OCCI_SENSOR_PERIOD, oldOcciSensorPeriod, occiSensorPeriod));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getOcciSensorGranularity() {
-		return occiSensorGranularity;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOcciSensorGranularity(String newOcciSensorGranularity) {
-		String oldOcciSensorGranularity = occiSensorGranularity;
-		occiSensorGranularity = newOcciSensorGranularity;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MonitoringPackage.SENSOR__OCCI_SENSOR_GRANULARITY, oldOcciSensorGranularity, occiSensorGranularity));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getOcciSensorAccuracy() {
-		return occiSensorAccuracy;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOcciSensorAccuracy(String newOcciSensorAccuracy) {
-		String oldOcciSensorAccuracy = occiSensorAccuracy;
-		occiSensorAccuracy = newOcciSensorAccuracy;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MonitoringPackage.SENSOR__OCCI_SENSOR_ACCURACY, oldOcciSensorAccuracy, occiSensorAccuracy));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case MonitoringPackage.SENSOR__OCCI_SENSOR_TIMEBASE:
-				return getOcciSensorTimebase();
-			case MonitoringPackage.SENSOR__OCCI_SENSOR_TIMESTART:
-				return getOcciSensorTimestart();
-			case MonitoringPackage.SENSOR__OCCI_SENSOR_TIMESTOP:
-				return getOcciSensorTimestop();
-			case MonitoringPackage.SENSOR__OCCI_SENSOR_PERIOD:
-				return getOcciSensorPeriod();
-			case MonitoringPackage.SENSOR__OCCI_SENSOR_GRANULARITY:
-				return getOcciSensorGranularity();
-			case MonitoringPackage.SENSOR__OCCI_SENSOR_ACCURACY:
-				return getOcciSensorAccuracy();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case MonitoringPackage.SENSOR__OCCI_SENSOR_TIMEBASE:
-				setOcciSensorTimebase((String)newValue);
-				return;
-			case MonitoringPackage.SENSOR__OCCI_SENSOR_TIMESTART:
-				setOcciSensorTimestart((String)newValue);
-				return;
-			case MonitoringPackage.SENSOR__OCCI_SENSOR_TIMESTOP:
-				setOcciSensorTimestop((String)newValue);
-				return;
-			case MonitoringPackage.SENSOR__OCCI_SENSOR_PERIOD:
-				setOcciSensorPeriod((String)newValue);
-				return;
-			case MonitoringPackage.SENSOR__OCCI_SENSOR_GRANULARITY:
-				setOcciSensorGranularity((String)newValue);
-				return;
-			case MonitoringPackage.SENSOR__OCCI_SENSOR_ACCURACY:
-				setOcciSensorAccuracy((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case MonitoringPackage.SENSOR__OCCI_SENSOR_TIMEBASE:
-				setOcciSensorTimebase(OCCI_SENSOR_TIMEBASE_EDEFAULT);
-				return;
-			case MonitoringPackage.SENSOR__OCCI_SENSOR_TIMESTART:
-				setOcciSensorTimestart(OCCI_SENSOR_TIMESTART_EDEFAULT);
-				return;
-			case MonitoringPackage.SENSOR__OCCI_SENSOR_TIMESTOP:
-				setOcciSensorTimestop(OCCI_SENSOR_TIMESTOP_EDEFAULT);
-				return;
-			case MonitoringPackage.SENSOR__OCCI_SENSOR_PERIOD:
-				setOcciSensorPeriod(OCCI_SENSOR_PERIOD_EDEFAULT);
-				return;
-			case MonitoringPackage.SENSOR__OCCI_SENSOR_GRANULARITY:
-				setOcciSensorGranularity(OCCI_SENSOR_GRANULARITY_EDEFAULT);
-				return;
-			case MonitoringPackage.SENSOR__OCCI_SENSOR_ACCURACY:
-				setOcciSensorAccuracy(OCCI_SENSOR_ACCURACY_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case MonitoringPackage.SENSOR__OCCI_SENSOR_TIMEBASE:
-				return OCCI_SENSOR_TIMEBASE_EDEFAULT == null ? occiSensorTimebase != null : !OCCI_SENSOR_TIMEBASE_EDEFAULT.equals(occiSensorTimebase);
-			case MonitoringPackage.SENSOR__OCCI_SENSOR_TIMESTART:
-				return OCCI_SENSOR_TIMESTART_EDEFAULT == null ? occiSensorTimestart != null : !OCCI_SENSOR_TIMESTART_EDEFAULT.equals(occiSensorTimestart);
-			case MonitoringPackage.SENSOR__OCCI_SENSOR_TIMESTOP:
-				return OCCI_SENSOR_TIMESTOP_EDEFAULT == null ? occiSensorTimestop != null : !OCCI_SENSOR_TIMESTOP_EDEFAULT.equals(occiSensorTimestop);
-			case MonitoringPackage.SENSOR__OCCI_SENSOR_PERIOD:
-				return OCCI_SENSOR_PERIOD_EDEFAULT == null ? occiSensorPeriod != null : !OCCI_SENSOR_PERIOD_EDEFAULT.equals(occiSensorPeriod);
-			case MonitoringPackage.SENSOR__OCCI_SENSOR_GRANULARITY:
-				return OCCI_SENSOR_GRANULARITY_EDEFAULT == null ? occiSensorGranularity != null : !OCCI_SENSOR_GRANULARITY_EDEFAULT.equals(occiSensorGranularity);
-			case MonitoringPackage.SENSOR__OCCI_SENSOR_ACCURACY:
-				return OCCI_SENSOR_ACCURACY_EDEFAULT == null ? occiSensorAccuracy != null : !OCCI_SENSOR_ACCURACY_EDEFAULT.equals(occiSensorAccuracy);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (occiSensorTimebase: ");
-		result.append(occiSensorTimebase);
-		result.append(", occiSensorTimestart: ");
-		result.append(occiSensorTimestart);
-		result.append(", occiSensorTimestop: ");
-		result.append(occiSensorTimestop);
-		result.append(", occiSensorPeriod: ");
-		result.append(occiSensorPeriod);
-		result.append(", occiSensorGranularity: ");
-		result.append(occiSensorGranularity);
-		result.append(", occiSensorAccuracy: ");
-		result.append(occiSensorAccuracy);
-		result.append(')');
-		return result.toString();
-	}
-
 } //SensorImpl
diff --git a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/util/MonitoringAdapterFactory.java b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/util/MonitoringAdapterFactory.java
index 04ee624b2cc16f41124e9782dc6fdf9fb1bfda1f..1731c56fe5900d52d3d05e8f19e8ea1f3a090bc5 100644
--- a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/util/MonitoringAdapterFactory.java
+++ b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/util/MonitoringAdapterFactory.java
@@ -94,20 +94,20 @@ public class MonitoringAdapterFactory extends AdapterFactoryImpl {
 				return createDatagathererAdapter();
 			}
 			@Override
-			public Adapter caseProcessor(Processor object) {
-				return createProcessorAdapter();
+			public Adapter caseDataprocessor(Dataprocessor object) {
+				return createDataprocessorAdapter();
 			}
 			@Override
-			public Adapter casePublisher(Publisher object) {
-				return createPublisherAdapter();
+			public Adapter caseResultprovider(Resultprovider object) {
+				return createResultproviderAdapter();
 			}
 			@Override
-			public Adapter caseMonitoringproperty(Monitoringproperty object) {
-				return createMonitoringpropertyAdapter();
+			public Adapter caseMonitorableproperty(Monitorableproperty object) {
+				return createMonitorablepropertyAdapter();
 			}
 			@Override
-			public Adapter caseMartpublisher(Martpublisher object) {
-				return createMartpublisherAdapter();
+			public Adapter caseOcciresultprovider(Occiresultprovider object) {
+				return createOcciresultproviderAdapter();
 			}
 			@Override
 			public Adapter caseEntity(Entity object) {
@@ -182,58 +182,58 @@ public class MonitoringAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link monitoring.Processor <em>Processor</em>}'.
+	 * Creates a new adapter for an object of class '{@link monitoring.Dataprocessor <em>Dataprocessor</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see monitoring.Processor
+	 * @see monitoring.Dataprocessor
 	 * @generated
 	 */
-	public Adapter createProcessorAdapter() {
+	public Adapter createDataprocessorAdapter() {
 		return null;
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link monitoring.Publisher <em>Publisher</em>}'.
+	 * Creates a new adapter for an object of class '{@link monitoring.Resultprovider <em>Resultprovider</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see monitoring.Publisher
+	 * @see monitoring.Resultprovider
 	 * @generated
 	 */
-	public Adapter createPublisherAdapter() {
+	public Adapter createResultproviderAdapter() {
 		return null;
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link monitoring.Monitoringproperty <em>Monitoringproperty</em>}'.
+	 * Creates a new adapter for an object of class '{@link monitoring.Monitorableproperty <em>Monitorableproperty</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see monitoring.Monitoringproperty
+	 * @see monitoring.Monitorableproperty
 	 * @generated
 	 */
-	public Adapter createMonitoringpropertyAdapter() {
+	public Adapter createMonitorablepropertyAdapter() {
 		return null;
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link monitoring.Martpublisher <em>Martpublisher</em>}'.
+	 * Creates a new adapter for an object of class '{@link monitoring.Occiresultprovider <em>Occiresultprovider</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see monitoring.Martpublisher
+	 * @see monitoring.Occiresultprovider
 	 * @generated
 	 */
-	public Adapter createMartpublisherAdapter() {
+	public Adapter createOcciresultproviderAdapter() {
 		return null;
 	}
 
diff --git a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/util/MonitoringSwitch.java b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/util/MonitoringSwitch.java
index 701da7e3b7837635b7e436ec1b3fc4e4ed930a07..2e9835e61ab480440cb998bab02a04e8378ad5ad 100644
--- a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/util/MonitoringSwitch.java
+++ b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/util/MonitoringSwitch.java
@@ -102,36 +102,36 @@ public class MonitoringSwitch<T> extends Switch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case MonitoringPackage.PROCESSOR: {
-				Processor processor = (Processor)theEObject;
-				T result = caseProcessor(processor);
-				if (result == null) result = caseComponent(processor);
-				if (result == null) result = caseResource(processor);
-				if (result == null) result = caseEntity(processor);
+			case MonitoringPackage.DATAPROCESSOR: {
+				Dataprocessor dataprocessor = (Dataprocessor)theEObject;
+				T result = caseDataprocessor(dataprocessor);
+				if (result == null) result = caseComponent(dataprocessor);
+				if (result == null) result = caseResource(dataprocessor);
+				if (result == null) result = caseEntity(dataprocessor);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case MonitoringPackage.PUBLISHER: {
-				Publisher publisher = (Publisher)theEObject;
-				T result = casePublisher(publisher);
-				if (result == null) result = caseComponent(publisher);
-				if (result == null) result = caseResource(publisher);
-				if (result == null) result = caseEntity(publisher);
+			case MonitoringPackage.RESULTPROVIDER: {
+				Resultprovider resultprovider = (Resultprovider)theEObject;
+				T result = caseResultprovider(resultprovider);
+				if (result == null) result = caseComponent(resultprovider);
+				if (result == null) result = caseResource(resultprovider);
+				if (result == null) result = caseEntity(resultprovider);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case MonitoringPackage.MONITORINGPROPERTY: {
-				Monitoringproperty monitoringproperty = (Monitoringproperty)theEObject;
-				T result = caseMonitoringproperty(monitoringproperty);
-				if (result == null) result = caseLink(monitoringproperty);
-				if (result == null) result = caseEntity(monitoringproperty);
+			case MonitoringPackage.MONITORABLEPROPERTY: {
+				Monitorableproperty monitorableproperty = (Monitorableproperty)theEObject;
+				T result = caseMonitorableproperty(monitorableproperty);
+				if (result == null) result = caseLink(monitorableproperty);
+				if (result == null) result = caseEntity(monitorableproperty);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case MonitoringPackage.MARTPUBLISHER: {
-				Martpublisher martpublisher = (Martpublisher)theEObject;
-				T result = caseMartpublisher(martpublisher);
-				if (result == null) result = caseMixinBase(martpublisher);
+			case MonitoringPackage.OCCIRESULTPROVIDER: {
+				Occiresultprovider occiresultprovider = (Occiresultprovider)theEObject;
+				T result = caseOcciresultprovider(occiresultprovider);
+				if (result == null) result = caseMixinBase(occiresultprovider);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
@@ -170,62 +170,62 @@ public class MonitoringSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Processor</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Dataprocessor</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Processor</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Dataprocessor</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseProcessor(Processor object) {
+	public T caseDataprocessor(Dataprocessor object) {
 		return null;
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Publisher</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Resultprovider</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Publisher</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Resultprovider</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T casePublisher(Publisher object) {
+	public T caseResultprovider(Resultprovider object) {
 		return null;
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Monitoringproperty</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Monitorableproperty</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Monitoringproperty</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Monitorableproperty</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseMonitoringproperty(Monitoringproperty object) {
+	public T caseMonitorableproperty(Monitorableproperty object) {
 		return null;
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Martpublisher</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Occiresultprovider</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Martpublisher</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Occiresultprovider</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseMartpublisher(Martpublisher object) {
+	public T caseOcciresultprovider(Occiresultprovider object) {
 		return null;
 	}
 
diff --git a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/util/MonitoringValidator.java b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/util/MonitoringValidator.java
index afaf9369335eb7418464901c9cb28cb2855f6b1a..1df82fa8d4a2b66979a47884f306ff85c063ca34 100644
--- a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/util/MonitoringValidator.java
+++ b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/util/MonitoringValidator.java
@@ -57,20 +57,20 @@ public class MonitoringValidator extends EObjectValidator {
 	public static final String DIAGNOSTIC_SOURCE = "monitoring";
 
 	/**
-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Target Constraint' of 'Monitoringproperty'.
+	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Target Constraint' of 'Monitorableproperty'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final int MONITORINGPROPERTY__TARGET_CONSTRAINT = 1;
+	public static final int MONITORABLEPROPERTY__TARGET_CONSTRAINT = 1;
 
 	/**
-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Applies Constraint' of 'Martpublisher'.
+	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Applies Constraint' of 'Occiresultprovider'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final int MARTPUBLISHER__APPLIES_CONSTRAINT = 2;
+	public static final int OCCIRESULTPROVIDER__APPLIES_CONSTRAINT = 2;
 
 	/**
 	 * A constant with a fixed name that can be used as the base value for additional hand written constants.
@@ -131,18 +131,14 @@ public class MonitoringValidator extends EObjectValidator {
 				return validateSensor((Sensor)value, diagnostics, context);
 			case MonitoringPackage.DATAGATHERER:
 				return validateDatagatherer((Datagatherer)value, diagnostics, context);
-			case MonitoringPackage.PROCESSOR:
-				return validateProcessor((Processor)value, diagnostics, context);
-			case MonitoringPackage.PUBLISHER:
-				return validatePublisher((Publisher)value, diagnostics, context);
-			case MonitoringPackage.MONITORINGPROPERTY:
-				return validateMonitoringproperty((Monitoringproperty)value, diagnostics, context);
-			case MonitoringPackage.MARTPUBLISHER:
-				return validateMartpublisher((Martpublisher)value, diagnostics, context);
-			case MonitoringPackage.DATE_TIME:
-				return validateDateTime((String)value, diagnostics, context);
-			case MonitoringPackage.SECOND:
-				return validateSecond((String)value, diagnostics, context);
+			case MonitoringPackage.DATAPROCESSOR:
+				return validateDataprocessor((Dataprocessor)value, diagnostics, context);
+			case MonitoringPackage.RESULTPROVIDER:
+				return validateResultprovider((Resultprovider)value, diagnostics, context);
+			case MonitoringPackage.MONITORABLEPROPERTY:
+				return validateMonitorableproperty((Monitorableproperty)value, diagnostics, context);
+			case MonitoringPackage.OCCIRESULTPROVIDER:
+				return validateOcciresultprovider((Occiresultprovider)value, diagnostics, context);
 			case MonitoringPackage.STRING:
 				return validateString((String)value, diagnostics, context);
 			default:
@@ -201,21 +197,21 @@ public class MonitoringValidator extends EObjectValidator {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateProcessor(Processor processor, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(processor, diagnostics, context)) return false;
-		boolean result = validate_EveryMultiplicityConforms(processor, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(processor, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(processor, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(processor, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(processor, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(processor, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(processor, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(processor, diagnostics, context);
-		if (result || diagnostics != null) result &= occiValidator.validateEntity_IdUnique(processor, diagnostics, context);
-		if (result || diagnostics != null) result &= occiValidator.validateEntity_AttributesNameUnique(processor, diagnostics, context);
-		if (result || diagnostics != null) result &= occiValidator.validateEntity_KindCompatibleWithOneAppliesOfEachMixin(processor, diagnostics, context);
-		if (result || diagnostics != null) result &= occiValidator.validateEntity_DifferentMixins(processor, diagnostics, context);
-		if (result || diagnostics != null) result &= occiValidator.validateResource_ResourceKindIsInParent(processor, diagnostics, context);
+	public boolean validateDataprocessor(Dataprocessor dataprocessor, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if (!validate_NoCircularContainment(dataprocessor, diagnostics, context)) return false;
+		boolean result = validate_EveryMultiplicityConforms(dataprocessor, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(dataprocessor, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(dataprocessor, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(dataprocessor, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(dataprocessor, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_UniqueID(dataprocessor, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(dataprocessor, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(dataprocessor, diagnostics, context);
+		if (result || diagnostics != null) result &= occiValidator.validateEntity_IdUnique(dataprocessor, diagnostics, context);
+		if (result || diagnostics != null) result &= occiValidator.validateEntity_AttributesNameUnique(dataprocessor, diagnostics, context);
+		if (result || diagnostics != null) result &= occiValidator.validateEntity_KindCompatibleWithOneAppliesOfEachMixin(dataprocessor, diagnostics, context);
+		if (result || diagnostics != null) result &= occiValidator.validateEntity_DifferentMixins(dataprocessor, diagnostics, context);
+		if (result || diagnostics != null) result &= occiValidator.validateResource_ResourceKindIsInParent(dataprocessor, diagnostics, context);
 		return result;
 	}
 
@@ -224,21 +220,21 @@ public class MonitoringValidator extends EObjectValidator {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validatePublisher(Publisher publisher, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(publisher, diagnostics, context)) return false;
-		boolean result = validate_EveryMultiplicityConforms(publisher, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(publisher, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(publisher, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(publisher, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(publisher, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(publisher, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(publisher, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(publisher, diagnostics, context);
-		if (result || diagnostics != null) result &= occiValidator.validateEntity_IdUnique(publisher, diagnostics, context);
-		if (result || diagnostics != null) result &= occiValidator.validateEntity_AttributesNameUnique(publisher, diagnostics, context);
-		if (result || diagnostics != null) result &= occiValidator.validateEntity_KindCompatibleWithOneAppliesOfEachMixin(publisher, diagnostics, context);
-		if (result || diagnostics != null) result &= occiValidator.validateEntity_DifferentMixins(publisher, diagnostics, context);
-		if (result || diagnostics != null) result &= occiValidator.validateResource_ResourceKindIsInParent(publisher, diagnostics, context);
+	public boolean validateResultprovider(Resultprovider resultprovider, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if (!validate_NoCircularContainment(resultprovider, diagnostics, context)) return false;
+		boolean result = validate_EveryMultiplicityConforms(resultprovider, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(resultprovider, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(resultprovider, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(resultprovider, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(resultprovider, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_UniqueID(resultprovider, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(resultprovider, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(resultprovider, diagnostics, context);
+		if (result || diagnostics != null) result &= occiValidator.validateEntity_IdUnique(resultprovider, diagnostics, context);
+		if (result || diagnostics != null) result &= occiValidator.validateEntity_AttributesNameUnique(resultprovider, diagnostics, context);
+		if (result || diagnostics != null) result &= occiValidator.validateEntity_KindCompatibleWithOneAppliesOfEachMixin(resultprovider, diagnostics, context);
+		if (result || diagnostics != null) result &= occiValidator.validateEntity_DifferentMixins(resultprovider, diagnostics, context);
+		if (result || diagnostics != null) result &= occiValidator.validateResource_ResourceKindIsInParent(resultprovider, diagnostics, context);
 		return result;
 	}
 
@@ -247,35 +243,35 @@ public class MonitoringValidator extends EObjectValidator {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateMonitoringproperty(Monitoringproperty monitoringproperty, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(monitoringproperty, diagnostics, context)) return false;
-		boolean result = validate_EveryMultiplicityConforms(monitoringproperty, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(monitoringproperty, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(monitoringproperty, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(monitoringproperty, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(monitoringproperty, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(monitoringproperty, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(monitoringproperty, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(monitoringproperty, diagnostics, context);
-		if (result || diagnostics != null) result &= occiValidator.validateEntity_IdUnique(monitoringproperty, diagnostics, context);
-		if (result || diagnostics != null) result &= occiValidator.validateEntity_AttributesNameUnique(monitoringproperty, diagnostics, context);
-		if (result || diagnostics != null) result &= occiValidator.validateEntity_KindCompatibleWithOneAppliesOfEachMixin(monitoringproperty, diagnostics, context);
-		if (result || diagnostics != null) result &= occiValidator.validateEntity_DifferentMixins(monitoringproperty, diagnostics, context);
-		if (result || diagnostics != null) result &= occiValidator.validateLink_LinkKindIsInParent(monitoringproperty, diagnostics, context);
-		if (result || diagnostics != null) result &= occiValidator.validateLink_sourceReferenceInvariant(monitoringproperty, diagnostics, context);
-		if (result || diagnostics != null) result &= occiValidator.validateLink_targetReferenceInvariant(monitoringproperty, diagnostics, context);
-		if (result || diagnostics != null) result &= validateMonitoringproperty_targetConstraint(monitoringproperty, diagnostics, context);
+	public boolean validateMonitorableproperty(Monitorableproperty monitorableproperty, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if (!validate_NoCircularContainment(monitorableproperty, diagnostics, context)) return false;
+		boolean result = validate_EveryMultiplicityConforms(monitorableproperty, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(monitorableproperty, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(monitorableproperty, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(monitorableproperty, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(monitorableproperty, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_UniqueID(monitorableproperty, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(monitorableproperty, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(monitorableproperty, diagnostics, context);
+		if (result || diagnostics != null) result &= occiValidator.validateEntity_IdUnique(monitorableproperty, diagnostics, context);
+		if (result || diagnostics != null) result &= occiValidator.validateEntity_AttributesNameUnique(monitorableproperty, diagnostics, context);
+		if (result || diagnostics != null) result &= occiValidator.validateEntity_KindCompatibleWithOneAppliesOfEachMixin(monitorableproperty, diagnostics, context);
+		if (result || diagnostics != null) result &= occiValidator.validateEntity_DifferentMixins(monitorableproperty, diagnostics, context);
+		if (result || diagnostics != null) result &= occiValidator.validateLink_LinkKindIsInParent(monitorableproperty, diagnostics, context);
+		if (result || diagnostics != null) result &= occiValidator.validateLink_sourceReferenceInvariant(monitorableproperty, diagnostics, context);
+		if (result || diagnostics != null) result &= occiValidator.validateLink_targetReferenceInvariant(monitorableproperty, diagnostics, context);
+		if (result || diagnostics != null) result &= validateMonitorableproperty_targetConstraint(monitorableproperty, diagnostics, context);
 		return result;
 	}
 
 	/**
-	 * Validates the targetConstraint constraint of '<em>Monitoringproperty</em>'.
+	 * Validates the targetConstraint constraint of '<em>Monitorableproperty</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateMonitoringproperty_targetConstraint(Monitoringproperty monitoringproperty, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return monitoringproperty.targetConstraint(diagnostics, context);
+	public boolean validateMonitorableproperty_targetConstraint(Monitorableproperty monitorableproperty, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return monitorableproperty.targetConstraint(diagnostics, context);
 	}
 
 	/**
@@ -283,70 +279,28 @@ public class MonitoringValidator extends EObjectValidator {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateMartpublisher(Martpublisher martpublisher, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(martpublisher, diagnostics, context)) return false;
-		boolean result = validate_EveryMultiplicityConforms(martpublisher, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(martpublisher, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(martpublisher, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(martpublisher, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(martpublisher, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(martpublisher, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(martpublisher, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(martpublisher, diagnostics, context);
-		if (result || diagnostics != null) result &= validateMartpublisher_appliesConstraint(martpublisher, diagnostics, context);
+	public boolean validateOcciresultprovider(Occiresultprovider occiresultprovider, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if (!validate_NoCircularContainment(occiresultprovider, diagnostics, context)) return false;
+		boolean result = validate_EveryMultiplicityConforms(occiresultprovider, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(occiresultprovider, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(occiresultprovider, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(occiresultprovider, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(occiresultprovider, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_UniqueID(occiresultprovider, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(occiresultprovider, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(occiresultprovider, diagnostics, context);
+		if (result || diagnostics != null) result &= validateOcciresultprovider_appliesConstraint(occiresultprovider, diagnostics, context);
 		return result;
 	}
 
 	/**
-	 * Validates the appliesConstraint constraint of '<em>Martpublisher</em>'.
+	 * Validates the appliesConstraint constraint of '<em>Occiresultprovider</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateMartpublisher_appliesConstraint(Martpublisher martpublisher, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return martpublisher.appliesConstraint(diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateDateTime(String dateTime, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		boolean result = validateDateTime_Pattern(dateTime, diagnostics, context);
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @see #validateDateTime_Pattern
-	 */
-	public static final  PatternMatcher [][] DATE_TIME__PATTERN__VALUES =
-		new PatternMatcher [][] {
-			new PatternMatcher [] {
-				XMLTypeUtil.createPatternMatcher("^(\\d{4}((-)?(0[1-9]|1[0-2])((-)?(0[1-9]|[1-2][0-9]|3[0-1])(T(24:00(:00(\\.[0]+)?)?|(([0-1][0-9]|2[0-3])(:)[0-5][0-9])((:)[0-5][0-9](\\.[\\d]+)?)?)((\\+|-)(14:00|(0[0-9]|1[0-3])(:)[0-5][0-9])|Z))?)?)?)$")
-			}
-		};
-
-	/**
-	 * Validates the Pattern constraint of '<em>Date Time</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateDateTime_Pattern(String dateTime, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return validatePattern(MonitoringPackage.Literals.DATE_TIME, dateTime, DATE_TIME__PATTERN__VALUES, diagnostics, context);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean validateSecond(String second, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return true;
+	public boolean validateOcciresultprovider_appliesConstraint(Occiresultprovider occiresultprovider, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return occiresultprovider.appliesConstraint(diagnostics, context);
 	}
 
 	/**
diff --git a/src/test/java/de/ugoe/cs/rwm/mocci/ResolveProxyTest.java b/src/test/java/de/ugoe/cs/rwm/mocci/ResolveProxyTest.java
index d628c0df6f838b1d18f80fecfe9e34d645b27b93..82dd9d10849aea494f5c96ec37d51a2074fd2a58 100644
--- a/src/test/java/de/ugoe/cs/rwm/mocci/ResolveProxyTest.java
+++ b/src/test/java/de/ugoe/cs/rwm/mocci/ResolveProxyTest.java
@@ -43,7 +43,7 @@ public class ResolveProxyTest {
 	
 	@Test
 	public void resolveProxies() {
-		Path newOCCI = Paths.get(de.ugoe.cs.rwm.docci.ModelUtility.getPathToResource("occi/hadoopClusterNewExt2.occic"));
+		Path newOCCI = Paths.get(de.ugoe.cs.rwm.docci.ModelUtility.getPathToResource("occi/hadoopClusterNewExtWithMem.occic"));
 		
 		Resource ress = de.ugoe.cs.rwm.docci.ModelUtility.loadOCCIintoEMFResource(newOCCI);
 		ResourceSet resSet = ress.getResourceSet();
diff --git a/src/test/java/de/ugoe/cs/rwm/mocci/live/DeployHadoopMonitoringTestLive.java b/src/test/java/de/ugoe/cs/rwm/mocci/live/DeployHadoopMonitoringTestLive.java
index 977f3ab571e41da73ff29a48a0388265ec4db306..4ca86bcc7579c43fd056a4ad79ad24adda1fef6b 100644
--- a/src/test/java/de/ugoe/cs/rwm/mocci/live/DeployHadoopMonitoringTestLive.java
+++ b/src/test/java/de/ugoe/cs/rwm/mocci/live/DeployHadoopMonitoringTestLive.java
@@ -5,34 +5,18 @@ import static org.junit.Assert.assertTrue;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.eclipse.cmf.occi.core.Configuration;
-import org.eclipse.cmf.occi.core.Link;
-import org.eclipse.cmf.occi.core.Mixin;
-import org.eclipse.cmf.occi.core.OCCIPackage;
-import org.eclipse.cmf.occi.core.util.OcciRegistry;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.epsilon.emc.emf.CachedResourceSet;
-import org.junit.Before;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import de.ugoe.cs.rwm.docci.MartDeployer;
 import de.ugoe.cs.rwm.docci.ModelUtility;
-import de.ugoe.cs.rwm.mocci.TestUtility;
 import de.ugoe.cs.rwm.docci.connector.Connector;
-import de.ugoe.cs.rwm.docci.connector.LocalhostConnector;
 import de.ugoe.cs.rwm.docci.connector.MartConnector;
+import de.ugoe.cs.rwm.mocci.TestUtility;
 import de.ugoe.cs.rwm.tocci.Transformator;
 import de.ugoe.cs.rwm.tocci.TransformatorFactory;
 import de.ugoe.cs.rwm.tocci.occi2openstack.OCCI2OPENSTACKTransformator;
-import monitoring.MonitoringPackage;
 
 public class DeployHadoopMonitoringTestLive {
 	String manNWid = "urn:uuid:29d78078-fb4c-47aa-a9af-b8aaf3339590";
diff --git a/src/test/java/de/ugoe/cs/rwm/mocci/live/EmptyTestLive.java b/src/test/java/de/ugoe/cs/rwm/mocci/live/EmptyTestLive.java
new file mode 100644
index 0000000000000000000000000000000000000000..3d6d6551b621e3c948d1739c695fef4451b3e6ed
--- /dev/null
+++ b/src/test/java/de/ugoe/cs/rwm/mocci/live/EmptyTestLive.java
@@ -0,0 +1,58 @@
+package de.ugoe.cs.rwm.mocci.live;
+
+import static org.junit.Assert.assertTrue;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.eclipse.cmf.occi.core.Configuration;
+import org.eclipse.cmf.occi.core.Link;
+import org.eclipse.cmf.occi.core.Mixin;
+import org.eclipse.cmf.occi.core.OCCIPackage;
+import org.eclipse.cmf.occi.core.util.OcciRegistry;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.epsilon.emc.emf.CachedResourceSet;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import de.ugoe.cs.rwm.docci.MartDeployer;
+import de.ugoe.cs.rwm.docci.ModelUtility;
+import de.ugoe.cs.rwm.mocci.TestUtility;
+import de.ugoe.cs.rwm.docci.connector.Connector;
+import de.ugoe.cs.rwm.docci.connector.LocalhostConnector;
+import de.ugoe.cs.rwm.docci.connector.MartConnector;
+import de.ugoe.cs.rwm.tocci.Transformator;
+import de.ugoe.cs.rwm.tocci.TransformatorFactory;
+import de.ugoe.cs.rwm.tocci.occi2openstack.OCCI2OPENSTACKTransformator;
+import monitoring.MonitoringPackage;
+
+public class EmptyTestLive {
+	String manNWid = "urn:uuid:29d78078-fb4c-47aa-a9af-b8aaf3339590";
+	String manNWRuntimeId = "75a4639e-9ce7-4058-b859-8a711b0e2e7b";
+	String sshKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6H7Ydi45BTHid4qNppGAi5mzjbnZgt7bi6xLGmZG9CiLmhMsxOuk3Z05Nn+pmoN98qS0eY8S240PPk5VOlYqBY0vdRAwrZSHHaLdMp6I7ARNrI2KraYduweqz7ZQxPXQfwIeYx2HKQxEF2r+4//Fo4WfgdBkLuulvl/Gw3TUzJNQHvgpaiNo9+PI5CZydHnZbjUkRikS12pT+CbNKj+0QKeQztbCd41aKxDv5H0DjltVRcpPppv4dmiU/zoCAIngWLO1PPgfYWyze8Z9IoyBT7Qdg30U91TYZBuxzXR5lq7Fh64y/IZ/SjdOdSIvIuDjtmJDULRdLJzrvubrKY+YH Generated-by-Nova";
+	String userData = "I2Nsb3VkLWNvbmZpZwoKIyBVcGdyYWRlIHRoZSBpbnN0YW5jZSBvbiBmaXJzdCBib290CiMgKGllIHJ1biBhcHQtZ2V0IHVwZ3JhZGUpCiMKIyBEZWZhdWx0OiBmYWxzZQojIEFsaWFzZXM6IGFwdF91cGdyYWRlCnBhY2thZ2VfdXBncmFkZTogdHJ1ZQoKcGFja2FnZXM6CiAtIHB5dGhvbgoKd3JpdGVfZmlsZXM6CiAgLSBwYXRoOiAvZXRjL25ldHdvcmsvaW50ZXJmYWNlcy5kLzUwLWNsb3VkLWluaXQuY2ZnCiAgICBjb250ZW50OiB8CiAgICAgIGF1dG8gbG8KICAgICAgaWZhY2UgbG8gaW5ldCBsb29wYmFjawogICAgICAKICAgICAgYXV0byBlbnMwCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMAogICAgICBpZmFjZSBlbnMwIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMQogICAgICBpZmFjZSBlbnMxIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMyCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMgogICAgICBpZmFjZSBlbnMyIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMzCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMwogICAgICBpZmFjZSBlbnMzIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM0CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNAogICAgICBpZmFjZSBlbnM0IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM1CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNQogICAgICBpZmFjZSBlbnM1IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM2CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNgogICAgICBpZmFjZSBlbnM2IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM3CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNwogICAgICBpZmFjZSBlbnM3IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM4CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOAogICAgICBpZmFjZSBlbnM4IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM5CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOQogICAgICBpZmFjZSBlbnM5IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxMAogICAgICBhbGxvdy1ob3RwbHVnIGVuczEwCiAgICAgIGlmYWNlIGVuczEwIGluZXQgZGhjcAoKIyMj";
+
+	
+	@BeforeClass
+	public static void OCCIRegistrySetup() {		
+		TestUtility.loggerSetup();
+		TestUtility.extensionRegistrySetup();
+	}
+ 
+	@Test
+	public void deprovisionEverything() {
+		CachedResourceSet.getCache().clear();
+		Path occiPath = Paths.get(ModelUtility.getPathToResource("occi/Empty.occic"));
+		Connector conn = new MartConnector("192.168.35.45", 8080, "ubuntu", "~/key.pem");
+		MartDeployer deployer = new MartDeployer(conn);
+		deployer.deploy(occiPath);
+	}
+}
diff --git a/src/test/resources/martserver-plugins/de.ugoe.cs.rwm.mocci.connector.dummy.jar b/src/test/resources/martserver-plugins/de.ugoe.cs.rwm.mocci.connector.dummy.jar
index 213d415c254d2d18986adde7644eae7f07f13742..793d3af5aecf748e6d4f11a219cefd3fdb7b33a1 100644
Binary files a/src/test/resources/martserver-plugins/de.ugoe.cs.rwm.mocci.connector.dummy.jar and b/src/test/resources/martserver-plugins/de.ugoe.cs.rwm.mocci.connector.dummy.jar differ
diff --git a/src/test/resources/martserver-plugins/de.ugoe.cs.rwm.mocci.model.jar b/src/test/resources/martserver-plugins/de.ugoe.cs.rwm.mocci.model.jar
index 99b8ee2cc84765710233053d52daf75be0bd5d14..3daa71dced99d384fa0d58e143d94690b9d10dfc 100644
Binary files a/src/test/resources/martserver-plugins/de.ugoe.cs.rwm.mocci.model.jar and b/src/test/resources/martserver-plugins/de.ugoe.cs.rwm.mocci.model.jar differ
diff --git a/src/test/resources/occi/expectedRuntime.occic b/src/test/resources/occi/expectedRuntime.occic
deleted file mode 100644
index 89cc8c39e63beb9572a1dc46903d67f27b00bc01..0000000000000000000000000000000000000000
--- a/src/test/resources/occi/expectedRuntime.occic
+++ /dev/null
@@ -1,451 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<occi:Configuration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ansibleconfiguration="http://schemas.modmacao.org/occi/ansible/ecore" xmlns:infrastructure="http://schemas.ogf.org/occi/infrastructure/ecore" xmlns:monitoring="http://schemas.ugoe.cs.rwm/monitoring/ecore" xmlns:occi="http://schemas.ogf.org/occi/core/ecore" xmlns:openstackruntime="http://schemas.modmacao.org/openstack/runtime/ecore" xmlns:ossweruntime="http://schemas.modmacao.org/openstack/swe/ecore" xmlns:placement="http://schemas.modmacao.org/placement/ecore" xmlns:platform="http://schemas.modmacao.org/occi/platform/ecore">
-  <use href="http://schemas.ogf.org/occi/core#/"/>
-  <use href="http://schemas.ogf.org/occi/infrastructure#/"/>
-  <use href="http://schemas.modmacao.org/occi/platform#/"/>
-  <use href="http://schemas.ogf.org/occi/infrastructure/compute/template/1.1#/"/>
-  <use href="http://schemas.modmacao.org/sugarcrm#/"/>
-  <use href="http://schemas.modmacao.org/openstack/runtime#/"/>
-  <use href="http://schemas.modmacao.org/modmacao#/"/>
-  <use href="http://schemas.ugoe.cs.rwm/workflow#/"/>
-  <use href="http://schemas.modmacao.org/toscabasetypes#/"/>
-  <use href="http://schemas.modmacao.org/toscaspecifictypes#/"/>
-  <use href="http://schemas.modmacao.org/placement#/"/>
-  <use href="http://schemas.modmacao.org/occi/ansible#/"/>
-  <use href="http://schemas.modmacao.org/openstack/swe#/"/>
-  <use href="http://schemas.ugoe.cs.rwm/monitoring#/"/>
-  <resources xsi:type="platform:Application" id="a4888ba9-a0ea-48f2-a29e-901c876ab42d" location="/application/urn:uuid:a4888ba9-a0ea-48f2-a29e-901c876ab42d/" occiAppState="error">
-    <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='application']"/>
-    <attributes name="occi.core.id" value="a4888ba9-a0ea-48f2-a29e-901c876ab42d"/>
-    <attributes name="occi.core.title" value="hadoopcluster"/>
-    <attributes name="occi.core.summary" value=""/>
-    <attributes name="occi.app.name" value=""/>
-    <attributes name="occi.app.context" value="0"/>
-    <attributes name="occi.app.url" value="0"/>
-    <attributes name="occi.app.state" value="undeployed"/>
-    <attributes name="occi.app.state.message" value=""/>
-    <links xsi:type="platform:Componentlink" id="7890f02b-6f56-4809-865f-d8c686fd9da1" location="/componentlink/urn:uuid:7890f02b-6f56-4809-865f-d8c686fd9da1/" target="//@resources.5">
-      <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
-      <attributes name="occi.core.id" value="7890f02b-6f56-4809-865f-d8c686fd9da1"/>
-      <attributes name="occi.core.title" value="link4"/>
-    </links>
-    <links xsi:type="platform:Componentlink" id="9aa31c50-c605-4370-aa60-2c7c461051ef" location="/componentlink/urn:uuid:9aa31c50-c605-4370-aa60-2c7c461051ef/" target="//@resources.13">
-      <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
-      <attributes name="occi.core.id" value="9aa31c50-c605-4370-aa60-2c7c461051ef"/>
-      <attributes name="occi.core.title" value="ComponentLink"/>
-    </links>
-  </resources>
-  <resources xsi:type="monitoring:Sensor" id="efb0f50a-7a7c-4153-b939-4846d6554dbb" location="/sensor/urn:uuid:efb0f50a-7a7c-4153-b939-4846d6554dbb/" occiAppState="inactive" occiAppStateMessage="" occiSensorTimebase="" occiSensorTimestart="" occiSensorTimestop="" occiSensorPeriod="" occiSensorGranularity="" occiSensorAccuracy="">
-    <kind href="http://schemas.ugoe.cs.rwm/monitoring#//@kinds[term='sensor']"/>
-    <attributes name="occi.core.id" value="efb0f50a-7a7c-4153-b939-4846d6554dbb"/>
-    <attributes name="occi.core.title" value="Sensor"/>
-    <attributes name="occi.core.summary" value=""/>
-    <attributes name="occi.app.name" value=""/>
-    <attributes name="occi.app.context" value="0"/>
-    <attributes name="occi.app.url" value="0"/>
-    <attributes name="occi.app.state" value="undeployed"/>
-    <attributes name="occi.app.state.message" value=""/>
-    <attributes name="occi.sensor.timebase" value=""/>
-    <attributes name="occi.sensor.timestart" value=""/>
-    <attributes name="occi.sensor.timestop" value=""/>
-    <attributes name="occi.sensor.period" value=""/>
-    <attributes name="occi.sensor.granularity" value=""/>
-    <attributes name="occi.sensor.accuracy" value=""/>
-    <links xsi:type="platform:Componentlink" id="93f08e31-f350-42b7-a73b-c139eba4a8e3" location="/componentlink/urn:uuid:93f08e31-f350-42b7-a73b-c139eba4a8e3/" target="//@resources.7">
-      <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
-      <attributes name="occi.core.id" value="93f08e31-f350-42b7-a73b-c139eba4a8e3"/>
-      <attributes name="occi.core.title" value="link3"/>
-    </links>
-    <links xsi:type="platform:Componentlink" id="9c604867-3135-4fa1-af9e-2bb11018ff5a" location="/componentlink/urn:uuid:9c604867-3135-4fa1-af9e-2bb11018ff5a/" target="//@resources.2">
-      <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
-      <attributes name="occi.core.id" value="9c604867-3135-4fa1-af9e-2bb11018ff5a"/>
-      <attributes name="occi.core.title" value="link2"/>
-    </links>
-    <links xsi:type="platform:Componentlink" id="04cf6483-706d-4a2a-9114-9918ab2bb52a" location="/componentlink/urn:uuid:04cf6483-706d-4a2a-9114-9918ab2bb52a/" target="//@resources.11">
-      <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
-      <attributes name="occi.core.id" value="04cf6483-706d-4a2a-9114-9918ab2bb52a"/>
-      <attributes name="occi.core.title" value="link1"/>
-    </links>
-  </resources>
-  <resources xsi:type="monitoring:Processor" id="1bda25ab-723b-47e7-9704-5134db26ebdc" location="/processor/urn:uuid:1bda25ab-723b-47e7-9704-5134db26ebdc/" rlinks="//@resources.7/@links.0 //@resources.1/@links.1" occiComponentState="inactive">
-    <kind href="http://schemas.ugoe.cs.rwm/monitoring#//@kinds[term='processor']"/>
-    <attributes name="occi.core.id" value="1bda25ab-723b-47e7-9704-5134db26ebdc"/>
-    <attributes name="occi.core.title" value="Processor"/>
-    <attributes name="occi.core.summary" value=""/>
-    <attributes name="occi.component.state" value="undeployed"/>
-    <attributes name="occi.component.state.message" value=""/>
-    <parts mixin="//@mixins.4"/>
-    <links xsi:type="platform:Componentlink" id="1a821776-7886-4cb4-8b80-46a8403acf40" location="/componentlink/urn:uuid:1a821776-7886-4cb4-8b80-46a8403acf40/" target="//@resources.11">
-      <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
-      <attributes name="occi.core.id" value="1a821776-7886-4cb4-8b80-46a8403acf40"/>
-      <attributes name="occi.core.title" value="link1"/>
-    </links>
-    <links xsi:type="placement:Placementlink" id="ff7019e4-a9dc-48dc-83c3-ab77714a25f4" location="/placementlink/urn:uuid:ff7019e4-a9dc-48dc-83c3-ab77714a25f4/" target="//@resources.10">
-      <kind href="http://schemas.modmacao.org/placement#//@kinds[term='placementlink']"/>
-      <attributes name="occi.core.id" value="ff7019e4-a9dc-48dc-83c3-ab77714a25f4"/>
-      <attributes name="occi.core.title" value="link2"/>
-    </links>
-  </resources>
-  <resources xsi:type="infrastructure:Network" id="29d78078-fb4c-47aa-a9af-b8aaf3339590" location="/network/urn:uuid:29d78078-fb4c-47aa-a9af-b8aaf3339590/" rlinks="//@resources.10/@links.0 //@resources.8/@links.2 //@resources.9/@links.0">
-    <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='network']"/>
-    <attributes name="occi.core.id" value="29d78078-fb4c-47aa-a9af-b8aaf3339590"/>
-    <attributes name="occi.core.title" value="Management Network"/>
-    <attributes name="occi.core.summary" value=""/>
-    <attributes name="occi.network.vlan" value="0"/>
-    <attributes name="occi.network.label" value=""/>
-    <attributes name="occi.network.state" value="inactive"/>
-    <attributes name="occi.network.state.message" value=""/>
-    <parts xsi:type="openstackruntime:Runtimeid" openstackRuntimeId="75a4639e-9ce7-4058-b859-8a711b0e2e7b">
-      <mixin href="http://schemas.modmacao.org/openstack/runtime#//@mixins[term='runtimeid']"/>
-      <attributes name="openstack.runtime.id" value="75a4639e-9ce7-4058-b859-8a711b0e2e7b"/>
-    </parts>
-  </resources>
-  <resources xsi:type="infrastructure:Network" id="29d78078-fb4c-47aa-a9af-b8aaf3339591" title="hNetwork" location="/network/urn:uuid:29d78078-fb4c-47aa-a9af-b8aaf3339591/" rlinks="//@resources.8/@links.1 //@resources.9/@links.1" occiNetworkVlan="0" occiNetworkLabel="" occiNetworkState="active" occiNetworkStateMessage="">
-    <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='network']"/>
-    <attributes name="occi.core.id" value="29d78078-fb4c-47aa-a9af-b8aaf3339591"/>
-    <attributes name="occi.core.title" value="hNetwork"/>
-    <attributes name="occi.core.summary" value=""/>
-    <attributes name="occi.network.vlan" value="0"/>
-    <attributes name="occi.network.label" value=""/>
-    <attributes name="occi.network.state" value="active"/>
-    <attributes name="occi.network.state.message" value=""/>
-    <parts xsi:type="infrastructure:Ipnetwork" occiNetworkAddress="10.254.1.1/24">
-      <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ipnetwork']"/>
-      <attributes name="occi.network.address" value="10.254.1.1/24"/>
-      <attributes name="occi.network.gateway" value=""/>
-      <attributes name="occi.network.allocation" value="dynamic"/>
-    </parts>
-    <parts xsi:type="openstackruntime:Runtimeid" openstackRuntimeId="ffb9aca8-7599-4cb1-999f-306a0b8efd0e">
-      <mixin href="http://schemas.modmacao.org/openstack/runtime#//@mixins[term='runtimeid']"/>
-    </parts>
-  </resources>
-  <resources xsi:type="platform:Component" id="f934d445-d0c8-4f2f-8086-d9f1a8255898" location="/component/urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255898/" rlinks="//@resources.0/@links.0" occiComponentState="error" occiComponentStateMessage="">
-    <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='component']"/>
-    <attributes name="occi.core.id" value="f934d445-d0c8-4f2f-8086-d9f1a8255898"/>
-    <attributes name="occi.core.title" value="Worker"/>
-    <attributes name="occi.core.summary" value=""/>
-    <attributes name="occi.component.state" value="undeployed"/>
-    <attributes name="occi.component.state.message" value=""/>
-    <parts mixin="//@mixins.2"/>
-    <links xsi:type="placement:Placementlink" id="ff292f08-d263-41b6-88c8-84d33783b917" location="/placementlink/urn:uuid:ff292f08-d263-41b6-88c8-84d33783b917/" target="//@resources.8">
-      <kind href="http://schemas.modmacao.org/placement#//@kinds[term='placementlink']"/>
-      <attributes name="occi.core.id" value="ff292f08-d263-41b6-88c8-84d33783b917"/>
-      <attributes name="occi.core.title" value="link1"/>
-    </links>
-  </resources>
-  <resources xsi:type="infrastructure:Network" id="7a9fca2c-24fb-473c-aa9c-8dc9e68a432a" title="MonitoringNetwork" location="/network/urn:uuid:7a9fca2c-24fb-473c-aa9c-8dc9e68a432a/" rlinks="//@resources.10/@links.1 //@resources.8/@links.0" occiNetworkVlan="0" occiNetworkLabel="" occiNetworkState="active" occiNetworkStateMessage="">
-    <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='network']"/>
-    <attributes name="occi.core.id" value="7a9fca2c-24fb-473c-aa9c-8dc9e68a432a"/>
-    <attributes name="occi.core.title" value="MonitoringNetwork"/>
-    <attributes name="occi.core.summary" value=""/>
-    <attributes name="occi.network.vlan" value="0"/>
-    <attributes name="occi.network.label" value=""/>
-    <attributes name="occi.network.state" value="active"/>
-    <attributes name="occi.network.state.message" value=""/>
-    <parts xsi:type="infrastructure:Ipnetwork" occiNetworkAddress="100.254.1.1/24">
-      <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ipnetwork']"/>
-      <attributes name="occi.network.address" value="100.254.1.1/24"/>
-      <attributes name="occi.network.gateway" value=""/>
-      <attributes name="occi.network.allocation" value="dynamic"/>
-    </parts>
-    <parts xsi:type="openstackruntime:Runtimeid" openstackRuntimeId="a78e379b-83d7-4afe-95ec-6266a1ada35d">
-      <mixin href="http://schemas.modmacao.org/openstack/runtime#//@mixins[term='runtimeid']"/>
-    </parts>
-  </resources>
-  <resources xsi:type="monitoring:Publisher" id="588f705e-5279-4847-9337-846af2c86972" location="/publisher/urn:uuid:588f705e-5279-4847-9337-846af2c86972/" rlinks="//@resources.1/@links.0" occiComponentState="inactive">
-    <kind href="http://schemas.ugoe.cs.rwm/monitoring#//@kinds[term='publisher']"/>
-    <attributes name="occi.core.id" value="588f705e-5279-4847-9337-846af2c86972"/>
-    <attributes name="occi.core.title" value="Publisher"/>
-    <attributes name="occi.core.summary" value=""/>
-    <attributes name="occi.component.state" value="undeployed"/>
-    <attributes name="occi.component.state.message" value=""/>
-    <parts mixin="//@mixins.5"/>
-    <links xsi:type="platform:Componentlink" id="9551c357-59f8-4ac1-8c85-0e886e206b80" location="/componentlink/urn:uuid:9551c357-59f8-4ac1-8c85-0e886e206b80/" target="//@resources.2">
-      <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
-      <attributes name="occi.core.id" value="9551c357-59f8-4ac1-8c85-0e886e206b80"/>
-      <attributes name="occi.core.title" value="link1"/>
-    </links>
-    <links xsi:type="placement:Placementlink" id="275b5bce-084c-46f0-88bc-1f6f31bf3616" location="/placementlink/urn:uuid:275b5bce-084c-46f0-88bc-1f6f31bf3616/" target="//@resources.10">
-      <kind href="http://schemas.modmacao.org/placement#//@kinds[term='placementlink']"/>
-      <attributes name="occi.core.id" value="275b5bce-084c-46f0-88bc-1f6f31bf3616"/>
-      <attributes name="occi.core.title" value="link2"/>
-    </links>
-  </resources>
-  <resources xsi:type="infrastructure:Compute" id="2e6a73d0-faaa-476a-bd25-ca461dd166cf" title="hadoop-worker-1" location="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166cf/" rlinks="//@resources.11/@links.0 //@resources.5/@links.0" occiComputeCores="2" occiComputeHostname="hadoop-worker-1" occiComputeShare="0" occiComputeSpeed="0.0" occiComputeMemory="4096.0" occiComputeState="active" occiComputeStateMessage="">
-    <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='compute']"/>
-    <attributes name="occi.core.id" value="2e6a73d0-faaa-476a-bd25-ca461dd166cf"/>
-    <attributes name="occi.core.title" value="hadoop-worker-1"/>
-    <attributes name="occi.core.summary" value=""/>
-    <attributes name="occi.compute.architecture" value="x86"/>
-    <attributes name="occi.compute.cores" value="2"/>
-    <attributes name="occi.compute.hostname" value="hadoop-worker-1"/>
-    <attributes name="occi.compute.share" value="0"/>
-    <attributes name="occi.compute.speed" value="0"/>
-    <attributes name="occi.compute.memory" value="4096"/>
-    <attributes name="occi.compute.state" value="active"/>
-    <attributes name="occi.compute.state.message" value=""/>
-    <parts xsi:type="infrastructure:User_data" occiComputeUserdata="I2Nsb3VkLWNvbmZpZwoKIyBVcGdyYWRlIHRoZSBpbnN0YW5jZSBvbiBmaXJzdCBib290CiMgKGllIHJ1biBhcHQtZ2V0IHVwZ3JhZGUpCiMKIyBEZWZhdWx0OiBmYWxzZQojIEFsaWFzZXM6IGFwdF91cGdyYWRlCnBhY2thZ2VfdXBncmFkZTogdHJ1ZQoKcGFja2FnZXM6CiAtIHB5dGhvbgoKd3JpdGVfZmlsZXM6CiAgLSBwYXRoOiAvZXRjL25ldHdvcmsvaW50ZXJmYWNlcy5kLzUwLWNsb3VkLWluaXQuY2ZnCiAgICBjb250ZW50OiB8CiAgICAgIGF1dG8gbG8KICAgICAgaWZhY2UgbG8gaW5ldCBsb29wYmFjawogICAgICAKICAgICAgYXV0byBlbnMwCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMAogICAgICBpZmFjZSBlbnMwIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMQogICAgICBpZmFjZSBlbnMxIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMyCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMgogICAgICBpZmFjZSBlbnMyIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMzCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMwogICAgICBpZmFjZSBlbnMzIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM0CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNAogICAgICBpZmFjZSBlbnM0IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM1CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNQogICAgICBpZmFjZSBlbnM1IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM2CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNgogICAgICBpZmFjZSBlbnM2IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM3CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNwogICAgICBpZmFjZSBlbnM3IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM4CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOAogICAgICBpZmFjZSBlbnM4IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM5CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOQogICAgICBpZmFjZSBlbnM5IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxMAogICAgICBhbGxvdy1ob3RwbHVnIGVuczEwCiAgICAgIGlmYWNlIGVuczEwIGluZXQgZGhjcAoKIyMj">
-      <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='user_data']"/>
-      <attributes name="occi.compute.userdata" value="I2Nsb3VkLWNvbmZpZwoKIyBVcGdyYWRlIHRoZSBpbnN0YW5jZSBvbiBmaXJzdCBib290CiMgKGllIHJ1biBhcHQtZ2V0IHVwZ3JhZGUpCiMKIyBEZWZhdWx0OiBmYWxzZQojIEFsaWFzZXM6IGFwdF91cGdyYWRlCnBhY2thZ2VfdXBncmFkZTogdHJ1ZQoKcGFja2FnZXM6CiAtIHB5dGhvbgoKd3JpdGVfZmlsZXM6CiAgLSBwYXRoOiAvZXRjL25ldHdvcmsvaW50ZXJmYWNlcy5kLzUwLWNsb3VkLWluaXQuY2ZnCiAgICBjb250ZW50OiB8CiAgICAgIGF1dG8gbG8KICAgICAgaWZhY2UgbG8gaW5ldCBsb29wYmFjawogICAgICAKICAgICAgYXV0byBlbnMwCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMAogICAgICBpZmFjZSBlbnMwIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMQogICAgICBpZmFjZSBlbnMxIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMyCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMgogICAgICBpZmFjZSBlbnMyIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMzCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMwogICAgICBpZmFjZSBlbnMzIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM0CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNAogICAgICBpZmFjZSBlbnM0IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM1CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNQogICAgICBpZmFjZSBlbnM1IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM2CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNgogICAgICBpZmFjZSBlbnM2IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM3CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNwogICAgICBpZmFjZSBlbnM3IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM4CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOAogICAgICBpZmFjZSBlbnM4IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM5CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOQogICAgICBpZmFjZSBlbnM5IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxMAogICAgICBhbGxvdy1ob3RwbHVnIGVuczEwCiAgICAgIGlmYWNlIGVuczEwIGluZXQgZGhjcAoKIyMj"/>
-    </parts>
-    <parts xsi:type="ossweruntime:Ubuntu_xenialxerus">
-      <mixin href="http://schemas.modmacao.org/openstack/swe#//@mixins[term='ubuntu_xenialxerus']"/>
-      <attributes name="openstack.runtime.id" value="5437eae8-7c47-4834-929c-a314de77d291"/>
-    </parts>
-    <parts xsi:type="infrastructure:Ssh_key" occiCredentialsSshPublickey="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6H7Ydi45BTHid4qNppGAi5mzjbnZgt7bi6xLGmZG9CiLmhMsxOuk3Z05Nn+pmoN98qS0eY8S240PPk5VOlYqBY0vdRAwrZSHHaLdMp6I7ARNrI2KraYduweqz7ZQxPXQfwIeYx2HKQxEF2r+4//Fo4WfgdBkLuulvl/Gw3TUzJNQHvgpaiNo9+PI5CZydHnZbjUkRikS12pT+CbNKj+0QKeQztbCd41aKxDv5H0DjltVRcpPppv4dmiU/zoCAIngWLO1PPgfYWyze8Z9IoyBT7Qdg30U91TYZBuxzXR5lq7Fh64y/IZ/SjdOdSIvIuDjtmJDULRdLJzrvubrKY+YH Generated-by-Nova">
-      <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ssh_key']"/>
-      <attributes name="occi.credentials.ssh.publickey" value="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6H7Ydi45BTHid4qNppGAi5mzjbnZgt7bi6xLGmZG9CiLmhMsxOuk3Z05Nn+pmoN98qS0eY8S240PPk5VOlYqBY0vdRAwrZSHHaLdMp6I7ARNrI2KraYduweqz7ZQxPXQfwIeYx2HKQxEF2r+4//Fo4WfgdBkLuulvl/Gw3TUzJNQHvgpaiNo9+PI5CZydHnZbjUkRikS12pT+CbNKj+0QKeQztbCd41aKxDv5H0DjltVRcpPppv4dmiU/zoCAIngWLO1PPgfYWyze8Z9IoyBT7Qdg30U91TYZBuxzXR5lq7Fh64y/IZ/SjdOdSIvIuDjtmJDULRdLJzrvubrKY+YH Generated-by-Nova"/>
-    </parts>
-    <parts xsi:type="monitoring:Monitoringproperties">
-      <mixin href="http://schemas.ugoe.cs.rwm/monitoring#//@mixins[term='monitoringproperties']"/>
-      <attributes name="monitoring.properties" value=""/>
-    </parts>
-    <parts xsi:type="openstackruntime:Runtimeid" openstackRuntimeId="d3cade51-e0c2-48d5-ad75-0706dd301caf">
-      <mixin href="http://schemas.modmacao.org/openstack/runtime#//@mixins[term='runtimeid']"/>
-    </parts>
-    <links xsi:type="infrastructure:Networkinterface" id="03f91178-136f-4023-876e-84509f8a5a2d" location="/networkinterface/urn:uuid:03f91178-136f-4023-876e-84509f8a5a2d/" target="//@resources.6">
-      <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='networkinterface']"/>
-      <attributes name="occi.core.id" value="03f91178-136f-4023-876e-84509f8a5a2d"/>
-      <attributes name="occi.core.title" value="monNwLink"/>
-      <attributes name="occi.networkinterface.interface" value=""/>
-      <attributes name="occi.networkinterface.mac" value=""/>
-      <attributes name="occi.networkinterface.state" value="active"/>
-      <attributes name="occi.networkinterface.state.message" value=""/>
-      <attributes name="occi.networkinterface.address" value="100.254.1.35"/>
-      <attributes name="occi.networkinterface.gateway" value=""/>
-      <attributes name="occi.networkinterface.allocation" value="dynamic"/>
-      <parts xsi:type="infrastructure:Ipnetworkinterface" occiNetworkinterfaceAddress="100.254.1.35">
-        <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ipnetworkinterface']"/>
-      </parts>
-      <parts xsi:type="openstackruntime:Runtimeid" openstackRuntimeId="fb5e8706-c5a5-48b1-a5f7-554be26b1f0b">
-        <mixin href="http://schemas.modmacao.org/openstack/runtime#//@mixins[term='runtimeid']"/>
-      </parts>
-    </links>
-    <links xsi:type="infrastructure:Networkinterface" id="c8c49905-3d5e-43b2-8d09-fabf92d29722" location="/networkinterface/urn:uuid:c8c49905-3d5e-43b2-8d09-fabf92d29722/" target="//@resources.4">
-      <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='networkinterface']"/>
-      <attributes name="occi.core.id" value="c8c49905-3d5e-43b2-8d09-fabf92d29722"/>
-      <attributes name="occi.core.title" value="link2"/>
-      <attributes name="occi.networkinterface.interface" value=""/>
-      <attributes name="occi.networkinterface.mac" value=""/>
-      <attributes name="occi.networkinterface.state" value="active"/>
-      <attributes name="occi.networkinterface.state.message" value=""/>
-      <attributes name="occi.networkinterface.address" value="10.254.1.8"/>
-      <attributes name="occi.networkinterface.gateway" value=""/>
-      <attributes name="occi.networkinterface.allocation" value="dynamic"/>
-      <parts xsi:type="infrastructure:Ipnetworkinterface" occiNetworkinterfaceAddress="10.254.1.8">
-        <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ipnetworkinterface']"/>
-      </parts>
-      <parts xsi:type="openstackruntime:Runtimeid" openstackRuntimeId="beffdcda-b4f3-4acd-a6ba-8d1cb4642d9d">
-        <mixin href="http://schemas.modmacao.org/openstack/runtime#//@mixins[term='runtimeid']"/>
-      </parts>
-    </links>
-    <links xsi:type="infrastructure:Networkinterface" id="a81f796a-c59f-46d7-8411-e3811ddfc58d" location="/networkinterface/urn:uuid:a81f796a-c59f-46d7-8411-e3811ddfc58d/" target="//@resources.3">
-      <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='networkinterface']"/>
-      <attributes name="occi.core.id" value="a81f796a-c59f-46d7-8411-e3811ddfc58d"/>
-      <attributes name="occi.core.title" value="hadoop-worker-1 -> Management Network"/>
-      <attributes name="occi.networkinterface.interface" value=""/>
-      <attributes name="occi.networkinterface.mac" value=""/>
-      <attributes name="occi.networkinterface.state" value="active"/>
-      <attributes name="occi.networkinterface.state.message" value=""/>
-      <attributes name="occi.networkinterface.address" value=""/>
-      <attributes name="occi.networkinterface.gateway" value=""/>
-      <attributes name="occi.networkinterface.allocation" value="dynamic"/>
-      <parts xsi:type="infrastructure:Ipnetworkinterface" occiNetworkinterfaceAddress="10.0.0.25">
-        <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ipnetworkinterface']"/>
-      </parts>
-      <parts xsi:type="ansibleconfiguration:Ansibleendpoint">
-        <mixin href="http://schemas.modmacao.org/occi/ansible#//@mixins[term='ansibleendpoint']"/>
-      </parts>
-      <parts xsi:type="openstackruntime:Runtimeid" openstackRuntimeId="59fbe73d-0707-401e-9941-97539f59b108">
-        <mixin href="http://schemas.modmacao.org/openstack/runtime#//@mixins[term='runtimeid']"/>
-      </parts>
-    </links>
-  </resources>
-  <resources xsi:type="infrastructure:Compute" id="2e6a73d0-faaa-476a-bd25-ca461dd166ce" title="hadoop-master" location="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166ce/" rlinks="//@resources.13/@links.0 //@resources.12/@links.0" occiComputeCores="2" occiComputeHostname="hadoop-master" occiComputeShare="0" occiComputeSpeed="0.0" occiComputeMemory="4096.0" occiComputeState="active" occiComputeStateMessage="">
-    <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='compute']"/>
-    <attributes name="occi.core.id" value="2e6a73d0-faaa-476a-bd25-ca461dd166ce"/>
-    <attributes name="occi.core.title" value="hadoop-master"/>
-    <attributes name="occi.core.summary" value=""/>
-    <attributes name="occi.compute.architecture" value="x86"/>
-    <attributes name="occi.compute.cores" value="2"/>
-    <attributes name="occi.compute.hostname" value="hadoop-master"/>
-    <attributes name="occi.compute.share" value="0"/>
-    <attributes name="occi.compute.speed" value="0"/>
-    <attributes name="occi.compute.memory" value="4096"/>
-    <attributes name="occi.compute.state" value="active"/>
-    <attributes name="occi.compute.state.message" value=""/>
-    <parts xsi:type="infrastructure:User_data" occiComputeUserdata="I2Nsb3VkLWNvbmZpZwoKIyBVcGdyYWRlIHRoZSBpbnN0YW5jZSBvbiBmaXJzdCBib290CiMgKGllIHJ1biBhcHQtZ2V0IHVwZ3JhZGUpCiMKIyBEZWZhdWx0OiBmYWxzZQojIEFsaWFzZXM6IGFwdF91cGdyYWRlCnBhY2thZ2VfdXBncmFkZTogdHJ1ZQoKcGFja2FnZXM6CiAtIHB5dGhvbgoKd3JpdGVfZmlsZXM6CiAgLSBwYXRoOiAvZXRjL25ldHdvcmsvaW50ZXJmYWNlcy5kLzUwLWNsb3VkLWluaXQuY2ZnCiAgICBjb250ZW50OiB8CiAgICAgIGF1dG8gbG8KICAgICAgaWZhY2UgbG8gaW5ldCBsb29wYmFjawogICAgICAKICAgICAgYXV0byBlbnMwCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMAogICAgICBpZmFjZSBlbnMwIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMQogICAgICBpZmFjZSBlbnMxIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMyCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMgogICAgICBpZmFjZSBlbnMyIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMzCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMwogICAgICBpZmFjZSBlbnMzIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM0CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNAogICAgICBpZmFjZSBlbnM0IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM1CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNQogICAgICBpZmFjZSBlbnM1IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM2CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNgogICAgICBpZmFjZSBlbnM2IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM3CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNwogICAgICBpZmFjZSBlbnM3IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM4CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOAogICAgICBpZmFjZSBlbnM4IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM5CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOQogICAgICBpZmFjZSBlbnM5IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxMAogICAgICBhbGxvdy1ob3RwbHVnIGVuczEwCiAgICAgIGlmYWNlIGVuczEwIGluZXQgZGhjcAoKIyMj">
-      <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='user_data']"/>
-      <attributes name="occi.compute.userdata" value="I2Nsb3VkLWNvbmZpZwoKIyBVcGdyYWRlIHRoZSBpbnN0YW5jZSBvbiBmaXJzdCBib290CiMgKGllIHJ1biBhcHQtZ2V0IHVwZ3JhZGUpCiMKIyBEZWZhdWx0OiBmYWxzZQojIEFsaWFzZXM6IGFwdF91cGdyYWRlCnBhY2thZ2VfdXBncmFkZTogdHJ1ZQoKcGFja2FnZXM6CiAtIHB5dGhvbgoKd3JpdGVfZmlsZXM6CiAgLSBwYXRoOiAvZXRjL25ldHdvcmsvaW50ZXJmYWNlcy5kLzUwLWNsb3VkLWluaXQuY2ZnCiAgICBjb250ZW50OiB8CiAgICAgIGF1dG8gbG8KICAgICAgaWZhY2UgbG8gaW5ldCBsb29wYmFjawogICAgICAKICAgICAgYXV0byBlbnMwCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMAogICAgICBpZmFjZSBlbnMwIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMQogICAgICBpZmFjZSBlbnMxIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMyCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMgogICAgICBpZmFjZSBlbnMyIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMzCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMwogICAgICBpZmFjZSBlbnMzIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM0CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNAogICAgICBpZmFjZSBlbnM0IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM1CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNQogICAgICBpZmFjZSBlbnM1IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM2CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNgogICAgICBpZmFjZSBlbnM2IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM3CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNwogICAgICBpZmFjZSBlbnM3IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM4CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOAogICAgICBpZmFjZSBlbnM4IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM5CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOQogICAgICBpZmFjZSBlbnM5IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxMAogICAgICBhbGxvdy1ob3RwbHVnIGVuczEwCiAgICAgIGlmYWNlIGVuczEwIGluZXQgZGhjcAoKIyMj"/>
-    </parts>
-    <parts xsi:type="ossweruntime:Ubuntu_xenialxerus">
-      <mixin href="http://schemas.modmacao.org/openstack/swe#//@mixins[term='ubuntu_xenialxerus']"/>
-      <attributes name="openstack.runtime.id" value="5437eae8-7c47-4834-929c-a314de77d291"/>
-    </parts>
-    <parts xsi:type="infrastructure:Ssh_key" occiCredentialsSshPublickey="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6H7Ydi45BTHid4qNppGAi5mzjbnZgt7bi6xLGmZG9CiLmhMsxOuk3Z05Nn+pmoN98qS0eY8S240PPk5VOlYqBY0vdRAwrZSHHaLdMp6I7ARNrI2KraYduweqz7ZQxPXQfwIeYx2HKQxEF2r+4//Fo4WfgdBkLuulvl/Gw3TUzJNQHvgpaiNo9+PI5CZydHnZbjUkRikS12pT+CbNKj+0QKeQztbCd41aKxDv5H0DjltVRcpPppv4dmiU/zoCAIngWLO1PPgfYWyze8Z9IoyBT7Qdg30U91TYZBuxzXR5lq7Fh64y/IZ/SjdOdSIvIuDjtmJDULRdLJzrvubrKY+YH Generated-by-Nova">
-      <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ssh_key']"/>
-      <attributes name="occi.credentials.ssh.publickey" value="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6H7Ydi45BTHid4qNppGAi5mzjbnZgt7bi6xLGmZG9CiLmhMsxOuk3Z05Nn+pmoN98qS0eY8S240PPk5VOlYqBY0vdRAwrZSHHaLdMp6I7ARNrI2KraYduweqz7ZQxPXQfwIeYx2HKQxEF2r+4//Fo4WfgdBkLuulvl/Gw3TUzJNQHvgpaiNo9+PI5CZydHnZbjUkRikS12pT+CbNKj+0QKeQztbCd41aKxDv5H0DjltVRcpPppv4dmiU/zoCAIngWLO1PPgfYWyze8Z9IoyBT7Qdg30U91TYZBuxzXR5lq7Fh64y/IZ/SjdOdSIvIuDjtmJDULRdLJzrvubrKY+YH Generated-by-Nova"/>
-    </parts>
-    <parts xsi:type="openstackruntime:Runtimeid" openstackRuntimeId="a8193a3f-d0a6-48e2-900f-f40a972186f6">
-      <mixin href="http://schemas.modmacao.org/openstack/runtime#//@mixins[term='runtimeid']"/>
-    </parts>
-    <links xsi:type="infrastructure:Networkinterface" id="576fa64d-bf7e-4c15-bd20-d3e13c03ad64" location="/networkinterface/urn:uuid:576fa64d-bf7e-4c15-bd20-d3e13c03ad64/" target="//@resources.3">
-      <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='networkinterface']"/>
-      <attributes name="occi.core.id" value="576fa64d-bf7e-4c15-bd20-d3e13c03ad64"/>
-      <attributes name="occi.core.title" value="hadoop-master -> Management Network"/>
-      <attributes name="occi.networkinterface.interface" value=""/>
-      <attributes name="occi.networkinterface.mac" value=""/>
-      <attributes name="occi.networkinterface.state" value="active"/>
-      <attributes name="occi.networkinterface.state.message" value=""/>
-      <attributes name="occi.networkinterface.address" value=""/>
-      <attributes name="occi.networkinterface.gateway" value=""/>
-      <attributes name="occi.networkinterface.allocation" value="dynamic"/>
-      <parts xsi:type="infrastructure:Ipnetworkinterface" occiNetworkinterfaceAddress="10.0.0.16">
-        <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ipnetworkinterface']"/>
-      </parts>
-      <parts xsi:type="ansibleconfiguration:Ansibleendpoint">
-        <mixin href="http://schemas.modmacao.org/occi/ansible#//@mixins[term='ansibleendpoint']"/>
-      </parts>
-      <parts xsi:type="openstackruntime:Runtimeid" openstackRuntimeId="2322b413-a434-4262-ba6d-e082f5d4a0cf">
-        <mixin href="http://schemas.modmacao.org/openstack/runtime#//@mixins[term='runtimeid']"/>
-      </parts>
-    </links>
-    <links xsi:type="infrastructure:Networkinterface" id="ea482951-5c26-471d-aa1b-8e03b1e6096c" location="/networkinterface/urn:uuid:ea482951-5c26-471d-aa1b-8e03b1e6096c/" target="//@resources.4">
-      <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='networkinterface']"/>
-      <attributes name="occi.core.id" value="ea482951-5c26-471d-aa1b-8e03b1e6096c"/>
-      <attributes name="occi.core.title" value="link3"/>
-      <attributes name="occi.networkinterface.interface" value=""/>
-      <attributes name="occi.networkinterface.mac" value=""/>
-      <attributes name="occi.networkinterface.state" value="active"/>
-      <attributes name="occi.networkinterface.state.message" value=""/>
-      <attributes name="occi.networkinterface.address" value="10.254.1.5"/>
-      <attributes name="occi.networkinterface.gateway" value=""/>
-      <attributes name="occi.networkinterface.allocation" value="dynamic"/>
-      <parts xsi:type="infrastructure:Ipnetworkinterface" occiNetworkinterfaceAddress="10.254.1.5">
-        <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ipnetworkinterface']"/>
-      </parts>
-      <parts xsi:type="openstackruntime:Runtimeid" openstackRuntimeId="f9a171b5-050a-455e-acf8-582e9a2db090">
-        <mixin href="http://schemas.modmacao.org/openstack/runtime#//@mixins[term='runtimeid']"/>
-      </parts>
-    </links>
-  </resources>
-  <resources xsi:type="infrastructure:Compute" id="37829092-c690-494a-98fa-335b2fd660ea" title="MonVm" location="/compute/urn:uuid:37829092-c690-494a-98fa-335b2fd660ea/" rlinks="//@resources.7/@links.1 //@resources.2/@links.1" occiComputeCores="2" occiComputeHostname="monVM" occiComputeShare="0" occiComputeSpeed="0.0" occiComputeMemory="4096.0" occiComputeState="active" occiComputeStateMessage="">
-    <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='compute']"/>
-    <attributes name="occi.core.id" value="37829092-c690-494a-98fa-335b2fd660ea"/>
-    <attributes name="occi.core.title" value="MonVm"/>
-    <attributes name="occi.core.summary" value=""/>
-    <attributes name="occi.compute.architecture" value="x86"/>
-    <attributes name="occi.compute.cores" value="2"/>
-    <attributes name="occi.compute.hostname" value="monVM"/>
-    <attributes name="occi.compute.share" value="0"/>
-    <attributes name="occi.compute.speed" value="0"/>
-    <attributes name="occi.compute.memory" value="4096"/>
-    <attributes name="occi.compute.state" value="active"/>
-    <attributes name="occi.compute.state.message" value=""/>
-    <parts xsi:type="infrastructure:User_data" occiComputeUserdata="I2Nsb3VkLWNvbmZpZwoKIyBVcGdyYWRlIHRoZSBpbnN0YW5jZSBvbiBmaXJzdCBib290CiMgKGllIHJ1biBhcHQtZ2V0IHVwZ3JhZGUpCiMKIyBEZWZhdWx0OiBmYWxzZQojIEFsaWFzZXM6IGFwdF91cGdyYWRlCnBhY2thZ2VfdXBncmFkZTogdHJ1ZQoKcGFja2FnZXM6CiAtIHB5dGhvbgoKd3JpdGVfZmlsZXM6CiAgLSBwYXRoOiAvZXRjL25ldHdvcmsvaW50ZXJmYWNlcy5kLzUwLWNsb3VkLWluaXQuY2ZnCiAgICBjb250ZW50OiB8CiAgICAgIGF1dG8gbG8KICAgICAgaWZhY2UgbG8gaW5ldCBsb29wYmFjawogICAgICAKICAgICAgYXV0byBlbnMwCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMAogICAgICBpZmFjZSBlbnMwIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMQogICAgICBpZmFjZSBlbnMxIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMyCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMgogICAgICBpZmFjZSBlbnMyIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMzCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMwogICAgICBpZmFjZSBlbnMzIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM0CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNAogICAgICBpZmFjZSBlbnM0IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM1CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNQogICAgICBpZmFjZSBlbnM1IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM2CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNgogICAgICBpZmFjZSBlbnM2IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM3CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNwogICAgICBpZmFjZSBlbnM3IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM4CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOAogICAgICBpZmFjZSBlbnM4IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM5CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOQogICAgICBpZmFjZSBlbnM5IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxMAogICAgICBhbGxvdy1ob3RwbHVnIGVuczEwCiAgICAgIGlmYWNlIGVuczEwIGluZXQgZGhjcAoKIyMj">
-      <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='user_data']"/>
-      <attributes name="occi.compute.userdata" value="I2Nsb3VkLWNvbmZpZwoKIyBVcGdyYWRlIHRoZSBpbnN0YW5jZSBvbiBmaXJzdCBib290CiMgKGllIHJ1biBhcHQtZ2V0IHVwZ3JhZGUpCiMKIyBEZWZhdWx0OiBmYWxzZQojIEFsaWFzZXM6IGFwdF91cGdyYWRlCnBhY2thZ2VfdXBncmFkZTogdHJ1ZQoKcGFja2FnZXM6CiAtIHB5dGhvbgoKd3JpdGVfZmlsZXM6CiAgLSBwYXRoOiAvZXRjL25ldHdvcmsvaW50ZXJmYWNlcy5kLzUwLWNsb3VkLWluaXQuY2ZnCiAgICBjb250ZW50OiB8CiAgICAgIGF1dG8gbG8KICAgICAgaWZhY2UgbG8gaW5ldCBsb29wYmFjawogICAgICAKICAgICAgYXV0byBlbnMwCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMAogICAgICBpZmFjZSBlbnMwIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMQogICAgICBpZmFjZSBlbnMxIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMyCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMgogICAgICBpZmFjZSBlbnMyIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMzCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMwogICAgICBpZmFjZSBlbnMzIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM0CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNAogICAgICBpZmFjZSBlbnM0IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM1CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNQogICAgICBpZmFjZSBlbnM1IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM2CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNgogICAgICBpZmFjZSBlbnM2IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM3CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNwogICAgICBpZmFjZSBlbnM3IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM4CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOAogICAgICBpZmFjZSBlbnM4IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM5CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOQogICAgICBpZmFjZSBlbnM5IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxMAogICAgICBhbGxvdy1ob3RwbHVnIGVuczEwCiAgICAgIGlmYWNlIGVuczEwIGluZXQgZGhjcAoKIyMj"/>
-    </parts>
-    <parts xsi:type="ossweruntime:Ubuntu_xenialxerus">
-      <mixin href="http://schemas.modmacao.org/openstack/swe#//@mixins[term='ubuntu_xenialxerus']"/>
-      <attributes name="openstack.runtime.id" value="5437eae8-7c47-4834-929c-a314de77d291"/>
-    </parts>
-    <parts xsi:type="infrastructure:Ssh_key" occiCredentialsSshPublickey="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6H7Ydi45BTHid4qNppGAi5mzjbnZgt7bi6xLGmZG9CiLmhMsxOuk3Z05Nn+pmoN98qS0eY8S240PPk5VOlYqBY0vdRAwrZSHHaLdMp6I7ARNrI2KraYduweqz7ZQxPXQfwIeYx2HKQxEF2r+4//Fo4WfgdBkLuulvl/Gw3TUzJNQHvgpaiNo9+PI5CZydHnZbjUkRikS12pT+CbNKj+0QKeQztbCd41aKxDv5H0DjltVRcpPppv4dmiU/zoCAIngWLO1PPgfYWyze8Z9IoyBT7Qdg30U91TYZBuxzXR5lq7Fh64y/IZ/SjdOdSIvIuDjtmJDULRdLJzrvubrKY+YH Generated-by-Nova">
-      <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ssh_key']"/>
-      <attributes name="occi.credentials.ssh.publickey" value="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6H7Ydi45BTHid4qNppGAi5mzjbnZgt7bi6xLGmZG9CiLmhMsxOuk3Z05Nn+pmoN98qS0eY8S240PPk5VOlYqBY0vdRAwrZSHHaLdMp6I7ARNrI2KraYduweqz7ZQxPXQfwIeYx2HKQxEF2r+4//Fo4WfgdBkLuulvl/Gw3TUzJNQHvgpaiNo9+PI5CZydHnZbjUkRikS12pT+CbNKj+0QKeQztbCd41aKxDv5H0DjltVRcpPppv4dmiU/zoCAIngWLO1PPgfYWyze8Z9IoyBT7Qdg30U91TYZBuxzXR5lq7Fh64y/IZ/SjdOdSIvIuDjtmJDULRdLJzrvubrKY+YH Generated-by-Nova"/>
-    </parts>
-    <parts xsi:type="openstackruntime:Runtimeid" openstackRuntimeId="426dd30a-4aed-42f3-854d-217e6e74f4a8">
-      <mixin href="http://schemas.modmacao.org/openstack/runtime#//@mixins[term='runtimeid']"/>
-    </parts>
-    <links xsi:type="infrastructure:Networkinterface" id="efe27a6b-e6e3-4fe8-ab52-9b4039fba9e5" location="/networkinterface/urn:uuid:efe27a6b-e6e3-4fe8-ab52-9b4039fba9e5/" target="//@resources.3">
-      <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='networkinterface']"/>
-      <attributes name="occi.core.id" value="efe27a6b-e6e3-4fe8-ab52-9b4039fba9e5"/>
-      <attributes name="occi.core.title" value="MonVm -> Management Network"/>
-      <attributes name="occi.networkinterface.interface" value=""/>
-      <attributes name="occi.networkinterface.mac" value=""/>
-      <attributes name="occi.networkinterface.state" value="active"/>
-      <attributes name="occi.networkinterface.state.message" value=""/>
-      <attributes name="occi.networkinterface.address" value=""/>
-      <attributes name="occi.networkinterface.gateway" value=""/>
-      <attributes name="occi.networkinterface.allocation" value="dynamic"/>
-      <parts xsi:type="infrastructure:Ipnetworkinterface" occiNetworkinterfaceAddress="10.0.0.9">
-        <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ipnetworkinterface']"/>
-      </parts>
-      <parts xsi:type="ansibleconfiguration:Ansibleendpoint">
-        <mixin href="http://schemas.modmacao.org/occi/ansible#//@mixins[term='ansibleendpoint']"/>
-      </parts>
-      <parts xsi:type="openstackruntime:Runtimeid" openstackRuntimeId="0bf1a760-6db1-4347-938e-e24b25556ec0">
-        <mixin href="http://schemas.modmacao.org/openstack/runtime#//@mixins[term='runtimeid']"/>
-      </parts>
-    </links>
-    <links xsi:type="infrastructure:Networkinterface" id="00d6889d-b644-44bf-af13-3fe350e926ed" location="/networkinterface/urn:uuid:00d6889d-b644-44bf-af13-3fe350e926ed/" target="//@resources.6">
-      <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='networkinterface']"/>
-      <attributes name="occi.core.id" value="00d6889d-b644-44bf-af13-3fe350e926ed"/>
-      <attributes name="occi.core.title" value="link1"/>
-      <attributes name="occi.networkinterface.interface" value=""/>
-      <attributes name="occi.networkinterface.mac" value=""/>
-      <attributes name="occi.networkinterface.state" value="active"/>
-      <attributes name="occi.networkinterface.state.message" value=""/>
-      <attributes name="occi.networkinterface.address" value=""/>
-      <attributes name="occi.networkinterface.gateway" value=""/>
-      <attributes name="occi.networkinterface.allocation" value="dynamic"/>
-      <parts xsi:type="infrastructure:Ipnetworkinterface">
-        <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ipnetworkinterface']"/>
-      </parts>
-      <parts xsi:type="openstackruntime:Runtimeid" openstackRuntimeId="1a9c2480-618e-405f-bebc-532c5ff6d546">
-        <mixin href="http://schemas.modmacao.org/openstack/runtime#//@mixins[term='runtimeid']"/>
-      </parts>
-    </links>
-  </resources>
-  <resources xsi:type="monitoring:Datagatherer" id="051affdc-d686-48f8-884c-83fe81718a48" location="/datagatherer/urn:uuid:051affdc-d686-48f8-884c-83fe81718a48/" rlinks="//@resources.1/@links.2 //@resources.2/@links.0" occiComponentState="inactive">
-    <kind href="http://schemas.ugoe.cs.rwm/monitoring#//@kinds[term='datagatherer']"/>
-    <attributes name="occi.core.id" value="051affdc-d686-48f8-884c-83fe81718a48"/>
-    <attributes name="occi.core.title" value="DataGatherer"/>
-    <attributes name="occi.core.summary" value=""/>
-    <attributes name="occi.component.state" value="undeployed"/>
-    <attributes name="occi.component.state.message" value=""/>
-    <attributes name="occi.collector.period" value=""/>
-    <attributes name="occi.collector.granularity" value=""/>
-    <attributes name="occi.collector.accuracy" value=""/>
-    <parts mixin="//@mixins.3"/>
-    <links xsi:type="placement:Placementlink" id="60cc05ca-4fd7-465b-8fd0-945dcbf8867f" location="/placementlink/urn:uuid:60cc05ca-4fd7-465b-8fd0-945dcbf8867f/" target="//@resources.8">
-      <kind href="http://schemas.modmacao.org/placement#//@kinds[term='placementlink']"/>
-      <attributes name="occi.core.id" value="60cc05ca-4fd7-465b-8fd0-945dcbf8867f"/>
-      <attributes name="occi.core.title" value="link1"/>
-    </links>
-  </resources>
-  <resources xsi:type="platform:Component" id="f934d445-d0c8-4f2f-8086-d9f1a8255896" location="/component/urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255896/" occiComponentStateMessage="">
-    <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='component']"/>
-    <attributes name="occi.core.id" value="f934d445-d0c8-4f2f-8086-d9f1a8255896"/>
-    <attributes name="occi.core.title" value="Wordcount"/>
-    <attributes name="occi.core.summary" value=""/>
-    <attributes name="occi.component.state" value="undeployed"/>
-    <attributes name="occi.component.state.message" value=""/>
-    <parts mixin="//@mixins.0"/>
-    <links xsi:type="placement:Placementlink" id="ff292f08-d263-41b6-88c8-84d33783b929" location="/placementlink/urn:uuid:ff292f08-d263-41b6-88c8-84d33783b929/" target="//@resources.9">
-      <kind href="http://schemas.modmacao.org/placement#//@kinds[term='placementlink']"/>
-      <attributes name="occi.core.id" value="ff292f08-d263-41b6-88c8-84d33783b929"/>
-      <attributes name="occi.core.title" value="link1"/>
-    </links>
-  </resources>
-  <resources xsi:type="platform:Component" id="f934d445-d0c8-4f2f-8086-d9f1a8255897" location="/component/urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255897/" rlinks="//@resources.0/@links.1" occiComponentState="error" occiComponentStateMessage="">
-    <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='component']"/>
-    <attributes name="occi.core.id" value="f934d445-d0c8-4f2f-8086-d9f1a8255897"/>
-    <attributes name="occi.core.title" value="hMaster"/>
-    <attributes name="occi.core.summary" value=""/>
-    <attributes name="occi.component.state" value="undeployed"/>
-    <attributes name="occi.component.state.message" value=""/>
-    <parts mixin="//@mixins.1"/>
-    <links xsi:type="placement:Placementlink" id="ff292f08-d263-41b6-88c8-84d33783b928" location="/placementlink/urn:uuid:ff292f08-d263-41b6-88c8-84d33783b928/" target="//@resources.9">
-      <kind href="http://schemas.modmacao.org/placement#//@kinds[term='placementlink']"/>
-      <attributes name="occi.core.id" value="ff292f08-d263-41b6-88c8-84d33783b928"/>
-      <attributes name="occi.core.title" value="link1"/>
-    </links>
-  </resources>
-  <mixins name="hjob" scheme="http://schemas.modmacao.org/usermixins#"/>
-  <mixins name="hmaster" scheme="http://schemas.modmacao.org/usermixins#"/>
-  <mixins name="hworker" scheme="http://schemas.modmacao.org/usermixins#"/>
-  <mixins name="cpugatherer" scheme="http://schemas.modmacao.org/usermixins#"/>
-  <mixins name="cpuprocessor" scheme="http://schemas.modmacao.org/usermixins#"/>
-  <mixins name="cpupublisher" scheme="http://schemas.modmacao.org/usermixins#"/>
-</occi:Configuration>
diff --git a/src/test/resources/occi/expectedRuntimeImage.pdf b/src/test/resources/occi/expectedRuntimeImage.pdf
deleted file mode 100644
index aa36da5884c9d83a816bda040a4b8265556f8b5c..0000000000000000000000000000000000000000
Binary files a/src/test/resources/occi/expectedRuntimeImage.pdf and /dev/null differ
diff --git a/src/test/resources/occi/hadoopClusterNewExt.occic b/src/test/resources/occi/hadoopClusterNewExt.occic
deleted file mode 100644
index 71b7fe03d99fbbfe3581fa81048ff87d8922fa97..0000000000000000000000000000000000000000
--- a/src/test/resources/occi/hadoopClusterNewExt.occic
+++ /dev/null
@@ -1,283 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<occi:Configuration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:infrastructure="http://schemas.ogf.org/occi/infrastructure/ecore" xmlns:monitoring="http://schemas.ugoe.cs.rwm/monitoring/ecore" xmlns:occi="http://schemas.ogf.org/occi/core/ecore" xmlns:placement="http://schemas.modmacao.org/placement/ecore" xmlns:platform="http://schemas.modmacao.org/occi/platform/ecore">
-  <use href="http://schemas.ogf.org/occi/core#/"/>
-  <use href="http://schemas.ogf.org/occi/infrastructure#/"/>
-  <use href="http://schemas.modmacao.org/occi/platform#/"/>
-  <use href="http://schemas.ogf.org/occi/infrastructure/compute/template/1.1#/"/>
-  <use href="http://schemas.modmacao.org/placement#/"/>
-  <use href="http://schemas.modmacao.org/openstack/runtime#/"/>
-  <use href="http://schemas.modmacao.org/modmacao#/"/>
-  <use href="http://schemas.modmacao.org/openstack/swe#/"/>
-  <use href="http://schemas.ugoe.cs.rwm/monitoring#/"/>
-  <resources xsi:type="infrastructure:Compute" id="urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166ce" title="hadoop-master" location="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166ce/" rlinks="//@resources.2/@links.0 //@resources.1/@links.0" occiComputeCores="2" occiComputeHostname="vm2" occiComputeMemory="4096.0" occiComputeState="active">
-    <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='compute']"/>
-    <attributes name="occi.core.id" value="urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166ce"/>
-    <attributes name="occi.core.title" value="hadoop-master"/>
-    <attributes name="occi.core.summary" value=""/>
-    <attributes name="occi.compute.architecture" value="x86"/>
-    <attributes name="occi.compute.cores" value="2"/>
-    <attributes name="occi.compute.hostname" value="hadoop-master"/>
-    <attributes name="occi.compute.share" value="0"/>
-    <attributes name="occi.compute.speed" value="0"/>
-    <attributes name="occi.compute.memory" value="4096"/>
-    <attributes name="occi.compute.state" value="active"/>
-    <attributes name="occi.compute.state.message" value=""/>
-    <parts xsi:type="infrastructure:Ssh_key" occiCredentialsSshPublickey="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6H7Ydi45BTHid4qNppGAi5mzjbnZgt7bi6xLGmZG9CiLmhMsxOuk3Z05Nn+pmoN98qS0eY8S240PPk5VOlYqBY0vdRAwrZSHHaLdMp6I7ARNrI2KraYduweqz7ZQxPXQfwIeYx2HKQxEF2r+4//Fo4WfgdBkLuulvl/Gw3TUzJNQHvgpaiNo9+PI5CZydHnZbjUkRikS12pT+CbNKj+0QKeQztbCd41aKxDv5H0DjltVRcpPppv4dmiU/zoCAIngWLO1PPgfYWyze8Z9IoyBT7Qdg30U91TYZBuxzXR5lq7Fh64y/IZ/SjdOdSIvIuDjtmJDULRdLJzrvubrKY+YH Generated-by-Nova">
-      <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ssh_key']"/>
-      <attributes name="occi.credentials.ssh.publickey" value="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6H7Ydi45BTHid4qNppGAi5mzjbnZgt7bi6xLGmZG9CiLmhMsxOuk3Z05Nn+pmoN98qS0eY8S240PPk5VOlYqBY0vdRAwrZSHHaLdMp6I7ARNrI2KraYduweqz7ZQxPXQfwIeYx2HKQxEF2r+4//Fo4WfgdBkLuulvl/Gw3TUzJNQHvgpaiNo9+PI5CZydHnZbjUkRikS12pT+CbNKj+0QKeQztbCd41aKxDv5H0DjltVRcpPppv4dmiU/zoCAIngWLO1PPgfYWyze8Z9IoyBT7Qdg30U91TYZBuxzXR5lq7Fh64y/IZ/SjdOdSIvIuDjtmJDULRdLJzrvubrKY+YH Generated-by-Nova"/>
-    </parts>
-    <parts xsi:type="infrastructure:User_data" occiComputeUserdata="I2Nsb3VkLWNvbmZpZwoKIyBVcGdyYWRlIHRoZSBpbnN0YW5jZSBvbiBmaXJzdCBib290CiMgKGllIHJ1biBhcHQtZ2V0IHVwZ3JhZGUpCiMKIyBEZWZhdWx0OiBmYWxzZQojIEFsaWFzZXM6IGFwdF91cGdyYWRlCnBhY2thZ2VfdXBncmFkZTogdHJ1ZQoKcGFja2FnZXM6CiAtIHB5dGhvbgoKd3JpdGVfZmlsZXM6CiAgLSBwYXRoOiAvZXRjL25ldHdvcmsvaW50ZXJmYWNlcy5kLzUwLWNsb3VkLWluaXQuY2ZnCiAgICBjb250ZW50OiB8CiAgICAgIGF1dG8gbG8KICAgICAgaWZhY2UgbG8gaW5ldCBsb29wYmFjawogICAgICAKICAgICAgYXV0byBlbnMwCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMAogICAgICBpZmFjZSBlbnMwIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMQogICAgICBpZmFjZSBlbnMxIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMyCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMgogICAgICBpZmFjZSBlbnMyIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMzCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMwogICAgICBpZmFjZSBlbnMzIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM0CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNAogICAgICBpZmFjZSBlbnM0IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM1CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNQogICAgICBpZmFjZSBlbnM1IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM2CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNgogICAgICBpZmFjZSBlbnM2IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM3CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNwogICAgICBpZmFjZSBlbnM3IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM4CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOAogICAgICBpZmFjZSBlbnM4IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM5CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOQogICAgICBpZmFjZSBlbnM5IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxMAogICAgICBhbGxvdy1ob3RwbHVnIGVuczEwCiAgICAgIGlmYWNlIGVuczEwIGluZXQgZGhjcAoKIyMj">
-      <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='user_data']"/>
-      <attributes name="occi.compute.userdata" value="I2Nsb3VkLWNvbmZpZwoKIyBVcGdyYWRlIHRoZSBpbnN0YW5jZSBvbiBmaXJzdCBib290CiMgKGllIHJ1biBhcHQtZ2V0IHVwZ3JhZGUpCiMKIyBEZWZhdWx0OiBmYWxzZQojIEFsaWFzZXM6IGFwdF91cGdyYWRlCnBhY2thZ2VfdXBncmFkZTogdHJ1ZQoKcGFja2FnZXM6CiAtIHB5dGhvbgoKd3JpdGVfZmlsZXM6CiAgLSBwYXRoOiAvZXRjL25ldHdvcmsvaW50ZXJmYWNlcy5kLzUwLWNsb3VkLWluaXQuY2ZnCiAgICBjb250ZW50OiB8CiAgICAgIGF1dG8gbG8KICAgICAgaWZhY2UgbG8gaW5ldCBsb29wYmFjawogICAgICAKICAgICAgYXV0byBlbnMwCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMAogICAgICBpZmFjZSBlbnMwIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMQogICAgICBpZmFjZSBlbnMxIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMyCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMgogICAgICBpZmFjZSBlbnMyIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMzCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMwogICAgICBpZmFjZSBlbnMzIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM0CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNAogICAgICBpZmFjZSBlbnM0IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM1CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNQogICAgICBpZmFjZSBlbnM1IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM2CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNgogICAgICBpZmFjZSBlbnM2IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM3CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNwogICAgICBpZmFjZSBlbnM3IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM4CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOAogICAgICBpZmFjZSBlbnM4IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM5CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOQogICAgICBpZmFjZSBlbnM5IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxMAogICAgICBhbGxvdy1ob3RwbHVnIGVuczEwCiAgICAgIGlmYWNlIGVuczEwIGluZXQgZGhjcAoKIyMj"/>
-    </parts>
-    <parts>
-      <mixin href="http://schemas.modmacao.org/openstack/swe#//@mixins[term='ubuntu_xenialxerus']"/>
-    </parts>
-    <links xsi:type="infrastructure:Networkinterface" id="urn:uuid:ea482951-5c26-471d-aa1b-8e03b1e6096c" title="link3" location="/networkinterface/urn:uuid:ea482951-5c26-471d-aa1b-8e03b1e6096c" target="//@resources.6">
-      <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='networkinterface']"/>
-      <attributes name="occi.core.id" value="urn:uuid:ea482951-5c26-471d-aa1b-8e03b1e6096c"/>
-      <attributes name="occi.core.title" value="link3"/>
-      <attributes name="occi.networkinterface.address" value="10.254.1.5"/>
-      <parts xsi:type="infrastructure:Ipnetworkinterface" occiNetworkinterfaceAddress="10.254.1.5" occiNetworkinterfaceGateway="10.254.1.254">
-        <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ipnetworkinterface']"/>
-      </parts>
-    </links>
-  </resources>
-  <resources xsi:type="platform:Component" id="urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255896" title="Wordcount" location="/component/urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255896/" occiComponentStateMessage="">
-    <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='component']"/>
-    <attributes name="occi.core.id" value="urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255896"/>
-    <attributes name="occi.core.title" value="Wordcount"/>
-    <attributes name="occi.core.summary" value=""/>
-    <attributes name="occi.component.state" value="undeployed"/>
-    <attributes name="occi.component.state.message" value=""/>
-    <parts mixin="//@mixins.0"/>
-    <links xsi:type="placement:Placementlink" id="urn:uuid:ff292f08-d263-41b6-88c8-84d33783b929" title="link1" location="/placementlink/urn:uuid:ff292f08-d263-41b6-88c8-84d33783b929/" target="//@resources.0">
-      <kind href="http://schemas.modmacao.org/placement#//@kinds[term='placementlink']"/>
-      <attributes name="occi.core.id" value="urn:uuid:ff292f08-d263-41b6-88c8-84d33783b929"/>
-      <attributes name="occi.core.title" value="link1"/>
-    </links>
-  </resources>
-  <resources xsi:type="platform:Component" id="urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255897" title="hMaster" location="/component/urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255897/" rlinks="//@resources.3/@links.0" occiComponentStateMessage="">
-    <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='component']"/>
-    <attributes name="occi.core.id" value="urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255897"/>
-    <attributes name="occi.core.title" value="hMaster"/>
-    <attributes name="occi.core.summary" value=""/>
-    <attributes name="occi.component.state" value="undeployed"/>
-    <attributes name="occi.component.state.message" value=""/>
-    <parts mixin="//@mixins.1"/>
-    <links xsi:type="placement:Placementlink" id="urn:uuid:ff292f08-d263-41b6-88c8-84d33783b928" title="link1" location="/placementlink/urn:uuid:ff292f08-d263-41b6-88c8-84d33783b928/" target="//@resources.0">
-      <kind href="http://schemas.modmacao.org/placement#//@kinds[term='placementlink']"/>
-      <attributes name="occi.core.id" value="urn:uuid:ff292f08-d263-41b6-88c8-84d33783b928"/>
-      <attributes name="occi.core.title" value="link1"/>
-      <attributes name="occi.core.source" value="/component/urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255897/"/>
-      <attributes name="occi.core.target" value="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166ce/"/>
-    </links>
-  </resources>
-  <resources xsi:type="platform:Application" id="urn:uuid:a4888ba9-a0ea-48f2-a29e-901c876ab42d" title="hadoopcluster" location="/application/urn:uuid:a4888ba9-a0ea-48f2-a29e-901c876ab42d" occiAppName="" occiAppState="deployed">
-    <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='application']"/>
-    <attributes name="occi.core.id" value="urn:uuid:a4888ba9-a0ea-48f2-a29e-901c876ab42d"/>
-    <attributes name="occi.core.title" value="hadoopcluster"/>
-    <links xsi:type="platform:Componentlink" id="urn:uuid:9aa31c50-c605-4370-aa60-2c7c461051ef" title="ComponentLink" location="/componentlink/urn:uuid:9aa31c50-c605-4370-aa60-2c7c461051ef" target="//@resources.2">
-      <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
-      <attributes name="occi.core.id" value="urn:uuid:9aa31c50-c605-4370-aa60-2c7c461051ef"/>
-      <attributes name="occi.core.title" value="ComponentLink"/>
-    </links>
-    <links xsi:type="platform:Componentlink" id="urn:uuid:7890f02b-6f56-4809-865f-d8c686fd9da1" title="link4" location="/componentlink/urn:uuid:7890f02b-6f56-4809-865f-d8c686fd9da1" target="//@resources.5">
-      <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
-      <attributes name="occi.core.id" value="urn:uuid:7890f02b-6f56-4809-865f-d8c686fd9da1"/>
-      <attributes name="occi.core.title" value="link4"/>
-    </links>
-  </resources>
-  <resources xsi:type="infrastructure:Compute" id="urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166cf" title="hadoop-worker-1" location="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166cf/" rlinks="//@resources.5/@links.0 //@resources.8/@links.0" occiComputeCores="2" occiComputeHostname="vm2" occiComputeMemory="4096.0" occiComputeState="active">
-    <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='compute']"/>
-    <attributes name="occi.core.id" value="urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166cf"/>
-    <attributes name="occi.core.title" value="hadoop-worker-1"/>
-    <attributes name="occi.core.summary" value=""/>
-    <attributes name="occi.compute.architecture" value="x86"/>
-    <attributes name="occi.compute.cores" value="2"/>
-    <attributes name="occi.compute.hostname" value="hadoop-worker-1"/>
-    <attributes name="occi.compute.share" value="0"/>
-    <attributes name="occi.compute.speed" value="0"/>
-    <attributes name="occi.compute.memory" value="4096"/>
-    <attributes name="occi.compute.state" value="active"/>
-    <attributes name="occi.compute.state.message" value=""/>
-    <parts xsi:type="infrastructure:Ssh_key" occiCredentialsSshPublickey="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6H7Ydi45BTHid4qNppGAi5mzjbnZgt7bi6xLGmZG9CiLmhMsxOuk3Z05Nn+pmoN98qS0eY8S240PPk5VOlYqBY0vdRAwrZSHHaLdMp6I7ARNrI2KraYduweqz7ZQxPXQfwIeYx2HKQxEF2r+4//Fo4WfgdBkLuulvl/Gw3TUzJNQHvgpaiNo9+PI5CZydHnZbjUkRikS12pT+CbNKj+0QKeQztbCd41aKxDv5H0DjltVRcpPppv4dmiU/zoCAIngWLO1PPgfYWyze8Z9IoyBT7Qdg30U91TYZBuxzXR5lq7Fh64y/IZ/SjdOdSIvIuDjtmJDULRdLJzrvubrKY+YH Generated-by-Nova">
-      <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ssh_key']"/>
-      <attributes name="occi.credentials.ssh.publickey" value="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6H7Ydi45BTHid4qNppGAi5mzjbnZgt7bi6xLGmZG9CiLmhMsxOuk3Z05Nn+pmoN98qS0eY8S240PPk5VOlYqBY0vdRAwrZSHHaLdMp6I7ARNrI2KraYduweqz7ZQxPXQfwIeYx2HKQxEF2r+4//Fo4WfgdBkLuulvl/Gw3TUzJNQHvgpaiNo9+PI5CZydHnZbjUkRikS12pT+CbNKj+0QKeQztbCd41aKxDv5H0DjltVRcpPppv4dmiU/zoCAIngWLO1PPgfYWyze8Z9IoyBT7Qdg30U91TYZBuxzXR5lq7Fh64y/IZ/SjdOdSIvIuDjtmJDULRdLJzrvubrKY+YH Generated-by-Nova"/>
-    </parts>
-    <parts xsi:type="infrastructure:User_data" occiComputeUserdata="I2Nsb3VkLWNvbmZpZwoKIyBVcGdyYWRlIHRoZSBpbnN0YW5jZSBvbiBmaXJzdCBib290CiMgKGllIHJ1biBhcHQtZ2V0IHVwZ3JhZGUpCiMKIyBEZWZhdWx0OiBmYWxzZQojIEFsaWFzZXM6IGFwdF91cGdyYWRlCnBhY2thZ2VfdXBncmFkZTogdHJ1ZQoKcGFja2FnZXM6CiAtIHB5dGhvbgoKd3JpdGVfZmlsZXM6CiAgLSBwYXRoOiAvZXRjL25ldHdvcmsvaW50ZXJmYWNlcy5kLzUwLWNsb3VkLWluaXQuY2ZnCiAgICBjb250ZW50OiB8CiAgICAgIGF1dG8gbG8KICAgICAgaWZhY2UgbG8gaW5ldCBsb29wYmFjawogICAgICAKICAgICAgYXV0byBlbnMwCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMAogICAgICBpZmFjZSBlbnMwIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMQogICAgICBpZmFjZSBlbnMxIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMyCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMgogICAgICBpZmFjZSBlbnMyIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMzCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMwogICAgICBpZmFjZSBlbnMzIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM0CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNAogICAgICBpZmFjZSBlbnM0IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM1CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNQogICAgICBpZmFjZSBlbnM1IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM2CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNgogICAgICBpZmFjZSBlbnM2IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM3CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNwogICAgICBpZmFjZSBlbnM3IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM4CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOAogICAgICBpZmFjZSBlbnM4IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM5CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOQogICAgICBpZmFjZSBlbnM5IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxMAogICAgICBhbGxvdy1ob3RwbHVnIGVuczEwCiAgICAgIGlmYWNlIGVuczEwIGluZXQgZGhjcAoKIyMj">
-      <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='user_data']"/>
-      <attributes name="occi.compute.userdata" value="I2Nsb3VkLWNvbmZpZwoKIyBVcGdyYWRlIHRoZSBpbnN0YW5jZSBvbiBmaXJzdCBib290CiMgKGllIHJ1biBhcHQtZ2V0IHVwZ3JhZGUpCiMKIyBEZWZhdWx0OiBmYWxzZQojIEFsaWFzZXM6IGFwdF91cGdyYWRlCnBhY2thZ2VfdXBncmFkZTogdHJ1ZQoKcGFja2FnZXM6CiAtIHB5dGhvbgoKd3JpdGVfZmlsZXM6CiAgLSBwYXRoOiAvZXRjL25ldHdvcmsvaW50ZXJmYWNlcy5kLzUwLWNsb3VkLWluaXQuY2ZnCiAgICBjb250ZW50OiB8CiAgICAgIGF1dG8gbG8KICAgICAgaWZhY2UgbG8gaW5ldCBsb29wYmFjawogICAgICAKICAgICAgYXV0byBlbnMwCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMAogICAgICBpZmFjZSBlbnMwIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMQogICAgICBpZmFjZSBlbnMxIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMyCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMgogICAgICBpZmFjZSBlbnMyIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMzCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMwogICAgICBpZmFjZSBlbnMzIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM0CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNAogICAgICBpZmFjZSBlbnM0IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM1CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNQogICAgICBpZmFjZSBlbnM1IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM2CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNgogICAgICBpZmFjZSBlbnM2IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM3CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNwogICAgICBpZmFjZSBlbnM3IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM4CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOAogICAgICBpZmFjZSBlbnM4IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM5CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOQogICAgICBpZmFjZSBlbnM5IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxMAogICAgICBhbGxvdy1ob3RwbHVnIGVuczEwCiAgICAgIGlmYWNlIGVuczEwIGluZXQgZGhjcAoKIyMj"/>
-    </parts>
-    <parts>
-      <mixin href="http://schemas.modmacao.org/openstack/swe#//@mixins[term='ubuntu_xenialxerus']"/>
-    </parts>
-    <parts>
-      <mixin href="http://schemas.ugoe.cs.rwm/monitoring#//@mixins[term='monitoringproperties']"/>
-    </parts>
-    <links xsi:type="infrastructure:Networkinterface" id="urn:uuid:c8c49905-3d5e-43b2-8d09-fabf92d29722" title="link2" location="/networkinterface/urn:uuid:c8c49905-3d5e-43b2-8d09-fabf92d29722" target="//@resources.6">
-      <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='networkinterface']"/>
-      <attributes name="occi.core.id" value="urn:uuid:c8c49905-3d5e-43b2-8d09-fabf92d29722"/>
-      <attributes name="occi.core.title" value="link2"/>
-      <attributes name="occi.networkinterface.address" value="10.254.1.8"/>
-      <parts xsi:type="infrastructure:Ipnetworkinterface" occiNetworkinterfaceAddress="10.254.1.8" occiNetworkinterfaceGateway="10.254.1.254">
-        <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ipnetworkinterface']"/>
-      </parts>
-    </links>
-    <links xsi:type="infrastructure:Networkinterface" id="urn:uuid:03f91178-136f-4023-876e-84509f8a5a2d" title="monNwLink" target="//@resources.12" occiNetworkinterfaceInterface="100.254.1.35" occiNetworkinterfaceMac="">
-      <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='networkinterface']"/>
-      <attributes name="occi.core.id" value="urn:uuid:03f91178-136f-4023-876e-84509f8a5a2d"/>
-      <attributes name="occi.core.title" value="monNwLink"/>
-      <attributes name="occi.networkinterface.address" value="100.254.1.35"/>
-      <parts xsi:type="infrastructure:Ipnetworkinterface" occiNetworkinterfaceAddress="100.254.1.35" occiNetworkinterfaceGateway="">
-        <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ipnetworkinterface']"/>
-      </parts>
-    </links>
-  </resources>
-  <resources xsi:type="platform:Component" id="urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255898" title="Worker" location="/component/urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255898/" rlinks="//@resources.3/@links.1" occiComponentStateMessage="">
-    <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='component']"/>
-    <attributes name="occi.core.id" value="urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255898"/>
-    <attributes name="occi.core.title" value="Worker"/>
-    <attributes name="occi.core.summary" value=""/>
-    <attributes name="occi.component.state" value="undeployed"/>
-    <attributes name="occi.component.state.message" value=""/>
-    <parts mixin="//@mixins.2"/>
-    <links xsi:type="placement:Placementlink" id="urn:uuid:ff292f08-d263-41b6-88c8-84d33783b917" title="link1" location="/placementlink/urn:uuid:ff292f08-d263-41b6-88c8-84d33783b917/" target="//@resources.4">
-      <kind href="http://schemas.modmacao.org/placement#//@kinds[term='placementlink']"/>
-      <attributes name="occi.core.id" value="urn:uuid:ff292f08-d263-41b6-88c8-84d33783b917"/>
-      <attributes name="occi.core.title" value="link1"/>
-      <attributes name="occi.core.target" value="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166ce/"/>
-    </links>
-  </resources>
-  <resources xsi:type="infrastructure:Network" id="urn:uuid:29d78078-fb4c-47aa-a9af-b8aaf3339591" title="hNetwork" location="/network/urn:uuid:29d78078-fb4c-47aa-a9af-b8aaf3339591/" rlinks="//@resources.0/@links.0 //@resources.4/@links.0" occiNetworkState="active">
-    <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='network']"/>
-    <attributes name="occi.core.id" value="urn:uuid:29d78078-fb4c-47aa-a9af-b8aaf3339591"/>
-    <attributes name="occi.core.title" value="hNetwork"/>
-    <attributes name="occi.core.summary" value=""/>
-    <attributes name="occi.network.vlan" value="0"/>
-    <attributes name="occi.network.label" value=""/>
-    <attributes name="occi.network.state" value="active"/>
-    <attributes name="occi.network.state.message" value=""/>
-    <parts>
-      <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ipnetwork']"/>
-      <attributes name="occi.network.address" value="10.254.1.1/24"/>
-    </parts>
-  </resources>
-  <resources xsi:type="monitoring:Sensor" id="urn:uuid:efb0f50a-7a7c-4153-b939-4846d6554dbb" title="Sensor">
-    <kind href="http://schemas.ugoe.cs.rwm/monitoring#//@kinds[term='sensor']"/>
-    <attributes name="occi.core.id" value="urn:uuid:efb0f50a-7a7c-4153-b939-4846d6554dbb"/>
-    <attributes name="occi.core.title" value="Sensor"/>
-    <attributes name="occi.core.summary" value=""/>
-    <attributes name="occi.sensor.timebase" value=""/>
-    <attributes name="occi.sensor.timestart" value=""/>
-    <attributes name="occi.sensor.timestop" value=""/>
-    <attributes name="occi.sensor.period" value=""/>
-    <attributes name="occi.sensor.granularity" value=""/>
-    <attributes name="occi.sensor.accuracy" value=""/>
-    <attributes name="occi.app.state" value="undeployed"/>
-    <attributes name="occi.app.state.message" value=""/>
-    <links xsi:type="platform:Componentlink" id="urn:uuid:04cf6483-706d-4a2a-9114-9918ab2bb52a" title="link1" target="//@resources.8">
-      <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
-      <attributes name="occi.core.id" value="urn:uuid:04cf6483-706d-4a2a-9114-9918ab2bb52a"/>
-      <attributes name="occi.core.title" value="link1"/>
-    </links>
-    <links xsi:type="platform:Componentlink" id="urn:uuid:9c604867-3135-4fa1-af9e-2bb11018ff5a" title="link2" target="//@resources.9">
-      <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
-      <attributes name="occi.core.id" value="urn:uuid:9c604867-3135-4fa1-af9e-2bb11018ff5a"/>
-      <attributes name="occi.core.title" value="link2"/>
-    </links>
-    <links xsi:type="platform:Componentlink" id="urn:uuid:93f08e31-f350-42b7-a73b-c139eba4a8e3" title="link3" target="//@resources.10">
-      <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
-      <attributes name="occi.core.id" value="urn:uuid:93f08e31-f350-42b7-a73b-c139eba4a8e3"/>
-      <attributes name="occi.core.title" value="link3"/>
-    </links>
-  </resources>
-  <resources xsi:type="monitoring:Datagatherer" id="urn:uuid:051affdc-d686-48f8-884c-83fe81718a48" title="DataGatherer" rlinks="//@resources.7/@links.0 //@resources.9/@links.0">
-    <kind href="http://schemas.ugoe.cs.rwm/monitoring#//@kinds[term='datagatherer']"/>
-    <attributes name="occi.core.id" value="urn:uuid:051affdc-d686-48f8-884c-83fe81718a48"/>
-    <attributes name="occi.core.title" value="DataGatherer"/>
-    <parts mixin="//@mixins.3"/>
-    <links xsi:type="placement:Placementlink" id="urn:uuid:60cc05ca-4fd7-465b-8fd0-945dcbf8867f" title="link1" target="//@resources.4">
-      <kind href="http://schemas.modmacao.org/placement#//@kinds[term='placementlink']"/>
-      <attributes name="occi.core.id" value="urn:uuid:60cc05ca-4fd7-465b-8fd0-945dcbf8867f"/>
-      <attributes name="occi.core.title" value="link1"/>
-    </links>
-  </resources>
-  <resources xsi:type="monitoring:Processor" id="urn:uuid:1bda25ab-723b-47e7-9704-5134db26ebdc" title="Processor" rlinks="//@resources.10/@links.0 //@resources.7/@links.1">
-    <kind href="http://schemas.ugoe.cs.rwm/monitoring#//@kinds[term='processor']"/>
-    <attributes name="occi.core.id" value="urn:uuid:1bda25ab-723b-47e7-9704-5134db26ebdc"/>
-    <attributes name="occi.core.title" value="Processor"/>
-    <parts mixin="//@mixins.4"/>
-    <links xsi:type="platform:Componentlink" id="urn:uuid:1a821776-7886-4cb4-8b80-46a8403acf40" title="link1" target="//@resources.8">
-      <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
-      <attributes name="occi.core.id" value="urn:uuid:1a821776-7886-4cb4-8b80-46a8403acf40"/>
-      <attributes name="occi.core.title" value="link1"/>
-    </links>
-    <links xsi:type="placement:Placementlink" id="urn:uuid:ff7019e4-a9dc-48dc-83c3-ab77714a25f4" title="link2" target="//@resources.11">
-      <kind href="http://schemas.modmacao.org/placement#//@kinds[term='placementlink']"/>
-      <attributes name="occi.core.id" value="urn:uuid:ff7019e4-a9dc-48dc-83c3-ab77714a25f4"/>
-      <attributes name="occi.core.title" value="link2"/>
-    </links>
-  </resources>
-  <resources xsi:type="monitoring:Publisher" id="urn:uuid:588f705e-5279-4847-9337-846af2c86972" title="Publisher" rlinks="//@resources.7/@links.2">
-    <kind href="http://schemas.ugoe.cs.rwm/monitoring#//@kinds[term='publisher']"/>
-    <attributes name="occi.core.id" value="urn:uuid:588f705e-5279-4847-9337-846af2c86972"/>
-    <attributes name="occi.core.title" value="Publisher"/>
-    <parts mixin="//@mixins.5"/>
-    <links xsi:type="platform:Componentlink" id="urn:uuid:9551c357-59f8-4ac1-8c85-0e886e206b80" title="link1" target="//@resources.9">
-      <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
-      <attributes name="occi.core.id" value="urn:uuid:9551c357-59f8-4ac1-8c85-0e886e206b80"/>
-      <attributes name="occi.core.title" value="link1"/>
-    </links>
-    <links xsi:type="placement:Placementlink" id="urn:uuid:275b5bce-084c-46f0-88bc-1f6f31bf3616" title="link2" target="//@resources.11">
-      <kind href="http://schemas.modmacao.org/placement#//@kinds[term='placementlink']"/>
-      <attributes name="occi.core.id" value="urn:uuid:275b5bce-084c-46f0-88bc-1f6f31bf3616"/>
-      <attributes name="occi.core.title" value="link2"/>
-    </links>
-  </resources>
-  <resources xsi:type="infrastructure:Compute" id="urn:uuid:37829092-c690-494a-98fa-335b2fd660ea" title="MonVm" rlinks="//@resources.9/@links.1 //@resources.10/@links.1" occiComputeHostname="monVM" occiComputeState="inactive">
-    <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='compute']"/>
-    <attributes name="occi.core.id" value="urn:uuid:37829092-c690-494a-98fa-335b2fd660ea"/>
-    <attributes name="occi.core.title" value="MonVm"/>
-    <attributes name="occi.core.summary" value=""/>
-    <attributes name="occi.compute.architecture" value="x86"/>
-    <attributes name="occi.compute.cores" value="2"/>
-    <attributes name="occi.compute.hostname" value="monVM"/>
-    <attributes name="occi.compute.share" value="0"/>
-    <attributes name="occi.compute.speed" value="0"/>
-    <attributes name="occi.compute.memory" value="4096"/>
-    <attributes name="occi.compute.state" value="active"/>
-    <attributes name="occi.compute.state.message" value=""/>
-    <parts>
-      <mixin href="http://schemas.modmacao.org/openstack/swe#//@mixins[term='ubuntu_xenialxerus']"/>
-    </parts>
-    <links xsi:type="infrastructure:Networkinterface" id="urn:uuid:00d6889d-b644-44bf-af13-3fe350e926ed" title="link1" target="//@resources.12">
-      <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='networkinterface']"/>
-      <attributes name="occi.core.id" value="urn:uuid:00d6889d-b644-44bf-af13-3fe350e926ed"/>
-      <attributes name="occi.core.title" value="link1"/>
-      <parts xsi:type="infrastructure:Ipnetworkinterface" occiNetworkinterfaceAddress="100.254.1.25">
-        <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ipnetworkinterface']"/>
-      </parts>
-    </links>
-  </resources>
-  <resources xsi:type="infrastructure:Network" id="urn:uuid:7a9fca2c-24fb-473c-aa9c-8dc9e68a432a" title="MonitoringNetwork" rlinks="//@resources.11/@links.0 //@resources.4/@links.1" occiNetworkState="inactive">
-    <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='network']"/>
-    <attributes name="occi.core.id" value="urn:uuid:7a9fca2c-24fb-473c-aa9c-8dc9e68a432a"/>
-    <attributes name="occi.core.title" value="MonitoringNetwork"/>
-    <attributes name="occi.core.summary" value=""/>
-    <attributes name="occi.network.vlan" value="0"/>
-    <attributes name="occi.network.label" value=""/>
-    <attributes name="occi.network.state" value="active"/>
-    <attributes name="occi.network.state.message" value=""/>
-    <parts>
-      <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ipnetwork']"/>
-      <attributes name="occi.network.address" value="100.254.1.1/24"/>
-    </parts>
-  </resources>
-  <mixins name="hJob" scheme="http://schemas.modmacao.org/usermixins#" title="Hjob"/>
-  <mixins name="hMaster" scheme="http://schemas.modmacao.org/usermixins#" title="HMaster"/>
-  <mixins name="hWorker" scheme="http://schemas.modmacao.org/usermixins#" title="HWorker"/>
-  <mixins name="CPUGatherer" scheme="http://schemas.modmacao.org/usermixins#" title="CPUGatherer"/>
-  <mixins name="CPUProcessor" scheme="http://schemas.modmacao.org/usermixins#" title="CPUProcessor"/>
-  <mixins name="CPUPublisher" scheme="http://schemas.modmacao.org/usermixins#" title="CPUPublisher"/>
-</occi:Configuration>
diff --git a/src/test/resources/occi/hadoopClusterNewExtCPUOnly.occic b/src/test/resources/occi/hadoopClusterNewExtCPUOnly.occic
deleted file mode 100644
index 21600cab2314e90abdf11b36de761fb1925aad25..0000000000000000000000000000000000000000
--- a/src/test/resources/occi/hadoopClusterNewExtCPUOnly.occic
+++ /dev/null
@@ -1,288 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<occi:Configuration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:infrastructure="http://schemas.ogf.org/occi/infrastructure/ecore" xmlns:monitoring="http://schemas.ugoe.cs.rwm/monitoring/ecore" xmlns:occi="http://schemas.ogf.org/occi/core/ecore" xmlns:placement="http://schemas.modmacao.org/placement/ecore" xmlns:platform="http://schemas.modmacao.org/occi/platform/ecore">
-  <use href="http://schemas.ogf.org/occi/core#/"/>
-  <use href="http://schemas.ogf.org/occi/infrastructure#/"/>
-  <use href="http://schemas.modmacao.org/occi/platform#/"/>
-  <use href="http://schemas.ogf.org/occi/infrastructure/compute/template/1.1#/"/>
-  <use href="http://schemas.modmacao.org/placement#/"/>
-  <use href="http://schemas.modmacao.org/openstack/runtime#/"/>
-  <use href="http://schemas.modmacao.org/modmacao#/"/>
-  <use href="http://schemas.modmacao.org/openstack/swe#/"/>
-  <use href="http://schemas.ugoe.cs.rwm/monitoring#/"/>
-  <resources xsi:type="infrastructure:Compute" id="urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166ce" title="hadoop-master" location="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166ce/" rlinks="//@resources.2/@links.0 //@resources.1/@links.0" occiComputeCores="2" occiComputeHostname="vm2" occiComputeMemory="4096.0" occiComputeState="active">
-    <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='compute']"/>
-    <attributes name="occi.core.id" value="urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166ce"/>
-    <attributes name="occi.core.title" value="hadoop-master"/>
-    <attributes name="occi.core.summary" value=""/>
-    <attributes name="occi.compute.architecture" value="x86"/>
-    <attributes name="occi.compute.cores" value="2"/>
-    <attributes name="occi.compute.hostname" value="hadoop-master"/>
-    <attributes name="occi.compute.share" value="0"/>
-    <attributes name="occi.compute.speed" value="0"/>
-    <attributes name="occi.compute.memory" value="4096"/>
-    <attributes name="occi.compute.state" value="active"/>
-    <attributes name="occi.compute.state.message" value=""/>
-    <parts xsi:type="infrastructure:Ssh_key" occiCredentialsSshPublickey="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6H7Ydi45BTHid4qNppGAi5mzjbnZgt7bi6xLGmZG9CiLmhMsxOuk3Z05Nn+pmoN98qS0eY8S240PPk5VOlYqBY0vdRAwrZSHHaLdMp6I7ARNrI2KraYduweqz7ZQxPXQfwIeYx2HKQxEF2r+4//Fo4WfgdBkLuulvl/Gw3TUzJNQHvgpaiNo9+PI5CZydHnZbjUkRikS12pT+CbNKj+0QKeQztbCd41aKxDv5H0DjltVRcpPppv4dmiU/zoCAIngWLO1PPgfYWyze8Z9IoyBT7Qdg30U91TYZBuxzXR5lq7Fh64y/IZ/SjdOdSIvIuDjtmJDULRdLJzrvubrKY+YH Generated-by-Nova">
-      <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ssh_key']"/>
-      <attributes name="occi.credentials.ssh.publickey" value="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6H7Ydi45BTHid4qNppGAi5mzjbnZgt7bi6xLGmZG9CiLmhMsxOuk3Z05Nn+pmoN98qS0eY8S240PPk5VOlYqBY0vdRAwrZSHHaLdMp6I7ARNrI2KraYduweqz7ZQxPXQfwIeYx2HKQxEF2r+4//Fo4WfgdBkLuulvl/Gw3TUzJNQHvgpaiNo9+PI5CZydHnZbjUkRikS12pT+CbNKj+0QKeQztbCd41aKxDv5H0DjltVRcpPppv4dmiU/zoCAIngWLO1PPgfYWyze8Z9IoyBT7Qdg30U91TYZBuxzXR5lq7Fh64y/IZ/SjdOdSIvIuDjtmJDULRdLJzrvubrKY+YH Generated-by-Nova"/>
-    </parts>
-    <parts xsi:type="infrastructure:User_data" occiComputeUserdata="I2Nsb3VkLWNvbmZpZwoKIyBVcGdyYWRlIHRoZSBpbnN0YW5jZSBvbiBmaXJzdCBib290CiMgKGllIHJ1biBhcHQtZ2V0IHVwZ3JhZGUpCiMKIyBEZWZhdWx0OiBmYWxzZQojIEFsaWFzZXM6IGFwdF91cGdyYWRlCnBhY2thZ2VfdXBncmFkZTogdHJ1ZQoKcGFja2FnZXM6CiAtIHB5dGhvbgoKd3JpdGVfZmlsZXM6CiAgLSBwYXRoOiAvZXRjL25ldHdvcmsvaW50ZXJmYWNlcy5kLzUwLWNsb3VkLWluaXQuY2ZnCiAgICBjb250ZW50OiB8CiAgICAgIGF1dG8gbG8KICAgICAgaWZhY2UgbG8gaW5ldCBsb29wYmFjawogICAgICAKICAgICAgYXV0byBlbnMwCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMAogICAgICBpZmFjZSBlbnMwIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMQogICAgICBpZmFjZSBlbnMxIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMyCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMgogICAgICBpZmFjZSBlbnMyIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMzCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMwogICAgICBpZmFjZSBlbnMzIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM0CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNAogICAgICBpZmFjZSBlbnM0IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM1CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNQogICAgICBpZmFjZSBlbnM1IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM2CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNgogICAgICBpZmFjZSBlbnM2IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM3CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNwogICAgICBpZmFjZSBlbnM3IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM4CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOAogICAgICBpZmFjZSBlbnM4IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM5CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOQogICAgICBpZmFjZSBlbnM5IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxMAogICAgICBhbGxvdy1ob3RwbHVnIGVuczEwCiAgICAgIGlmYWNlIGVuczEwIGluZXQgZGhjcAoKIyMj">
-      <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='user_data']"/>
-      <attributes name="occi.compute.userdata" value="I2Nsb3VkLWNvbmZpZwoKIyBVcGdyYWRlIHRoZSBpbnN0YW5jZSBvbiBmaXJzdCBib290CiMgKGllIHJ1biBhcHQtZ2V0IHVwZ3JhZGUpCiMKIyBEZWZhdWx0OiBmYWxzZQojIEFsaWFzZXM6IGFwdF91cGdyYWRlCnBhY2thZ2VfdXBncmFkZTogdHJ1ZQoKcGFja2FnZXM6CiAtIHB5dGhvbgoKd3JpdGVfZmlsZXM6CiAgLSBwYXRoOiAvZXRjL25ldHdvcmsvaW50ZXJmYWNlcy5kLzUwLWNsb3VkLWluaXQuY2ZnCiAgICBjb250ZW50OiB8CiAgICAgIGF1dG8gbG8KICAgICAgaWZhY2UgbG8gaW5ldCBsb29wYmFjawogICAgICAKICAgICAgYXV0byBlbnMwCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMAogICAgICBpZmFjZSBlbnMwIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMQogICAgICBpZmFjZSBlbnMxIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMyCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMgogICAgICBpZmFjZSBlbnMyIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMzCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMwogICAgICBpZmFjZSBlbnMzIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM0CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNAogICAgICBpZmFjZSBlbnM0IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM1CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNQogICAgICBpZmFjZSBlbnM1IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM2CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNgogICAgICBpZmFjZSBlbnM2IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM3CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNwogICAgICBpZmFjZSBlbnM3IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM4CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOAogICAgICBpZmFjZSBlbnM4IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM5CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOQogICAgICBpZmFjZSBlbnM5IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxMAogICAgICBhbGxvdy1ob3RwbHVnIGVuczEwCiAgICAgIGlmYWNlIGVuczEwIGluZXQgZGhjcAoKIyMj"/>
-    </parts>
-    <parts>
-      <mixin href="http://schemas.modmacao.org/openstack/swe#//@mixins[term='ubuntu_xenialxerus']"/>
-    </parts>
-    <links xsi:type="infrastructure:Networkinterface" id="urn:uuid:ea482951-5c26-471d-aa1b-8e03b1e6096c" title="link3" location="/networkinterface/urn:uuid:ea482951-5c26-471d-aa1b-8e03b1e6096c" target="//@resources.6">
-      <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='networkinterface']"/>
-      <attributes name="occi.core.id" value="urn:uuid:ea482951-5c26-471d-aa1b-8e03b1e6096c"/>
-      <attributes name="occi.core.title" value="link3"/>
-      <attributes name="occi.networkinterface.address" value="10.254.1.5"/>
-      <parts xsi:type="infrastructure:Ipnetworkinterface" occiNetworkinterfaceAddress="10.254.1.5" occiNetworkinterfaceGateway="10.254.1.254">
-        <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ipnetworkinterface']"/>
-      </parts>
-    </links>
-  </resources>
-  <resources xsi:type="platform:Component" id="urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255896" title="Wordcount" location="/component/urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255896/" occiComponentStateMessage="">
-    <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='component']"/>
-    <attributes name="occi.core.id" value="urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255896"/>
-    <attributes name="occi.core.title" value="Wordcount"/>
-    <attributes name="occi.core.summary" value=""/>
-    <attributes name="occi.component.state" value="undeployed"/>
-    <attributes name="occi.component.state.message" value=""/>
-    <parts mixin="//@mixins.0"/>
-    <links xsi:type="placement:Placementlink" id="urn:uuid:ff292f08-d263-41b6-88c8-84d33783b929" title="link1" location="/placementlink/urn:uuid:ff292f08-d263-41b6-88c8-84d33783b929/" target="//@resources.0">
-      <kind href="http://schemas.modmacao.org/placement#//@kinds[term='placementlink']"/>
-      <attributes name="occi.core.id" value="urn:uuid:ff292f08-d263-41b6-88c8-84d33783b929"/>
-      <attributes name="occi.core.title" value="link1"/>
-    </links>
-  </resources>
-  <resources xsi:type="platform:Component" id="urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255897" title="hMaster" location="/component/urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255897/" rlinks="//@resources.3/@links.0" occiComponentStateMessage="">
-    <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='component']"/>
-    <attributes name="occi.core.id" value="urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255897"/>
-    <attributes name="occi.core.title" value="hMaster"/>
-    <attributes name="occi.core.summary" value=""/>
-    <attributes name="occi.component.state" value="undeployed"/>
-    <attributes name="occi.component.state.message" value=""/>
-    <parts mixin="//@mixins.1"/>
-    <links xsi:type="placement:Placementlink" id="urn:uuid:ff292f08-d263-41b6-88c8-84d33783b928" title="link1" location="/placementlink/urn:uuid:ff292f08-d263-41b6-88c8-84d33783b928/" target="//@resources.0">
-      <kind href="http://schemas.modmacao.org/placement#//@kinds[term='placementlink']"/>
-      <attributes name="occi.core.id" value="urn:uuid:ff292f08-d263-41b6-88c8-84d33783b928"/>
-      <attributes name="occi.core.title" value="link1"/>
-      <attributes name="occi.core.source" value="/component/urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255897/"/>
-      <attributes name="occi.core.target" value="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166ce/"/>
-    </links>
-  </resources>
-  <resources xsi:type="platform:Application" id="urn:uuid:a4888ba9-a0ea-48f2-a29e-901c876ab42d" title="hadoopcluster" location="/application/urn:uuid:a4888ba9-a0ea-48f2-a29e-901c876ab42d" occiAppName="" occiAppState="deployed">
-    <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='application']"/>
-    <attributes name="occi.core.id" value="urn:uuid:a4888ba9-a0ea-48f2-a29e-901c876ab42d"/>
-    <attributes name="occi.core.title" value="hadoopcluster"/>
-    <links xsi:type="platform:Componentlink" id="urn:uuid:9aa31c50-c605-4370-aa60-2c7c461051ef" title="ComponentLink" location="/componentlink/urn:uuid:9aa31c50-c605-4370-aa60-2c7c461051ef" target="//@resources.2">
-      <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
-      <attributes name="occi.core.id" value="urn:uuid:9aa31c50-c605-4370-aa60-2c7c461051ef"/>
-      <attributes name="occi.core.title" value="ComponentLink"/>
-    </links>
-    <links xsi:type="platform:Componentlink" id="urn:uuid:7890f02b-6f56-4809-865f-d8c686fd9da1" title="link4" location="/componentlink/urn:uuid:7890f02b-6f56-4809-865f-d8c686fd9da1" target="//@resources.5">
-      <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
-      <attributes name="occi.core.id" value="urn:uuid:7890f02b-6f56-4809-865f-d8c686fd9da1"/>
-      <attributes name="occi.core.title" value="link4"/>
-    </links>
-  </resources>
-  <resources xsi:type="infrastructure:Compute" id="urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166cf" title="hadoop-worker-1" location="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166cf/" rlinks="//@resources.5/@links.0 //@resources.8/@links.0" occiComputeCores="2" occiComputeHostname="vm2" occiComputeMemory="4096.0" occiComputeState="active">
-    <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='compute']"/>
-    <attributes name="occi.core.id" value="urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166cf"/>
-    <attributes name="occi.core.title" value="hadoop-worker-1"/>
-    <attributes name="occi.core.summary" value=""/>
-    <attributes name="occi.compute.architecture" value="x86"/>
-    <attributes name="occi.compute.cores" value="2"/>
-    <attributes name="occi.compute.hostname" value="hadoop-worker-1"/>
-    <attributes name="occi.compute.share" value="0"/>
-    <attributes name="occi.compute.speed" value="0"/>
-    <attributes name="occi.compute.memory" value="4096"/>
-    <attributes name="occi.compute.state" value="active"/>
-    <attributes name="occi.compute.state.message" value=""/>
-    <parts xsi:type="infrastructure:Ssh_key" occiCredentialsSshPublickey="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6H7Ydi45BTHid4qNppGAi5mzjbnZgt7bi6xLGmZG9CiLmhMsxOuk3Z05Nn+pmoN98qS0eY8S240PPk5VOlYqBY0vdRAwrZSHHaLdMp6I7ARNrI2KraYduweqz7ZQxPXQfwIeYx2HKQxEF2r+4//Fo4WfgdBkLuulvl/Gw3TUzJNQHvgpaiNo9+PI5CZydHnZbjUkRikS12pT+CbNKj+0QKeQztbCd41aKxDv5H0DjltVRcpPppv4dmiU/zoCAIngWLO1PPgfYWyze8Z9IoyBT7Qdg30U91TYZBuxzXR5lq7Fh64y/IZ/SjdOdSIvIuDjtmJDULRdLJzrvubrKY+YH Generated-by-Nova">
-      <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ssh_key']"/>
-      <attributes name="occi.credentials.ssh.publickey" value="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6H7Ydi45BTHid4qNppGAi5mzjbnZgt7bi6xLGmZG9CiLmhMsxOuk3Z05Nn+pmoN98qS0eY8S240PPk5VOlYqBY0vdRAwrZSHHaLdMp6I7ARNrI2KraYduweqz7ZQxPXQfwIeYx2HKQxEF2r+4//Fo4WfgdBkLuulvl/Gw3TUzJNQHvgpaiNo9+PI5CZydHnZbjUkRikS12pT+CbNKj+0QKeQztbCd41aKxDv5H0DjltVRcpPppv4dmiU/zoCAIngWLO1PPgfYWyze8Z9IoyBT7Qdg30U91TYZBuxzXR5lq7Fh64y/IZ/SjdOdSIvIuDjtmJDULRdLJzrvubrKY+YH Generated-by-Nova"/>
-    </parts>
-    <parts xsi:type="infrastructure:User_data" occiComputeUserdata="I2Nsb3VkLWNvbmZpZwoKIyBVcGdyYWRlIHRoZSBpbnN0YW5jZSBvbiBmaXJzdCBib290CiMgKGllIHJ1biBhcHQtZ2V0IHVwZ3JhZGUpCiMKIyBEZWZhdWx0OiBmYWxzZQojIEFsaWFzZXM6IGFwdF91cGdyYWRlCnBhY2thZ2VfdXBncmFkZTogdHJ1ZQoKcGFja2FnZXM6CiAtIHB5dGhvbgoKd3JpdGVfZmlsZXM6CiAgLSBwYXRoOiAvZXRjL25ldHdvcmsvaW50ZXJmYWNlcy5kLzUwLWNsb3VkLWluaXQuY2ZnCiAgICBjb250ZW50OiB8CiAgICAgIGF1dG8gbG8KICAgICAgaWZhY2UgbG8gaW5ldCBsb29wYmFjawogICAgICAKICAgICAgYXV0byBlbnMwCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMAogICAgICBpZmFjZSBlbnMwIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMQogICAgICBpZmFjZSBlbnMxIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMyCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMgogICAgICBpZmFjZSBlbnMyIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMzCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMwogICAgICBpZmFjZSBlbnMzIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM0CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNAogICAgICBpZmFjZSBlbnM0IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM1CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNQogICAgICBpZmFjZSBlbnM1IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM2CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNgogICAgICBpZmFjZSBlbnM2IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM3CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNwogICAgICBpZmFjZSBlbnM3IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM4CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOAogICAgICBpZmFjZSBlbnM4IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM5CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOQogICAgICBpZmFjZSBlbnM5IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxMAogICAgICBhbGxvdy1ob3RwbHVnIGVuczEwCiAgICAgIGlmYWNlIGVuczEwIGluZXQgZGhjcAoKIyMj">
-      <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='user_data']"/>
-      <attributes name="occi.compute.userdata" value="I2Nsb3VkLWNvbmZpZwoKIyBVcGdyYWRlIHRoZSBpbnN0YW5jZSBvbiBmaXJzdCBib290CiMgKGllIHJ1biBhcHQtZ2V0IHVwZ3JhZGUpCiMKIyBEZWZhdWx0OiBmYWxzZQojIEFsaWFzZXM6IGFwdF91cGdyYWRlCnBhY2thZ2VfdXBncmFkZTogdHJ1ZQoKcGFja2FnZXM6CiAtIHB5dGhvbgoKd3JpdGVfZmlsZXM6CiAgLSBwYXRoOiAvZXRjL25ldHdvcmsvaW50ZXJmYWNlcy5kLzUwLWNsb3VkLWluaXQuY2ZnCiAgICBjb250ZW50OiB8CiAgICAgIGF1dG8gbG8KICAgICAgaWZhY2UgbG8gaW5ldCBsb29wYmFjawogICAgICAKICAgICAgYXV0byBlbnMwCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMAogICAgICBpZmFjZSBlbnMwIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMQogICAgICBpZmFjZSBlbnMxIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMyCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMgogICAgICBpZmFjZSBlbnMyIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMzCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMwogICAgICBpZmFjZSBlbnMzIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM0CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNAogICAgICBpZmFjZSBlbnM0IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM1CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNQogICAgICBpZmFjZSBlbnM1IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM2CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNgogICAgICBpZmFjZSBlbnM2IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM3CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNwogICAgICBpZmFjZSBlbnM3IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM4CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOAogICAgICBpZmFjZSBlbnM4IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM5CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOQogICAgICBpZmFjZSBlbnM5IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxMAogICAgICBhbGxvdy1ob3RwbHVnIGVuczEwCiAgICAgIGlmYWNlIGVuczEwIGluZXQgZGhjcAoKIyMj"/>
-    </parts>
-    <parts>
-      <mixin href="http://schemas.modmacao.org/openstack/swe#//@mixins[term='ubuntu_xenialxerus']"/>
-    </parts>
-    <links xsi:type="infrastructure:Networkinterface" id="urn:uuid:c8c49905-3d5e-43b2-8d09-fabf92d29722" title="link2" location="/networkinterface/urn:uuid:c8c49905-3d5e-43b2-8d09-fabf92d29722" target="//@resources.6">
-      <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='networkinterface']"/>
-      <attributes name="occi.core.id" value="urn:uuid:c8c49905-3d5e-43b2-8d09-fabf92d29722"/>
-      <attributes name="occi.core.title" value="link2"/>
-      <attributes name="occi.networkinterface.address" value="10.254.1.8"/>
-      <parts xsi:type="infrastructure:Ipnetworkinterface" occiNetworkinterfaceAddress="10.254.1.8" occiNetworkinterfaceGateway="10.254.1.254">
-        <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ipnetworkinterface']"/>
-      </parts>
-    </links>
-    <links xsi:type="infrastructure:Networkinterface" id="urn:uuid:03f91178-136f-4023-876e-84509f8a5a2d" title="monNwLink" target="//@resources.12" occiNetworkinterfaceInterface="100.254.1.35" occiNetworkinterfaceMac="">
-      <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='networkinterface']"/>
-      <attributes name="occi.core.id" value="urn:uuid:03f91178-136f-4023-876e-84509f8a5a2d"/>
-      <attributes name="occi.core.title" value="monNwLink"/>
-      <attributes name="occi.networkinterface.address" value="100.254.1.35"/>
-      <parts xsi:type="infrastructure:Ipnetworkinterface" occiNetworkinterfaceAddress="100.254.1.35" occiNetworkinterfaceGateway="">
-        <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ipnetworkinterface']"/>
-      </parts>
-    </links>
-  </resources>
-  <resources xsi:type="platform:Component" id="urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255898" title="Worker" location="/component/urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255898/" rlinks="//@resources.3/@links.1" occiComponentStateMessage="">
-    <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='component']"/>
-    <attributes name="occi.core.id" value="urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255898"/>
-    <attributes name="occi.core.title" value="Worker"/>
-    <attributes name="occi.core.summary" value=""/>
-    <attributes name="occi.component.state" value="undeployed"/>
-    <attributes name="occi.component.state.message" value=""/>
-    <parts mixin="//@mixins.2"/>
-    <links xsi:type="placement:Placementlink" id="urn:uuid:ff292f08-d263-41b6-88c8-84d33783b917" title="link1" location="/placementlink/urn:uuid:ff292f08-d263-41b6-88c8-84d33783b917/" target="//@resources.4">
-      <kind href="http://schemas.modmacao.org/placement#//@kinds[term='placementlink']"/>
-      <attributes name="occi.core.id" value="urn:uuid:ff292f08-d263-41b6-88c8-84d33783b917"/>
-      <attributes name="occi.core.title" value="link1"/>
-      <attributes name="occi.core.target" value="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166ce/"/>
-    </links>
-  </resources>
-  <resources xsi:type="infrastructure:Network" id="urn:uuid:29d78078-fb4c-47aa-a9af-b8aaf3339591" title="hNetwork" location="/network/urn:uuid:29d78078-fb4c-47aa-a9af-b8aaf3339591/" rlinks="//@resources.0/@links.0 //@resources.4/@links.0" occiNetworkState="active">
-    <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='network']"/>
-    <attributes name="occi.core.id" value="urn:uuid:29d78078-fb4c-47aa-a9af-b8aaf3339591"/>
-    <attributes name="occi.core.title" value="hNetwork"/>
-    <attributes name="occi.core.summary" value=""/>
-    <attributes name="occi.network.vlan" value="0"/>
-    <attributes name="occi.network.label" value=""/>
-    <attributes name="occi.network.state" value="active"/>
-    <attributes name="occi.network.state.message" value=""/>
-    <parts>
-      <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ipnetwork']"/>
-      <attributes name="occi.network.address" value="10.254.1.1/24"/>
-    </parts>
-  </resources>
-  <resources xsi:type="monitoring:Sensor" id="urn:uuid:efb0f50a-7a7c-4153-b939-4846d6554dbb" title="Sensor">
-    <kind href="http://schemas.ugoe.cs.rwm/monitoring#//@kinds[term='sensor']"/>
-    <attributes name="occi.core.id" value="urn:uuid:efb0f50a-7a7c-4153-b939-4846d6554dbb"/>
-    <attributes name="occi.core.title" value="Sensor"/>
-    <attributes name="occi.core.summary" value=""/>
-    <attributes name="occi.sensor.timebase" value=""/>
-    <attributes name="occi.sensor.timestart" value=""/>
-    <attributes name="occi.sensor.timestop" value=""/>
-    <attributes name="occi.sensor.period" value=""/>
-    <attributes name="occi.sensor.granularity" value=""/>
-    <attributes name="occi.sensor.accuracy" value=""/>
-    <attributes name="occi.app.state" value="undeployed"/>
-    <attributes name="occi.app.state.message" value=""/>
-    <links xsi:type="platform:Componentlink" id="urn:uuid:04cf6483-706d-4a2a-9114-9918ab2bb52a" title="link1" target="//@resources.8">
-      <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
-      <attributes name="occi.core.id" value="urn:uuid:04cf6483-706d-4a2a-9114-9918ab2bb52a"/>
-      <attributes name="occi.core.title" value="link1"/>
-    </links>
-    <links xsi:type="platform:Componentlink" id="urn:uuid:9c604867-3135-4fa1-af9e-2bb11018ff5a" title="link2" target="//@resources.9">
-      <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
-      <attributes name="occi.core.id" value="urn:uuid:9c604867-3135-4fa1-af9e-2bb11018ff5a"/>
-      <attributes name="occi.core.title" value="link2"/>
-    </links>
-    <links xsi:type="platform:Componentlink" id="urn:uuid:93f08e31-f350-42b7-a73b-c139eba4a8e3" title="link3" target="//@resources.10">
-      <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
-      <attributes name="occi.core.id" value="urn:uuid:93f08e31-f350-42b7-a73b-c139eba4a8e3"/>
-      <attributes name="occi.core.title" value="link3"/>
-    </links>
-  </resources>
-  <resources xsi:type="monitoring:Datagatherer" id="urn:uuid:051affdc-d686-48f8-884c-83fe81718a48" title="DataGatherer" rlinks="//@resources.7/@links.0 //@resources.9/@links.0">
-    <kind href="http://schemas.ugoe.cs.rwm/monitoring#//@kinds[term='datagatherer']"/>
-    <attributes name="occi.core.id" value="urn:uuid:051affdc-d686-48f8-884c-83fe81718a48"/>
-    <attributes name="occi.core.title" value="DataGatherer"/>
-    <parts mixin="//@mixins.3"/>
-    <links xsi:type="placement:Placementlink" id="urn:uuid:60cc05ca-4fd7-465b-8fd0-945dcbf8867f" title="link1" target="//@resources.4">
-      <kind href="http://schemas.modmacao.org/placement#//@kinds[term='placementlink']"/>
-      <attributes name="occi.core.id" value="urn:uuid:60cc05ca-4fd7-465b-8fd0-945dcbf8867f"/>
-      <attributes name="occi.core.title" value="link1"/>
-    </links>
-  </resources>
-  <resources xsi:type="monitoring:Processor" id="urn:uuid:1bda25ab-723b-47e7-9704-5134db26ebdc" title="Processor" rlinks="//@resources.10/@links.0 //@resources.7/@links.1" gathererAddress="100.254.1.35">
-    <kind href="http://schemas.ugoe.cs.rwm/monitoring#//@kinds[term='processor']"/>
-    <attributes name="occi.core.id" value="urn:uuid:1bda25ab-723b-47e7-9704-5134db26ebdc"/>
-    <attributes name="occi.core.title" value="Processor"/>
-    <attributes name="gatherer.address" value="100.254.1.35"/>
-    <parts mixin="//@mixins.4"/>
-    <links xsi:type="platform:Componentlink" id="urn:uuid:1a821776-7886-4cb4-8b80-46a8403acf40" title="link1" target="//@resources.8">
-      <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
-      <attributes name="occi.core.id" value="urn:uuid:1a821776-7886-4cb4-8b80-46a8403acf40"/>
-      <attributes name="occi.core.title" value="link1"/>
-    </links>
-    <links xsi:type="placement:Placementlink" id="urn:uuid:ff7019e4-a9dc-48dc-83c3-ab77714a25f4" title="link2" target="//@resources.11">
-      <kind href="http://schemas.modmacao.org/placement#//@kinds[term='placementlink']"/>
-      <attributes name="occi.core.id" value="urn:uuid:ff7019e4-a9dc-48dc-83c3-ab77714a25f4"/>
-      <attributes name="occi.core.title" value="link2"/>
-    </links>
-  </resources>
-  <resources xsi:type="monitoring:Publisher" id="urn:uuid:588f705e-5279-4847-9337-846af2c86972" title="Publisher" rlinks="//@resources.7/@links.2" publisherEndpoint="192.168.35.45:8080">
-    <kind href="http://schemas.ugoe.cs.rwm/monitoring#//@kinds[term='publisher']"/>
-    <attributes name="occi.core.id" value="urn:uuid:588f705e-5279-4847-9337-846af2c86972"/>
-    <attributes name="occi.core.title" value="Publisher"/>
-    <attributes name="publisher.endpoint" value="192.168.35.45:8080"/>
-    <parts mixin="//@mixins.5"/>
-    <parts xsi:type="monitoring:Martpublisher" monitoringPropertyName="CPU" monitoringPropertyId="" monitoringPropertyResource="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166cf/">
-      <mixin href="http://schemas.ugoe.cs.rwm/monitoring#//@mixins[term='martpublisher']"/>
-      <attributes name="monitoring.property.name" value="CPU"/>
-      <attributes name="monitoring.property.resource" value="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166cf/"/>
-      <attributes name="monitoring.property.id" value="/monitoringproperty/fb3604c9-1fd4-4fa8-bee6-eafceddd0487"/>
-    </parts>
-    <links xsi:type="platform:Componentlink" id="urn:uuid:9551c357-59f8-4ac1-8c85-0e886e206b80" title="link1" target="//@resources.9">
-      <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
-      <attributes name="occi.core.id" value="urn:uuid:9551c357-59f8-4ac1-8c85-0e886e206b80"/>
-      <attributes name="occi.core.title" value="link1"/>
-    </links>
-    <links xsi:type="placement:Placementlink" id="urn:uuid:275b5bce-084c-46f0-88bc-1f6f31bf3616" title="link2" target="//@resources.11">
-      <kind href="http://schemas.modmacao.org/placement#//@kinds[term='placementlink']"/>
-      <attributes name="occi.core.id" value="urn:uuid:275b5bce-084c-46f0-88bc-1f6f31bf3616"/>
-      <attributes name="occi.core.title" value="link2"/>
-    </links>
-  </resources>
-  <resources xsi:type="infrastructure:Compute" id="urn:uuid:37829092-c690-494a-98fa-335b2fd660ea" title="MonVm" rlinks="//@resources.9/@links.1 //@resources.10/@links.1" occiComputeHostname="monVM" occiComputeState="inactive">
-    <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='compute']"/>
-    <attributes name="occi.core.id" value="urn:uuid:37829092-c690-494a-98fa-335b2fd660ea"/>
-    <attributes name="occi.core.title" value="MonVm"/>
-    <attributes name="occi.core.summary" value=""/>
-    <attributes name="occi.compute.architecture" value="x86"/>
-    <attributes name="occi.compute.cores" value="2"/>
-    <attributes name="occi.compute.hostname" value="monVM"/>
-    <attributes name="occi.compute.share" value="0"/>
-    <attributes name="occi.compute.speed" value="0"/>
-    <attributes name="occi.compute.memory" value="4096"/>
-    <attributes name="occi.compute.state" value="active"/>
-    <attributes name="occi.compute.state.message" value=""/>
-    <parts>
-      <mixin href="http://schemas.modmacao.org/openstack/swe#//@mixins[term='ubuntu_xenialxerus']"/>
-    </parts>
-    <links xsi:type="infrastructure:Networkinterface" id="urn:uuid:00d6889d-b644-44bf-af13-3fe350e926ed" title="link1" target="//@resources.12">
-      <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='networkinterface']"/>
-      <attributes name="occi.core.id" value="urn:uuid:00d6889d-b644-44bf-af13-3fe350e926ed"/>
-      <attributes name="occi.core.title" value="link1"/>
-      <parts xsi:type="infrastructure:Ipnetworkinterface" occiNetworkinterfaceAddress="100.254.1.25">
-        <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ipnetworkinterface']"/>
-      </parts>
-    </links>
-  </resources>
-  <resources xsi:type="infrastructure:Network" id="urn:uuid:7a9fca2c-24fb-473c-aa9c-8dc9e68a432a" title="MonitoringNetwork" rlinks="//@resources.11/@links.0 //@resources.4/@links.1" occiNetworkState="inactive">
-    <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='network']"/>
-    <attributes name="occi.core.id" value="urn:uuid:7a9fca2c-24fb-473c-aa9c-8dc9e68a432a"/>
-    <attributes name="occi.core.title" value="MonitoringNetwork"/>
-    <attributes name="occi.core.summary" value=""/>
-    <attributes name="occi.network.vlan" value="0"/>
-    <attributes name="occi.network.label" value=""/>
-    <attributes name="occi.network.state" value="active"/>
-    <attributes name="occi.network.state.message" value=""/>
-    <parts>
-      <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ipnetwork']"/>
-      <attributes name="occi.network.address" value="100.254.1.1/24"/>
-    </parts>
-  </resources>
-  <mixins name="hJob" scheme="http://schemas.modmacao.org/usermixins#" title="Hjob"/>
-  <mixins name="hMaster" scheme="http://schemas.modmacao.org/usermixins#" title="HMaster"/>
-  <mixins name="hWorker" scheme="http://schemas.modmacao.org/usermixins#" title="HWorker"/>
-  <mixins name="CPUGatherer" scheme="http://schemas.modmacao.org/usermixins#" title="CPUGatherer"/>
-  <mixins name="CPUProcessor" scheme="http://schemas.modmacao.org/usermixins#" title="CPUProcessor"/>
-  <mixins name="CPUPublisher" scheme="http://schemas.modmacao.org/usermixins#" title="CPUPublisher"/>
-</occi:Configuration>
diff --git a/src/test/resources/occi/hadoopClusterNewExtWithMem.occic b/src/test/resources/occi/hadoopClusterNewExtWithMem.occic
index b4b8ecdaa7c04ac05a8c290e3461dff540c1c98b..347251e0d710ad1257ad114c612412d5715e925f 100644
--- a/src/test/resources/occi/hadoopClusterNewExtWithMem.occic
+++ b/src/test/resources/occi/hadoopClusterNewExtWithMem.occic
@@ -88,7 +88,7 @@
       <attributes name="occi.core.title" value="link4"/>
     </links>
   </resources>
-  <resources xsi:type="infrastructure:Compute" id="urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166cf" title="hadoop-worker-1" location="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166cf/" rlinks="//@resources.5/@links.0 //@resources.8/@links.0" occiComputeCores="2" occiComputeHostname="vm2" occiComputeMemory="4096.0" occiComputeState="active">
+  <resources xsi:type="infrastructure:Compute" id="urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166cf" title="hadoop-worker-1" location="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166cf/" rlinks="//@resources.5/@links.0 //@resources.8/@links.0 //@resources.7/@links.3 //@resources.15/@links.3" occiComputeCores="2" occiComputeHostname="vm2" occiComputeMemory="4096.0" occiComputeState="active">
     <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='compute']"/>
     <attributes name="occi.core.id" value="urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166cf"/>
     <attributes name="occi.core.title" value="hadoop-worker-1"/>
@@ -165,12 +165,6 @@
     <attributes name="occi.core.id" value="urn:uuid:efb0f50a-7a7c-4153-b939-4846d6554dbb"/>
     <attributes name="occi.core.title" value="Sensor"/>
     <attributes name="occi.core.summary" value=""/>
-    <attributes name="occi.sensor.timebase" value=""/>
-    <attributes name="occi.sensor.timestart" value=""/>
-    <attributes name="occi.sensor.timestop" value=""/>
-    <attributes name="occi.sensor.period" value=""/>
-    <attributes name="occi.sensor.granularity" value=""/>
-    <attributes name="occi.sensor.accuracy" value=""/>
     <attributes name="occi.app.state" value="undeployed"/>
     <attributes name="occi.app.state.message" value=""/>
     <links xsi:type="platform:Componentlink" id="urn:uuid:04cf6483-706d-4a2a-9114-9918ab2bb52a" title="link1" target="//@resources.8">
@@ -188,6 +182,12 @@
       <attributes name="occi.core.id" value="urn:uuid:93f08e31-f350-42b7-a73b-c139eba4a8e3"/>
       <attributes name="occi.core.title" value="link3"/>
     </links>
+    <links xsi:type="monitoring:Monitorableproperty" id="urn:uuid:ba16f4ee-1601-4192-a259-eae4274aed72" title="CPU Monitoring" location="" target="//@resources.4" monitoringProperty="CPU" monitoringResult="">
+      <kind href="http://schemas.ugoe.cs.rwm/monitoring#//@kinds[term='monitorableproperty']"/>
+      <attributes name="occi.core.id" value="urn:uuid:ba16f4ee-1601-4192-a259-eae4274aed72"/>
+      <attributes name="occi.core.title" value="CPU Monitoring"/>
+      <attributes name="monitoring.property" value="CPU"/>
+    </links>
   </resources>
   <resources xsi:type="monitoring:Datagatherer" id="urn:uuid:051affdc-d686-48f8-884c-83fe81718a48" title="DataGatherer" rlinks="//@resources.7/@links.0 //@resources.9/@links.0 //@resources.13/@links.0 //@resources.15/@links.0">
     <kind href="http://schemas.ugoe.cs.rwm/monitoring#//@kinds[term='datagatherer']"/>
@@ -200,11 +200,10 @@
       <attributes name="occi.core.title" value="link1"/>
     </links>
   </resources>
-  <resources xsi:type="monitoring:Processor" id="urn:uuid:1bda25ab-723b-47e7-9704-5134db26ebdc" title="Processor" rlinks="//@resources.10/@links.0 //@resources.7/@links.1" gathererAddress="100.254.1.35">
-    <kind href="http://schemas.ugoe.cs.rwm/monitoring#//@kinds[term='processor']"/>
+  <resources xsi:type="monitoring:Dataprocessor" id="urn:uuid:1bda25ab-723b-47e7-9704-5134db26ebdc" title="Processor" rlinks="//@resources.10/@links.0 //@resources.7/@links.1">
+    <kind href="http://schemas.ugoe.cs.rwm/monitoring#//@kinds[term='dataprocessor']"/>
     <attributes name="occi.core.id" value="urn:uuid:1bda25ab-723b-47e7-9704-5134db26ebdc"/>
     <attributes name="occi.core.title" value="Processor"/>
-    <attributes name="gatherer.address" value="100.254.1.35"/>
     <parts mixin="//@mixins.4"/>
     <links xsi:type="platform:Componentlink" id="urn:uuid:1a821776-7886-4cb4-8b80-46a8403acf40" title="link1" target="//@resources.8">
       <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
@@ -217,17 +216,14 @@
       <attributes name="occi.core.title" value="link2"/>
     </links>
   </resources>
-  <resources xsi:type="monitoring:Publisher" id="urn:uuid:588f705e-5279-4847-9337-846af2c86972" title="Publisher" rlinks="//@resources.7/@links.2" publisherEndpoint="192.168.35.45:8080">
-    <kind href="http://schemas.ugoe.cs.rwm/monitoring#//@kinds[term='publisher']"/>
+  <resources xsi:type="monitoring:Resultprovider" id="urn:uuid:588f705e-5279-4847-9337-846af2c86972" title="Resultprovider" rlinks="//@resources.7/@links.2">
+    <kind href="http://schemas.ugoe.cs.rwm/monitoring#//@kinds[term='resultprovider']"/>
     <attributes name="occi.core.id" value="urn:uuid:588f705e-5279-4847-9337-846af2c86972"/>
-    <attributes name="occi.core.title" value="Publisher"/>
-    <attributes name="publisher.endpoint" value="192.168.35.45:8080"/>
+    <attributes name="occi.core.title" value="Resultprovider"/>
     <parts mixin="//@mixins.5"/>
-    <parts xsi:type="monitoring:Martpublisher" monitoringPropertyName="CPU" monitoringPropertyId="" monitoringPropertyResource="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166cf/">
-      <mixin href="http://schemas.ugoe.cs.rwm/monitoring#//@mixins[term='martpublisher']"/>
-      <attributes name="monitoring.property.name" value="CPU"/>
-      <attributes name="monitoring.property.resource" value="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166cf/"/>
-      <attributes name="monitoring.property.id" value="/monitoringproperty/fb3604c9-1fd4-4fa8-bee6-eafceddd0487"/>
+    <parts xsi:type="monitoring:Occiresultprovider">
+      <mixin href="http://schemas.ugoe.cs.rwm/monitoring#//@mixins[term='occiresultprovider']"/>
+      <attributes name="result.provider.endpoint" value="192.168.35.45:8080"/>
     </parts>
     <links xsi:type="platform:Componentlink" id="urn:uuid:9551c357-59f8-4ac1-8c85-0e886e206b80" title="link1" target="//@resources.9">
       <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
@@ -279,11 +275,10 @@
       <attributes name="occi.network.address" value="100.254.1.1/24"/>
     </parts>
   </resources>
-  <resources xsi:type="monitoring:Processor" id="urn:uuid:1bda25ab-723b-47e7-9704-5134db26ebdd" title="Processor" rlinks="//@resources.14/@links.0 //@resources.15/@links.2" gathererAddress="100.254.1.35">
-    <kind href="http://schemas.ugoe.cs.rwm/monitoring#//@kinds[term='processor']"/>
+  <resources xsi:type="monitoring:Dataprocessor" id="urn:uuid:1bda25ab-723b-47e7-9704-5134db26ebdd" title="Processor" rlinks="//@resources.14/@links.0 //@resources.15/@links.2">
+    <kind href="http://schemas.ugoe.cs.rwm/monitoring#//@kinds[term='dataprocessor']"/>
     <attributes name="occi.core.title" value="Processor"/>
     <attributes name="occi.core.id" value="urn:uuid:1bda25ab-723b-47e7-9704-5134db26ebdd"/>
-    <attributes name="gatherer.address" value="100.254.1.35"/>
     <parts mixin="//@mixins.6"/>
     <links xsi:type="platform:Componentlink" id="urn:uuid:1a821776-7886-4cb4-8b80-46a8403acf41" title="link1" target="//@resources.8">
       <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
@@ -296,17 +291,14 @@
       <attributes name="occi.core.title" value="link2"/>
     </links>
   </resources>
-  <resources xsi:type="monitoring:Publisher" id="urn:uuid:588f705e-5279-4847-9337-846af2c86973" title="Publisher" rlinks="//@resources.15/@links.1" publisherEndpoint="192.168.35.45:8080">
-    <kind href="http://schemas.ugoe.cs.rwm/monitoring#//@kinds[term='publisher']"/>
+  <resources xsi:type="monitoring:Resultprovider" id="urn:uuid:588f705e-5279-4847-9337-846af2c86973" title="Resultprovider" rlinks="//@resources.15/@links.1">
+    <kind href="http://schemas.ugoe.cs.rwm/monitoring#//@kinds[term='resultprovider']"/>
     <attributes name="occi.core.id" value="urn:uuid:588f705e-5279-4847-9337-846af2c86973"/>
-    <attributes name="occi.core.title" value="Publisher"/>
-    <attributes name="publisher.endpoint" value="192.168.35.45:8080"/>
+    <attributes name="occi.core.title" value="Resultprovider"/>
     <parts mixin="//@mixins.7"/>
-    <parts xsi:type="monitoring:Martpublisher" monitoringPropertyName="Mem" monitoringPropertyId="/monitoringproperty/fb3604c9-1fd4-4fa8-bee6-eafceddd0488" monitoringPropertyResource="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166cf/">
-      <mixin href="http://schemas.ugoe.cs.rwm/monitoring#//@mixins[term='martpublisher']"/>
-      <attributes name="monitoring.property.name" value="Mem"/>
-      <attributes name="monitoring.property.resource" value="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166cf/"/>
-      <attributes name="monitoring.property.id" value="/monitoringproperty/fb3604c9-1fd4-4fa8-bee6-eafceddd0488"/>
+    <parts xsi:type="monitoring:Occiresultprovider">
+      <mixin href="http://schemas.ugoe.cs.rwm/monitoring#//@mixins[term='occiresultprovider']"/>
+      <attributes name="result.provider.endpoint" value="192.168.35.45:8080"/>
     </parts>
     <links xsi:type="platform:Componentlink" id="urn:uuid:9551c357-59f8-4ac1-8c85-0e886e206b83" title="link1" target="//@resources.13">
       <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
@@ -319,12 +311,10 @@
       <attributes name="occi.core.title" value="link2"/>
     </links>
   </resources>
-  <resources xsi:type="monitoring:Sensor" id="urn:uuid:efb0f50a-7a7c-4153-b939-4846d6554dbc" title="Sensor" occiAppStateMessage="" occiSensorPeriod="" occiSensorAccuracy="">
+  <resources xsi:type="monitoring:Sensor" id="urn:uuid:efb0f50a-7a7c-4153-b939-4846d6554dbc" title="Sensor" occiAppStateMessage="">
     <kind href="http://schemas.ugoe.cs.rwm/monitoring#//@kinds[term='sensor']"/>
     <attributes name="occi.core.title" value="Sensor"/>
     <attributes name="occi.core.id" value="urn:uuid:efb0f50a-7a7c-4153-b939-4846d6554dbc"/>
-    <attributes name="occi.sensor.period" value=""/>
-    <attributes name="occi.sensor.accuracy" value=""/>
     <attributes name="occi.app.state.message" value=""/>
     <links xsi:type="platform:Componentlink" id="urn:uuid:04cf6483-706d-4a2a-9114-9918ab2bb52b" title="link1" target="//@resources.8">
       <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
@@ -341,6 +331,12 @@
       <attributes name="occi.core.id" value="urn:uuid:93f08e31-f350-42b7-a73b-c139eba4a8e4"/>
       <attributes name="occi.core.title" value="link3"/>
     </links>
+    <links xsi:type="monitoring:Monitorableproperty" id="urn:uuid:ba16f4ee-1601-4192-a259-eae4274aed73" title="MEM Monitoring" location="" target="//@resources.4" monitoringProperty="Mem" monitoringResult="">
+      <kind href="http://schemas.ugoe.cs.rwm/monitoring#//@kinds[term='monitorableproperty']"/>
+      <attributes name="occi.core.title" value="MEM Monitoring"/>
+      <attributes name="occi.core.id" value="urn:uuid:ba16f4ee-1601-4192-a259-eae4274aed73"/>
+      <attributes name="monitoring.property" value="Mem"/>
+    </links>
   </resources>
   <mixins name="hJob" scheme="http://schemas.modmacao.org/usermixins#" title="Hjob"/>
   <mixins name="hMaster" scheme="http://schemas.modmacao.org/usermixins#" title="HMaster"/>
diff --git a/src/test/resources/roles/cpuprocessor/files/processor.sh b/src/test/resources/roles/cpuprocessor/files/processor.sh
index c823ae5163480c3c9644dd2280902d4b01759fbe..4ad171ab8e8bb901efd3765837614f1296723809 100755
--- a/src/test/resources/roles/cpuprocessor/files/processor.sh
+++ b/src/test/resources/roles/cpuprocessor/files/processor.sh
@@ -1,14 +1,14 @@
-#! /bin/sh
+#! /bin/bash
 
 avgCpu=0
 slept=0
 sequence=3
 times=3
 send=$(python -c "print $sequence*$times")
-url=http://192.168.35.28:61208/api/2/cpu/total
+url=http://$1:61208/api/2/cpu/total
 
 if [ -f ~/monitor.txt ]; then
-    echo "Removing previoud monitoring data"
+    echo "Removing previous monitoring data"
     rm monitor.txt
 fi
 
diff --git a/src/test/resources/roles/cpuprocessor/tasks/main.yml b/src/test/resources/roles/cpuprocessor/tasks/main.yml
index d95903d4ac061539dd9f88b4b56063b24aa724a5..51b21f295315b687aae5eb17764b22d5c04005b1 100644
--- a/src/test/resources/roles/cpuprocessor/tasks/main.yml
+++ b/src/test/resources/roles/cpuprocessor/tasks/main.yml
@@ -19,7 +19,7 @@
 - name: Start CPUProcessor
   block:
   - name: Execute processor script
-    command: start-stop-daemon --start --startas /home/ubuntu/processor.sh -m --pidfile /run/processor.pid -b
+    command: start-stop-daemon --start --startas /home/ubuntu/processor.sh 100.254.1.35 -m --pidfile /run/processor.pid -b
   when: task == "START"
   become_user: root
   
diff --git a/src/test/resources/roles/cpupublisher/files/publisher.sh b/src/test/resources/roles/cpupublisher/files/publisher.sh
index a66670c7df730db3e40a37758abaf4bfce259c22..45f116ba7999a10803edbebb9b82de6b5dcc049f 100644
--- a/src/test/resources/roles/cpupublisher/files/publisher.sh
+++ b/src/test/resources/roles/cpupublisher/files/publisher.sh
@@ -1,9 +1,21 @@
-#! /bin/sh
-
-threshold=80
+#! /bin/bash
+
+endpoint=$1
+propresource=$2
+propname=$3
+sensor=$4
+propid=$5
+thresholdCrit=90
+thresholdHigh=60
+thresholdMid=40
+thresholdLow=10
 monfile=~/monitor.txt
 sequence=3
 
+echo "Endpoint: $endpoint"
+echo "Resource: $propresource"
+echo "Name: $propname"
+
 if [! -f "$monfile" ]; then
     echo "Did not find file for monitoring: $monfile"
     sleep 10
@@ -22,18 +34,27 @@ while true; do
     val=$(tail -1 $monfile)
     echo "$val"
 
-    if [ $(echo "$val > $threshold" | bc ) = 1 ]; then
+    if [ $(echo "$val > $thresholdCrit" | bc ) = 1 ]; then
        state=Critical
+    elif [ $(echo "$val > $thresholdHigh" | bc ) = 1 ]; then
+       state=High
+    elif [ $(echo "$val > $thresholdMid" | bc ) = 1 ]; then
+       state=Mid
+    elif [ $(echo "$val > $thresholdLow" | bc ) = 1 ]; then
+       state=Low
     else
-       state=Cool
+       state=None
     fi
+    
 
     if [ "$oldstate" = "$state" ]; then
       echo "Nothing changed! Still in state $state"
     else
       echo "New state reached: $state"
       echo "Publishing new results"
+      curl -v -X PUT http://"$endpoint""$propid" -H 'Content-Type: text/occi'  -H 'Category: monitorableproperty; scheme="http://schemas.ugoe.cs.rwm/monitoring#"; class="kind"'  -H 'X-OCCI-Attribute:occi.core.source="'$sensor'",occi.core.target="'$propresource'", occi.core.title="monProp", monitoring.result="'$state'", monitoring.property="'$propname'"' 
       oldstate=$state
     fi
     sleep $sequence
 done
+
diff --git a/src/test/resources/roles/cpupublisher/tasks/main.yml b/src/test/resources/roles/cpupublisher/tasks/main.yml
index f9dd15157c5384ce5155b07d7734a11855e15c81..90492864213c1e695619016c0d47ec3a25b3e669 100644
--- a/src/test/resources/roles/cpupublisher/tasks/main.yml
+++ b/src/test/resources/roles/cpupublisher/tasks/main.yml
@@ -23,7 +23,7 @@
 - name: Start CPUPublisher
   block:
   - name: Execute publisher script
-    command: start-stop-daemon --start --startas /home/ubuntu/publisher.sh -m --pidfile /run/publisher.pid -b
+    command: start-stop-daemon --start --startas /home/ubuntu/publisher.sh {{ result_provider_endpoint }} {{ monitorable_property_target }} {{ monitorable_property_property }} {{ sensor }} {{ monitorable_property }} -m --pidfile /run/publisher.pid -b
   when: task == "START"
   become_user: root
   
@@ -36,6 +36,7 @@
 
 - name: Undeploy CPUPublisher
   block:
-  - debug: msg="Operation undeploy not implemented."
+  - debug: msg="To be implemented."
   when: task == "UNDEPLOY"
   become_user: root
+
diff --git a/src/test/resources/roles/mecoshark/README.md b/src/test/resources/roles/mecoshark/README.md
deleted file mode 100644
index 225dd44b9fc5b3abff7e9c68ff9e91d505cdd5f0..0000000000000000000000000000000000000000
--- a/src/test/resources/roles/mecoshark/README.md
+++ /dev/null
@@ -1,38 +0,0 @@
-Role Name
-=========
-
-A brief description of the role goes here.
-
-Requirements
-------------
-
-Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required.
-
-Role Variables
---------------
-
-A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well.
-
-Dependencies
-------------
-
-A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles.
-
-Example Playbook
-----------------
-
-Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
-
-    - hosts: servers
-      roles:
-         - { role: username.rolename, x: 42 }
-
-License
--------
-
-BSD
-
-Author Information
-------------------
-
-An optional section for the role authors to include contact information, or a website (HTML is not allowed).
diff --git a/src/test/resources/roles/mecoshark/defaults/main.yml b/src/test/resources/roles/mecoshark/defaults/main.yml
deleted file mode 100644
index 672d0f5d3949e64ffc2dc69b8f8d7990619ee81c..0000000000000000000000000000000000000000
--- a/src/test/resources/roles/mecoshark/defaults/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# defaults file for pip
diff --git a/src/test/resources/roles/mecoshark/handlers/main.yml b/src/test/resources/roles/mecoshark/handlers/main.yml
deleted file mode 100644
index 03bcffc54748da1c510e19dc87476d874440eff1..0000000000000000000000000000000000000000
--- a/src/test/resources/roles/mecoshark/handlers/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# handlers file for pip
diff --git a/src/test/resources/roles/mecoshark/meta/main.yml b/src/test/resources/roles/mecoshark/meta/main.yml
deleted file mode 100644
index 0a147082ea5084e910650dfbf9a9f0803931b6cb..0000000000000000000000000000000000000000
--- a/src/test/resources/roles/mecoshark/meta/main.yml
+++ /dev/null
@@ -1,246 +0,0 @@
-galaxy_info:
-  author: your name
-  description: 
-  company: your company (optional)
-  
-  # If the issue tracker for your role is not on github, uncomment the
-  # next line and provide a value
-  # issue_tracker_url: http://example.com/issue/tracker
-  
-  # Some suggested licenses:
-  # - BSD (default)
-  # - MIT
-  # - GPLv2
-  # - GPLv3
-  # - Apache
-  # - CC-BY
-  license: license (GPLv2, CC-BY, etc)
-  
-  min_ansible_version: 1.2
-
-  # Optionally specify the branch Galaxy will use when accessing the GitHub
-  # repo for this role. During role install, if no tags are available,
-  # Galaxy will use this branch. During import Galaxy will access files on
-  # this branch. If travis integration is cofigured, only notification for this
-  # branch will be accepted. Otherwise, in all cases, the repo's default branch
-  # (usually master) will be used.
-  #github_branch:
-  
-  #
-  # Below are all platforms currently available. Just uncomment
-  # the ones that apply to your role. If you don't see your
-  # platform on this list, let us know and we'll get it added!
-  #
-  #platforms:
-  #- name: OpenBSD
-  #  versions:
-  #  - all
-  #  - 5.6
-  #  - 5.7
-  #  - 5.8
-  #  - 5.9
-  #  - 6.0
-  #  - 6.1
-  #  - 6.2
-  #- name: Fedora
-  #  versions:
-  #  - all
-  #  - 16
-  #  - 17
-  #  - 18
-  #  - 19
-  #  - 20
-  #  - 21
-  #  - 22
-  #  - 23
-  #  - 24
-  #  - 25
-  #  - 26
-  #  - 27
-  #- name: DellOS
-  #  versions:
-  #  - all
-  #  - 10
-  #  - 6
-  #  - 9
-  #- name: MacOSX
-  #  versions:
-  #  - all
-  #  - 10.10
-  #  - 10.11
-  #  - 10.12
-  #  - 10.7
-  #  - 10.8
-  #  - 10.9
-  #- name: Synology
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Junos
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Cumulus
-  #  versions:
-  #  - all
-  #  - 2.5
-  #  - 3.0
-  #  - 3.1
-  #  - 3.2
-  #  - 3.3
-  #  - 3.4
-  #  - 3.5
-  #- name: GenericBSD
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Void Linux
-  #  versions:
-  #  - all
-  #  - any
-  #- name: GenericLinux
-  #  versions:
-  #  - all
-  #  - any
-  #- name: NXOS
-  #  versions:
-  #  - all
-  #  - any
-  #- name: macOS
-  #  versions:
-  #  - all
-  #  - Sierra
-  #- name: IOS
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Amazon
-  #  versions:
-  #  - all
-  #  - 2013.03
-  #  - 2013.09
-  #  - 2016.03
-  #  - 2016.09
-  #- name: ArchLinux
-  #  versions:
-  #  - all
-  #  - any
-  #- name: FreeBSD
-  #  versions:
-  #  - all
-  #  - 10.0
-  #  - 10.1
-  #  - 10.2
-  #  - 10.3
-  #  - 10.4
-  #  - 11.0
-  #  - 11.1
-  #  - 8.0
-  #  - 8.1
-  #  - 8.2
-  #  - 8.3
-  #  - 8.4
-  #  - 9.0
-  #  - 9.1
-  #  - 9.1
-  #  - 9.2
-  #  - 9.3
-  #- name: Ubuntu
-  #  versions:
-  #  - all
-  #  - artful
-  #  - bionic
-  #  - lucid
-  #  - maverick
-  #  - natty
-  #  - oneiric
-  #  - precise
-  #  - quantal
-  #  - raring
-  #  - saucy
-  #  - trusty
-  #  - utopic
-  #  - vivid
-  #  - wily
-  #  - xenial
-  #  - yakkety
-  #  - zesty
-  #- name: Debian
-  #  versions:
-  #  - all
-  #  - buster
-  #  - etch
-  #  - jessie
-  #  - lenny
-  #  - sid
-  #  - squeeze
-  #  - stretch
-  #  - wheezy
-  #- name: Alpine
-  #  versions:
-  #  - all
-  #  - any
-  #- name: EL
-  #  versions:
-  #  - all
-  #  - 5
-  #  - 6
-  #  - 7
-  #- name: Windows
-  #  versions:
-  #  - all
-  #  - 2012R2
-  #- name: SmartOS
-  #  versions:
-  #  - all
-  #  - any
-  #- name: opensuse
-  #  versions:
-  #  - all
-  #  - 12.1
-  #  - 12.2
-  #  - 12.3
-  #  - 13.1
-  #  - 13.2
-  #- name: SLES
-  #  versions:
-  #  - all
-  #  - 10SP3
-  #  - 10SP4
-  #  - 11
-  #  - 11SP1
-  #  - 11SP2
-  #  - 11SP3
-  #  - 11SP4
-  #  - 12
-  #  - 12SP1
-  #- name: GenericUNIX
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Solaris
-  #  versions:
-  #  - all
-  #  - 10
-  #  - 11.0
-  #  - 11.1
-  #  - 11.2
-  #  - 11.3
-  #- name: eos
-  #  versions:
-  #  - all
-  #  - Any
-  
-  galaxy_tags: []
-    # List tags for your role here, one per line. A tag is
-    # a keyword that describes and categorizes the role.
-    # Users find roles by searching for tags. Be sure to
-    # remove the '[]' above if you add tags to this list.
-    #
-    # NOTE: A tag is limited to a single word comprised of
-    # alphanumeric characters. Maximum 20 tags per role.
-
-dependencies: []
-  # List your role dependencies here, one per line.
-  # Be sure to remove the '[]' above if you add dependencies
-  # to this list.
\ No newline at end of file
diff --git a/src/test/resources/roles/mecoshark/tasks/main.yml b/src/test/resources/roles/mecoshark/tasks/main.yml
deleted file mode 100644
index bdcc2f2f08cd3ed3f44540919951728e3b2b15bc..0000000000000000000000000000000000000000
--- a/src/test/resources/roles/mecoshark/tasks/main.yml
+++ /dev/null
@@ -1,98 +0,0 @@
-- block:
-  - name: enable ubuntu group
-    group: name=ubuntu state=present
-  - name: enable ubuntu user
-    user: name=ubuntu state=present shell=/bin/bash
-
-  - name: Installing required packages
-    apt: pkg=python3-pip state=installed force=yes
-    become_user: root
-
-
-  - name: Installing required packages
-    apt: pkg=python3-cffi state=installed force=yes
-    become_user: root
-
-
-  - name: Installing required packages
-    apt: pkg=git state=installed force=yes
-    become_user: root
-
-
-  - name: Installing required packages
-    become_user: root
-    apt: pkg=openjdk-8-jre-headless state=installed
-
-  - name: Installing required packages
-    become_user: root
-    apt: pkg=unzip state=installed
-
-  - name: Creating mecoshark folder
-    file: path=~/mecoshark state=directory
-
-  - name: Clone mecoSHARK repository
-    git:
-     repo: 'https://github.com/smartshark/mecoSHARK.git'
-     dest: ~/mecoshark
-     clone: yes
-     update: no
-    
-  - name: Pip install mecoSHARK
-    shell: pip3 install https://github.com/smartshark/mecoSHARK/zipball/master --process-dependency-links
-
-  - name: Upload sourcemeter
-    unarchive:
-      src: SourceMeter-8.2.0-x64-linux.tgz
-      dest: ~/
-      
-  when: task == "DEPLOY"
-  remote_user: "ubuntu"
-  become_user: ubuntu
-
-- block:
-  - name: Set JAVA HOME
-    become_user: root
-    lineinfile: 
-      dest: /etc/environment 
-      state: present 
-      regexp: '^JAVA_HOME'
-      line: 'JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64'
-
-  - name: Set LC_ALL
-    become_user: root
-    lineinfile: 
-      dest: /etc/environment 
-      state: present 
-      regexp: '^LC_ALL'
-      line: 'LC_ALL=en_US.UTF-8'
-
-  - name: Set LANG
-    become_user: root
-    lineinfile: 
-      dest: /etc/environment 
-      state: present 
-      regexp: '^LANG'
-      line: 'LANG=en_US.UTF-8'
-
-  - name: add /home/ubuntu/mecoshark/external/sloccount2.26 to path
-    become_user: root
-    lineinfile:
-     dest: /etc/environment
-     state: present
-     backrefs: yes
-     regexp: 'PATH=(["]*)((?!.*?/home/ubuntu/mecoshark/external/sloccount2.26).*?)(["]*)$'
-     line: 'PATH=\1\2:/home/ubuntu/mecoshark/external/sloccount2.26\3'
-
-  - name: Move sourcemeter
-    shell: cp -r /home/ubuntu/SourceMeter-8.2.0-x64-linux/ /home/ubuntu/mecoshark/external/sourcemeter/
-    
-  when: task == "CONFIGURE"
-  remote_user: ubuntu
-  become_user: "ubuntu"
- 
-- block:
-   - name: Test mecoSHARK
-     shell: echo "python3.6 ~/mecoshark/setup.py test"
-  when: task == "START"
-  remote_user: ubuntu
-  become_user: "ubuntu"
diff --git a/src/test/resources/roles/mecoshark/tests/inventory b/src/test/resources/roles/mecoshark/tests/inventory
deleted file mode 100644
index d18580b3c364645735235c667c2a546e28c273bb..0000000000000000000000000000000000000000
--- a/src/test/resources/roles/mecoshark/tests/inventory
+++ /dev/null
@@ -1 +0,0 @@
-localhost
\ No newline at end of file
diff --git a/src/test/resources/roles/mecoshark/tests/test.yml b/src/test/resources/roles/mecoshark/tests/test.yml
deleted file mode 100644
index 3784b47046aa8a9d0e8348ffce64f5458d4c3222..0000000000000000000000000000000000000000
--- a/src/test/resources/roles/mecoshark/tests/test.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-- hosts: localhost
-  remote_user: root
-  roles:
-    - pip
\ No newline at end of file
diff --git a/src/test/resources/roles/mecoshark/vars/main.yml b/src/test/resources/roles/mecoshark/vars/main.yml
deleted file mode 100644
index ec5619103c8e29013a93f20f461301c748f83c93..0000000000000000000000000000000000000000
--- a/src/test/resources/roles/mecoshark/vars/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# vars file for pip
diff --git a/src/test/resources/roles/mecosharkjob/README.md b/src/test/resources/roles/mecosharkjob/README.md
deleted file mode 100644
index 225dd44b9fc5b3abff7e9c68ff9e91d505cdd5f0..0000000000000000000000000000000000000000
--- a/src/test/resources/roles/mecosharkjob/README.md
+++ /dev/null
@@ -1,38 +0,0 @@
-Role Name
-=========
-
-A brief description of the role goes here.
-
-Requirements
-------------
-
-Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required.
-
-Role Variables
---------------
-
-A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well.
-
-Dependencies
-------------
-
-A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles.
-
-Example Playbook
-----------------
-
-Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
-
-    - hosts: servers
-      roles:
-         - { role: username.rolename, x: 42 }
-
-License
--------
-
-BSD
-
-Author Information
-------------------
-
-An optional section for the role authors to include contact information, or a website (HTML is not allowed).
diff --git a/src/test/resources/roles/mecosharkjob/defaults/main.yml b/src/test/resources/roles/mecosharkjob/defaults/main.yml
deleted file mode 100644
index 334c04601846cc2cd5413bd72e70e6a613e02023..0000000000000000000000000000000000000000
--- a/src/test/resources/roles/mecosharkjob/defaults/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# defaults file for vcsshark
diff --git a/src/test/resources/roles/mecosharkjob/handlers/main.yml b/src/test/resources/roles/mecosharkjob/handlers/main.yml
deleted file mode 100644
index c0feb823f5cb0b7edf3b99d28a363a4adb2a5917..0000000000000000000000000000000000000000
--- a/src/test/resources/roles/mecosharkjob/handlers/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# handlers file for vcsshark
diff --git a/src/test/resources/roles/mecosharkjob/meta/main.yml b/src/test/resources/roles/mecosharkjob/meta/main.yml
deleted file mode 100644
index 0a147082ea5084e910650dfbf9a9f0803931b6cb..0000000000000000000000000000000000000000
--- a/src/test/resources/roles/mecosharkjob/meta/main.yml
+++ /dev/null
@@ -1,246 +0,0 @@
-galaxy_info:
-  author: your name
-  description: 
-  company: your company (optional)
-  
-  # If the issue tracker for your role is not on github, uncomment the
-  # next line and provide a value
-  # issue_tracker_url: http://example.com/issue/tracker
-  
-  # Some suggested licenses:
-  # - BSD (default)
-  # - MIT
-  # - GPLv2
-  # - GPLv3
-  # - Apache
-  # - CC-BY
-  license: license (GPLv2, CC-BY, etc)
-  
-  min_ansible_version: 1.2
-
-  # Optionally specify the branch Galaxy will use when accessing the GitHub
-  # repo for this role. During role install, if no tags are available,
-  # Galaxy will use this branch. During import Galaxy will access files on
-  # this branch. If travis integration is cofigured, only notification for this
-  # branch will be accepted. Otherwise, in all cases, the repo's default branch
-  # (usually master) will be used.
-  #github_branch:
-  
-  #
-  # Below are all platforms currently available. Just uncomment
-  # the ones that apply to your role. If you don't see your
-  # platform on this list, let us know and we'll get it added!
-  #
-  #platforms:
-  #- name: OpenBSD
-  #  versions:
-  #  - all
-  #  - 5.6
-  #  - 5.7
-  #  - 5.8
-  #  - 5.9
-  #  - 6.0
-  #  - 6.1
-  #  - 6.2
-  #- name: Fedora
-  #  versions:
-  #  - all
-  #  - 16
-  #  - 17
-  #  - 18
-  #  - 19
-  #  - 20
-  #  - 21
-  #  - 22
-  #  - 23
-  #  - 24
-  #  - 25
-  #  - 26
-  #  - 27
-  #- name: DellOS
-  #  versions:
-  #  - all
-  #  - 10
-  #  - 6
-  #  - 9
-  #- name: MacOSX
-  #  versions:
-  #  - all
-  #  - 10.10
-  #  - 10.11
-  #  - 10.12
-  #  - 10.7
-  #  - 10.8
-  #  - 10.9
-  #- name: Synology
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Junos
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Cumulus
-  #  versions:
-  #  - all
-  #  - 2.5
-  #  - 3.0
-  #  - 3.1
-  #  - 3.2
-  #  - 3.3
-  #  - 3.4
-  #  - 3.5
-  #- name: GenericBSD
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Void Linux
-  #  versions:
-  #  - all
-  #  - any
-  #- name: GenericLinux
-  #  versions:
-  #  - all
-  #  - any
-  #- name: NXOS
-  #  versions:
-  #  - all
-  #  - any
-  #- name: macOS
-  #  versions:
-  #  - all
-  #  - Sierra
-  #- name: IOS
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Amazon
-  #  versions:
-  #  - all
-  #  - 2013.03
-  #  - 2013.09
-  #  - 2016.03
-  #  - 2016.09
-  #- name: ArchLinux
-  #  versions:
-  #  - all
-  #  - any
-  #- name: FreeBSD
-  #  versions:
-  #  - all
-  #  - 10.0
-  #  - 10.1
-  #  - 10.2
-  #  - 10.3
-  #  - 10.4
-  #  - 11.0
-  #  - 11.1
-  #  - 8.0
-  #  - 8.1
-  #  - 8.2
-  #  - 8.3
-  #  - 8.4
-  #  - 9.0
-  #  - 9.1
-  #  - 9.1
-  #  - 9.2
-  #  - 9.3
-  #- name: Ubuntu
-  #  versions:
-  #  - all
-  #  - artful
-  #  - bionic
-  #  - lucid
-  #  - maverick
-  #  - natty
-  #  - oneiric
-  #  - precise
-  #  - quantal
-  #  - raring
-  #  - saucy
-  #  - trusty
-  #  - utopic
-  #  - vivid
-  #  - wily
-  #  - xenial
-  #  - yakkety
-  #  - zesty
-  #- name: Debian
-  #  versions:
-  #  - all
-  #  - buster
-  #  - etch
-  #  - jessie
-  #  - lenny
-  #  - sid
-  #  - squeeze
-  #  - stretch
-  #  - wheezy
-  #- name: Alpine
-  #  versions:
-  #  - all
-  #  - any
-  #- name: EL
-  #  versions:
-  #  - all
-  #  - 5
-  #  - 6
-  #  - 7
-  #- name: Windows
-  #  versions:
-  #  - all
-  #  - 2012R2
-  #- name: SmartOS
-  #  versions:
-  #  - all
-  #  - any
-  #- name: opensuse
-  #  versions:
-  #  - all
-  #  - 12.1
-  #  - 12.2
-  #  - 12.3
-  #  - 13.1
-  #  - 13.2
-  #- name: SLES
-  #  versions:
-  #  - all
-  #  - 10SP3
-  #  - 10SP4
-  #  - 11
-  #  - 11SP1
-  #  - 11SP2
-  #  - 11SP3
-  #  - 11SP4
-  #  - 12
-  #  - 12SP1
-  #- name: GenericUNIX
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Solaris
-  #  versions:
-  #  - all
-  #  - 10
-  #  - 11.0
-  #  - 11.1
-  #  - 11.2
-  #  - 11.3
-  #- name: eos
-  #  versions:
-  #  - all
-  #  - Any
-  
-  galaxy_tags: []
-    # List tags for your role here, one per line. A tag is
-    # a keyword that describes and categorizes the role.
-    # Users find roles by searching for tags. Be sure to
-    # remove the '[]' above if you add tags to this list.
-    #
-    # NOTE: A tag is limited to a single word comprised of
-    # alphanumeric characters. Maximum 20 tags per role.
-
-dependencies: []
-  # List your role dependencies here, one per line.
-  # Be sure to remove the '[]' above if you add dependencies
-  # to this list.
\ No newline at end of file
diff --git a/src/test/resources/roles/mecosharkjob/tasks/main.yml b/src/test/resources/roles/mecosharkjob/tasks/main.yml
deleted file mode 100644
index 597ac8f3647a2c01e2b067c6828477744a6d66c4..0000000000000000000000000000000000000000
--- a/src/test/resources/roles/mecosharkjob/tasks/main.yml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-# tasks file for vcsshark
-- block:
-  - name: enable ubuntu group
-    group: name=ubuntu state=present
-
-  - name: enable ubuntu user
-    user: name=ubuntu state=present shell=/bin/bash
-
-  - name: Deploy mecoSHARK Job
-    shell: echo "Insert part for deployment here."
-  when: task == "DEPLOY"
-  remote_user: ubuntu
-  become_user: ubuntu
-
-- block:
-  - name: Executing help as check
-    shell: python3.6 ~/mecoshark/main.py --help
-
-  - name: Create outdir
-    file: path={{ tempdirpath }} state=directory
-
-  when: task == "CONFIGURE"
-  remote_user: ubuntu
-  become_user: ubuntu
- 
-- block:
-  - name: Start mecoSHARK
-    shell: python3.6 ~/mecoshark/main.py -i ~/{{ projectname }} --db-database {{ mongodb }} -o {{ tempdirpath }} -r {{ revision }}  -u {{ projectrepo }}
-  when: task == "START"
-  become_user: "ubuntu"
-  remote_user: ubuntu
diff --git a/src/test/resources/roles/mecosharkjob/tests/inventory b/src/test/resources/roles/mecosharkjob/tests/inventory
deleted file mode 100644
index d18580b3c364645735235c667c2a546e28c273bb..0000000000000000000000000000000000000000
--- a/src/test/resources/roles/mecosharkjob/tests/inventory
+++ /dev/null
@@ -1 +0,0 @@
-localhost
\ No newline at end of file
diff --git a/src/test/resources/roles/mecosharkjob/tests/test.yml b/src/test/resources/roles/mecosharkjob/tests/test.yml
deleted file mode 100644
index 1cada8756ea6df9f039deff0f74baf523d039528..0000000000000000000000000000000000000000
--- a/src/test/resources/roles/mecosharkjob/tests/test.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-- hosts: localhost
-  remote_user: root
-  roles:
-    - vcsshark
diff --git a/src/test/resources/roles/mecosharkjob/vars/main.yml b/src/test/resources/roles/mecosharkjob/vars/main.yml
deleted file mode 100644
index 681202b0e8d16621e7a16c37bc249df824690c61..0000000000000000000000000000000000000000
--- a/src/test/resources/roles/mecosharkjob/vars/main.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-# vars file for vcsshark
-projectrepo: https://github.com/openintents/safe.git
-#https://github.com/checkstyle/checkstyle.git
-projectname: safe
-#checkstyle
-mongodb: vcsshark
-mongolocation: localhost
-tempdirpath: ~/temp
-revision: f582d1017be3a2df16ca64fce38a97416a6cbad7
diff --git a/src/test/resources/roles/memeshark/README.md b/src/test/resources/roles/memeshark/README.md
deleted file mode 100644
index 225dd44b9fc5b3abff7e9c68ff9e91d505cdd5f0..0000000000000000000000000000000000000000
--- a/src/test/resources/roles/memeshark/README.md
+++ /dev/null
@@ -1,38 +0,0 @@
-Role Name
-=========
-
-A brief description of the role goes here.
-
-Requirements
-------------
-
-Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required.
-
-Role Variables
---------------
-
-A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well.
-
-Dependencies
-------------
-
-A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles.
-
-Example Playbook
-----------------
-
-Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
-
-    - hosts: servers
-      roles:
-         - { role: username.rolename, x: 42 }
-
-License
--------
-
-BSD
-
-Author Information
-------------------
-
-An optional section for the role authors to include contact information, or a website (HTML is not allowed).
diff --git a/src/test/resources/roles/memeshark/defaults/main.yml b/src/test/resources/roles/memeshark/defaults/main.yml
deleted file mode 100644
index 672d0f5d3949e64ffc2dc69b8f8d7990619ee81c..0000000000000000000000000000000000000000
--- a/src/test/resources/roles/memeshark/defaults/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# defaults file for pip
diff --git a/src/test/resources/roles/memeshark/handlers/main.yml b/src/test/resources/roles/memeshark/handlers/main.yml
deleted file mode 100644
index 03bcffc54748da1c510e19dc87476d874440eff1..0000000000000000000000000000000000000000
--- a/src/test/resources/roles/memeshark/handlers/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# handlers file for pip
diff --git a/src/test/resources/roles/memeshark/meta/main.yml b/src/test/resources/roles/memeshark/meta/main.yml
deleted file mode 100644
index 0a147082ea5084e910650dfbf9a9f0803931b6cb..0000000000000000000000000000000000000000
--- a/src/test/resources/roles/memeshark/meta/main.yml
+++ /dev/null
@@ -1,246 +0,0 @@
-galaxy_info:
-  author: your name
-  description: 
-  company: your company (optional)
-  
-  # If the issue tracker for your role is not on github, uncomment the
-  # next line and provide a value
-  # issue_tracker_url: http://example.com/issue/tracker
-  
-  # Some suggested licenses:
-  # - BSD (default)
-  # - MIT
-  # - GPLv2
-  # - GPLv3
-  # - Apache
-  # - CC-BY
-  license: license (GPLv2, CC-BY, etc)
-  
-  min_ansible_version: 1.2
-
-  # Optionally specify the branch Galaxy will use when accessing the GitHub
-  # repo for this role. During role install, if no tags are available,
-  # Galaxy will use this branch. During import Galaxy will access files on
-  # this branch. If travis integration is cofigured, only notification for this
-  # branch will be accepted. Otherwise, in all cases, the repo's default branch
-  # (usually master) will be used.
-  #github_branch:
-  
-  #
-  # Below are all platforms currently available. Just uncomment
-  # the ones that apply to your role. If you don't see your
-  # platform on this list, let us know and we'll get it added!
-  #
-  #platforms:
-  #- name: OpenBSD
-  #  versions:
-  #  - all
-  #  - 5.6
-  #  - 5.7
-  #  - 5.8
-  #  - 5.9
-  #  - 6.0
-  #  - 6.1
-  #  - 6.2
-  #- name: Fedora
-  #  versions:
-  #  - all
-  #  - 16
-  #  - 17
-  #  - 18
-  #  - 19
-  #  - 20
-  #  - 21
-  #  - 22
-  #  - 23
-  #  - 24
-  #  - 25
-  #  - 26
-  #  - 27
-  #- name: DellOS
-  #  versions:
-  #  - all
-  #  - 10
-  #  - 6
-  #  - 9
-  #- name: MacOSX
-  #  versions:
-  #  - all
-  #  - 10.10
-  #  - 10.11
-  #  - 10.12
-  #  - 10.7
-  #  - 10.8
-  #  - 10.9
-  #- name: Synology
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Junos
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Cumulus
-  #  versions:
-  #  - all
-  #  - 2.5
-  #  - 3.0
-  #  - 3.1
-  #  - 3.2
-  #  - 3.3
-  #  - 3.4
-  #  - 3.5
-  #- name: GenericBSD
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Void Linux
-  #  versions:
-  #  - all
-  #  - any
-  #- name: GenericLinux
-  #  versions:
-  #  - all
-  #  - any
-  #- name: NXOS
-  #  versions:
-  #  - all
-  #  - any
-  #- name: macOS
-  #  versions:
-  #  - all
-  #  - Sierra
-  #- name: IOS
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Amazon
-  #  versions:
-  #  - all
-  #  - 2013.03
-  #  - 2013.09
-  #  - 2016.03
-  #  - 2016.09
-  #- name: ArchLinux
-  #  versions:
-  #  - all
-  #  - any
-  #- name: FreeBSD
-  #  versions:
-  #  - all
-  #  - 10.0
-  #  - 10.1
-  #  - 10.2
-  #  - 10.3
-  #  - 10.4
-  #  - 11.0
-  #  - 11.1
-  #  - 8.0
-  #  - 8.1
-  #  - 8.2
-  #  - 8.3
-  #  - 8.4
-  #  - 9.0
-  #  - 9.1
-  #  - 9.1
-  #  - 9.2
-  #  - 9.3
-  #- name: Ubuntu
-  #  versions:
-  #  - all
-  #  - artful
-  #  - bionic
-  #  - lucid
-  #  - maverick
-  #  - natty
-  #  - oneiric
-  #  - precise
-  #  - quantal
-  #  - raring
-  #  - saucy
-  #  - trusty
-  #  - utopic
-  #  - vivid
-  #  - wily
-  #  - xenial
-  #  - yakkety
-  #  - zesty
-  #- name: Debian
-  #  versions:
-  #  - all
-  #  - buster
-  #  - etch
-  #  - jessie
-  #  - lenny
-  #  - sid
-  #  - squeeze
-  #  - stretch
-  #  - wheezy
-  #- name: Alpine
-  #  versions:
-  #  - all
-  #  - any
-  #- name: EL
-  #  versions:
-  #  - all
-  #  - 5
-  #  - 6
-  #  - 7
-  #- name: Windows
-  #  versions:
-  #  - all
-  #  - 2012R2
-  #- name: SmartOS
-  #  versions:
-  #  - all
-  #  - any
-  #- name: opensuse
-  #  versions:
-  #  - all
-  #  - 12.1
-  #  - 12.2
-  #  - 12.3
-  #  - 13.1
-  #  - 13.2
-  #- name: SLES
-  #  versions:
-  #  - all
-  #  - 10SP3
-  #  - 10SP4
-  #  - 11
-  #  - 11SP1
-  #  - 11SP2
-  #  - 11SP3
-  #  - 11SP4
-  #  - 12
-  #  - 12SP1
-  #- name: GenericUNIX
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Solaris
-  #  versions:
-  #  - all
-  #  - 10
-  #  - 11.0
-  #  - 11.1
-  #  - 11.2
-  #  - 11.3
-  #- name: eos
-  #  versions:
-  #  - all
-  #  - Any
-  
-  galaxy_tags: []
-    # List tags for your role here, one per line. A tag is
-    # a keyword that describes and categorizes the role.
-    # Users find roles by searching for tags. Be sure to
-    # remove the '[]' above if you add tags to this list.
-    #
-    # NOTE: A tag is limited to a single word comprised of
-    # alphanumeric characters. Maximum 20 tags per role.
-
-dependencies: []
-  # List your role dependencies here, one per line.
-  # Be sure to remove the '[]' above if you add dependencies
-  # to this list.
\ No newline at end of file
diff --git a/src/test/resources/roles/memeshark/tasks/main.yml b/src/test/resources/roles/memeshark/tasks/main.yml
deleted file mode 100644
index 02ea9b5c793ccf95a49f2cad59ddf8f37b0024a4..0000000000000000000000000000000000000000
--- a/src/test/resources/roles/memeshark/tasks/main.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-- block:
-  - name: enable ubuntu group
-    group: name=ubuntu state=present
-  - name: enable ubuntu user
-    user: name=ubuntu state=present shell=/bin/bash
-
-  - name: Installing required packages
-    apt: pkg=python3-pip state=installed force=yes
-    become_user: root
-
-
-  - name: Installing required packages
-    apt: pkg=python3-cffi state=installed force=yes
-    become_user: root
-
-  - name: Installing required packages
-    apt: pkg=git state=installed force=yes
-    become_user: root
-
-  - name: Installing required packages
-    apt: pkg=openjdk-8-jre-headless state=installed
-    become_user: root
-
-  - name: Creating memeshark folder
-    file: path=~/memeshark state=directory
-
-  - name: Clone memeSHARK repository
-    git:
-     repo: 'https://github.com/smartshark/memeSHARK.git'
-     dest: ~/memeshark
-     clone: yes
-     update: no
-    
-  - name: Pip install memeSHARK
-    shell: pip3 install https://github.com/smartshark/memeSHARK/zipball/master --process-dependency-links
-      
-  when: task == "DEPLOY"
-  remote_user: "ubuntu"
-  become_user: ubuntu
-
-- block:
-  - name: Configure memeSHARK
-    shell: echo "Configure"
-    
-  when: task == "CONFIGURE"
-  remote_user: ubuntu
-  become_user: "ubuntu"
- 
-- block:
-   - name: Test mecoSHARK
-     shell: echo "python3.6 ~/memeshark/main.py"
-  when: task == "START"
-  remote_user: ubuntu
-  become_user: "ubuntu"
diff --git a/src/test/resources/roles/memeshark/tests/inventory b/src/test/resources/roles/memeshark/tests/inventory
deleted file mode 100644
index d18580b3c364645735235c667c2a546e28c273bb..0000000000000000000000000000000000000000
--- a/src/test/resources/roles/memeshark/tests/inventory
+++ /dev/null
@@ -1 +0,0 @@
-localhost
\ No newline at end of file
diff --git a/src/test/resources/roles/memeshark/tests/test.yml b/src/test/resources/roles/memeshark/tests/test.yml
deleted file mode 100644
index 3784b47046aa8a9d0e8348ffce64f5458d4c3222..0000000000000000000000000000000000000000
--- a/src/test/resources/roles/memeshark/tests/test.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-- hosts: localhost
-  remote_user: root
-  roles:
-    - pip
\ No newline at end of file
diff --git a/src/test/resources/roles/memeshark/vars/main.yml b/src/test/resources/roles/memeshark/vars/main.yml
deleted file mode 100644
index ec5619103c8e29013a93f20f461301c748f83c93..0000000000000000000000000000000000000000
--- a/src/test/resources/roles/memeshark/vars/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# vars file for pip
diff --git a/src/test/resources/roles/memesharkjob/README.md b/src/test/resources/roles/memesharkjob/README.md
deleted file mode 100644
index 225dd44b9fc5b3abff7e9c68ff9e91d505cdd5f0..0000000000000000000000000000000000000000
--- a/src/test/resources/roles/memesharkjob/README.md
+++ /dev/null
@@ -1,38 +0,0 @@
-Role Name
-=========
-
-A brief description of the role goes here.
-
-Requirements
-------------
-
-Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required.
-
-Role Variables
---------------
-
-A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well.
-
-Dependencies
-------------
-
-A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles.
-
-Example Playbook
-----------------
-
-Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
-
-    - hosts: servers
-      roles:
-         - { role: username.rolename, x: 42 }
-
-License
--------
-
-BSD
-
-Author Information
-------------------
-
-An optional section for the role authors to include contact information, or a website (HTML is not allowed).
diff --git a/src/test/resources/roles/memesharkjob/defaults/main.yml b/src/test/resources/roles/memesharkjob/defaults/main.yml
deleted file mode 100644
index 334c04601846cc2cd5413bd72e70e6a613e02023..0000000000000000000000000000000000000000
--- a/src/test/resources/roles/memesharkjob/defaults/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# defaults file for vcsshark
diff --git a/src/test/resources/roles/memesharkjob/handlers/main.yml b/src/test/resources/roles/memesharkjob/handlers/main.yml
deleted file mode 100644
index c0feb823f5cb0b7edf3b99d28a363a4adb2a5917..0000000000000000000000000000000000000000
--- a/src/test/resources/roles/memesharkjob/handlers/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# handlers file for vcsshark
diff --git a/src/test/resources/roles/memesharkjob/meta/main.yml b/src/test/resources/roles/memesharkjob/meta/main.yml
deleted file mode 100644
index 0a147082ea5084e910650dfbf9a9f0803931b6cb..0000000000000000000000000000000000000000
--- a/src/test/resources/roles/memesharkjob/meta/main.yml
+++ /dev/null
@@ -1,246 +0,0 @@
-galaxy_info:
-  author: your name
-  description: 
-  company: your company (optional)
-  
-  # If the issue tracker for your role is not on github, uncomment the
-  # next line and provide a value
-  # issue_tracker_url: http://example.com/issue/tracker
-  
-  # Some suggested licenses:
-  # - BSD (default)
-  # - MIT
-  # - GPLv2
-  # - GPLv3
-  # - Apache
-  # - CC-BY
-  license: license (GPLv2, CC-BY, etc)
-  
-  min_ansible_version: 1.2
-
-  # Optionally specify the branch Galaxy will use when accessing the GitHub
-  # repo for this role. During role install, if no tags are available,
-  # Galaxy will use this branch. During import Galaxy will access files on
-  # this branch. If travis integration is cofigured, only notification for this
-  # branch will be accepted. Otherwise, in all cases, the repo's default branch
-  # (usually master) will be used.
-  #github_branch:
-  
-  #
-  # Below are all platforms currently available. Just uncomment
-  # the ones that apply to your role. If you don't see your
-  # platform on this list, let us know and we'll get it added!
-  #
-  #platforms:
-  #- name: OpenBSD
-  #  versions:
-  #  - all
-  #  - 5.6
-  #  - 5.7
-  #  - 5.8
-  #  - 5.9
-  #  - 6.0
-  #  - 6.1
-  #  - 6.2
-  #- name: Fedora
-  #  versions:
-  #  - all
-  #  - 16
-  #  - 17
-  #  - 18
-  #  - 19
-  #  - 20
-  #  - 21
-  #  - 22
-  #  - 23
-  #  - 24
-  #  - 25
-  #  - 26
-  #  - 27
-  #- name: DellOS
-  #  versions:
-  #  - all
-  #  - 10
-  #  - 6
-  #  - 9
-  #- name: MacOSX
-  #  versions:
-  #  - all
-  #  - 10.10
-  #  - 10.11
-  #  - 10.12
-  #  - 10.7
-  #  - 10.8
-  #  - 10.9
-  #- name: Synology
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Junos
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Cumulus
-  #  versions:
-  #  - all
-  #  - 2.5
-  #  - 3.0
-  #  - 3.1
-  #  - 3.2
-  #  - 3.3
-  #  - 3.4
-  #  - 3.5
-  #- name: GenericBSD
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Void Linux
-  #  versions:
-  #  - all
-  #  - any
-  #- name: GenericLinux
-  #  versions:
-  #  - all
-  #  - any
-  #- name: NXOS
-  #  versions:
-  #  - all
-  #  - any
-  #- name: macOS
-  #  versions:
-  #  - all
-  #  - Sierra
-  #- name: IOS
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Amazon
-  #  versions:
-  #  - all
-  #  - 2013.03
-  #  - 2013.09
-  #  - 2016.03
-  #  - 2016.09
-  #- name: ArchLinux
-  #  versions:
-  #  - all
-  #  - any
-  #- name: FreeBSD
-  #  versions:
-  #  - all
-  #  - 10.0
-  #  - 10.1
-  #  - 10.2
-  #  - 10.3
-  #  - 10.4
-  #  - 11.0
-  #  - 11.1
-  #  - 8.0
-  #  - 8.1
-  #  - 8.2
-  #  - 8.3
-  #  - 8.4
-  #  - 9.0
-  #  - 9.1
-  #  - 9.1
-  #  - 9.2
-  #  - 9.3
-  #- name: Ubuntu
-  #  versions:
-  #  - all
-  #  - artful
-  #  - bionic
-  #  - lucid
-  #  - maverick
-  #  - natty
-  #  - oneiric
-  #  - precise
-  #  - quantal
-  #  - raring
-  #  - saucy
-  #  - trusty
-  #  - utopic
-  #  - vivid
-  #  - wily
-  #  - xenial
-  #  - yakkety
-  #  - zesty
-  #- name: Debian
-  #  versions:
-  #  - all
-  #  - buster
-  #  - etch
-  #  - jessie
-  #  - lenny
-  #  - sid
-  #  - squeeze
-  #  - stretch
-  #  - wheezy
-  #- name: Alpine
-  #  versions:
-  #  - all
-  #  - any
-  #- name: EL
-  #  versions:
-  #  - all
-  #  - 5
-  #  - 6
-  #  - 7
-  #- name: Windows
-  #  versions:
-  #  - all
-  #  - 2012R2
-  #- name: SmartOS
-  #  versions:
-  #  - all
-  #  - any
-  #- name: opensuse
-  #  versions:
-  #  - all
-  #  - 12.1
-  #  - 12.2
-  #  - 12.3
-  #  - 13.1
-  #  - 13.2
-  #- name: SLES
-  #  versions:
-  #  - all
-  #  - 10SP3
-  #  - 10SP4
-  #  - 11
-  #  - 11SP1
-  #  - 11SP2
-  #  - 11SP3
-  #  - 11SP4
-  #  - 12
-  #  - 12SP1
-  #- name: GenericUNIX
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Solaris
-  #  versions:
-  #  - all
-  #  - 10
-  #  - 11.0
-  #  - 11.1
-  #  - 11.2
-  #  - 11.3
-  #- name: eos
-  #  versions:
-  #  - all
-  #  - Any
-  
-  galaxy_tags: []
-    # List tags for your role here, one per line. A tag is
-    # a keyword that describes and categorizes the role.
-    # Users find roles by searching for tags. Be sure to
-    # remove the '[]' above if you add tags to this list.
-    #
-    # NOTE: A tag is limited to a single word comprised of
-    # alphanumeric characters. Maximum 20 tags per role.
-
-dependencies: []
-  # List your role dependencies here, one per line.
-  # Be sure to remove the '[]' above if you add dependencies
-  # to this list.
\ No newline at end of file
diff --git a/src/test/resources/roles/memesharkjob/tasks/main.yml b/src/test/resources/roles/memesharkjob/tasks/main.yml
deleted file mode 100644
index f4a6dea71ac8bb01947e40ecc9ac8499f6dce5e9..0000000000000000000000000000000000000000
--- a/src/test/resources/roles/memesharkjob/tasks/main.yml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-# tasks file for vcsshark
-- block:
-  - name: enable ubuntu group
-    group: name=ubuntu state=present
-
-  - name: enable ubuntu user
-    user: name=ubuntu state=present shell=/bin/bash
-
-  - name: Deploy memeSHARK Job
-    shell: echo "Insert part for deployment here."
-  when: task == "DEPLOY"
-  remote_user: ubuntu
-  become_user: ubuntu
-
-- block:
-  - name: Executing check
-    shell: echo "python3.6 ~/memeshark/memeshark.py"
-  when: task == "CONFIGURE"
-  remote_user: ubuntu
-  become_user: ubuntu
- 
-- block:
-  - name: Start memeSHARK
-    shell: python3.6 ~/memeshark/main.py -n {{ projectname }} -D {{ mongodb }} -H {{ mongolocation }} -p 27017
-  when: task == "START"
-  become_user: "ubuntu"
-  remote_user: ubuntu
diff --git a/src/test/resources/roles/memesharkjob/tests/inventory b/src/test/resources/roles/memesharkjob/tests/inventory
deleted file mode 100644
index d18580b3c364645735235c667c2a546e28c273bb..0000000000000000000000000000000000000000
--- a/src/test/resources/roles/memesharkjob/tests/inventory
+++ /dev/null
@@ -1 +0,0 @@
-localhost
\ No newline at end of file
diff --git a/src/test/resources/roles/memesharkjob/tests/test.yml b/src/test/resources/roles/memesharkjob/tests/test.yml
deleted file mode 100644
index 1cada8756ea6df9f039deff0f74baf523d039528..0000000000000000000000000000000000000000
--- a/src/test/resources/roles/memesharkjob/tests/test.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-- hosts: localhost
-  remote_user: root
-  roles:
-    - vcsshark
diff --git a/src/test/resources/roles/memesharkjob/vars/main.yml b/src/test/resources/roles/memesharkjob/vars/main.yml
deleted file mode 100644
index 769304137376957497316093d5cfed3b0800f33a..0000000000000000000000000000000000000000
--- a/src/test/resources/roles/memesharkjob/vars/main.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-# vars file for vcsshark
-projectpath: ~/safe
-projectname: safe
-#checkstyle
-mongodb: vcsshark
-mongolocation: localhost
diff --git a/src/test/resources/roles/memprocessor/tasks/main.yml b/src/test/resources/roles/memprocessor/tasks/main.yml
index 7b8ef23efe5a9868e003b3c0b07383cf8e6e8dfb..08c606e4a141f1f91e393a5e9d0fd98577f3fe70 100644
--- a/src/test/resources/roles/memprocessor/tasks/main.yml
+++ b/src/test/resources/roles/memprocessor/tasks/main.yml
@@ -19,7 +19,7 @@
 - name: Start MemProcessor
   block:
   - name: Execute processor script
-    command: start-stop-daemon --start --startas /home/ubuntu/memprocessor.sh {{ gatherer_address }} -m --pidfile /run/memprocessor.pid -b
+    command: start-stop-daemon --start --startas /home/ubuntu/memprocessor.sh 100.254.1.35 -m --pidfile /run/memprocessor.pid -b
   when: task == "START"
   become_user: root
   
diff --git a/src/test/resources/roles/mempublisher/files/mempublisher.sh b/src/test/resources/roles/mempublisher/files/mempublisher.sh
index 6b10a6de071ce1aeed2c4334daf76af669d64054..dbaab32e81521cbf8f7db4b152908fe08a4a52e1 100644
--- a/src/test/resources/roles/mempublisher/files/mempublisher.sh
+++ b/src/test/resources/roles/mempublisher/files/mempublisher.sh
@@ -52,7 +52,7 @@ while true; do
     else
       echo "New state reached: $state"
       echo "Publishing new results"
-      curl -v -X PUT http://"$endpoint""$propid" -H 'Content-Type: text/occi'  -H 'Category: monitoringproperty; scheme="http://schemas.ugoe.cs.rwm/monitoring#"; class="kind"'  -H 'X-OCCI-Attribute:occi.core.source="'$sensor'",occi.core.target="'$propresource'", occi.core.title="monProp", monitoring.property.value="'$state'", monitoring.property.name="'$propname'"' 
+      curl -v -X PUT http://"$endpoint""$propid" -H 'Content-Type: text/occi'  -H 'Category: monitorableproperty; scheme="http://schemas.ugoe.cs.rwm/monitoring#"; class="kind"'  -H 'X-OCCI-Attribute:occi.core.source="'$sensor'",occi.core.target="'$propresource'", occi.core.title="monProp", monitoring.property="'$state'", monitoring.property.result="'$propname'"' 
       oldstate=$state
     fi
     sleep $sequence
diff --git a/src/test/resources/roles/mempublisher/tasks/main.yml b/src/test/resources/roles/mempublisher/tasks/main.yml
index ac66d2e1a72928da21d23f87d223fa20c57449b4..dee3b22cdafeb0705851e84ff04e6601bade7609 100644
--- a/src/test/resources/roles/mempublisher/tasks/main.yml
+++ b/src/test/resources/roles/mempublisher/tasks/main.yml
@@ -23,7 +23,7 @@
 - name: Start MemPublisher
   block:
   - name: Execute mempublisher script
-    command: start-stop-daemon --start --startas /home/ubuntu/mempublisher.sh {{ publisher_endpoint }} {{ monitoring_property_resource }} {{ monitoring_property_name }} {{ sensor }} {{ monitoring_property_id }} -m --pidfile /run/mempublisher.pid -b
+    command: start-stop-daemon --start --startas /home/ubuntu/mempublisher.sh {{ result_provider_endpoint }} {{ monitorable_property_target }} {{ monitorable_property_property }} {{ sensor }} {{ monitorable_property }} -m --pidfile /run/mempublisher.pid -b
   when: task == "START"
   become_user: root
   
@@ -36,7 +36,7 @@
 
 - name: Undeploy MemPublisher
   block:
-  - debug: msg="Attributes {{ publisher_endpoint }} {{ monitoring_property_resource }} {{ monitoring_property_name }}."
+  - debug: msg="To be implemented."
   when: task == "UNDEPLOY"
   become_user: root
 
diff --git a/src/test/resources/roles/mongodb/README.md b/src/test/resources/roles/mongodb/README.md
deleted file mode 100644
index 225dd44b9fc5b3abff7e9c68ff9e91d505cdd5f0..0000000000000000000000000000000000000000
--- a/src/test/resources/roles/mongodb/README.md
+++ /dev/null
@@ -1,38 +0,0 @@
-Role Name
-=========
-
-A brief description of the role goes here.
-
-Requirements
-------------
-
-Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required.
-
-Role Variables
---------------
-
-A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well.
-
-Dependencies
-------------
-
-A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles.
-
-Example Playbook
-----------------
-
-Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
-
-    - hosts: servers
-      roles:
-         - { role: username.rolename, x: 42 }
-
-License
--------
-
-BSD
-
-Author Information
-------------------
-
-An optional section for the role authors to include contact information, or a website (HTML is not allowed).
diff --git a/src/test/resources/roles/mongodb/defaults/main.yml b/src/test/resources/roles/mongodb/defaults/main.yml
deleted file mode 100644
index 334c04601846cc2cd5413bd72e70e6a613e02023..0000000000000000000000000000000000000000
--- a/src/test/resources/roles/mongodb/defaults/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# defaults file for vcsshark
diff --git a/src/test/resources/roles/mongodb/handlers/main.yml b/src/test/resources/roles/mongodb/handlers/main.yml
deleted file mode 100644
index c0feb823f5cb0b7edf3b99d28a363a4adb2a5917..0000000000000000000000000000000000000000
--- a/src/test/resources/roles/mongodb/handlers/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# handlers file for vcsshark
diff --git a/src/test/resources/roles/mongodb/meta/main.yml b/src/test/resources/roles/mongodb/meta/main.yml
deleted file mode 100644
index 0a147082ea5084e910650dfbf9a9f0803931b6cb..0000000000000000000000000000000000000000
--- a/src/test/resources/roles/mongodb/meta/main.yml
+++ /dev/null
@@ -1,246 +0,0 @@
-galaxy_info:
-  author: your name
-  description: 
-  company: your company (optional)
-  
-  # If the issue tracker for your role is not on github, uncomment the
-  # next line and provide a value
-  # issue_tracker_url: http://example.com/issue/tracker
-  
-  # Some suggested licenses:
-  # - BSD (default)
-  # - MIT
-  # - GPLv2
-  # - GPLv3
-  # - Apache
-  # - CC-BY
-  license: license (GPLv2, CC-BY, etc)
-  
-  min_ansible_version: 1.2
-
-  # Optionally specify the branch Galaxy will use when accessing the GitHub
-  # repo for this role. During role install, if no tags are available,
-  # Galaxy will use this branch. During import Galaxy will access files on
-  # this branch. If travis integration is cofigured, only notification for this
-  # branch will be accepted. Otherwise, in all cases, the repo's default branch
-  # (usually master) will be used.
-  #github_branch:
-  
-  #
-  # Below are all platforms currently available. Just uncomment
-  # the ones that apply to your role. If you don't see your
-  # platform on this list, let us know and we'll get it added!
-  #
-  #platforms:
-  #- name: OpenBSD
-  #  versions:
-  #  - all
-  #  - 5.6
-  #  - 5.7
-  #  - 5.8
-  #  - 5.9
-  #  - 6.0
-  #  - 6.1
-  #  - 6.2
-  #- name: Fedora
-  #  versions:
-  #  - all
-  #  - 16
-  #  - 17
-  #  - 18
-  #  - 19
-  #  - 20
-  #  - 21
-  #  - 22
-  #  - 23
-  #  - 24
-  #  - 25
-  #  - 26
-  #  - 27
-  #- name: DellOS
-  #  versions:
-  #  - all
-  #  - 10
-  #  - 6
-  #  - 9
-  #- name: MacOSX
-  #  versions:
-  #  - all
-  #  - 10.10
-  #  - 10.11
-  #  - 10.12
-  #  - 10.7
-  #  - 10.8
-  #  - 10.9
-  #- name: Synology
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Junos
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Cumulus
-  #  versions:
-  #  - all
-  #  - 2.5
-  #  - 3.0
-  #  - 3.1
-  #  - 3.2
-  #  - 3.3
-  #  - 3.4
-  #  - 3.5
-  #- name: GenericBSD
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Void Linux
-  #  versions:
-  #  - all
-  #  - any
-  #- name: GenericLinux
-  #  versions:
-  #  - all
-  #  - any
-  #- name: NXOS
-  #  versions:
-  #  - all
-  #  - any
-  #- name: macOS
-  #  versions:
-  #  - all
-  #  - Sierra
-  #- name: IOS
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Amazon
-  #  versions:
-  #  - all
-  #  - 2013.03
-  #  - 2013.09
-  #  - 2016.03
-  #  - 2016.09
-  #- name: ArchLinux
-  #  versions:
-  #  - all
-  #  - any
-  #- name: FreeBSD
-  #  versions:
-  #  - all
-  #  - 10.0
-  #  - 10.1
-  #  - 10.2
-  #  - 10.3
-  #  - 10.4
-  #  - 11.0
-  #  - 11.1
-  #  - 8.0
-  #  - 8.1
-  #  - 8.2
-  #  - 8.3
-  #  - 8.4
-  #  - 9.0
-  #  - 9.1
-  #  - 9.1
-  #  - 9.2
-  #  - 9.3
-  #- name: Ubuntu
-  #  versions:
-  #  - all
-  #  - artful
-  #  - bionic
-  #  - lucid
-  #  - maverick
-  #  - natty
-  #  - oneiric
-  #  - precise
-  #  - quantal
-  #  - raring
-  #  - saucy
-  #  - trusty
-  #  - utopic
-  #  - vivid
-  #  - wily
-  #  - xenial
-  #  - yakkety
-  #  - zesty
-  #- name: Debian
-  #  versions:
-  #  - all
-  #  - buster
-  #  - etch
-  #  - jessie
-  #  - lenny
-  #  - sid
-  #  - squeeze
-  #  - stretch
-  #  - wheezy
-  #- name: Alpine
-  #  versions:
-  #  - all
-  #  - any
-  #- name: EL
-  #  versions:
-  #  - all
-  #  - 5
-  #  - 6
-  #  - 7
-  #- name: Windows
-  #  versions:
-  #  - all
-  #  - 2012R2
-  #- name: SmartOS
-  #  versions:
-  #  - all
-  #  - any
-  #- name: opensuse
-  #  versions:
-  #  - all
-  #  - 12.1
-  #  - 12.2
-  #  - 12.3
-  #  - 13.1
-  #  - 13.2
-  #- name: SLES
-  #  versions:
-  #  - all
-  #  - 10SP3
-  #  - 10SP4
-  #  - 11
-  #  - 11SP1
-  #  - 11SP2
-  #  - 11SP3
-  #  - 11SP4
-  #  - 12
-  #  - 12SP1
-  #- name: GenericUNIX
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Solaris
-  #  versions:
-  #  - all
-  #  - 10
-  #  - 11.0
-  #  - 11.1
-  #  - 11.2
-  #  - 11.3
-  #- name: eos
-  #  versions:
-  #  - all
-  #  - Any
-  
-  galaxy_tags: []
-    # List tags for your role here, one per line. A tag is
-    # a keyword that describes and categorizes the role.
-    # Users find roles by searching for tags. Be sure to
-    # remove the '[]' above if you add tags to this list.
-    #
-    # NOTE: A tag is limited to a single word comprised of
-    # alphanumeric characters. Maximum 20 tags per role.
-
-dependencies: []
-  # List your role dependencies here, one per line.
-  # Be sure to remove the '[]' above if you add dependencies
-  # to this list.
\ No newline at end of file
diff --git a/src/test/resources/roles/mongodb/tasks/main.yml b/src/test/resources/roles/mongodb/tasks/main.yml
deleted file mode 100644
index 56113079e303e1c1781481d1c9126f38a4ffa2ed..0000000000000000000000000000000000000000
--- a/src/test/resources/roles/mongodb/tasks/main.yml
+++ /dev/null
@@ -1,43 +0,0 @@
----
-# tasks file for vcsshark
-- block:
-  - name: enable ubuntu group
-    group: name=ubuntu state=present
-
-  - name: enable ubuntu user
-    user: name=ubuntu state=present shell=/bin/bash
-
-  - name: Import public key used by the package management system
-    shell: apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4
-    become_user: root
-
-  - name: Create a list file for MongoDB
-    shell: echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-4.0.list
-
-  - name: Install the MongoDB packages.
-    apt: 
-      name: mongodb-org
-      update_cache: yes
-  when: task == "DEPLOY"
-  remote_user: ubuntu
-  become_user: root
-
-- block:
-   - name: Configure MongoDB
-     shell: echo "Add MongoDB configuration here"
-
-   - name: Check if successfully started 
-     shell: echo "Verify that the mongod process has started successfully by checking the contents of the log file at /var/log/mongodb/mongod.log for a line reading [initandlisten] waiting for connections on port 27017"
-
-  when: task == "CONFIGURE"
-  remote_user: ubuntu
-  become_user: root
- 
-- block:
-   - name: Start mongod
-     service:
-       name: mongod
-       state: started
-  when: task == "START"
-  become_user: root
-  remote_user: "ubuntu"
diff --git a/src/test/resources/roles/mongodb/tests/inventory b/src/test/resources/roles/mongodb/tests/inventory
deleted file mode 100644
index d18580b3c364645735235c667c2a546e28c273bb..0000000000000000000000000000000000000000
--- a/src/test/resources/roles/mongodb/tests/inventory
+++ /dev/null
@@ -1 +0,0 @@
-localhost
\ No newline at end of file
diff --git a/src/test/resources/roles/mongodb/tests/test.yml b/src/test/resources/roles/mongodb/tests/test.yml
deleted file mode 100644
index 1cada8756ea6df9f039deff0f74baf523d039528..0000000000000000000000000000000000000000
--- a/src/test/resources/roles/mongodb/tests/test.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-- hosts: localhost
-  remote_user: root
-  roles:
-    - vcsshark
diff --git a/src/test/resources/roles/mongodb/vars/main.yml b/src/test/resources/roles/mongodb/vars/main.yml
deleted file mode 100644
index a62ad05b19277599d738b9e16675ce76f2992ec3..0000000000000000000000000000000000000000
--- a/src/test/resources/roles/mongodb/vars/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# vars file for vcsshark