--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/sdk/core/SDKCorePlugin.java	Wed Dec 02 14:34:30 2009 -0600
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/sdk/core/SDKCorePlugin.java	Wed Dec 02 14:39:17 2009 -0600
@@ -16,6 +16,8 @@
 import org.osgi.framework.BundleContext;
 
 import com.nokia.carbide.cpp.internal.sdk.core.model.SDKManager;
+import com.nokia.carbide.cpp.internal.sdk.core.model.SDKManagerRaptorOnly;
+import com.nokia.cpp.internal.api.utils.core.HostOS;
 
 
 /**
@@ -31,7 +33,7 @@
 	// The shared instance
 	private static SDKCorePlugin plugin;
 	
-	private static SDKManager sdkManager;
+	private static ISDKManager sdkManager;
 	
 	/**
 	 * The constructor
@@ -76,7 +78,10 @@
 	 */
 	public static ISDKManager getSDKManager() {
 		if (sdkManager == null) {
-			sdkManager = new SDKManager();
+			if (HostOS.IS_WIN32)
+				sdkManager = new SDKManager();
+			else
+				sdkManager = new SDKManagerRaptorOnly();
 		}
 		return sdkManager;
 	}