diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/ChannelContainer.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/ChannelContainer.java
new file mode 100644
index 0000000..6d9610f
--- /dev/null
+++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/ChannelContainer.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+* Copyright (c) 2009 EclipseSource and others. 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:
+*   EclipseSource - initial API and implementation
+******************************************************************************/
+package org.eclipse.ecf.datashare;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.ecf.core.IContainer;
+
+/**
+ * @since 2.0
+ */
+public class ChannelContainer implements IChannelContainer {
+
+	private final IContainer container;
+	private final IChannelContainerAdapter containerAdapter;
+
+	public ChannelContainer(IContainer container, IChannelContainerAdapter containerAdapter) {
+		Assert.isNotNull(container);
+		Assert.isNotNull(containerAdapter);
+		this.container = container;
+		this.containerAdapter = containerAdapter;
+	}
+
+	public IContainer getContainer() {
+		return container;
+	}
+
+	public IChannelContainerAdapter getContainerAdapter() {
+		return containerAdapter;
+	}
+
+}
diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelContainer.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelContainer.java
new file mode 100644
index 0000000..dc38418
--- /dev/null
+++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelContainer.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+* Copyright (c) 2009 EclipseSource and others. 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:
+*   EclipseSource - initial API and implementation
+******************************************************************************/
+package org.eclipse.ecf.datashare;
+
+import org.eclipse.ecf.core.IContainer;
+
+/**
+ * @since 2.0
+ */
+public interface IChannelContainer {
+
+	public IContainer getContainer();
+
+	public IChannelContainerAdapter getContainerAdapter();
+
+}