diff --git a/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/META-INF/MANIFEST.MF b/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/META-INF/MANIFEST.MF
index fd9867f..ea53d5c 100644
--- a/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/META-INF/MANIFEST.MF
+++ b/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/META-INF/MANIFEST.MF
@@ -13,16 +13,16 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.databinding.property,
  org.eclipse.jface.databinding,
  org.eclipse.core.databinding.beans,
+ org.eclipse.graphiti;bundle-version="0.13.0",
  com.sap.conn.jco,
  org.fusesource.camel.component.sap;bundle-version="6.2.0",
  org.fusesource.camel.component.sap.model;bundle-version="6.2.0",
  org.fusesource.camel.component.sap.model.edit;bundle-version="6.2.0",
+ org.fusesource.ide.camel.model.service.core;bundle-version="8.0.0",
  org.fusesource.ide.commons;bundle-version="8.0.0",
  org.eclipse.core.expressions,
  org.eclipse.ui.views.properties.tabbed,
- org.fusesource.ide.camel.editor;bundle-version="8.0.0",
- org.eclipse.graphiti;bundle-version="0.11.0",
- org.fusesource.ide.camel.model;bundle-version="8.0.0"
+ org.fusesource.ide.camel.editor;bundle-version="8.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Bundle-Vendor
diff --git a/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/editor/provider/SapIDocDestinationPaletteEntry.java b/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/editor/provider/SapIDocDestinationPaletteEntry.java
index 87c70dc..c2f45a9 100644
--- a/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/editor/provider/SapIDocDestinationPaletteEntry.java
+++ b/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/editor/provider/SapIDocDestinationPaletteEntry.java
@@ -11,8 +11,8 @@
 import org.eclipse.graphiti.features.IFeatureProvider;
 import org.fusesource.ide.camel.editor.features.create.ext.CreateEndpointFigureFeature;
 import org.fusesource.ide.camel.editor.provider.ext.ICustomPaletteEntry;
-import org.fusesource.ide.camel.model.Endpoint;
-import org.fusesource.ide.camel.model.catalog.Dependency;
+import org.fusesource.ide.camel.model.service.core.catalog.Dependency;
+
 
 public class SapIDocDestinationPaletteEntry implements
 		ICustomPaletteEntry {
@@ -23,9 +23,13 @@ public class SapIDocDestinationPaletteEntry implements
 	public static final String COMPONENT_DESCRIPTION = "Creates an SAP IDoc Destination endpoint..."; //$NON-NLS-1$
 	public static final String COMPONENT_URL = PROTOCOL + ":destination:idocType:idocTypeExtension:systemRelease:applicationRelease"; //$NON-NLS-1$
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.fusesource.ide.camel.editor.provider.ext.ICustomPaletteEntry#newCreateFeature(org.eclipse.graphiti.features.IFeatureProvider)
+	 */
 	@Override
 	public ICreateFeature newCreateFeature(IFeatureProvider fp) {
-		return new CreateEndpointFigureFeature(fp, COMPONENT_NAME, COMPONENT_DESCRIPTION, new Endpoint(COMPONENT_URL), getRequiredDependencies()); 
+		return new CreateEndpointFigureFeature(fp, COMPONENT_NAME, COMPONENT_DESCRIPTION, COMPONENT_URL, getRequiredDependencies()); 
 	}
 
 	/* (non-Javadoc)
diff --git a/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/editor/provider/SapIDocListDestinationPaletteEntry.java b/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/editor/provider/SapIDocListDestinationPaletteEntry.java
index 4b3a7a6..c41b06e 100644
--- a/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/editor/provider/SapIDocListDestinationPaletteEntry.java
+++ b/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/editor/provider/SapIDocListDestinationPaletteEntry.java
@@ -11,8 +11,7 @@
 import org.eclipse.graphiti.features.IFeatureProvider;
 import org.fusesource.ide.camel.editor.features.create.ext.CreateEndpointFigureFeature;
 import org.fusesource.ide.camel.editor.provider.ext.ICustomPaletteEntry;
-import org.fusesource.ide.camel.model.Endpoint;
-import org.fusesource.ide.camel.model.catalog.Dependency;
+import org.fusesource.ide.camel.model.service.core.catalog.Dependency;
 
 public class SapIDocListDestinationPaletteEntry implements
 		ICustomPaletteEntry {
@@ -23,9 +22,13 @@ public class SapIDocListDestinationPaletteEntry implements
 	public static final String COMPONENT_DESCRIPTION = "Creates an SAP IDoc List Destination endpoint..."; //$NON-NLS-1$
 	public static final String COMPONENT_URL = PROTOCOL + ":destination:idocType:idocTypeExtension:systemRelease:applicationRelease"; //$NON-NLS-1$
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.fusesource.ide.camel.editor.provider.ext.ICustomPaletteEntry#newCreateFeature(org.eclipse.graphiti.features.IFeatureProvider)
+	 */
 	@Override
 	public ICreateFeature newCreateFeature(IFeatureProvider fp) {
-		return new CreateEndpointFigureFeature(fp, COMPONENT_NAME, COMPONENT_DESCRIPTION, new Endpoint(COMPONENT_URL), getRequiredDependencies()); 
+		return new CreateEndpointFigureFeature(fp, COMPONENT_NAME, COMPONENT_DESCRIPTION, COMPONENT_URL, getRequiredDependencies()); 
 	}
 
 	/* (non-Javadoc)
diff --git a/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/editor/provider/SapIDocListServerPaletteEntry.java b/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/editor/provider/SapIDocListServerPaletteEntry.java
index 3a7a980..a921695 100644
--- a/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/editor/provider/SapIDocListServerPaletteEntry.java
+++ b/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/editor/provider/SapIDocListServerPaletteEntry.java
@@ -11,8 +11,7 @@
 import org.eclipse.graphiti.features.IFeatureProvider;
 import org.fusesource.ide.camel.editor.features.create.ext.CreateEndpointFigureFeature;
 import org.fusesource.ide.camel.editor.provider.ext.ICustomPaletteEntry;
-import org.fusesource.ide.camel.model.Endpoint;
-import org.fusesource.ide.camel.model.catalog.Dependency;
+import org.fusesource.ide.camel.model.service.core.catalog.Dependency;
 
 public class SapIDocListServerPaletteEntry implements
 		ICustomPaletteEntry {
@@ -25,7 +24,7 @@ public class SapIDocListServerPaletteEntry implements
 
 	@Override
 	public ICreateFeature newCreateFeature(IFeatureProvider fp) {
-		return new CreateEndpointFigureFeature(fp, COMPONENT_NAME, COMPONENT_DESCRIPTION, new Endpoint(COMPONENT_URL), getRequiredDependencies()); 
+		return new CreateEndpointFigureFeature(fp, COMPONENT_NAME, COMPONENT_DESCRIPTION, COMPONENT_URL, getRequiredDependencies()); 
 	}
 
 	/* (non-Javadoc)
diff --git a/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/editor/provider/SapQueuedIDocDestinationPaletteEntry.java b/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/editor/provider/SapQueuedIDocDestinationPaletteEntry.java
index 270d450..5828bc5 100644
--- a/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/editor/provider/SapQueuedIDocDestinationPaletteEntry.java
+++ b/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/editor/provider/SapQueuedIDocDestinationPaletteEntry.java
@@ -11,8 +11,7 @@
 import org.eclipse.graphiti.features.IFeatureProvider;
 import org.fusesource.ide.camel.editor.features.create.ext.CreateEndpointFigureFeature;
 import org.fusesource.ide.camel.editor.provider.ext.ICustomPaletteEntry;
-import org.fusesource.ide.camel.model.Endpoint;
-import org.fusesource.ide.camel.model.catalog.Dependency;
+import org.fusesource.ide.camel.model.service.core.catalog.Dependency;
 
 public class SapQueuedIDocDestinationPaletteEntry implements
 		ICustomPaletteEntry {
@@ -25,7 +24,7 @@ public class SapQueuedIDocDestinationPaletteEntry implements
 
 	@Override
 	public ICreateFeature newCreateFeature(IFeatureProvider fp) {
-		return new CreateEndpointFigureFeature(fp, COMPONENT_NAME, COMPONENT_DESCRIPTION, new Endpoint(COMPONENT_URL), getRequiredDependencies()); 
+		return new CreateEndpointFigureFeature(fp, COMPONENT_NAME, COMPONENT_DESCRIPTION, COMPONENT_URL, getRequiredDependencies()); 
 	}
 
 	/* (non-Javadoc)
diff --git a/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/editor/provider/SapQueuedIDocListDestinationPaletteEntry.java b/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/editor/provider/SapQueuedIDocListDestinationPaletteEntry.java
index c137090..e335548 100644
--- a/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/editor/provider/SapQueuedIDocListDestinationPaletteEntry.java
+++ b/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/editor/provider/SapQueuedIDocListDestinationPaletteEntry.java
@@ -11,8 +11,7 @@
 import org.eclipse.graphiti.features.IFeatureProvider;
 import org.fusesource.ide.camel.editor.features.create.ext.CreateEndpointFigureFeature;
 import org.fusesource.ide.camel.editor.provider.ext.ICustomPaletteEntry;
-import org.fusesource.ide.camel.model.Endpoint;
-import org.fusesource.ide.camel.model.catalog.Dependency;
+import org.fusesource.ide.camel.model.service.core.catalog.Dependency;
 
 public class SapQueuedIDocListDestinationPaletteEntry implements
 		ICustomPaletteEntry {
@@ -25,7 +24,7 @@ public class SapQueuedIDocListDestinationPaletteEntry implements
 
 	@Override
 	public ICreateFeature newCreateFeature(IFeatureProvider fp) {
-		return new CreateEndpointFigureFeature(fp, COMPONENT_NAME, COMPONENT_DESCRIPTION, new Endpoint(COMPONENT_URL), getRequiredDependencies()); 
+		return new CreateEndpointFigureFeature(fp, COMPONENT_NAME, COMPONENT_DESCRIPTION, COMPONENT_URL, getRequiredDependencies()); 
 	}
 
 	/* (non-Javadoc)
diff --git a/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/editor/provider/SapQueuedRfcDestinationPaletteEntry.java b/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/editor/provider/SapQueuedRfcDestinationPaletteEntry.java
index 6b846e7..b2f4fd3 100644
--- a/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/editor/provider/SapQueuedRfcDestinationPaletteEntry.java
+++ b/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/editor/provider/SapQueuedRfcDestinationPaletteEntry.java
@@ -11,8 +11,7 @@
 import org.eclipse.graphiti.features.IFeatureProvider;
 import org.fusesource.ide.camel.editor.features.create.ext.CreateEndpointFigureFeature;
 import org.fusesource.ide.camel.editor.provider.ext.ICustomPaletteEntry;
-import org.fusesource.ide.camel.model.Endpoint;
-import org.fusesource.ide.camel.model.catalog.Dependency;
+import org.fusesource.ide.camel.model.service.core.catalog.Dependency;
 
 public class SapQueuedRfcDestinationPaletteEntry implements
 		ICustomPaletteEntry {
@@ -25,7 +24,7 @@ public class SapQueuedRfcDestinationPaletteEntry implements
 
 	@Override
 	public ICreateFeature newCreateFeature(IFeatureProvider fp) {
-		return new CreateEndpointFigureFeature(fp, COMPONENT_NAME, COMPONENT_DESCRIPTION, new Endpoint(COMPONENT_URL), getRequiredDependencies()); 
+		return new CreateEndpointFigureFeature(fp, COMPONENT_NAME, COMPONENT_DESCRIPTION, COMPONENT_URL, getRequiredDependencies()); 
 	}
 
 	/* (non-Javadoc)
diff --git a/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/editor/provider/SapSynchronousRfcDestinationPaletteEntry.java b/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/editor/provider/SapSynchronousRfcDestinationPaletteEntry.java
index 0edee92..046b60d 100644
--- a/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/editor/provider/SapSynchronousRfcDestinationPaletteEntry.java
+++ b/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/editor/provider/SapSynchronousRfcDestinationPaletteEntry.java
@@ -11,8 +11,7 @@
 import org.eclipse.graphiti.features.IFeatureProvider;
 import org.fusesource.ide.camel.editor.features.create.ext.CreateEndpointFigureFeature;
 import org.fusesource.ide.camel.editor.provider.ext.ICustomPaletteEntry;
-import org.fusesource.ide.camel.model.Endpoint;
-import org.fusesource.ide.camel.model.catalog.Dependency;
+import org.fusesource.ide.camel.model.service.core.catalog.Dependency;
 
 public class SapSynchronousRfcDestinationPaletteEntry implements
 		ICustomPaletteEntry {
@@ -25,7 +24,7 @@ public class SapSynchronousRfcDestinationPaletteEntry implements
 	
 	@Override
 	public ICreateFeature newCreateFeature(IFeatureProvider fp) {
-		return new CreateEndpointFigureFeature(fp, COMPONENT_NAME, COMPONENT_DESCRIPTION, new Endpoint(COMPONENT_URL), getRequiredDependencies()); 
+		return new CreateEndpointFigureFeature(fp, COMPONENT_NAME, COMPONENT_DESCRIPTION, COMPONENT_URL, getRequiredDependencies()); 
 	}
 
 	/* (non-Javadoc)
diff --git a/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/editor/provider/SapSynchronousRfcServerPaletteEntry.java b/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/editor/provider/SapSynchronousRfcServerPaletteEntry.java
index 3f3a572..348221d 100644
--- a/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/editor/provider/SapSynchronousRfcServerPaletteEntry.java
+++ b/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/editor/provider/SapSynchronousRfcServerPaletteEntry.java
@@ -11,8 +11,7 @@
 import org.eclipse.graphiti.features.IFeatureProvider;
 import org.fusesource.ide.camel.editor.features.create.ext.CreateEndpointFigureFeature;
 import org.fusesource.ide.camel.editor.provider.ext.ICustomPaletteEntry;
-import org.fusesource.ide.camel.model.Endpoint;
-import org.fusesource.ide.camel.model.catalog.Dependency;
+import org.fusesource.ide.camel.model.service.core.catalog.Dependency;
 
 public class SapSynchronousRfcServerPaletteEntry implements
 		ICustomPaletteEntry {
@@ -25,7 +24,7 @@ public class SapSynchronousRfcServerPaletteEntry implements
 
 	@Override
 	public ICreateFeature newCreateFeature(IFeatureProvider fp) {
-		return new CreateEndpointFigureFeature(fp, COMPONENT_NAME, COMPONENT_DESCRIPTION, new Endpoint(COMPONENT_URL), getRequiredDependencies()); 
+		return new CreateEndpointFigureFeature(fp, COMPONENT_NAME, COMPONENT_DESCRIPTION, COMPONENT_URL, getRequiredDependencies()); 
 	}
 
 	/* (non-Javadoc)
diff --git a/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/editor/provider/SapTransactionalRfcDestinationPaletteEntry.java b/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/editor/provider/SapTransactionalRfcDestinationPaletteEntry.java
index b115e75..8c1e58c 100644
--- a/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/editor/provider/SapTransactionalRfcDestinationPaletteEntry.java
+++ b/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/editor/provider/SapTransactionalRfcDestinationPaletteEntry.java
@@ -11,8 +11,7 @@
 import org.eclipse.graphiti.features.IFeatureProvider;
 import org.fusesource.ide.camel.editor.features.create.ext.CreateEndpointFigureFeature;
 import org.fusesource.ide.camel.editor.provider.ext.ICustomPaletteEntry;
-import org.fusesource.ide.camel.model.Endpoint;
-import org.fusesource.ide.camel.model.catalog.Dependency;
+import org.fusesource.ide.camel.model.service.core.catalog.Dependency;
 
 public class SapTransactionalRfcDestinationPaletteEntry implements
 		ICustomPaletteEntry {
@@ -25,7 +24,7 @@ public class SapTransactionalRfcDestinationPaletteEntry implements
 
 	@Override
 	public ICreateFeature newCreateFeature(IFeatureProvider fp) {
-		return new CreateEndpointFigureFeature(fp, COMPONENT_NAME, COMPONENT_DESCRIPTION, new Endpoint(COMPONENT_URL), getRequiredDependencies()); 
+		return new CreateEndpointFigureFeature(fp, COMPONENT_NAME, COMPONENT_DESCRIPTION, COMPONENT_URL, getRequiredDependencies()); 
 	}
 
 	/* (non-Javadoc)
diff --git a/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/editor/provider/SapTransactionalRfcServerPaletteEntry.java b/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/editor/provider/SapTransactionalRfcServerPaletteEntry.java
index 2a34836..13e8508 100644
--- a/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/editor/provider/SapTransactionalRfcServerPaletteEntry.java
+++ b/jboss-fuse-sap-tool-suite/plugins/org.fusesource.ide.sap.ui/src/org/fusesource/ide/sap/ui/editor/provider/SapTransactionalRfcServerPaletteEntry.java
@@ -11,8 +11,7 @@
 import org.eclipse.graphiti.features.IFeatureProvider;
 import org.fusesource.ide.camel.editor.features.create.ext.CreateEndpointFigureFeature;
 import org.fusesource.ide.camel.editor.provider.ext.ICustomPaletteEntry;
-import org.fusesource.ide.camel.model.Endpoint;
-import org.fusesource.ide.camel.model.catalog.Dependency;
+import org.fusesource.ide.camel.model.service.core.catalog.Dependency;
 
 public class SapTransactionalRfcServerPaletteEntry implements
 		ICustomPaletteEntry {
@@ -25,7 +24,7 @@ public class SapTransactionalRfcServerPaletteEntry implements
 
 	@Override
 	public ICreateFeature newCreateFeature(IFeatureProvider fp) {
-		return new CreateEndpointFigureFeature(fp, COMPONENT_NAME, COMPONENT_DESCRIPTION, new Endpoint(COMPONENT_URL), getRequiredDependencies()); 
+		return new CreateEndpointFigureFeature(fp, COMPONENT_NAME, COMPONENT_DESCRIPTION, COMPONENT_URL, getRequiredDependencies()); 
 	}
 
 	/* (non-Javadoc)