diff --git a/application/pivot/daanse.pivot.bndrun b/application/pivot/daanse.pivot.bndrun
index e104b8d..d71bd2b 100644
--- a/application/pivot/daanse.pivot.bndrun
+++ b/application/pivot/daanse.pivot.bndrun
@@ -37,8 +37,7 @@
 	bnd.identity;id='ch.qos.logback.classic',\
 	bnd.identity;id='org.eclipse.daanse.mdx.parser.api',\
 	bnd.identity;id='org.eclipse.daanse.mdx.parser.ccc',\
-	bnd.identity;id='org.eclipse.daanse.rolap.mapping.api',\
-	bnd.identity;id='org.eclipse.daanse.rolap.mapping.emf',\
+	bnd.identity;id='org.eclipse.daanse.rolap.mapping.model',\
 	bnd.identity;id='org.gecko.emf.osgi.component',\
 	bnd.identity;id='org.eclipse.daanse.sql.guard.api',\
 	bnd.identity;id='org.eclipse.daanse.sql.guard.jsqltranspiler',\
@@ -84,9 +83,7 @@
 	org.eclipse.daanse.olap.spi;version='[0.0.1,0.0.2)',\
 	org.eclipse.daanse.olap.xmla.bridge;version='[0.0.1,0.0.2)',\
 	org.eclipse.daanse.rolap.core;version='[0.0.1,0.0.2)',\
-	org.eclipse.daanse.rolap.mapping.api;version='[0.0.1,0.0.2)',\
-	org.eclipse.daanse.rolap.mapping.emf;version='[0.0.1,0.0.2)',\
-	org.eclipse.daanse.rolap.mapping.pojo;version='[0.0.1,0.0.2)',\
+	org.eclipse.daanse.rolap.mapping.model;version='[0.0.1,0.0.2)',\
 	org.eclipse.daanse.sql.guard.api;version='[0.0.1,0.0.2)',\
 	org.eclipse.daanse.sql.guard.jsqltranspiler;version='[0.0.1,0.0.2)',\
 	org.eclipse.daanse.xmla.api;version='[0.0.1,0.0.2)',\
diff --git a/application/playground/daanse.playground.bndrun b/application/playground/daanse.playground.bndrun
index 7854127..c528c20 100644
--- a/application/playground/daanse.playground.bndrun
+++ b/application/playground/daanse.playground.bndrun
@@ -40,8 +40,7 @@
 	bnd.identity;id='org.eclipse.daanse.jdbc.db.core',\
 	bnd.identity;id='org.eclipse.daanse.mdx.parser.api',\
 	bnd.identity;id='org.eclipse.daanse.mdx.parser.ccc',\
-	bnd.identity;id='org.eclipse.daanse.rolap.mapping.api',\
-	bnd.identity;id='org.eclipse.daanse.rolap.mapping.emf',\
+	bnd.identity;id='org.eclipse.daanse.rolap.mapping.model',\
 	bnd.identity;id='org.gecko.emf.osgi.component',\
 	bnd.identity;id='org.eclipse.daanse.sql.guard.api',\
 	bnd.identity;id='org.eclipse.daanse.sql.guard.jsqltranspiler',\
@@ -144,9 +143,7 @@
 	org.eclipse.daanse.olap.spi;version='[0.0.1,0.0.2)',\
 	org.eclipse.daanse.olap.xmla.bridge;version='[0.0.1,0.0.2)',\
 	org.eclipse.daanse.rolap.core;version='[0.0.1,0.0.2)',\
-	org.eclipse.daanse.rolap.mapping.api;version='[0.0.1,0.0.2)',\
-	org.eclipse.daanse.rolap.mapping.emf;version='[0.0.1,0.0.2)',\
-	org.eclipse.daanse.rolap.mapping.pojo;version='[0.0.1,0.0.2)',\
+	org.eclipse.daanse.rolap.mapping.model;version='[0.0.1,0.0.2)',\
 	org.eclipse.daanse.server.application.playground;version='[0.0.1,0.0.2)',\
 	org.eclipse.daanse.sql.guard.api;version='[0.0.1,0.0.2)',\
 	org.eclipse.daanse.sql.guard.jsqltranspiler;version='[0.0.1,0.0.2)',\
diff --git a/application/pom.xml b/application/pom.xml
index 648d788..d421b7b 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -130,7 +130,7 @@
     <dependency>
       <groupId>org.eclipse.daanse</groupId>
       <version>${revision}</version>
-      <artifactId>org.eclipse.daanse.rolap.mapping.emf</artifactId>
+      <artifactId>org.eclipse.daanse.rolap.mapping.model</artifactId>
       <scope>compile</scope>
     </dependency>
 
diff --git a/application/probe/daanse.probe.bndrun b/application/probe/daanse.probe.bndrun
index d4af4f4..1a941ee 100644
--- a/application/probe/daanse.probe.bndrun
+++ b/application/probe/daanse.probe.bndrun
@@ -42,8 +42,7 @@
 	bnd.identity;id='org.eclipse.daanse.jdbc.db.core',\
 	bnd.identity;id='org.eclipse.daanse.mdx.parser.api',\
 	bnd.identity;id='org.eclipse.daanse.mdx.parser.ccc',\
-	bnd.identity;id='org.eclipse.daanse.rolap.mapping.api',\
-	bnd.identity;id='org.eclipse.daanse.rolap.mapping.emf',\
+	bnd.identity;id='org.eclipse.daanse.rolap.mapping.model',\
 	bnd.identity;id='org.eclipse.daanse.jdbc.db.importer.csv',\
 	bnd.identity;id='org.gecko.emf.osgi.component',\
 	bnd.identity;id='org.eclipse.daanse.sql.guard.api',\
@@ -112,9 +111,7 @@
 	org.eclipse.daanse.rolap.core;version='[0.0.1,0.0.2)',\
 	org.eclipse.daanse.rolap.documentation.api;version='[0.0.1,0.0.2)',\
 	org.eclipse.daanse.rolap.documentation.common;version='[0.0.1,0.0.2)',\
-	org.eclipse.daanse.rolap.mapping.api;version='[0.0.1,0.0.2)',\
-	org.eclipse.daanse.rolap.mapping.emf;version='[0.0.1,0.0.2)',\
-	org.eclipse.daanse.rolap.mapping.pojo;version='[0.0.1,0.0.2)',\
+	org.eclipse.daanse.rolap.mapping.model;version='[0.0.1,0.0.2)',\
 	org.eclipse.daanse.rolap.mapping.verifyer.api;version='[0.0.1,0.0.2)',\
 	org.eclipse.daanse.server.application.probe;version='[0.0.1,0.0.2)',\
 	org.eclipse.daanse.sql.guard.api;version='[0.0.1,0.0.2)',\
diff --git a/application/probe/logback.xml b/application/probe/logback.xml
index 304d514..bc7fc83 100644
--- a/application/probe/logback.xml
+++ b/application/probe/logback.xml
@@ -44,7 +44,12 @@
     </encoder>
   </appender>
 
-  <root level="INFO">
+  <logger name="org.eclipse.jetty" level="WARN"/>
+  <logger name="org.eclipse.daanse.jdbc" level="WARN"/>
+  <logger name="org.eclipse.daanse.mdx.parser.ccc" level="WARN"/>
+  <logger name="org.eclipse.daanse.rolap.element" level="WARN"/>
+
+  <root level="DEBUG">
     <appender-ref ref="STDOUT" />
     <appender-ref ref="ROLL_FILE" />
   </root>
diff --git a/application/probe/src/main/java/org/eclipse/daanse/server/application/probe/CatalogXmiFileListener.java b/application/probe/src/main/java/org/eclipse/daanse/server/application/probe/CatalogXmiFileListener.java
index 6a408fb..088f1f5 100644
--- a/application/probe/src/main/java/org/eclipse/daanse/server/application/probe/CatalogXmiFileListener.java
+++ b/application/probe/src/main/java/org/eclipse/daanse/server/application/probe/CatalogXmiFileListener.java
@@ -13,8 +13,8 @@
 */
 package org.eclipse.daanse.server.application.probe;
 
-import static org.eclipse.daanse.rolap.mapping.emf.rolapmapping.provider.Constants.PID_EMF_MAPPING_PROVIDER;
-import static org.eclipse.daanse.rolap.mapping.emf.rolapmapping.provider.Constants.RESOURCE_URL;
+import static org.eclipse.daanse.rolap.mapping.model.provider.Constants.PID_EMF_MAPPING_PROVIDER;
+import static org.eclipse.daanse.rolap.mapping.model.provider.Constants.RESOURCE_URL;
 
 import java.io.IOException;
 import java.nio.file.Path;