diff --git a/apis/atmos/pom.xml b/apis/atmos/pom.xml
index 1d905ff05b..d55db0e29e 100644
--- a/apis/atmos/pom.xml
+++ b/apis/atmos/pom.xml
@@ -2,7 +2,7 @@
 <!--
 
 
-    Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+    Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
 
     ====================================================================
     Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,9 +28,12 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../../project/pom.xml</relativePath>
     </parent>
+
     <groupId>org.jclouds.api</groupId>
     <artifactId>atmos</artifactId>
     <name>jclouds atmos components</name>
+    <packaging>bundle</packaging>
+
     <properties>
         <test.initializer>org.jclouds.atmos.blobstore.integration.AtmosStorageTestInitializer</test.initializer>
         <test.atmos.endpoint>https://accesspoint.atmos.com</test.atmos.endpoint>
@@ -38,6 +41,7 @@
         <test.atmos.identity>FIXME</test.atmos.identity>
         <test.atmos.credential>FIXME</test.atmos.credential>
     </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.jclouds</groupId>
@@ -125,5 +129,21 @@
             </build>
         </profile>
     </profiles>
+
+    <build>
+        <plugins>
+            <plugin>    
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.atmos.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
   
 </project>
diff --git a/apis/byon/README.txt b/apis/byon/README.txt
index 7f26360eae..ac724e7d0f 100644
--- a/apis/byon/README.txt
+++ b/apis/byon/README.txt
@@ -65,6 +65,8 @@ Here are the properties:
   * description    - optional; long description of this node 
                                * note this is not yet in jclouds NodeMetadata
   * hostname       - name or ip address to contact the node on
+  * location_id    - optional; correlates to a ZONE-scoped Location
+                               * note that if present for one node, must be present for all
   * os_arch        - ex. x86 
   * os_family      - must conform to org.jclouds.compute.domain.OsFamily in lower-hyphen format
                      ex. rhel, ubuntu, centos, debian, amzn-linux
@@ -96,6 +98,7 @@ nodes:
       name: cluster-1
       description: accounting analytics cluster
       hostname: cluster-1.mydomain.com
+      location_id: virginia
       os_arch: x86
       os_family: rhel
       os_description: redhat with CDH
diff --git a/apis/byon/pom.xml b/apis/byon/pom.xml
index ccc9434618..c1575a1737 100644
--- a/apis/byon/pom.xml
+++ b/apis/byon/pom.xml
@@ -28,9 +28,12 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../../project/pom.xml</relativePath>
     </parent>
+
     <groupId>org.jclouds.api</groupId>
     <artifactId>byon</artifactId>
     <name>jclouds bring your own node provider</name>
+    <packaging>bundle</packaging>
+
     <properties>
         <test.byon.endpoint>file://c:/test.txt</test.byon.endpoint>
         <test.byon.sudo-password> </test.byon.sudo-password>
@@ -81,7 +84,7 @@
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>1.6</version>
+            <version>1.8</version>
         </dependency>
     </dependencies>
 
@@ -120,4 +123,20 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>    
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.byon.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
diff --git a/apis/byon/src/main/java/org/jclouds/byon/Node.java b/apis/byon/src/main/java/org/jclouds/byon/Node.java
index 5030da44fb..ada9382e51 100644
--- a/apis/byon/src/main/java/org/jclouds/byon/Node.java
+++ b/apis/byon/src/main/java/org/jclouds/byon/Node.java
@@ -20,60 +20,170 @@ package org.jclouds.byon;
 
 import java.net.URI;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 
 import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
 
 /**
  * 
  * @author Adrian Cole
  */
 public class Node {
-   // public due to snakeyaml
-   public Node() {
+   public static Builder builder() {
+      return new Builder();
    }
 
-   public Node(String id, String name, String description, String hostname, String osArch, String osFamily,
-            String osDescription, String osVersion, String group, List<String> tags, String username,
-            String credential, URI credentialUrl, String sudo_password) {
+   public static class Builder {
+      private String id;
+      private String name;
+      private String description;
+      private String hostname;
+      private String locationId;
+      private String osArch;
+      private String osFamily;
+      private String osDescription;
+      private String osVersion;
+      private boolean os64Bit;
+      private String group;
+      private Set<String> tags = ImmutableSet.of();
+      private String username;
+      private String credential;
+      private URI credentialUrl;
+      private String sudoPassword;
+
+      public Builder id(String id) {
+         this.id = id;
+         return this;
+      }
+
+      public Builder name(String name) {
+         this.name = name;
+         return this;
+      }
+
+      public Builder description(String description) {
+         this.description = description;
+         return this;
+      }
+
+      public Builder hostname(String hostname) {
+         this.hostname = hostname;
+         return this;
+      }
+
+      public Builder locationId(String locationId) {
+         this.locationId = locationId;
+         return this;
+      }
+
+      public Builder osArch(String osArch) {
+         this.osArch = osArch;
+         return this;
+      }
+
+      public Builder osFamily(String osFamily) {
+         this.osFamily = osFamily;
+         return this;
+      }
+
+      public Builder osDescription(String osDescription) {
+         this.osDescription = osDescription;
+         return this;
+      }
+
+      public Builder osVersion(String osVersion) {
+         this.osVersion = osVersion;
+         return this;
+      }
+
+      public Builder os64Bit(boolean os64Bit) {
+         this.os64Bit = os64Bit;
+         return this;
+      }
+
+      public Builder group(String group) {
+         this.group = group;
+         return this;
+      }
+
+      public Builder tags(Iterable<String> tags) {
+         this.tags = ImmutableSet.copyOf(tags);
+         return this;
+      }
+
+      public Builder username(String username) {
+         this.username = username;
+         return this;
+      }
+
+      public Builder credential(String credential) {
+         this.credential = credential;
+         return this;
+      }
+
+      public Builder credentialUrl(URI credentialUrl) {
+         this.credentialUrl = credentialUrl;
+         return this;
+      }
+
+      public Builder sudoPassword(String sudoPassword) {
+         this.sudoPassword = sudoPassword;
+         return this;
+      }
+
+      public Node build() {
+         return new Node(id, name, description, hostname, locationId, osArch, osFamily, osDescription, osVersion,
+                  os64Bit, group, tags, username, credential, credentialUrl, sudoPassword);
+      }
+   }
+
+   public Node(String id, String name, String description, String hostname, String locationId, String osArch,
+            String osFamily, String osDescription, String osVersion, boolean os64Bit, String group,
+            Iterable<String> tags, String username, String credential, URI credentialUrl, String sudoPassword) {
       this.id = id;
       this.name = name;
       this.description = description;
       this.hostname = hostname;
-      this.os_arch = osArch;
-      this.os_family = osFamily;
-      this.os_description = osDescription;
-      this.os_version = osVersion;
+      this.locationId = locationId;
+      this.osArch = osArch;
+      this.osFamily = osFamily;
+      this.osDescription = osDescription;
+      this.osVersion = osVersion;
+      this.os64Bit = os64Bit;
       this.group = group;
-      this.tags = ImmutableList.copyOf(tags);
+      this.tags = ImmutableSet.copyOf(tags);
       this.username = username;
       this.credential = credential;
-      this.credential_url = credentialUrl != null ? credentialUrl.toASCIIString() : null;
-      this.sudo_password = sudo_password;
+      this.credentialUrl = credentialUrl;
+      this.sudoPassword = sudoPassword;
    }
 
-   // public due to snakeyaml
-   public String id;
-   public String name;
-   public String description;
-   public String hostname;
-   public String os_arch;
-   public String os_family;
-   public String os_description;
-   public String os_version;
-   public String group;
-   public List<String> tags;
-   public String username;
-   public String credential;
-   public String credential_url;
-   public String sudo_password;
+   private final String id;
+   private final String name;
+   private final String description;
+   private final String hostname;
+   private final String locationId;
+   private final String osArch;
+   private final String osFamily;
+   private final String osDescription;
+   private final String osVersion;
+   private final boolean os64Bit;
+   private final String group;
+   private final Set<String> tags;
+   private final String username;
+   private final String credential;
+   private final URI credentialUrl;
+   private final String sudoPassword;
 
    public String getId() {
       return id;
    }
 
+   public String getLocationId() {
+      return locationId;
+   }
+
    public String getName() {
       return name;
    }
@@ -91,19 +201,23 @@ public class Node {
    }
 
    public String getOsArch() {
-      return os_arch;
+      return osArch;
    }
 
    public String getOsFamily() {
-      return os_family;
+      return osFamily;
    }
 
    public String getOsDescription() {
-      return os_description;
+      return osDescription;
    }
 
    public String getOsVersion() {
-      return os_version;
+      return osVersion;
+   }
+
+   public boolean isOs64Bit() {
+      return os64Bit;
    }
 
    public Set<String> getTags() {
@@ -122,7 +236,11 @@ public class Node {
    }
 
    public URI getCredentialUrl() {
-      return credential_url != null ? URI.create(credential_url) : null;
+      return credentialUrl;
+   }
+
+   public String getSudoPassword() {
+      return sudoPassword;
    }
 
    @Override
@@ -130,10 +248,6 @@ public class Node {
       return Objects.hashCode(id);
    }
 
-   public String getSudoPassword() {
-      return sudo_password;
-   }
-
    @Override
    public boolean equals(Object that) {
       if (that == null)
@@ -144,10 +258,11 @@ public class Node {
    @Override
    public String toString() {
       return Objects.toStringHelper(this).add("id", id).add("name", name).add("description", description).add(
-               "hostname", hostname).add("osArch", os_arch).add("osFamily", os_family).add("osDescription",
-               os_description).add("osVersion", os_version).add("group", group).add("tags", tags).add("username",
-               username).add("hasCredential", credential != null || credential_url != null).add("hasSudoPassword",
-               sudo_password != null).toString();
+               "locationId", locationId).add("hostname", hostname).add("osArch", osArch).add("osFamily", osFamily).add(
+               "osDescription", osDescription).add("osVersion", osVersion).add("os64Bit", os64Bit).add("group", group)
+               .add("tags", tags).add("username", username).add("hasCredential",
+                        credential != null || credentialUrl != null).add("hasSudoPassword", sudoPassword != null)
+               .toString();
    }
 
 }
diff --git a/apis/byon/src/main/java/org/jclouds/byon/config/BYONComputeServiceContextModule.java b/apis/byon/src/main/java/org/jclouds/byon/config/BYONComputeServiceContextModule.java
index b66419ba30..9c1e261993 100644
--- a/apis/byon/src/main/java/org/jclouds/byon/config/BYONComputeServiceContextModule.java
+++ b/apis/byon/src/main/java/org/jclouds/byon/config/BYONComputeServiceContextModule.java
@@ -25,7 +25,7 @@ import java.util.Map;
 import javax.inject.Singleton;
 
 import org.jclouds.byon.Node;
-import org.jclouds.byon.functions.NodesFromYaml;
+import org.jclouds.byon.functions.NodesFromYamlStream;
 import org.jclouds.byon.internal.BYONComputeServiceAdapter;
 import org.jclouds.byon.suppliers.NodesParsedFromSupplier;
 import org.jclouds.byon.suppliers.SupplyFromProviderURIOrNodesProperty;
@@ -44,7 +44,7 @@ import com.google.inject.TypeLiteral;
  * 
  * @author Adrian Cole
  */
-@SuppressWarnings( { "rawtypes", "unchecked" })
+@SuppressWarnings("unchecked")
 @SingleThreaded
 public class BYONComputeServiceContextModule extends
          JCloudsNativeComputeServiceAdapterContextModule<Supplier, Supplier> {
@@ -53,7 +53,6 @@ public class BYONComputeServiceContextModule extends
       super(Supplier.class, Supplier.class, BYONComputeServiceAdapter.class);
    }
 
-   @SuppressWarnings("unchecked")
    @Provides
    @Singleton
    Supplier provideApi(Supplier<Map<String, Node>> in) {
@@ -73,7 +72,7 @@ public class BYONComputeServiceContextModule extends
       }).to(SupplyFromProviderURIOrNodesProperty.class);
       // TODO make this somehow overridable via user request
       bind(new TypeLiteral<Function<InputStream, Map<String, Node>>>() {
-      }).to(NodesFromYaml.class);
+      }).to(NodesFromYamlStream.class);
    }
 
 }
diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/BaseItemParserTest.java b/apis/byon/src/main/java/org/jclouds/byon/config/ConfiguresNodeStore.java
similarity index 66%
rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/BaseItemParserTest.java
rename to apis/byon/src/main/java/org/jclouds/byon/config/ConfiguresNodeStore.java
index 29cd7855b5..86856bc486 100644
--- a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/BaseItemParserTest.java
+++ b/apis/byon/src/main/java/org/jclouds/byon/config/ConfiguresNodeStore.java
@@ -16,13 +16,25 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.cloudstack.parse;
+package org.jclouds.byon.config;
 
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import com.google.common.annotations.Beta;
 
 /**
+ * designates the module configures a {@code Map<String, Node>}
  * 
  * @author Adrian Cole
+ * 
  */
-public abstract class BaseItemParserTest<T> extends BaseParserTest<T, T> {
+@Beta
+@Retention(RUNTIME)
+@Target(TYPE)
+public @interface ConfiguresNodeStore {
 
-}
+}
\ No newline at end of file
diff --git a/apis/byon/src/main/java/org/jclouds/byon/config/YamlNodeStoreModule.java b/apis/byon/src/main/java/org/jclouds/byon/config/YamlNodeStoreModule.java
new file mode 100644
index 0000000000..a52b71e31d
--- /dev/null
+++ b/apis/byon/src/main/java/org/jclouds/byon/config/YamlNodeStoreModule.java
@@ -0,0 +1,92 @@
+/**
+ *
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.byon.config;
+
+import java.io.InputStream;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import javax.inject.Singleton;
+
+import org.jclouds.byon.Node;
+import org.jclouds.byon.domain.YamlNode;
+import org.jclouds.collect.TransformingMap;
+import org.jclouds.io.CopyInputStreamInputSupplierMap;
+
+import com.google.common.annotations.Beta;
+import com.google.common.base.Function;
+import com.google.common.io.InputSupplier;
+import com.google.inject.AbstractModule;
+import com.google.inject.Provides;
+import com.google.inject.TypeLiteral;
+
+/**
+ * 
+ * @author Adrian Cole
+ */
+@ConfiguresNodeStore
+@Beta
+public class YamlNodeStoreModule extends AbstractModule {
+   private static final Map<String, InputSupplier<InputStream>> BACKING = new ConcurrentHashMap<String, InputSupplier<InputStream>>();
+   private final Map<String, InputStream> backing;
+
+   public YamlNodeStoreModule(Map<String, InputStream> backing) {
+      this.backing = backing;
+   }
+
+   public YamlNodeStoreModule() {
+      this(null);
+   }
+
+   @Override
+   protected void configure() {
+      bind(new TypeLiteral<Function<YamlNode, InputStream>>() {
+      }).toInstance(org.jclouds.byon.domain.YamlNode.yamlNodeToInputStream);
+      bind(new TypeLiteral<Function<InputStream, YamlNode>>() {
+      }).toInstance(org.jclouds.byon.domain.YamlNode.inputStreamToYamlNode);
+      bind(new TypeLiteral<Function<Node, YamlNode>>() {
+      }).toInstance(org.jclouds.byon.domain.YamlNode.nodeToYamlNode);
+      bind(new TypeLiteral<Function<YamlNode, Node>>() {
+      }).toInstance(org.jclouds.byon.domain.YamlNode.toNode);
+      if (backing != null) {
+         bind(new TypeLiteral<Map<String, InputStream>>() {
+         }).toInstance(backing);
+      } else {
+         bind(new TypeLiteral<Map<String, InputSupplier<InputStream>>>() {
+         }).toInstance(BACKING);
+         bind(new TypeLiteral<Map<String, InputStream>>() {
+         }).to(new TypeLiteral<CopyInputStreamInputSupplierMap>() {
+         });
+      }
+   }
+
+   @Provides
+   @Singleton
+   protected Map<String, Node> provideNodeStore(Map<String, YamlNode> backing,
+            Function<Node, YamlNode> yamlSerializer, Function<YamlNode, Node> yamlDeserializer) {
+      return new TransformingMap<String, YamlNode, Node>(backing, yamlDeserializer, yamlSerializer);
+   }
+
+   @Provides
+   @Singleton
+   protected Map<String, YamlNode> provideYamlStore(Map<String, InputStream> backing,
+            Function<YamlNode, InputStream> yamlSerializer, Function<InputStream, YamlNode> yamlDeserializer) {
+      return new TransformingMap<String, InputStream, YamlNode>(backing, yamlDeserializer, yamlSerializer);
+   }
+}
\ No newline at end of file
diff --git a/apis/byon/src/main/java/org/jclouds/byon/domain/YamlNode.java b/apis/byon/src/main/java/org/jclouds/byon/domain/YamlNode.java
new file mode 100644
index 0000000000..9b81bfc02a
--- /dev/null
+++ b/apis/byon/src/main/java/org/jclouds/byon/domain/YamlNode.java
@@ -0,0 +1,199 @@
+/**
+ *
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.byon.domain;
+
+import java.io.InputStream;
+import java.net.URI;
+import java.util.List;
+
+import org.jclouds.byon.Node;
+import org.jclouds.util.Strings2;
+import org.yaml.snakeyaml.DumperOptions;
+import org.yaml.snakeyaml.Loader;
+import org.yaml.snakeyaml.Yaml;
+import org.yaml.snakeyaml.constructor.Constructor;
+
+import com.google.common.base.Function;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
+import com.google.common.collect.ImmutableMap.Builder;
+import com.google.common.io.Closeables;
+
+/**
+ * Serializes to the following
+ * 
+ * <pre>
+ *       id: cluster-1
+ *       name: cluster-1
+ *       description: xyz
+ *       hostname: cluster-1.mydomain.com
+ *       location_id: virginia
+ *       os_arch: x86
+ *       os_family: linux
+ *       os_description: redhat
+ *       os_version: 5.3
+ *       os_64bit: 5.3
+ *       group: hadoop
+ *       tags:
+ *           - vanilla
+ *       username: kelvin
+ *       credential: password_or_rsa
+ *         or
+ *       credential_url: password_or_rsa_file ex. resource:///id_rsa will get the classpath /id_rsa; file://path/to/id_rsa
+ *       sudo_password: password
+ * </pre>
+ * 
+ * @author Kelvin Kakugawa
+ * @author Adrian Cole
+ */
+public class YamlNode {
+   public String id;
+   public String name;
+   public String description;
+   public String hostname;
+   public String location_id;
+   public String os_arch;
+   public String os_family;
+   public String os_description;
+   public String os_version;
+   public boolean os_64bit;
+   public String group;
+   public List<String> tags = Lists.newArrayList();
+   public String username;
+   public String credential;
+   public String credential_url;
+   public String sudo_password;
+
+   public static Function<YamlNode, Node> toNode = new Function<YamlNode, Node>() {
+      @Override
+      public Node apply(YamlNode arg0) {
+         if (arg0 == null)
+            return null;
+         return Node.builder().id(arg0.id).name(arg0.name).description(arg0.description).locationId(arg0.location_id)
+                  .hostname(arg0.hostname).osArch(arg0.os_arch).osFamily(arg0.os_family).osDescription(
+                           arg0.os_description).osVersion(arg0.os_version).os64Bit(arg0.os_64bit).group(arg0.group)
+                  .tags(arg0.tags).username(arg0.username).credential(arg0.credential).credentialUrl(
+                           arg0.credential_url != null ? URI.create(arg0.credential_url) : null).sudoPassword(
+                           arg0.sudo_password).build();
+      }
+   };
+
+   public Node toNode() {
+      return toNode.apply(this);
+   }
+
+   public static Function<InputStream, YamlNode> inputStreamToYamlNode = new Function<InputStream, YamlNode>() {
+      @Override
+      public YamlNode apply(InputStream in) {
+         if (in == null)
+            return null;
+         // note that snakeyaml also throws nosuchmethod error when you use the non-deprecated
+         // constructor
+         try {
+            return (YamlNode) new Yaml(new Loader(new Constructor(YamlNode.class))).load(in);
+         } finally {
+            Closeables.closeQuietly(in);
+         }
+      }
+   };
+
+   public static YamlNode fromYaml(InputStream in) {
+      return inputStreamToYamlNode.apply(in);
+   }
+
+   public static Function<YamlNode, InputStream> yamlNodeToInputStream = new Function<YamlNode, InputStream>() {
+      @Override
+      public InputStream apply(YamlNode in) {
+         if (in == null)
+            return null;
+         Builder<String, Object> prettier = ImmutableMap.<String, Object> builder();
+         if (in.id != null)
+            prettier.put("id", in.id);
+         if (in.name != null)
+            prettier.put("name", in.name);
+         if (in.description != null)
+            prettier.put("description", in.description);
+         if (in.hostname != null)
+            prettier.put("hostname", in.hostname);
+         if (in.location_id != null)
+            prettier.put("location_id", in.location_id);
+         if (in.os_arch != null)
+            prettier.put("os_arch", in.os_arch);
+         if (in.os_family != null)
+            prettier.put("os_family", in.os_family);
+         if (in.os_description != null)
+            prettier.put("os_description", in.os_description);
+         if (in.os_version != null)
+            prettier.put("os_version", in.os_version);
+         if (in.os_64bit)
+            prettier.put("os_64bit", in.os_64bit);
+         if (in.group != null)
+            prettier.put("group", in.group);
+         if (in.tags.size() != 0)
+            prettier.put("tags", in.tags);
+         if (in.username != null)
+            prettier.put("username", in.username);
+         if (in.credential != null)
+            prettier.put("credential", in.credential);
+         if (in.credential_url != null)
+            prettier.put("credential_url", in.credential_url);
+         if (in.sudo_password != null)
+            prettier.put("sudo_password", in.sudo_password);
+         DumperOptions options = new DumperOptions();
+         options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
+         return Strings2.toInputStream(new Yaml(options).dump(prettier.build()));
+      }
+   };
+
+   public InputStream toYaml() {
+      return yamlNodeToInputStream.apply(this);
+   }
+
+   public static YamlNode fromNode(Node in) {
+      return nodeToYamlNode.apply(in);
+   }
+
+   public static Function<Node, YamlNode> nodeToYamlNode = new Function<Node, YamlNode>() {
+      @Override
+      public YamlNode apply(Node arg0) {
+         if (arg0 == null)
+            return null;
+         YamlNode yaml = new YamlNode();
+         yaml.id = arg0.getId();
+         yaml.name = arg0.getName();
+         yaml.description = arg0.getDescription();
+         yaml.hostname = arg0.getHostname();
+         yaml.location_id = arg0.getLocationId();
+         yaml.os_arch = arg0.getOsArch();
+         yaml.os_family = arg0.getOsFamily();
+         yaml.os_description = arg0.getOsDescription();
+         yaml.os_version = arg0.getOsVersion();
+         yaml.os_64bit = arg0.isOs64Bit();
+         yaml.group = arg0.getGroup();
+         yaml.tags = ImmutableList.copyOf(arg0.getTags());
+         yaml.username = arg0.getUsername();
+         yaml.credential = arg0.getCredential();
+         yaml.credential_url = arg0.getCredentialUrl() != null ? arg0.getCredentialUrl().toASCIIString() : null;
+         yaml.sudo_password = arg0.getSudoPassword();
+         return yaml;
+      }
+   };
+
+}
\ No newline at end of file
diff --git a/apis/byon/src/main/java/org/jclouds/byon/functions/NodeToNodeMetadata.java b/apis/byon/src/main/java/org/jclouds/byon/functions/NodeToNodeMetadata.java
index 9c56f313b8..8479768062 100644
--- a/apis/byon/src/main/java/org/jclouds/byon/functions/NodeToNodeMetadata.java
+++ b/apis/byon/src/main/java/org/jclouds/byon/functions/NodeToNodeMetadata.java
@@ -24,25 +24,32 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
 import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
 
 import javax.annotation.Resource;
 import javax.inject.Inject;
+import javax.inject.Named;
 import javax.inject.Singleton;
 
 import org.jclouds.byon.Node;
+import org.jclouds.collect.Memoized;
 import org.jclouds.compute.domain.NodeMetadata;
 import org.jclouds.compute.domain.NodeMetadataBuilder;
 import org.jclouds.compute.domain.NodeState;
-import org.jclouds.compute.domain.OperatingSystemBuilder;
+import org.jclouds.compute.domain.OperatingSystem;
 import org.jclouds.compute.domain.OsFamily;
+import org.jclouds.compute.reference.ComputeServiceConstants;
 import org.jclouds.domain.Credentials;
 import org.jclouds.domain.Location;
 import org.jclouds.logging.Logger;
 import org.jclouds.util.Strings2;
 
 import com.google.common.base.Function;
+import com.google.common.base.Predicate;
 import com.google.common.base.Supplier;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
 
 /**
  * @author Adrian Cole
@@ -50,16 +57,19 @@ import com.google.common.collect.ImmutableSet;
 @Singleton
 public class NodeToNodeMetadata implements Function<Node, NodeMetadata> {
    @Resource
+   @Named(ComputeServiceConstants.COMPUTE_LOGGER)
    protected Logger logger = Logger.NULL;
 
    private final Supplier<Location> location;
+   private final Supplier<Set<? extends Location>> locations;
    private final Map<String, Credentials> credentialStore;
    private final Function<URI, InputStream> slurp;
 
    @Inject
-   NodeToNodeMetadata(Supplier<Location> location, Function<URI, InputStream> slurp,
-            Map<String, Credentials> credentialStore) {
+   NodeToNodeMetadata(Supplier<Location> location, @Memoized Supplier<Set<? extends Location>> locations,
+            Function<URI, InputStream> slurp, Map<String, Credentials> credentialStore) {
       this.location = checkNotNull(location, "location");
+      this.locations = checkNotNull(locations, "locations");
       this.credentialStore = checkNotNull(credentialStore, "credentialStore");
       this.slurp = checkNotNull(slurp, "slurp");
    }
@@ -69,10 +79,10 @@ public class NodeToNodeMetadata implements Function<Node, NodeMetadata> {
       NodeMetadataBuilder builder = new NodeMetadataBuilder();
       builder.ids(from.getId());
       builder.name(from.getName());
-      builder.location(location.get());
+      builder.location(findLocationWithId(from.getLocationId()));
       builder.group(from.getGroup());
-      // TODO add tags!
-      builder.operatingSystem(new OperatingSystemBuilder().arch(from.getOsArch()).family(
+      builder.tags(from.getTags());
+      builder.operatingSystem(OperatingSystem.builder().arch(from.getOsArch()).family(
                OsFamily.fromValue(from.getOsFamily())).description(from.getOsDescription())
                .version(from.getOsVersion()).build());
       builder.state(NodeState.RUNNING);
@@ -99,4 +109,24 @@ public class NodeToNodeMetadata implements Function<Node, NodeMetadata> {
          builder.adminPassword(from.getSudoPassword());
       return builder.build();
    }
+
+   private Location findLocationWithId(final String locationId) {
+      if (locationId == null)
+         return location.get();
+      try {
+         Location location = Iterables.find(locations.get(), new Predicate<Location>() {
+
+            @Override
+            public boolean apply(Location input) {
+               return input.getId().equals(locationId);
+            }
+
+         });
+         return location;
+
+      } catch (NoSuchElementException e) {
+         logger.debug("couldn't match instance location %s in: %s", locationId, locations.get());
+         return location.get();
+      }
+   }
 }
diff --git a/apis/byon/src/main/java/org/jclouds/byon/functions/NodesFromYaml.java b/apis/byon/src/main/java/org/jclouds/byon/functions/NodesFromYamlStream.java
similarity index 81%
rename from apis/byon/src/main/java/org/jclouds/byon/functions/NodesFromYaml.java
rename to apis/byon/src/main/java/org/jclouds/byon/functions/NodesFromYamlStream.java
index 2e30c61d48..52046332ef 100644
--- a/apis/byon/src/main/java/org/jclouds/byon/functions/NodesFromYaml.java
+++ b/apis/byon/src/main/java/org/jclouds/byon/functions/NodesFromYamlStream.java
@@ -27,12 +27,14 @@ import java.util.Map;
 import javax.inject.Singleton;
 
 import org.jclouds.byon.Node;
+import org.jclouds.byon.domain.YamlNode;
 import org.yaml.snakeyaml.Loader;
 import org.yaml.snakeyaml.TypeDescription;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.Constructor;
 
 import com.google.common.base.Function;
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Maps;
 
 /**
@@ -44,6 +46,7 @@ import com.google.common.collect.Maps;
  *       name: cluster-1
  *       description: xyz
  *       hostname: cluster-1.mydomain.com
+ *       location_id: virginia
  *       os_arch: x86
  *       os_family: linux
  *       os_description: redhat
@@ -59,36 +62,39 @@ import com.google.common.collect.Maps;
  * </pre>
  * 
  * @author Kelvin Kakugawa
+ * @author Adrian Cole
  */
 @Singleton
-public class NodesFromYaml implements Function<InputStream, Map<String, Node>> {
+public class NodesFromYamlStream implements Function<InputStream, Map<String, Node>> {
 
    /**
     * Type-safe config class for YAML
     * 
     */
    public static class Config {
-      public List<Node> nodes;
+      public List<YamlNode> nodes;
    }
 
    @Override
    public Map<String, Node> apply(InputStream source) {
+
       Constructor constructor = new Constructor(Config.class);
 
-      TypeDescription nodeDesc = new TypeDescription(Node.class);
+      TypeDescription nodeDesc = new TypeDescription(YamlNode.class);
       nodeDesc.putListPropertyType("tags", String.class);
       constructor.addTypeDescription(nodeDesc);
 
       TypeDescription configDesc = new TypeDescription(Config.class);
-      configDesc.putListPropertyType("nodes", Node.class);
+      configDesc.putListPropertyType("nodes", YamlNode.class);
       constructor.addTypeDescription(configDesc);
-
+      // note that snakeyaml also throws nosuchmethod error when you use the non-deprecated
+      // constructor
       Yaml yaml = new Yaml(new Loader(constructor));
       Config config = (Config) yaml.load(source);
       checkState(config != null, "missing config: class");
       checkState(config.nodes != null, "missing nodes: collection");
 
-      return Maps.uniqueIndex(config.nodes, new Function<Node, String>() {
+      return Maps.uniqueIndex(Iterables.transform(config.nodes, YamlNode.toNode), new Function<Node, String>() {
          public String apply(Node node) {
             return node.getId();
          }
diff --git a/apis/byon/src/main/java/org/jclouds/byon/internal/BYONComputeServiceAdapter.java b/apis/byon/src/main/java/org/jclouds/byon/internal/BYONComputeServiceAdapter.java
index e161f328cb..5a929b0000 100644
--- a/apis/byon/src/main/java/org/jclouds/byon/internal/BYONComputeServiceAdapter.java
+++ b/apis/byon/src/main/java/org/jclouds/byon/internal/BYONComputeServiceAdapter.java
@@ -21,6 +21,7 @@ package org.jclouds.byon.internal;
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.Map;
+import java.util.Set;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
@@ -34,11 +35,16 @@ import org.jclouds.compute.domain.NodeMetadata;
 import org.jclouds.compute.domain.Template;
 import org.jclouds.domain.Credentials;
 import org.jclouds.domain.Location;
+import org.jclouds.domain.LocationBuilder;
+import org.jclouds.domain.LocationScope;
 import org.jclouds.location.suppliers.JustProvider;
 
+import com.google.common.base.Function;
+import com.google.common.base.Predicates;
 import com.google.common.base.Supplier;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
+import com.google.common.collect.ImmutableSet.Builder;
 
 /**
  * 
@@ -59,8 +65,8 @@ public class BYONComputeServiceAdapter implements JCloudsNativeComputeServiceAda
    }
 
    @Override
-   public NodeMetadata createNodeWithGroupEncodedIntoNameThenStoreCredentials(String tag, String name, Template template,
-            Map<String, Credentials> credentialStore) {
+   public NodeMetadata createNodeWithGroupEncodedIntoNameThenStoreCredentials(String tag, String name,
+            Template template, Map<String, Credentials> credentialStore) {
       throw new UnsupportedOperationException();
    }
 
@@ -79,10 +85,26 @@ public class BYONComputeServiceAdapter implements JCloudsNativeComputeServiceAda
       return Iterables.transform(nodes.get().values(), converter);
    }
 
-   @SuppressWarnings("unchecked")
    @Override
    public Iterable<Location> listLocations() {
-      return (Iterable<Location>) locationSupplier.get();
+      Builder<Location> locations = ImmutableSet.builder();
+      Location provider = Iterables.getOnlyElement(locationSupplier.get());
+      Set<String> zones = ImmutableSet.copyOf(Iterables.filter(Iterables.transform(nodes.get().values(),
+               new Function<Node, String>() {
+
+                  @Override
+                  public String apply(Node arg0) {
+                     return arg0.getLocationId();
+                  }
+               }), Predicates.notNull()));
+      if (zones.size() == 0)
+         return locations.add(provider).build();
+      else
+         for (String zone : zones) {
+            locations.add(new LocationBuilder().scope(LocationScope.ZONE).id(zone).description(zone).parent(provider)
+                     .build());
+         }
+      return locations.build();
    }
 
    @Override
diff --git a/apis/byon/src/test/java/org/jclouds/byon/BYONComputeServiceTest.java b/apis/byon/src/test/java/org/jclouds/byon/BYONComputeServiceTest.java
index 5918fa5ae2..89d5f76c1c 100644
--- a/apis/byon/src/test/java/org/jclouds/byon/BYONComputeServiceTest.java
+++ b/apis/byon/src/test/java/org/jclouds/byon/BYONComputeServiceTest.java
@@ -18,16 +18,19 @@
  */
 package org.jclouds.byon;
 
+import static org.jclouds.byon.functions.NodeToNodeMetadataTest.expectedNodeMetadataFromResource;
+import static org.jclouds.byon.functions.NodeToNodeMetadataTest.expectedProviderLocationFromResource;
+import static org.jclouds.byon.functions.NodeToNodeMetadataTest.zoneCalled;
 import static org.testng.Assert.assertEquals;
 
 import java.net.URI;
 import java.util.Map;
 import java.util.Properties;
 
-import org.jclouds.byon.functions.NodeToNodeMetadataTest;
 import org.jclouds.byon.functions.NodesFromYamlTest;
 import org.jclouds.compute.ComputeServiceContext;
 import org.jclouds.compute.ComputeServiceContextFactory;
+import org.jclouds.domain.Location;
 import org.jclouds.ssh.jsch.config.JschSshClientModule;
 import org.testng.annotations.Test;
 
@@ -56,6 +59,7 @@ public class BYONComputeServiceTest {
    private void assertNodesParse(String endpoint) {
       ComputeServiceContext context = null;
       try {
+         Location providerLocation = expectedProviderLocationFromResource(endpoint);
 
          Properties props = new Properties();
          props.setProperty("byon.endpoint", endpoint);
@@ -69,12 +73,45 @@ public class BYONComputeServiceTest {
                   .getApi();
 
          assertEquals(supplier.get().size(), context.getComputeService().listNodes().size());
-         assertEquals(supplier.get(), ImmutableMap.<String, Node> of(NodesFromYamlTest.TEST1.id,
+         assertEquals(supplier.get(), ImmutableMap.<String, Node> of(NodesFromYamlTest.TEST1.getId(),
                   NodesFromYamlTest.TEST1));
 
-         assertEquals(context.getComputeService().listNodes(), ImmutableSet.of(NodeToNodeMetadataTest
-                  .expectedNodeMetadataFromResource(endpoint)));
+         assertEquals(context.getComputeService().listNodes(), ImmutableSet
+                  .of(expectedNodeMetadataFromResource(endpoint)));
+         assertEquals(context.getComputeService().listAssignableLocations(), ImmutableSet.of(providerLocation));
+      } finally {
+         if (context != null)
+            context.close();
+      }
+   }
 
+   public void testNodesWithLocations() {
+      ComputeServiceContext context = null;
+      try {
+         String endpoint = "file://" + getClass().getResource("/test_location.yaml").getPath();
+         Properties props = new Properties();
+         props.setProperty("byon.endpoint", endpoint);
+         context = new ComputeServiceContextFactory().createContext("byon", "foo", "bar", ImmutableSet
+                  .<Module> of(new JschSshClientModule()), props);
+
+         assertEquals(context.getProviderSpecificContext().getEndpoint(), URI.create(endpoint));
+
+         @SuppressWarnings("unchecked")
+         Supplier<Map<String, Node>> supplier = (Supplier<Map<String, Node>>) context.getProviderSpecificContext()
+                  .getApi();
+
+         assertEquals(supplier.get().size(), context.getComputeService().listNodes().size());
+         assertEquals(supplier.get(), ImmutableMap.<String, Node> of(NodesFromYamlTest.TEST2.getId(),
+                  NodesFromYamlTest.TEST2, NodesFromYamlTest.TEST3.getId(), NodesFromYamlTest.TEST3));
+         Location providerLocation = expectedProviderLocationFromResource(endpoint);
+
+         Location virginia = zoneCalled("virginia", providerLocation);
+         Location maryland = zoneCalled("maryland", providerLocation);
+
+         assertEquals(context.getComputeService().listNodes(), ImmutableSet.of(expectedNodeMetadataFromResource(1,
+                  endpoint, virginia), expectedNodeMetadataFromResource(2, endpoint, maryland)));
+         
+         assertEquals(context.getComputeService().listAssignableLocations(), ImmutableSet.of(virginia, maryland));
       } finally {
          if (context != null)
             context.close();
diff --git a/apis/byon/src/test/java/org/jclouds/byon/config/YamlNodeStoreModuleTest.java b/apis/byon/src/test/java/org/jclouds/byon/config/YamlNodeStoreModuleTest.java
new file mode 100644
index 0000000000..635deceb91
--- /dev/null
+++ b/apis/byon/src/test/java/org/jclouds/byon/config/YamlNodeStoreModuleTest.java
@@ -0,0 +1,163 @@
+/**
+ *
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.byon.config;
+
+import static org.testng.Assert.assertEquals;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.jclouds.byon.Node;
+import org.jclouds.io.CopyInputStreamInputSupplierMap;
+import org.jclouds.util.Strings2;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+import org.yaml.snakeyaml.Yaml;
+
+import com.google.common.io.InputSupplier;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import com.google.inject.Key;
+import com.google.inject.TypeLiteral;
+
+/**
+ * 
+ * @author Adrian Cole
+ */
+@Test(groups = "unit", singleThreaded = true)
+public class YamlNodeStoreModuleTest {
+   Yaml json = createInjector().getInstance(Yaml.class);
+
+   @DataProvider(name = "names")
+   public Object[][] createData() {
+      return new Object[][] { { "instance1", "bear" }, { "instance2", "apple" }, { "instance2", "francis" },
+               { "instance4", "robot" } };
+   }
+
+   @Test(dataProvider = "names")
+   public void deleteObject(String id, String name) throws InterruptedException, IOException {
+      Injector injector = createInjector();
+      Map<String, InputStream> map = getMap(injector);
+      check(map, getStore(injector), "i-20312", id, name);
+   }
+
+   public void testProvidedMapWithValue() throws IOException {
+      Map<String, InputStream> map = new CopyInputStreamInputSupplierMap(
+               new ConcurrentHashMap<String, InputSupplier<InputStream>>());
+
+      map.put("test", new ByteArrayInputStream("id: instance1\nname: instancename\n".getBytes()));
+      checkConsistent(map, getStore(createInjectorWithProvidedMap(map)), "test", "instance1", "instancename");
+      checkConsistent(map, getStore(createInjectorWithProvidedMap(map)), "test", "instance1", "instancename");
+      remove(map, getStore(createInjectorWithProvidedMap(map)), "test");
+
+   }
+
+   public void testProvidedConsistentAcrossRepeatedWrites() throws IOException {
+      Map<String, InputStream> map = new CopyInputStreamInputSupplierMap(
+               new ConcurrentHashMap<String, InputSupplier<InputStream>>());
+
+      Injector injector = createInjectorWithProvidedMap(map);
+      assertEquals(injector.getInstance(Key.get(new TypeLiteral<Map<String, InputStream>>() {
+      })), map);
+      Map<String, Node> store = getStore(injector);
+
+      for (int i = 0; i < 10; i++)
+         check(map, store, "test" + i, "instance1" + i, "instancename" + i);
+
+   }
+
+   public void testProvidedConsistentAcrossMultipleInjectors() throws IOException {
+      Map<String, InputStream> map = new CopyInputStreamInputSupplierMap(
+               new ConcurrentHashMap<String, InputSupplier<InputStream>>());
+
+      put(map, getStore(createInjectorWithProvidedMap(map)), "test", "instance1", "instancename");
+      checkConsistent(map, getStore(createInjectorWithProvidedMap(map)), "test", "instance1", "instancename");
+      checkConsistent(map, getStore(createInjectorWithProvidedMap(map)), "test", "instance1", "instancename");
+      remove(map, getStore(createInjectorWithProvidedMap(map)), "test");
+
+   }
+
+   public void testDefaultConsistentAcrossMultipleInjectors() throws IOException {
+      Map<String, InputStream> map = getMap(createInjector());
+
+      put(map, getStore(createInjector()), "test", "instance1", "instancename");
+      checkConsistent(map, getStore(createInjector()), "test", "instance1", "instancename");
+      checkConsistent(map, getStore(createInjector()), "test", "instance1", "instancename");
+      remove(map, getStore(createInjector()), "test");
+
+   }
+
+   protected Map<String, Node> getStore(Injector injector) {
+      return injector.getInstance(Key.get(new TypeLiteral<Map<String, Node>>() {
+      }));
+   }
+
+   protected Map<String, InputStream> getMap(Injector injector) {
+      return injector.getInstance(Key.get(new TypeLiteral<Map<String, InputStream>>() {
+      }));
+   }
+
+   protected Injector createInjectorWithProvidedMap(Map<String, InputStream> map) {
+      return Guice.createInjector(new YamlNodeStoreModule(map));
+   }
+
+   protected Injector createInjector() {
+      return Guice.createInjector(new YamlNodeStoreModule());
+   }
+
+   protected void check(Map<String, InputStream> map, Map<String, Node> store, String key, String id, String name)
+            throws IOException {
+      put(map, store, key, id, name);
+      checkConsistent(map, store, key, id, name);
+      remove(map, store, key);
+   }
+
+   protected void remove(Map<String, InputStream> map, Map<String, Node> store, String key) {
+      store.remove(key);
+      assertEquals(store.size(), 0);
+      assertEquals(map.size(), 0);
+      assertEquals(store.get(key), null);
+      assertEquals(map.get(key), null);
+   }
+
+   protected void checkConsistent(Map<String, InputStream> map, Map<String, Node> store, String key, String id,
+            String name) throws IOException {
+      assertEquals(store.size(), 1);
+      assertEquals(map.size(), 1);
+      // checkRepeatedRead
+      assertEquals(store.get(key), Node.builder().id(id).name(name).build());
+      assertEquals(store.get(key), Node.builder().id(id).name(name).build());
+      // checkRepeatedRead
+      checkToYaml(map, key, id, name);
+      checkToYaml(map, key, id, name);
+   }
+
+   protected void checkToYaml(Map<String, InputStream> map, String key, String id, String name) throws IOException {
+      assertEquals(Strings2.toStringAndClose(map.get(key)), String.format("id: %s\nname: %s\n", id, name));
+   }
+
+   protected void put(Map<String, InputStream> map, Map<String, Node> store, String key, String id, String name) {
+      assertEquals(store.size(), 0);
+      assertEquals(map.size(), 0);
+      store.put(key, Node.builder().id(id).name(name).build());
+   }
+}
\ No newline at end of file
diff --git a/apis/byon/src/test/java/org/jclouds/byon/functions/NodeToNodeMetadataTest.java b/apis/byon/src/test/java/org/jclouds/byon/functions/NodeToNodeMetadataTest.java
index 186cf1ac98..3a59c24026 100644
--- a/apis/byon/src/test/java/org/jclouds/byon/functions/NodeToNodeMetadataTest.java
+++ b/apis/byon/src/test/java/org/jclouds/byon/functions/NodeToNodeMetadataTest.java
@@ -22,12 +22,13 @@ import static org.testng.Assert.assertEquals;
 
 import java.net.URI;
 import java.util.Map;
+import java.util.Set;
 
 import org.jclouds.byon.suppliers.SupplyFromProviderURIOrNodesProperty;
 import org.jclouds.compute.domain.NodeMetadata;
 import org.jclouds.compute.domain.NodeMetadataBuilder;
 import org.jclouds.compute.domain.NodeState;
-import org.jclouds.compute.domain.OperatingSystemBuilder;
+import org.jclouds.compute.domain.OperatingSystem;
 import org.jclouds.compute.domain.OsFamily;
 import org.jclouds.domain.Credentials;
 import org.jclouds.domain.Location;
@@ -45,31 +46,51 @@ import com.google.common.collect.Maps;
  * @author Adrian Cole
  */
 public class NodeToNodeMetadataTest {
-   public static Location expectedLocationFromResource(String resource) {
+   public static Location expectedProviderLocationFromResource(String resource) {
       return new LocationBuilder().scope(LocationScope.PROVIDER).id("byon").description(resource).build();
    }
 
-   public static NodeMetadata expectedNodeMetadataFromResource(String resource) {
-      Location location = expectedLocationFromResource(resource);
+   public static Location zoneCalled(String zone, Location parent) {
+      return new LocationBuilder().scope(LocationScope.ZONE).id(zone).description(zone).parent(parent).build();
+   }
 
-      return new NodeMetadataBuilder().ids("cluster-1").group("hadoop").name("cluster-1").location(location).state(
-               NodeState.RUNNING).operatingSystem(
-               new OperatingSystemBuilder().description("redhat").family(OsFamily.RHEL).arch("x86").version("5.3")
-                        .build()).publicAddresses(ImmutableSet.of("cluster-1.mydomain.com")).credentials(
-               new Credentials("myUser", NodesFromYamlTest.key)).adminPassword("happy bear").build();
+   String resource = "location";
+
+   Location provider = expectedProviderLocationFromResource(resource);
+
+   Map<String, Credentials> credentialStore = Maps.newLinkedHashMap();
+
+   NodeToNodeMetadata parser = new NodeToNodeMetadata(Suppliers.ofInstance(provider), Suppliers
+            .<Set<? extends Location>> ofInstance(ImmutableSet.of(provider, zoneCalled("virginia", provider))),
+            new SupplyFromProviderURIOrNodesProperty(URI.create("test")), credentialStore);
+
+   public static NodeMetadata expectedNodeMetadataFromResource(String resource) {
+      return expectedNodeMetadataFromResource(resource, expectedProviderLocationFromResource(resource));
+   }
+
+   public static NodeMetadata expectedNodeMetadataFromResource(String resource, Location location) {
+      return expectedNodeMetadataFromResource(1, resource, location);
+   }
+
+   public static NodeMetadata expectedNodeMetadataFromResource(int id, String resource, Location location) {
+      return new NodeMetadataBuilder().ids("cluster-" + id).group("hadoop").name("cluster-" + id).location(location)
+               .state(NodeState.RUNNING).operatingSystem(
+                        OperatingSystem.builder().description("redhat").family(OsFamily.RHEL).arch("x86")
+                                 .version("5.3").build()).publicAddresses(
+                        ImmutableSet.of("cluster-" + id + ".mydomain.com")).credentials(
+                        new Credentials("myUser", NodesFromYamlTest.key)).adminPassword("happy bear").build();
    }
 
    @Test
    public void testNodesParse() throws Exception {
-
-      Map<String, Credentials> credentialStore = Maps.newLinkedHashMap();
-
-      NodeToNodeMetadata parser = new NodeToNodeMetadata(
-               Suppliers.ofInstance(expectedLocationFromResource("location")),
-               new SupplyFromProviderURIOrNodesProperty(URI.create("test")), credentialStore);
-
-      assertEquals(parser.apply(NodesFromYamlTest.TEST1), expectedNodeMetadataFromResource("location"));
+      assertEquals(parser.apply(NodesFromYamlTest.TEST1), expectedNodeMetadataFromResource(resource, provider));
       assertEquals(credentialStore, ImmutableMap.of("node#cluster-1", new Credentials("myUser", NodesFromYamlTest.key)));
+   }
 
+   @Test
+   public void testNodesParseLocation() throws Exception {
+      assertEquals(parser.apply(NodesFromYamlTest.TEST2), expectedNodeMetadataFromResource(resource, zoneCalled(
+               "virginia", provider)));
+      assertEquals(credentialStore, ImmutableMap.of("node#cluster-1", new Credentials("myUser", NodesFromYamlTest.key)));
    }
 }
diff --git a/apis/byon/src/test/java/org/jclouds/byon/functions/NodesFromYamlTest.java b/apis/byon/src/test/java/org/jclouds/byon/functions/NodesFromYamlTest.java
index 4a4b5855f8..292804ac4c 100644
--- a/apis/byon/src/test/java/org/jclouds/byon/functions/NodesFromYamlTest.java
+++ b/apis/byon/src/test/java/org/jclouds/byon/functions/NodesFromYamlTest.java
@@ -41,29 +41,47 @@ public class NodesFromYamlTest {
             .toString();
 
    public static final Node TEST1 = new Node("cluster-1", "cluster-1", "accounting analytics cluster",
-            "cluster-1.mydomain.com", "x86", "rhel", "redhat", "5.3", "hadoop", ImmutableList.of("vanilla"), "myUser",
-            key, null, "happy bear");
+            "cluster-1.mydomain.com", null, "x86", "rhel", "redhat", "5.3", false, "hadoop", ImmutableList.of("vanilla"),
+            "myUser", key, null, "happy bear");
+
+   public static final Node TEST2 = new Node("cluster-1", "cluster-1", "accounting analytics cluster",
+            "cluster-1.mydomain.com", "virginia", "x86", "rhel", "redhat", "5.3", false, "hadoop",
+            ImmutableList.of("vanilla"), "myUser", key, null, "happy bear");
+
+   public static final Node TEST3 = new Node("cluster-2", "cluster-2", "accounting analytics cluster",
+            "cluster-2.mydomain.com", "maryland", "x86", "rhel", "redhat", "5.3", false, "hadoop",
+            ImmutableList.of("vanilla"), "myUser", key, null, "happy bear");
 
    @Test
    public void testNodesParse() throws Exception {
 
       InputStream is = getClass().getResourceAsStream("/test1.yaml");
-      NodesFromYaml parser = new NodesFromYaml();
+      NodesFromYamlStream parser = new NodesFromYamlStream();
 
       assertEquals(parser.apply(is), ImmutableMap.of(TEST1.getId(), TEST1));
    }
 
+   @Test
+   public void testNodesParseLocation() throws Exception {
+
+      InputStream is = getClass().getResourceAsStream("/test_location.yaml");
+      NodesFromYamlStream parser = new NodesFromYamlStream();
+
+      assertEquals(parser.apply(is), ImmutableMap.of(TEST2.getId(), TEST2, TEST3.getId(), TEST3));
+   }
+
    @Test
    public void testNodesParseWhenCredentialInUrl() throws Exception {
 
       InputStream is = getClass().getResourceAsStream("/test_with_url.yaml");
-      NodesFromYaml parser = new NodesFromYaml();
+      NodesFromYamlStream parser = new NodesFromYamlStream();
 
       assertEquals(parser.apply(is), ImmutableMap.of(TEST1.getId(), TEST1));
    }
 
    @Test(expectedExceptions = IllegalStateException.class)
    public void testMustParseSomething() throws Exception {
-      new NodesFromYaml().apply(Strings2.toInputStream(""));
+      new NodesFromYamlStream().apply(Strings2.toInputStream(""));
    }
-}
+
+}
\ No newline at end of file
diff --git a/apis/byon/src/test/java/org/jclouds/byon/suppliers/NodesParsedFromSupplierTest.java b/apis/byon/src/test/java/org/jclouds/byon/suppliers/NodesParsedFromSupplierTest.java
index bb6c3c66b6..feb344a1ce 100644
--- a/apis/byon/src/test/java/org/jclouds/byon/suppliers/NodesParsedFromSupplierTest.java
+++ b/apis/byon/src/test/java/org/jclouds/byon/suppliers/NodesParsedFromSupplierTest.java
@@ -18,7 +18,7 @@
  */
 package org.jclouds.byon.suppliers;
 
-import org.jclouds.byon.functions.NodesFromYaml;
+import org.jclouds.byon.functions.NodesFromYamlStream;
 import org.jclouds.util.Strings2;
 import org.testng.annotations.Test;
 
@@ -33,7 +33,7 @@ public class NodesParsedFromSupplierTest {
    @Test(expectedExceptions = IllegalStateException.class)
    public void testMustParseSomething() throws Exception {
 
-      new NodesParsedFromSupplier(Suppliers.ofInstance(Strings2.toInputStream("nodes:\n")), new NodesFromYaml()).get();
+      new NodesParsedFromSupplier(Suppliers.ofInstance(Strings2.toInputStream("nodes:\n")), new NodesFromYamlStream()).get();
 
    }
 }
diff --git a/apis/byon/src/test/resources/test_location.yaml b/apis/byon/src/test/resources/test_location.yaml
new file mode 100644
index 0000000000..4f98110789
--- /dev/null
+++ b/apis/byon/src/test/resources/test_location.yaml
@@ -0,0 +1,43 @@
+nodes:
+    - id: cluster-1
+      name: cluster-1
+      description: accounting analytics cluster
+      hostname: cluster-1.mydomain.com
+      location_id: virginia
+      os_arch: x86
+      os_family: rhel
+      os_description: redhat
+      os_version: 5.3
+      group: hadoop
+      tags:
+          - vanilla
+      username: myUser
+      credential: |
+                  -----BEGIN RSA PRIVATE KEY-----
+                  MIIEowIBAAKCAQEAuzaE6azgUxwESX1rCGdJ5xpdrc1XC311bOGZBCE8NA+CpFh2
+                  u01Vfv68NC4u6LFgdXSY1vQt6hiA5TNqQk0TyVfFAunbXgTekF6XqDPQUf1nq9aZ
+                  lMvo4vlaLDKBkhG5HJE/pIa0iB+RMZLS0GhxsIWerEDmYdHKM25o
+                  -----END RSA PRIVATE KEY-----
+      sudo_password: happy bear
+      
+    - id: cluster-2
+      name: cluster-2
+      description: accounting analytics cluster
+      hostname: cluster-2.mydomain.com
+      location_id: maryland
+      os_arch: x86
+      os_family: rhel
+      os_description: redhat
+      os_version: 5.3
+      group: hadoop
+      tags:
+          - vanilla
+      username: myUser
+      credential: |
+                  -----BEGIN RSA PRIVATE KEY-----
+                  MIIEowIBAAKCAQEAuzaE6azgUxwESX1rCGdJ5xpdrc1XC311bOGZBCE8NA+CpFh2
+                  u01Vfv68NC4u6LFgdXSY1vQt6hiA5TNqQk0TyVfFAunbXgTekF6XqDPQUf1nq9aZ
+                  lMvo4vlaLDKBkhG5HJE/pIa0iB+RMZLS0GhxsIWerEDmYdHKM25o
+                  -----END RSA PRIVATE KEY-----
+      sudo_password: happy bear      
+      
\ No newline at end of file
diff --git a/apis/cloudfiles/pom.xml b/apis/cloudfiles/pom.xml
index 04f4ef8950..e968b8dd5d 100644
--- a/apis/cloudfiles/pom.xml
+++ b/apis/cloudfiles/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>cloudfiles</artifactId>
     <name>jcloud cloudfiles api</name>
     <description>jclouds components to access an implementation of CloudFiles</description>
+    <packaging>bundle</packaging>
 
     <properties>
         <test.initializer>org.jclouds.cloudfiles.blobstore.integration.CloudFilesTestInitializer</test.initializer>
@@ -145,6 +146,21 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>    
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.cloudfiles.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
 
diff --git a/apis/cloudservers/pom.xml b/apis/cloudservers/pom.xml
index 08b2ec2d15..1b697e2594 100644
--- a/apis/cloudservers/pom.xml
+++ b/apis/cloudservers/pom.xml
@@ -29,10 +29,12 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../../project/pom.xml</relativePath>
     </parent>
+
     <groupId>org.jclouds.api</groupId>
     <artifactId>cloudservers</artifactId>
     <name>jcloud cloudservers api</name>
     <description>jclouds components to access an implementation of CloudServers</description>
+    <packaging>bundle</packaging>
 
     <properties>
         <test.cloudservers.endpoint>https://auth.api.rackspacecloud.com</test.cloudservers.endpoint>
@@ -145,6 +147,21 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>    
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.cloudservers.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
 
diff --git a/apis/deltacloud/pom.xml b/apis/deltacloud/pom.xml
index 033ad23fa0..770e4a3776 100644
--- a/apis/deltacloud/pom.xml
+++ b/apis/deltacloud/pom.xml
@@ -34,6 +34,7 @@
     <artifactId>deltacloud</artifactId>
     <name>jclouds deltacloud core</name>
     <description>jclouds components to access deltacloud</description>
+    <packaging>bundle</packaging>
     
     <!-- bootstrapping: need to fetch the project POM -->
     <repositories>
@@ -141,4 +142,21 @@
             </build>
         </profile>
     </profiles>
+
+    <build>
+        <plugins>
+            <plugin>    
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.deltacloud.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
diff --git a/apis/ec2/pom.xml b/apis/ec2/pom.xml
index 107b73ef27..c7f44d4125 100644
--- a/apis/ec2/pom.xml
+++ b/apis/ec2/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>ec2</artifactId>
     <name>jcloud ec2 api</name>
     <description>jclouds components to access an implementation of EC2</description>
+    <packaging>bundle</packaging>
 
     <properties>
         <!-- when instances are hung, open a ticket and add here -->
@@ -142,6 +143,21 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>    
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.ec2.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
 
diff --git a/apis/ec2/src/main/clojure/org/jclouds/ec2/ebs.clj b/apis/ec2/src/main/clojure/org/jclouds/ec2/ebs.clj
index 62a172c939..05203bef12 100644
--- a/apis/ec2/src/main/clojure/org/jclouds/ec2/ebs.clj
+++ b/apis/ec2/src/main/clojure/org/jclouds/ec2/ebs.clj
@@ -25,20 +25,20 @@
   (:use (clojure.contrib def core))
   (:import org.jclouds.aws.domain.Region
     org.jclouds.compute.domain.NodeMetadata
-    (org.jclouds.aws.ec2.domain Volume Volume$Status Snapshot Snapshot$Status AvailabilityZone)
-    (org.jclouds.aws.ec2.options DescribeSnapshotsOptions DetachVolumeOptions CreateSnapshotOptions)))
+    (org.jclouds.ec2.domain Volume Volume$Status Snapshot Snapshot$Status AvailabilityZoneInfo)
+    (org.jclouds.ec2.options DescribeSnapshotsOptions DetachVolumeOptions CreateSnapshotOptions)))
 
 (defn snapshot?
-  "Returns true iff the argument is a org.jclouds.aws.ec2.domain.Snapshot."
+  "Returns true iff the argument is a org.jclouds.ec2.domain.Snapshot."
   [s]
   (instance? Snapshot s))
 
 (defn volume?
-  "Returns true iff the argument is a org.jclouds.aws.ec2.domain.Volume."
+  "Returns true iff the argument is a org.jclouds.ec2.domain.Volume."
   [v]
   (instance? Volume v))
 
-(defn #^org.jclouds.aws.ec2.services.ElasticBlockStoreClient
+(defn #^org.jclouds.ec2.services.ElasticBlockStoreClient
   ebs-service
   "Returns the synchronous ElasticBlockStoreClient associated with
    the specified compute service, or compute/*compute* as bound by with-compute-service."
@@ -74,7 +74,7 @@
                    (str "Can't obtain volume id from argument of type " (class v))))))
 
 (defn volumes
-  "Returns a set of org.jclouds.aws.ec2.domain.Volume instances corresponding to the
+  "Returns a set of org.jclouds.ec2.domain.Volume instances corresponding to the
    volumes in the specified region (defaulting to your account's default region).
 
    e.g. (with-compute-service [compute] (volumes))
@@ -172,7 +172,7 @@
 (defn get-zone
   [v]
   (cond
-    (instance? AvailabilityZone v) v
+    (instance? AvailabilityZoneInfo v) (.getZone  v)
     (instance? NodeMetadata v) (compute/location #^NodeMetadata v)
     (string? v) v
     (keyword? v) (name v)
@@ -225,14 +225,14 @@
 (defn create-volume
   "Creates a new volume given a set of options:
 
-   - one of :zone (keyword, string, or AvailabilityZone) or :node (NodeMetadata)
+   - one of :zone (keyword, string, or AvailabilityZoneInfo) or :node (NodeMetadata)
    - one or both of :snapshot (keyword, string, or Snapshot instance) or :size
      (string, keyword, or number)
    - :device (string or keyword) provided *only* when you want to attach the new volume to
      the :node you specified!
 
-   Returns a vector of [created org.jclouds.aws.ec2.domain.Volume,
-                        optional org.jclouds.aws.ec2.domain.Attachment]
+   Returns a vector of [created org.jclouds.ec2.domain.Volume,
+                        optional org.jclouds.ec2.domain.Attachment]
 
    Note that specifying :node instead of :zone will only attach the created volume
    :device is also provided.  Otherwise, the node is only used to obtain the desired
diff --git a/apis/ec2/src/main/clojure/org/jclouds/ec2/elastic_ip.clj b/apis/ec2/src/main/clojure/org/jclouds/ec2/elastic_ip.clj
index 003f3a99fb..cd1a70a616 100644
--- a/apis/ec2/src/main/clojure/org/jclouds/ec2/elastic_ip.clj
+++ b/apis/ec2/src/main/clojure/org/jclouds/ec2/elastic_ip.clj
@@ -22,12 +22,12 @@
      :doc "A clojure binding for the jclouds AWS elastic IP address interface."}
   org.jclouds.ec2.elastic-ip
   (:require (org.jclouds [compute :as compute])
-    [org.jclouds.aws.ebs :as ebs])
+    [org.jclouds.ec2.ebs :as ebs])
   (:use (clojure.contrib def core))
   (:import org.jclouds.compute.domain.NodeMetadata
-    (org.jclouds.aws.ec2.domain PublicIpInstanceIdPair)))
+    (org.jclouds.ec2.domain PublicIpInstanceIdPair)))
 
-(defn #^org.jclouds.aws.ec2.services.ElasticIPAddressClient
+(defn #^org.jclouds.ec2.services.ElasticIPAddressClient
   eip-service
   "Returns the synchronous ElasticIPAddressClient associated with
    the specified compute service, or compute/*compute* as bound by with-compute-service."
diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/EC2ComputeService.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/EC2ComputeService.java
index 7cbbb0dd5a..ae6f0e663e 100644
--- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/EC2ComputeService.java
+++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/EC2ComputeService.java
@@ -37,6 +37,7 @@ import org.jclouds.Constants;
 import org.jclouds.aws.util.AWSUtils;
 import org.jclouds.collect.Memoized;
 import org.jclouds.compute.ComputeServiceContext;
+import org.jclouds.compute.callables.RunScriptOnNode;
 import org.jclouds.compute.domain.Hardware;
 import org.jclouds.compute.domain.Image;
 import org.jclouds.compute.domain.NodeMetadata;
@@ -91,14 +92,16 @@ public class EC2ComputeService extends BaseComputeService {
          @Named("NODE_RUNNING") Predicate<NodeMetadata> nodeRunning,
          @Named("NODE_TERMINATED") Predicate<NodeMetadata> nodeTerminated,
          @Named("NODE_SUSPENDED") Predicate<NodeMetadata> nodeSuspended,
-         InitializeRunScriptOnNodeOrPlaceInBadMap.Factory initScriptRunnerFactory, InitAdminAccess initAdminAccess,
+         InitializeRunScriptOnNodeOrPlaceInBadMap.Factory initScriptRunnerFactory,
+         RunScriptOnNode.Factory runScriptOnNodeFactory, InitAdminAccess initAdminAccess,
          PersistNodeCredentials persistNodeCredentials, Timeouts timeouts,
          @Named(Constants.PROPERTY_USER_THREADS) ExecutorService executor, EC2Client ec2Client,
          Map<RegionAndName, KeyPair> credentialsMap, @Named("SECURITY") Map<RegionAndName, String> securityGroupMap) {
       super(context, credentialStore, images, sizes, locations, listNodesStrategy, getNodeMetadataStrategy,
             runNodesAndAddToSetStrategy, rebootNodeStrategy, destroyNodeStrategy, startNodeStrategy, stopNodeStrategy,
             templateBuilderProvider, templateOptionsProvider, nodeRunning, nodeTerminated, nodeSuspended,
-            initScriptRunnerFactory, initAdminAccess, persistNodeCredentials, timeouts, executor);
+            initScriptRunnerFactory, initAdminAccess, runScriptOnNodeFactory, persistNodeCredentials, timeouts,
+            executor);
       this.ec2Client = ec2Client;
       this.credentialsMap = credentialsMap;
       this.securityGroupMap = securityGroupMap;
diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/Volume.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/Volume.java
index 7312524c55..c5f15810ce 100644
--- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/Volume.java
+++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/Volume.java
@@ -65,7 +65,7 @@ public class Volume implements Comparable<Volume> {
    }
 
    public static enum Status {
-      CREATING, AVAILABLE, IN_USE, DELETING, UNRECOGNIZED;
+      CREATING, AVAILABLE, IN_USE, DELETING, ERROR, UNRECOGNIZED;
       public String value() {
          return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_HYPHEN, name());
       }
diff --git a/apis/elasticstack/pom.xml b/apis/elasticstack/pom.xml
index bbeda69387..7ede5a3de7 100644
--- a/apis/elasticstack/pom.xml
+++ b/apis/elasticstack/pom.xml
@@ -34,6 +34,7 @@
     <artifactId>elasticstack</artifactId>
     <name>jclouds elasticstack core</name>
     <description>jclouds components to access elasticstack</description>
+    <packaging>bundle</packaging>
     
     <!-- bootstrapping: need to fetch the project POM -->
     <repositories>
@@ -147,4 +148,20 @@
             </build>
         </profile>
     </profiles>
+
+    <build>
+        <plugins>
+            <plugin>    
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.elastichosts.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/apis/eucalyptus/pom.xml b/apis/eucalyptus/pom.xml
index 385ac0d096..9bc3d05365 100644
--- a/apis/eucalyptus/pom.xml
+++ b/apis/eucalyptus/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>eucalyptus</artifactId>
     <name>jclouds Eucalyptus api</name>
     <description>EC2 implementation based on Eucalyptus</description>
+    <packaging>bundle</packaging>
 
     <properties>
         <test.eucalyptus.endpoint>http://ecc.eucalyptus.com:8773/services/Eucalyptus</test.eucalyptus.endpoint>
@@ -136,6 +137,21 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>    
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.eucalyptus.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
 
diff --git a/apis/filesystem/pom.xml b/apis/filesystem/pom.xml
index edda5c8599..a094f69d49 100644
--- a/apis/filesystem/pom.xml
+++ b/apis/filesystem/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>filesystem</artifactId>
     <name>jcloud filesystem core</name>
     <description>jclouds components to access filesystem</description>
+    <packaging>bundle</packaging>
 
     <dependencies>
         <dependency>
@@ -72,5 +73,21 @@
         <test.initializer>org.jclouds.filesystem.integration.FilesystemTestInitializer</test.initializer>
     </properties>
 
+    <build>
+        <plugins>
+            <plugin>    
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.filesystem.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
 
diff --git a/apis/nova/pom.xml b/apis/nova/pom.xml
index 0104b4bd9c..f029512e81 100644
--- a/apis/nova/pom.xml
+++ b/apis/nova/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>nova</artifactId>
     <name>jcloud nova api</name>
     <description>jclouds components to access an implementation of OpenStack Nova</description>
+    <packaging>bundle</packaging>
 
     <properties>
 
@@ -96,22 +97,6 @@
         </dependency>
     </dependencies>
     
-    <build>
-    	<plugins>
-    		<plugin>
-    			<artifactId>maven-remote-resources-plugin</artifactId>
-                <version>1.2</version>
-                <executions>             
-                    <execution>
-                        <id>process-remote-resources</id>
-                        <!-- plugin is tuned off due to incorrect work in Eclipse-->
-                        <phase></phase>
-                    </execution>          
-                </executions>
-    		</plugin>
-    	</plugins>
-    </build>
-    
     <profiles>
         <profile>
             <id>live</id>
@@ -175,5 +160,20 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>    
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.openstack.nova.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
diff --git a/apis/nova/src/test/java/org/jclouds/openstack/nova/NovaAsyncClientTest.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/NovaAsyncClientTest.java
index 6728c0acf1..15f2a35eab 100644
--- a/apis/nova/src/test/java/org/jclouds/openstack/nova/NovaAsyncClientTest.java
+++ b/apis/nova/src/test/java/org/jclouds/openstack/nova/NovaAsyncClientTest.java
@@ -66,7 +66,7 @@ import static org.testng.Assert.assertEquals;
  * @author Adrian Cole
  */
 // NOTE:without testName, this will not call @Before* and fail w/NPE during surefire
-@Test(groups = "unit", testName = "NovaAsyncClientTest")
+@Test(groups = "unit", singleThreaded = true, testName = "NovaAsyncClientTest")
 public class NovaAsyncClientTest extends RestClientTest<NovaAsyncClient> {
    private static final Class<? extends ListOptions[]> listOptionsVarargsClass = new ListOptions[]{}.getClass();
    private static final Class<? extends CreateServerOptions[]> createServerOptionsVarargsClass = new CreateServerOptions[]{}
diff --git a/apis/s3/pom.xml b/apis/s3/pom.xml
index a8a4542cfc..c5deb1bb9f 100644
--- a/apis/s3/pom.xml
+++ b/apis/s3/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>s3</artifactId>
     <name>jcloud s3 api</name>
     <description>jclouds components to access an implementation of S3</description>
+    <packaging>bundle</packaging>
 
     <properties>
         <test.initializer>org.jclouds.s3.blobstore.integration.S3TestInitializer</test.initializer>
@@ -143,6 +144,21 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>    
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.s3.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
 
diff --git a/apis/scality-rs2/pom.xml b/apis/scality-rs2/pom.xml
index 0a90bf7c36..4191aa583b 100644
--- a/apis/scality-rs2/pom.xml
+++ b/apis/scality-rs2/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>scality-rs2</artifactId>
     <name>jclouds Eucalyptus Walrus api</name>
     <description>Simple Storage Service (S3) implementation based on Scality RING RS2</description>
+    <packaging>bundle</packaging>
 
     <properties>
         <test.initializer>org.jclouds.scality.rs2.blobstore.ScalityRS2TestInitializer</test.initializer>
@@ -139,6 +140,21 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>    
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.scality.rs2.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
 
diff --git a/apis/swift/pom.xml b/apis/swift/pom.xml
index d2c81ef2db..cc777879b4 100644
--- a/apis/swift/pom.xml
+++ b/apis/swift/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>swift</artifactId>
     <name>jcloud swift api</name>
     <description>jclouds components to access an implementation of OpenStack Swift</description>
+    <packaging>bundle</packaging>
 
     <properties>
         <test.initializer>org.jclouds.openstack.swift.blobstore.integration.SwiftTestInitializer</test.initializer>
@@ -143,6 +144,21 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>    
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.openstack.swift.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
 
diff --git a/apis/vcloud/pom.xml b/apis/vcloud/pom.xml
index ef13db1328..1931c88099 100644
--- a/apis/vcloud/pom.xml
+++ b/apis/vcloud/pom.xml
@@ -32,6 +32,7 @@
     <artifactId>vcloud</artifactId>
     <name>jcloud vcloud api</name>
     <description>jclouds components to access an implementation of VMWare vCloud</description>
+    <packaging>bundle</packaging>
 
     <properties>
         <!-- when instances are hung, open a ticket and add here -->
@@ -156,4 +157,20 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>    
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.vcloud.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
diff --git a/apis/vcloudexpress/pom.xml b/apis/vcloudexpress/pom.xml
index 04a6fc9663..229cfdc70a 100644
--- a/apis/vcloudexpress/pom.xml
+++ b/apis/vcloudexpress/pom.xml
@@ -32,6 +32,7 @@
     <artifactId>vcloudexpress</artifactId>
     <name>jcloud vcloudexpress api</name>
     <description>jclouds components to access an implementation of VMWare vCloud Express</description>
+    <packaging>bundle</packaging>
 
     <properties>
         <!-- when instances are hung, open a ticket and add here -->
@@ -156,4 +157,20 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>    
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.vcloud.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
diff --git a/apis/walrus/pom.xml b/apis/walrus/pom.xml
index 045191c9d4..704060ddf8 100644
--- a/apis/walrus/pom.xml
+++ b/apis/walrus/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>walrus</artifactId>
     <name>jclouds Eucalyptus Walrus api</name>
     <description>Simple Storage Service (S3) implementation based on Eucalyptus Walrus</description>
+    <packaging>bundle</packaging>
 
     <properties>
         <test.initializer>org.jclouds.walrus.blobstore.WalrusTestInitializer</test.initializer>
@@ -139,6 +140,21 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>    
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.walrus.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
 
diff --git a/blobstore/pom.xml b/blobstore/pom.xml
index b4c0301569..1a80f77774 100644
--- a/blobstore/pom.xml
+++ b/blobstore/pom.xml
@@ -32,6 +32,7 @@
     <artifactId>jclouds-blobstore</artifactId>
     <name>jclouds blobstore core</name>
     <description>jclouds components to access blobstore</description>
+    <packaging>bundle</packaging>
 
     <scm>
         <connection>scm:svn:http://jclouds.googlecode.com/svn/trunk/blobstore</connection>
@@ -118,6 +119,18 @@
                     </excludes>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.blobstore.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Fragment-Host>jclouds-core;version="${project.version}"</Fragment-Host>
+                    </instructions>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/common/aws/pom.xml b/common/aws/pom.xml
index 48812242ab..dbddac8ce2 100644
--- a/common/aws/pom.xml
+++ b/common/aws/pom.xml
@@ -32,6 +32,8 @@
     <artifactId>aws-common</artifactId>
     <name>jclouds Amazon AWS Components Core</name>
     <description>jclouds Core components to access Amazon AWS</description>
+    <packaging>bundle</packaging>
+
     <dependencies>
         <dependency>
             <groupId>org.jclouds</groupId>
@@ -47,4 +49,20 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>    
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration> 
+                    <instructions>      
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.aws.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>     
+                </configuration>
+            </plugin>   
+        </plugins>
+    </build>
+
 </project>
diff --git a/common/azure/pom.xml b/common/azure/pom.xml
index 5310bf0177..f0c9a62c2f 100644
--- a/common/azure/pom.xml
+++ b/common/azure/pom.xml
@@ -2,7 +2,7 @@
 <!--
 
 
-    Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+    Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
 
     ====================================================================
     Licensed under the Apache License, Version 2.0 (the "License");
@@ -32,6 +32,8 @@
     <artifactId>azure-common</artifactId>
     <name>jclouds Azure Components Core</name>
     <description>jclouds Core components to access Azure</description>
+    <packaging>bundle</packaging>
+
     <dependencies>
         <dependency>
             <groupId>org.jclouds</groupId>
@@ -47,4 +49,20 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>    
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.azure.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
diff --git a/common/openstack/pom.xml b/common/openstack/pom.xml
index ab1cee7d68..bb381bb985 100644
--- a/common/openstack/pom.xml
+++ b/common/openstack/pom.xml
@@ -2,7 +2,7 @@
 <!--
 
 
-    Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+    Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
 
     ====================================================================
     Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,10 +28,13 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../../project/pom.xml</relativePath>
     </parent>
+
     <groupId>org.jclouds.common</groupId>
     <artifactId>openstack-common</artifactId>
-    <name>jclouds Rackspace Components Core</name>
-    <description>jclouds Core components to access Rackspace apis</description>
+    <name>jclouds OpenStack Components Core</name>
+    <description>jclouds Core components to access OpenStack apis</description>
+    <packaging>bundle</packaging>
+
     <dependencies>
         <dependency>
             <groupId>org.jclouds</groupId>
@@ -47,4 +50,20 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>    
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.openstack.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
diff --git a/common/trmk/pom.xml b/common/trmk/pom.xml
index 1e6e9d10ad..589cd9d728 100644
--- a/common/trmk/pom.xml
+++ b/common/trmk/pom.xml
@@ -2,7 +2,7 @@
 <!--
 
 
-    Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+    Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
 
     ====================================================================
     Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,10 +28,13 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../../project/pom.xml</relativePath>
     </parent>
+
     <groupId>org.jclouds.common</groupId>
     <artifactId>trmk-common</artifactId>
     <name>common Terremark components</name>
     <description>common Terremark components</description>
+    <packaging>bundle</packaging>
+
     <dependencies>
         <dependency>
             <groupId>org.jclouds.api</groupId>
@@ -91,4 +94,20 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>    
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.vcloud.terremark.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
diff --git a/common/trmk/src/main/java/org/jclouds/vcloud/terremark/compute/TerremarkVCloudComputeService.java b/common/trmk/src/main/java/org/jclouds/vcloud/terremark/compute/TerremarkVCloudComputeService.java
index 2b06e57639..f6eaa75b2c 100644
--- a/common/trmk/src/main/java/org/jclouds/vcloud/terremark/compute/TerremarkVCloudComputeService.java
+++ b/common/trmk/src/main/java/org/jclouds/vcloud/terremark/compute/TerremarkVCloudComputeService.java
@@ -31,6 +31,7 @@ import javax.inject.Singleton;
 import org.jclouds.Constants;
 import org.jclouds.collect.Memoized;
 import org.jclouds.compute.ComputeServiceContext;
+import org.jclouds.compute.callables.RunScriptOnNode;
 import org.jclouds.compute.domain.Hardware;
 import org.jclouds.compute.domain.Image;
 import org.jclouds.compute.domain.NodeMetadata;
@@ -77,14 +78,16 @@ public class TerremarkVCloudComputeService extends BaseComputeService {
          @Named("NODE_RUNNING") Predicate<NodeMetadata> nodeRunning,
          @Named("NODE_TERMINATED") Predicate<NodeMetadata> nodeTerminated,
          @Named("NODE_SUSPENDED") Predicate<NodeMetadata> nodeSuspended,
-         InitializeRunScriptOnNodeOrPlaceInBadMap.Factory initScriptRunnerFactory, InitAdminAccess initAdminAccess,
+         InitializeRunScriptOnNodeOrPlaceInBadMap.Factory initScriptRunnerFactory,
+         RunScriptOnNode.Factory runScriptOnNodeFactory, InitAdminAccess initAdminAccess,
          PersistNodeCredentials persistNodeCredentials, Timeouts timeouts,
          @Named(Constants.PROPERTY_USER_THREADS) ExecutorService executor, CleanupOrphanKeys cleanupOrphanKeys,
          ConcurrentMap<OrgAndName, KeyPairCredentials> credentialsMap, NodeMetadataToOrgAndName nodeToOrgAndName) {
       super(context, credentialStore, images, sizes, locations, listNodesStrategy, getNodeMetadataStrategy,
             runNodesAndAddToSetStrategy, rebootNodeStrategy, destroyNodeStrategy, resumeNodeStrategy,
             suspendNodeStrategy, templateBuilderProvider, templateOptionsProvider, nodeRunning, nodeTerminated,
-            nodeSuspended, initScriptRunnerFactory, initAdminAccess, persistNodeCredentials, timeouts, executor);
+            nodeSuspended, initScriptRunnerFactory, initAdminAccess, runScriptOnNodeFactory, persistNodeCredentials,
+            timeouts, executor);
       this.cleanupOrphanKeys = cleanupOrphanKeys;
    }
 
diff --git a/common/vcloud/pom.xml b/common/vcloud/pom.xml
index 96c02d4d9e..b1e1f811e8 100644
--- a/common/vcloud/pom.xml
+++ b/common/vcloud/pom.xml
@@ -28,10 +28,13 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../../project/pom.xml</relativePath>
     </parent>
+
     <groupId>org.jclouds.common</groupId>
     <artifactId>vcloud-common</artifactId>
     <name>common vCloud components</name>
     <description>common vCloud components</description>
+    <packaging>bundle</packaging>
+
     <dependencies>
         <dependency>
             <groupId>com.jamesmurty.utils</groupId>
@@ -82,4 +85,19 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>    
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.vcloud.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/common/vcloud/src/main/java/org/jclouds/vcloud/functions/ParseLoginResponseFromHeaders.java b/common/vcloud/src/main/java/org/jclouds/vcloud/functions/ParseLoginResponseFromHeaders.java
index 49514a8976..292ec7da7c 100755
--- a/common/vcloud/src/main/java/org/jclouds/vcloud/functions/ParseLoginResponseFromHeaders.java
+++ b/common/vcloud/src/main/java/org/jclouds/vcloud/functions/ParseLoginResponseFromHeaders.java
@@ -28,7 +28,6 @@ import java.util.regex.Pattern;
 import javax.inject.Inject;
 import javax.inject.Provider;
 import javax.inject.Singleton;
-import javax.ws.rs.core.HttpHeaders;
 
 import org.jclouds.http.HttpResponse;
 import org.jclouds.http.HttpResponseException;
@@ -49,36 +48,35 @@ import com.google.common.base.Function;
  */
 @Singleton
 public class ParseLoginResponseFromHeaders implements Function<HttpResponse, VCloudSession> {
-   static final Pattern pattern = Pattern.compile("vcloud-token=([^;]+);.*");
+   static final Pattern pattern = Pattern.compile("(vcloud-token=)?([^;]+)(;.*)?");
 
    private final ParseSax.Factory factory;
    private final Provider<OrgListHandler> orgHandlerProvider;
 
    @Inject
-   private ParseLoginResponseFromHeaders(Factory factory,
-            Provider<OrgListHandler> orgHandlerProvider) {
+   private ParseLoginResponseFromHeaders(Factory factory, Provider<OrgListHandler> orgHandlerProvider) {
       this.factory = factory;
       this.orgHandlerProvider = orgHandlerProvider;
    }
 
    /**
-    * parses the http response headers to create a new {@link VCloudSession} object.
+    * parses the http response headers to create a new {@link VCloudSession}
+    * object.
     */
    public VCloudSession apply(HttpResponse from) {
-      String cookieHeader = checkNotNull(from.getFirstHeaderOrNull(HttpHeaders.SET_COOKIE),
-               HttpHeaders.SET_COOKIE);
+      String cookieHeader = checkNotNull(from.getFirstHeaderOrNull("x-vcloud-authorization"), "x-vcloud-authorization");
 
       final Matcher matcher = pattern.matcher(cookieHeader);
       boolean matchFound = matcher.find();
       try {
          if (matchFound) {
             final Map<String, ReferenceType> org = factory.create(orgHandlerProvider.get()).parse(
-                     from.getPayload().getInput());
+                  from.getPayload().getInput());
 
             return new VCloudSession() {
                @VCloudToken
                public String getVCloudToken() {
-                  return matcher.group(1);
+                  return matcher.group(2);
                }
 
                @Org
@@ -91,6 +89,6 @@ public class ParseLoginResponseFromHeaders implements Function<HttpResponse, VCl
       } finally {
          releasePayload(from);
       }
-      throw new HttpResponseException("not found ", null, from);
+      throw new HttpResponseException("x-vcloud-authorization not found ", null, from);
    }
 }
diff --git a/common/vcloud/src/main/java/org/jclouds/vcloud/xml/OrgNetworkHandler.java b/common/vcloud/src/main/java/org/jclouds/vcloud/xml/OrgNetworkHandler.java
index 894c39f95f..ec9ed8d30a 100644
--- a/common/vcloud/src/main/java/org/jclouds/vcloud/xml/OrgNetworkHandler.java
+++ b/common/vcloud/src/main/java/org/jclouds/vcloud/xml/OrgNetworkHandler.java
@@ -18,6 +18,7 @@
  */
 package org.jclouds.vcloud.xml;
 
+import static org.jclouds.util.SaxUtils.equalsOrSuffix;
 import static org.jclouds.vcloud.util.Utils.newReferenceType;
 
 import java.util.List;
@@ -271,11 +272,11 @@ public class OrgNetworkHandler extends ParseSax.HandlerWithResult<OrgNetwork> {
          this.vmNicId = -1;
       } else if (qName.equalsIgnoreCase("ExternalPort")) {
          externalPort = Integer.parseInt(currentOrNull());
-      } else if (qName.equalsIgnoreCase("IxternalIP")) {
+      } else if (qName.equalsIgnoreCase("InternalIP")) {
          internalIP = currentOrNull();
       } else if (qName.equalsIgnoreCase("InternalPort")) {
          internalPort = Integer.parseInt(currentOrNull());
-      } else if (qName.equals("NatProtocol")) {
+      } else if (equalsOrSuffix(qName, "Protocol")) {
          natProtocol = NatProtocol.valueOf(currentOrNull());
       } else if (qName.equals("PortForwardingRule")) {
          natRules.add(new PortForwardingRule(externalIP, externalPort, internalIP, internalPort, natProtocol));
diff --git a/common/vcloud/src/test/java/org/jclouds/vcloud/functions/ParseLoginResponseFromHeadersTest.java b/common/vcloud/src/test/java/org/jclouds/vcloud/functions/ParseLoginResponseFromHeadersTest.java
index b6b6f66e58..4c3a8d46c8 100644
--- a/common/vcloud/src/test/java/org/jclouds/vcloud/functions/ParseLoginResponseFromHeadersTest.java
+++ b/common/vcloud/src/test/java/org/jclouds/vcloud/functions/ParseLoginResponseFromHeadersTest.java
@@ -22,8 +22,6 @@ import static org.testng.Assert.assertEquals;
 
 import java.net.URI;
 
-import javax.ws.rs.core.HttpHeaders;
-
 import org.jclouds.http.HttpResponse;
 import org.jclouds.http.functions.BaseHandlerTest;
 import org.jclouds.io.Payloads;
@@ -55,7 +53,7 @@ public class ParseLoginResponseFromHeadersTest extends BaseHandlerTest {
    @Test
    public void testApply() {
       HttpResponse response = new HttpResponse(200, "OK", Payloads.newInputStreamPayload(getClass()
-            .getResourceAsStream("/orglist.xml")), ImmutableMultimap.<String,String>of(HttpHeaders.SET_COOKIE, "vcloud-token=9er4d061-4bff-48fa-84b1-5da7166764d2; path=/"));
+            .getResourceAsStream("/orglist.xml")), ImmutableMultimap.<String,String>of("x-vcloud-authorization", "vcloud-token=9er4d061-4bff-48fa-84b1-5da7166764d2; path=/"));
       response.getPayload().getContentMetadata().setContentType("Content-Type: application/xml; charset=utf-8");
       response.getPayload().getContentMetadata().setContentLength(307l);
 
@@ -69,15 +67,28 @@ public class ParseLoginResponseFromHeadersTest extends BaseHandlerTest {
    @Test
    public void testApplyBlueLock() {
       HttpResponse response = new HttpResponse(200, "OK", Payloads.newInputStreamPayload(getClass()
-            .getResourceAsStream("/orglist.xml")), ImmutableMultimap.<String,String>of(HttpHeaders.SET_COOKIE,"vcloud-token=c9f232506df9b65d7b7d97b7499eddd7; Domain=.bluelock.com; Path=/") );
+            .getResourceAsStream("/orglist.xml")), ImmutableMultimap.<String,String>of("x-vcloud-authorization","MUKOJ2HoAfoMmLnHRp4esNb2MtWscCLLhVysnsIsCG0=") );
       response.getPayload().getContentMetadata().setContentType("Content-Type: application/xml; charset=utf-8");
       response.getPayload().getContentMetadata().setContentLength(307l);
 
       VCloudSession reply = parser.apply(response);
-      assertEquals(reply.getVCloudToken(), "c9f232506df9b65d7b7d97b7499eddd7");
+      assertEquals(reply.getVCloudToken(), "MUKOJ2HoAfoMmLnHRp4esNb2MtWscCLLhVysnsIsCG0=");
       assertEquals(reply.getOrgs(), ImmutableMap.of("adrian@jclouds.org", new ReferenceTypeImpl("adrian@jclouds.org",
                VCloudMediaType.ORG_XML, URI.create("https://services.vcloudexpress.terremark.com/api/v0.8/org/48"))));
 
    }
 
+   @Test
+   public void testApplyVirtacore() {
+      HttpResponse response = new HttpResponse(200, "OK", Payloads.newInputStreamPayload(getClass()
+            .getResourceAsStream("/orglist.xml")), ImmutableMultimap.<String,String>of("x-vcloud-authorization","vcloud-token=IPy0w7UGD4lwtdWAK/ZVzfuLK+dztxGRqsOhWqV0i48=") );
+      response.getPayload().getContentMetadata().setContentType("Content-Type: application/xml; charset=utf-8");
+      response.getPayload().getContentMetadata().setContentLength(307l);
+
+      VCloudSession reply = parser.apply(response);
+      assertEquals(reply.getVCloudToken(), "IPy0w7UGD4lwtdWAK/ZVzfuLK+dztxGRqsOhWqV0i48=");
+      assertEquals(reply.getOrgs(), ImmutableMap.of("adrian@jclouds.org", new ReferenceTypeImpl("adrian@jclouds.org",
+               VCloudMediaType.ORG_XML, URI.create("https://services.vcloudexpress.terremark.com/api/v0.8/org/48"))));
+
+   }
 }
diff --git a/compute/pom.xml b/compute/pom.xml
index 9891b5ac2d..4d4e0a964f 100644
--- a/compute/pom.xml
+++ b/compute/pom.xml
@@ -29,15 +29,11 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../project/pom.xml</relativePath>
     </parent>
+
     <artifactId>jclouds-compute</artifactId>
     <name>jclouds compute core</name>
     <description>jclouds components to access compute providers</description>
-
-    <scm>
-        <connection>scm:svn:http://jclouds.googlecode.com/svn/trunk/compute</connection>
-        <developerConnection>scm:svn:https://jclouds.googlecode.com/svn/trunk/compute</developerConnection>
-        <url>http://jclouds.googlecode.com/svn/trunk/compute</url>
-    </scm>
+    <packaging>bundle</packaging>
 
     <dependencies>
         <dependency>
@@ -70,4 +66,21 @@
            <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.compute.*;version="${project.version}",org.jclouds.ssh.*;version="${project.version}"</Export-Package>
+                        <Import-Package>!org.jclouds.compute.*;org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Fragment-Host>jclouds-core;version="${project.version}"</Fragment-Host>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/compute/src/main/clojure/org/jclouds/compute2.clj b/compute/src/main/clojure/org/jclouds/compute2.clj
index 40eefbc56f..c4eca7ea95 100644
--- a/compute/src/main/clojure/org/jclouds/compute2.clj
+++ b/compute/src/main/clojure/org/jclouds/compute2.clj
@@ -69,7 +69,8 @@ Here's an example of creating and running a small linux node in the group webser
     [org.jclouds.compute.domain
      Template TemplateBuilder ComputeMetadata NodeMetadata Hardware
      OsFamily Image]
-    [org.jclouds.compute.options TemplateOptions]
+    [org.jclouds.compute.options TemplateOptions RunScriptOptions
+     RunScriptOptions$Builder]
     [org.jclouds.compute.predicates
      NodePredicates]
     [com.google.common.collect ImmutableSet])
@@ -197,7 +198,7 @@ Here's an example of creating and running a small linux node in the group webser
 
 (defn suspend-node
   "Suspend a node, given its id."
-  ([id #^ComputeService compute]
+  ([#^ComputeService compute id]
     (.suspendNode compute id)))
 
 (defn resume-nodes-matching
@@ -208,7 +209,7 @@ Here's an example of creating and running a small linux node in the group webser
 
 (defn resume-node
   "Resume a node, given its id."
-  ([id #^ComputeService compute]
+  ([#^ComputeService compute id]
     (.resumeNode compute id)))
 
 (defn reboot-nodes-matching
@@ -219,7 +220,7 @@ Here's an example of creating and running a small linux node in the group webser
 
 (defn reboot-node
   "Reboot a node, given its id."
-  ([id #^ComputeService compute]
+  ([#^ComputeService compute id]
     (.rebootNode compute id)))
 
 (defn destroy-nodes-matching
@@ -230,9 +231,19 @@ Here's an example of creating and running a small linux node in the group webser
 
 (defn destroy-node
   "Destroy a node, given its id."
-  ([id #^ComputeService compute]
+  ([#^ComputeService compute id]
     (.destroyNode compute id)))
 
+(defn run-script-on-node
+  "Run a script on a node"
+  ([#^ComputeService compute id command #^RunScriptOptions options]
+    (.runScriptOnNode compute id command options)))
+
+(defn run-script-on-nodes-matching
+  "Run a script on the nodes matching the given predicate"
+  ([#^ComputeService compute pred command #^RunScriptOptions options]
+    (.runScriptOnNodesMatching compute (to-predicate pred) command options)))
+
 (defmacro state-predicate [node state]
   `(= (.getState ~node)
     (. org.jclouds.compute.domain.NodeState ~state)))
diff --git a/compute/src/main/java/org/jclouds/compute/ComputeService.java b/compute/src/main/java/org/jclouds/compute/ComputeService.java
index f2ec54d0cc..8774d7326b 100755
--- a/compute/src/main/java/org/jclouds/compute/ComputeService.java
+++ b/compute/src/main/java/org/jclouds/compute/ComputeService.java
@@ -319,4 +319,40 @@ public interface ComputeService {
    Map<? extends NodeMetadata, ExecResponse> runScriptOnNodesMatching(Predicate<NodeMetadata> filter,
             Statement runScript, RunScriptOptions options) throws RunScriptOnNodesException;
 
+   /**
+    * Run the script on a specific node
+    * 
+    * @param id
+    *           node the script is to be executed on
+    * @param runScript
+    *           statement containing the script to run
+    * @param options
+    *           nullable options to how to run the script, whether to override credentials
+    * @return map with node identifiers and corresponding responses
+    * @throws NoSuchElementException
+    *            if the node is not found
+    * @throws IllegalStateException
+    *            if the node is not in running state
+    * 
+    * @see org.jclouds.compute.predicates.NodePredicates#runningWithTag(String)
+    * @see org.jclouds.scriptbuilder.domain.Statements
+    */
+   ExecResponse runScriptOnNode(String id, Statement runScript, RunScriptOptions options);
+
+   /**
+    * @see #runScriptOnNode(String, Statement, RunScriptOptions)
+    */
+   ExecResponse runScriptOnNode(String id, Statement runScript);
+   
+   /**
+    * @see #runScriptOnNode(String, Statement, RunScriptOptions)
+    * @see org.jclouds.scriptbuilder.domain.Statements#exec
+    */
+   ExecResponse runScriptOnNode(String id, String runScript, RunScriptOptions options);
+   
+   /**
+    * @see #runScriptOnNode(String, String, RunScriptOptions)
+    */
+   ExecResponse runScriptOnNode(String id, String runScript);
+
 }
diff --git a/compute/src/main/java/org/jclouds/compute/domain/ComputeMetadata.java b/compute/src/main/java/org/jclouds/compute/domain/ComputeMetadata.java
index 525e4dd534..312ffd21ab 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/ComputeMetadata.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/ComputeMetadata.java
@@ -18,6 +18,10 @@
  */
 package org.jclouds.compute.domain;
 
+import java.util.Set;
+
+import javax.annotation.Nullable;
+
 import org.jclouds.compute.domain.internal.ComputeMetadataImpl;
 import org.jclouds.domain.ResourceMetadata;
 
@@ -30,24 +34,23 @@ import com.google.inject.ImplementedBy;
 @ImplementedBy(ComputeMetadataImpl.class)
 public interface ComputeMetadata extends ResourceMetadata<ComputeType> {
    /**
-    * Type of the resource, ex node, image, size
-    * 
+    * @return Type of the resource, ex node, image, size
     */
    @Override
    public ComputeType getType();
 
    /**
-    * id of the server within the naming scope it was created. potentially generated by the service.
-    * 
+    * @return id of the server within the naming scope it was created. potentially generated by the
+    *         service.
     */
    @Override
    public String getProviderId();
 
    /**
-    * user defined name of the server.
-    * 
+    * @return user defined name of the server.
     */
    @Override
+   @Nullable
    public String getName();
 
    /**
@@ -56,7 +59,12 @@ public interface ComputeMetadata extends ResourceMetadata<ComputeType> {
     * a node or image is region based, the id will likely include both the region and the
     * provider-supplied id encoded to avoid collisions.
     * 
+    * @return unique id within your account on the provider
     */
    public String getId();
 
+   /**
+    * @return tags describing this resource, if supported
+    */
+   public Set<String> getTags();
 }
diff --git a/compute/src/main/java/org/jclouds/compute/domain/ComputeMetadataBuilder.java b/compute/src/main/java/org/jclouds/compute/domain/ComputeMetadataBuilder.java
index f98437ebed..b6f6093d5a 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/ComputeMetadataBuilder.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/ComputeMetadataBuilder.java
@@ -22,11 +22,14 @@ import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.net.URI;
 import java.util.Map;
+import java.util.Set;
 
 import org.jclouds.compute.domain.internal.ComputeMetadataImpl;
 import org.jclouds.domain.Location;
 import org.jclouds.domain.ResourceMetadataBuilder;
 
+import com.google.common.collect.ImmutableSet;
+
 /**
  * 
  * @author Adrian Cole
@@ -34,9 +37,9 @@ import org.jclouds.domain.ResourceMetadataBuilder;
 public class ComputeMetadataBuilder extends ResourceMetadataBuilder<ComputeType> {
    protected String id;
    protected ComputeType type;
+   protected Set<String> tags = ImmutableSet.<String>of();
 
    public ComputeMetadataBuilder(ComputeType type) {
-      super();
       this.type = checkNotNull(type, "type");
    }
 
@@ -45,6 +48,11 @@ public class ComputeMetadataBuilder extends ResourceMetadataBuilder<ComputeType>
       return this;
    }
 
+   public ComputeMetadataBuilder tags(Set<String> tags) {
+      this.tags  = ImmutableSet.<String> copyOf(checkNotNull(tags, "tags"));
+      return this;
+   }
+
    /**
     * set id and providerId to the same value;
     */
@@ -79,11 +87,11 @@ public class ComputeMetadataBuilder extends ResourceMetadataBuilder<ComputeType>
    }
 
    public ComputeMetadata build() {
-      return new ComputeMetadataImpl(type, providerId, name, id, location, uri, userMetadata);
+      return new ComputeMetadataImpl(type, providerId, name, id, location, uri, userMetadata, tags);
    }
 
    public static ComputeMetadataBuilder fromComputeMetadata(ComputeMetadata in) {
       return new ComputeMetadataBuilder(in.getType()).id(in.getId()).location(in.getLocation()).name(in.getName())
-            .uri(in.getUri()).userMetadata(in.getUserMetadata());
+            .uri(in.getUri()).userMetadata(in.getUserMetadata()).tags(in.getTags());
    }
 }
\ No newline at end of file
diff --git a/compute/src/main/java/org/jclouds/compute/domain/HardwareBuilder.java b/compute/src/main/java/org/jclouds/compute/domain/HardwareBuilder.java
index 2df37f24ca..caaea0035e 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/HardwareBuilder.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/HardwareBuilder.java
@@ -25,6 +25,7 @@ import static org.jclouds.compute.predicates.ImagePredicates.any;
 import java.net.URI;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.jclouds.compute.domain.internal.HardwareImpl;
 import org.jclouds.compute.predicates.ImagePredicates;
@@ -87,6 +88,11 @@ public class HardwareBuilder extends ComputeMetadataBuilder {
    public HardwareBuilder id(String id) {
       return HardwareBuilder.class.cast(super.id(id));
    }
+   
+   @Override
+   public HardwareBuilder tags(Set<String> tags) {
+      return HardwareBuilder.class.cast(super.tags(tags));
+   }
 
    @Override
    public HardwareBuilder ids(String id) {
@@ -120,14 +126,14 @@ public class HardwareBuilder extends ComputeMetadataBuilder {
 
    @Override
    public Hardware build() {
-      return new HardwareImpl(providerId, name, id, location, uri, userMetadata, processors, ram, volumes,
+      return new HardwareImpl(providerId, name, id, location, uri, userMetadata, tags, processors, ram, volumes,
                supportsImage);
    }
 
    @SuppressWarnings("unchecked")
    public static HardwareBuilder fromHardware(Hardware in) {
       return new HardwareBuilder().id(in.getId()).providerId(in.getProviderId()).location(in.getLocation()).name(
-               in.getName()).uri(in.getUri()).userMetadata(in.getUserMetadata()).processors(
+               in.getName()).uri(in.getUri()).userMetadata(in.getUserMetadata()).tags(in.getTags()).processors(
                List.class.cast(in.getProcessors())).ram(in.getRam()).volumes(List.class.cast(in.getVolumes()))
                .supportsImage(in.supportsImage());
    }
diff --git a/compute/src/main/java/org/jclouds/compute/domain/ImageBuilder.java b/compute/src/main/java/org/jclouds/compute/domain/ImageBuilder.java
index 42a92b1a9c..bd99e9be02 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/ImageBuilder.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/ImageBuilder.java
@@ -22,6 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.net.URI;
 import java.util.Map;
+import java.util.Set;
 
 import javax.annotation.Nullable;
 
@@ -73,6 +74,10 @@ public class ImageBuilder extends ComputeMetadataBuilder {
    public ImageBuilder id(String id) {
       return ImageBuilder.class.cast(super.id(id));
    }
+   
+   public ImageBuilder tags(Set<String> tags) {
+      return ImageBuilder.class.cast(super.tags(tags));
+   }
 
    @Override
    public ImageBuilder ids(String id) {
@@ -106,13 +111,13 @@ public class ImageBuilder extends ComputeMetadataBuilder {
 
    @Override
    public Image build() {
-      return new ImageImpl(providerId, name, id, location, uri, userMetadata, operatingSystem, description, version,
+      return new ImageImpl(providerId, name, id, location, uri, userMetadata, tags, operatingSystem, description, version,
                adminPassword, defaultCredentials);
    }
 
    public static ImageBuilder fromImage(Image image) {
       return new ImageBuilder().providerId(image.getProviderId()).name(image.getName()).id(image.getId()).location(
-               image.getLocation()).uri(image.getUri()).userMetadata(image.getUserMetadata()).version(
+               image.getLocation()).uri(image.getUri()).userMetadata(image.getUserMetadata()).tags(image.getTags()).version(
                image.getVersion()).description(image.getDescription()).operatingSystem(image.getOperatingSystem())
                .adminPassword(image.getAdminPassword()).defaultCredentials(image.getDefaultCredentials());
    }
diff --git a/compute/src/main/java/org/jclouds/compute/domain/NodeMetadataBuilder.java b/compute/src/main/java/org/jclouds/compute/domain/NodeMetadataBuilder.java
index ad1645184c..1f0671b7ab 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/NodeMetadataBuilder.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/NodeMetadataBuilder.java
@@ -113,6 +113,11 @@ public class NodeMetadataBuilder extends ComputeMetadataBuilder {
       return NodeMetadataBuilder.class.cast(super.id(id));
    }
 
+   @Override
+   public NodeMetadataBuilder tags(Set<String> tags) {
+      return NodeMetadataBuilder.class.cast(super.tags(tags));
+   }
+
    @Override
    public NodeMetadataBuilder ids(String id) {
       return NodeMetadataBuilder.class.cast(super.ids(id));
@@ -145,17 +150,17 @@ public class NodeMetadataBuilder extends ComputeMetadataBuilder {
 
    @Override
    public NodeMetadata build() {
-      return new NodeMetadataImpl(providerId, name, id, location, uri, userMetadata, group, hardware, imageId, os, state,
-               loginPort, publicAddresses, privateAddresses, adminPassword, credentials);
+      return new NodeMetadataImpl(providerId, name, id, location, uri, userMetadata, tags, group, hardware, imageId,
+               os, state, loginPort, publicAddresses, privateAddresses, adminPassword, credentials);
    }
 
    public static NodeMetadataBuilder fromNodeMetadata(NodeMetadata node) {
       return new NodeMetadataBuilder().providerId(node.getProviderId()).name(node.getName()).id(node.getId()).location(
-               node.getLocation()).uri(node.getUri()).userMetadata(node.getUserMetadata()).group(node.getGroup()).hardware(
-               node.getHardware()).imageId(node.getImageId()).operatingSystem(node.getOperatingSystem()).state(
-               node.getState()).loginPort(node.getLoginPort()).publicAddresses(node.getPublicAddresses())
-               .privateAddresses(node.getPrivateAddresses()).adminPassword(node.getAdminPassword()).credentials(
-                        node.getCredentials());
+               node.getLocation()).uri(node.getUri()).userMetadata(node.getUserMetadata()).tags(node.getTags()).group(
+               node.getGroup()).hardware(node.getHardware()).imageId(node.getImageId()).operatingSystem(
+               node.getOperatingSystem()).state(node.getState()).loginPort(node.getLoginPort()).publicAddresses(
+               node.getPublicAddresses()).privateAddresses(node.getPrivateAddresses()).adminPassword(
+               node.getAdminPassword()).credentials(node.getCredentials());
    }
 
 }
\ No newline at end of file
diff --git a/compute/src/main/java/org/jclouds/compute/domain/OsFamilyVersion64Bit.java b/compute/src/main/java/org/jclouds/compute/domain/OsFamilyVersion64Bit.java
index cd57a7e618..7725027694 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/OsFamilyVersion64Bit.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/OsFamilyVersion64Bit.java
@@ -42,7 +42,7 @@ public class OsFamilyVersion64Bit {
 
    @Override
    public String toString() {
-      return "OsFamilyVersion64Bit [family=" + family + ", version=" + version + ", is64Bit=" + is64Bit + "]";
+      return "[family=" + family + ", version=" + version + ", is64Bit=" + is64Bit + "]";
    }
 
    @Override
diff --git a/compute/src/main/java/org/jclouds/compute/domain/internal/ComputeMetadataImpl.java b/compute/src/main/java/org/jclouds/compute/domain/internal/ComputeMetadataImpl.java
index 1895c75ea0..47d57f03ff 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/internal/ComputeMetadataImpl.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/internal/ComputeMetadataImpl.java
@@ -22,12 +22,15 @@ import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.net.URI;
 import java.util.Map;
+import java.util.Set;
 
 import org.jclouds.compute.domain.ComputeMetadata;
 import org.jclouds.compute.domain.ComputeType;
 import org.jclouds.domain.Location;
 import org.jclouds.domain.internal.ResourceMetadataImpl;
 
+import com.google.common.collect.ImmutableSet;
+
 /**
  * @author Adrian Cole
  * @author Ivan Meredith
@@ -37,12 +40,14 @@ public class ComputeMetadataImpl extends ResourceMetadataImpl<ComputeType> imple
    private static final long serialVersionUID = 7374704415964898694L;
    private final String id;
    private final ComputeType type;
+   protected final Set<String> tags;
 
    public ComputeMetadataImpl(ComputeType type, String providerId, String name, String id, Location location, URI uri,
-         Map<String, String> userMetadata) {
+            Map<String, String> userMetadata, Set<String> tags) {
       super(providerId, name, location, uri, userMetadata);
       this.id = checkNotNull(id, "id");
       this.type = checkNotNull(type, "type");
+      this.tags = ImmutableSet.<String> copyOf(checkNotNull(tags, "tags"));
    }
 
    /**
@@ -61,6 +66,14 @@ public class ComputeMetadataImpl extends ResourceMetadataImpl<ComputeType> imple
       return id;
    }
 
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public Set<String> getTags() {
+      return tags;
+   }
+
    @Override
    public int hashCode() {
       final int prime = 31;
diff --git a/compute/src/main/java/org/jclouds/compute/domain/internal/HardwareImpl.java b/compute/src/main/java/org/jclouds/compute/domain/internal/HardwareImpl.java
index b3aa1b6e09..eb89e02b55 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/internal/HardwareImpl.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/internal/HardwareImpl.java
@@ -25,6 +25,7 @@ import static org.jclouds.compute.util.ComputeServiceUtils.getSpace;
 import java.net.URI;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import javax.annotation.Nullable;
 
@@ -53,9 +54,9 @@ public class HardwareImpl extends ComputeMetadataImpl implements Hardware {
    private final Predicate<Image> supportsImage;
 
    public HardwareImpl(String providerId, String name, String id, @Nullable Location location, URI uri,
-         Map<String, String> userMetadata, Iterable<? extends Processor> processors, int ram,
+         Map<String, String> userMetadata, Set<String> tags, Iterable<? extends Processor> processors, int ram,
          Iterable<? extends Volume> volumes, Predicate<Image> supportsImage) {
-      super(ComputeType.HARDWARE, providerId, name, id, location, uri, userMetadata);
+      super(ComputeType.HARDWARE, providerId, name, id, location, uri, userMetadata, tags);
       this.processors = ImmutableList.copyOf(checkNotNull(processors, "processors"));
       this.ram = ram;
       this.volumes = ImmutableList.copyOf(checkNotNull(volumes, "volumes"));
@@ -106,7 +107,7 @@ public class HardwareImpl extends ComputeMetadataImpl implements Hardware {
    @Override
    public String toString() {
       return "[id=" + getId() + ", providerId=" + getProviderId() + ", name=" + getName() + ", processors="
-            + processors + ", ram=" + ram + ", volumes=" + volumes + ", supportsImage=" + supportsImage + "]";
+            + processors + ", ram=" + ram + ", volumes=" + volumes + ", supportsImage=" + supportsImage + ", tags=" + tags + "]";
    }
 
    /**
diff --git a/compute/src/main/java/org/jclouds/compute/domain/internal/ImageImpl.java b/compute/src/main/java/org/jclouds/compute/domain/internal/ImageImpl.java
index 55bc97c3f6..0ea3cc2b5d 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/internal/ImageImpl.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/internal/ImageImpl.java
@@ -22,6 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.net.URI;
 import java.util.Map;
+import java.util.Set;
 
 import javax.annotation.Nullable;
 
@@ -47,9 +48,9 @@ public class ImageImpl extends ComputeMetadataImpl implements Image {
    private final Credentials defaultCredentials;
 
    public ImageImpl(String providerId, String name, String id, Location location, URI uri,
-            Map<String, String> userMetadata, OperatingSystem operatingSystem, String description,
+            Map<String, String> userMetadata,  Set<String> tags, OperatingSystem operatingSystem, String description,
             @Nullable String version, @Nullable String adminPassword, @Nullable Credentials defaultCredentials) {
-      super(ComputeType.IMAGE, providerId, name, id, location, uri, userMetadata);
+      super(ComputeType.IMAGE, providerId, name, id, location, uri, userMetadata, tags);
       this.operatingSystem = checkNotNull(operatingSystem, "operatingSystem");
       this.version = version;
       this.description = checkNotNull(description, "description");
@@ -102,7 +103,7 @@ public class ImageImpl extends ComputeMetadataImpl implements Image {
       return "[id=" + getId() + ", name=" + getName() + ", operatingSystem=" + operatingSystem + ", description="
                + description + ", version=" + version + ", location=" + getLocation() + ", loginUser="
                + ((defaultCredentials != null) ? defaultCredentials.identity : null) + ", userMetadata="
-               + getUserMetadata() + "]";
+               + getUserMetadata() + ", tags=" + tags + "]";
    }
 
    @Override
diff --git a/compute/src/main/java/org/jclouds/compute/domain/internal/NodeMetadataImpl.java b/compute/src/main/java/org/jclouds/compute/domain/internal/NodeMetadataImpl.java
index fdeeb56de1..108c650ad9 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/internal/NodeMetadataImpl.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/internal/NodeMetadataImpl.java
@@ -63,11 +63,11 @@ public class NodeMetadataImpl extends ComputeMetadataImpl implements NodeMetadat
    private final OperatingSystem os;
 
    public NodeMetadataImpl(String providerId, String name, String id, Location location, URI uri,
-            Map<String, String> userMetadata, @Nullable String group, @Nullable Hardware hardware,
+            Map<String, String> userMetadata, Set<String> tags, @Nullable String group, @Nullable Hardware hardware,
             @Nullable String imageId, @Nullable OperatingSystem os, NodeState state, int loginPort,
             Iterable<String> publicAddresses, Iterable<String> privateAddresses, @Nullable String adminPassword,
             @Nullable Credentials credentials) {
-      super(ComputeType.NODE, providerId, name, id, location, uri, userMetadata);
+      super(ComputeType.NODE, providerId, name, id, location, uri, userMetadata, tags);
       this.group = group;
       this.hardware = hardware;
       this.imageId = imageId;
@@ -175,7 +175,7 @@ public class NodeMetadataImpl extends ComputeMetadataImpl implements NodeMetadat
                + getOperatingSystem() + ", state=" + getState() + ", loginPort=" + getLoginPort()
                + ", privateAddresses=" + privateAddresses + ", publicAddresses=" + publicAddresses + ", hardware="
                + getHardware() + ", loginUser=" + ((credentials != null) ? credentials.identity : null)
-               + ", userMetadata=" + getUserMetadata() + "]";
+               + ", userMetadata=" + getUserMetadata() + ", tags=" + tags + "]";
    }
 
    @Override
diff --git a/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java b/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java
index f956a9fe1d..c03791bbd0 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java
@@ -557,10 +557,10 @@ public class TemplateBuilderImpl implements TemplateBuilder {
    }
 
    protected Hardware resolveSize(Ordering<Hardware> hardwareOrdering, final Iterable<? extends Image> images) {
-      Set<? extends Hardware> hardwaresl = hardwares.get();
+      Set<? extends Hardware> hardwarel = hardwares.get();
       Hardware hardware;
       try {
-         Iterable<? extends Hardware> hardwaresThatAreCompatibleWithOurImages = filter(hardwaresl,
+         Iterable<? extends Hardware> hardwaresThatAreCompatibleWithOurImages = filter(hardwarel,
                new Predicate<Hardware>() {
                   @Override
                   public boolean apply(final Hardware hardware) {
@@ -582,7 +582,7 @@ public class TemplateBuilderImpl implements TemplateBuilder {
                });
          hardware = hardwareOrdering.max(filter(hardwaresThatAreCompatibleWithOurImages, hardwarePredicate));
       } catch (NoSuchElementException exception) {
-         throw new NoSuchElementException("hardwares don't support any images: " + toString() + "\n" + hardwaresl
+         throw new NoSuchElementException("hardware don't support any images: " + toString() + "\n" + hardwarel
                + "\n" + images);
       }
       logger.debug("<<   matched hardware(%s)", hardware);
diff --git a/compute/src/main/java/org/jclouds/compute/internal/BaseComputeService.java b/compute/src/main/java/org/jclouds/compute/internal/BaseComputeService.java
index a28a47d790..e4f641cfa4 100755
--- a/compute/src/main/java/org/jclouds/compute/internal/BaseComputeService.java
+++ b/compute/src/main/java/org/jclouds/compute/internal/BaseComputeService.java
@@ -62,6 +62,7 @@ import org.jclouds.compute.domain.Hardware;
 import org.jclouds.compute.domain.Image;
 import org.jclouds.compute.domain.NodeMetadata;
 import org.jclouds.compute.domain.NodeMetadataBuilder;
+import org.jclouds.compute.domain.NodeState;
 import org.jclouds.compute.domain.Template;
 import org.jclouds.compute.domain.TemplateBuilder;
 import org.jclouds.compute.options.RunScriptOptions;
@@ -78,8 +79,8 @@ import org.jclouds.compute.strategy.ResumeNodeStrategy;
 import org.jclouds.compute.strategy.RunScriptOnNodeAndAddToGoodMapOrPutExceptionIntoBadMap;
 import org.jclouds.compute.strategy.SuspendNodeStrategy;
 import org.jclouds.domain.Credentials;
-import org.jclouds.domain.Credentials.Builder;
 import org.jclouds.domain.Location;
+import org.jclouds.domain.Credentials.Builder;
 import org.jclouds.io.Payload;
 import org.jclouds.logging.Logger;
 import org.jclouds.predicates.RetryablePredicate;
@@ -132,22 +133,25 @@ public class BaseComputeService implements ComputeService {
    private final Timeouts timeouts;
    private final InitAdminAccess initAdminAccess;
    private final PersistNodeCredentials persistNodeCredentials;
+   private final RunScriptOnNode.Factory runScriptOnNodeFactory;
    private final ExecutorService executor;
 
    @Inject
    protected BaseComputeService(ComputeServiceContext context, Map<String, Credentials> credentialStore,
-         @Memoized Supplier<Set<? extends Image>> images, @Memoized Supplier<Set<? extends Hardware>> hardwareProfiles,
-         @Memoized Supplier<Set<? extends Location>> locations, ListNodesStrategy listNodesStrategy,
-         GetNodeMetadataStrategy getNodeMetadataStrategy, CreateNodesInGroupThenAddToSet runNodesAndAddToSetStrategy,
-         RebootNodeStrategy rebootNodeStrategy, DestroyNodeStrategy destroyNodeStrategy,
-         ResumeNodeStrategy resumeNodeStrategy, SuspendNodeStrategy suspendNodeStrategy,
-         Provider<TemplateBuilder> templateBuilderProvider, Provider<TemplateOptions> templateOptionsProvider,
-         @Named("NODE_RUNNING") Predicate<NodeMetadata> nodeRunning,
-         @Named("NODE_TERMINATED") Predicate<NodeMetadata> nodeTerminated,
-         @Named("NODE_SUSPENDED") Predicate<NodeMetadata> nodeSuspended,
-         InitializeRunScriptOnNodeOrPlaceInBadMap.Factory initScriptRunnerFactory, InitAdminAccess initAdminAccess,
-         PersistNodeCredentials persistNodeCredentials, Timeouts timeouts,
-         @Named(Constants.PROPERTY_USER_THREADS) ExecutorService executor) {
+            @Memoized Supplier<Set<? extends Image>> images,
+            @Memoized Supplier<Set<? extends Hardware>> hardwareProfiles,
+            @Memoized Supplier<Set<? extends Location>> locations, ListNodesStrategy listNodesStrategy,
+            GetNodeMetadataStrategy getNodeMetadataStrategy,
+            CreateNodesInGroupThenAddToSet runNodesAndAddToSetStrategy, RebootNodeStrategy rebootNodeStrategy,
+            DestroyNodeStrategy destroyNodeStrategy, ResumeNodeStrategy resumeNodeStrategy,
+            SuspendNodeStrategy suspendNodeStrategy, Provider<TemplateBuilder> templateBuilderProvider,
+            Provider<TemplateOptions> templateOptionsProvider,
+            @Named("NODE_RUNNING") Predicate<NodeMetadata> nodeRunning,
+            @Named("NODE_TERMINATED") Predicate<NodeMetadata> nodeTerminated,
+            @Named("NODE_SUSPENDED") Predicate<NodeMetadata> nodeSuspended,
+            InitializeRunScriptOnNodeOrPlaceInBadMap.Factory initScriptRunnerFactory, InitAdminAccess initAdminAccess,
+            RunScriptOnNode.Factory runScriptOnNodeFactory, PersistNodeCredentials persistNodeCredentials,
+            Timeouts timeouts, @Named(Constants.PROPERTY_USER_THREADS) ExecutorService executor) {
       this.context = checkNotNull(context, "context");
       this.credentialStore = checkNotNull(credentialStore, "credentialStore");
       this.images = checkNotNull(images, "images");
@@ -168,6 +172,7 @@ public class BaseComputeService implements ComputeService {
       this.initScriptRunnerFactory = checkNotNull(initScriptRunnerFactory, "initScriptRunnerFactory");
       this.timeouts = checkNotNull(timeouts, "timeouts");
       this.initAdminAccess = checkNotNull(initAdminAccess, "initAdminAccess");
+      this.runScriptOnNodeFactory = checkNotNull(runScriptOnNodeFactory, "runScriptOnNodeFactory");
       this.persistNodeCredentials = checkNotNull(persistNodeCredentials, "persistNodeCredentials");
       this.executor = checkNotNull(executor, "executor");
    }
@@ -185,7 +190,7 @@ public class BaseComputeService implements ComputeService {
     */
    @Override
    public Set<? extends NodeMetadata> runNodesWithTag(String group, int count, Template template)
-         throws RunNodesException {
+            throws RunNodesException {
       return createNodesInGroup(group, count, template);
    }
 
@@ -194,7 +199,7 @@ public class BaseComputeService implements ComputeService {
     */
    @Override
    public Set<? extends NodeMetadata> runNodesWithTag(String group, int count, TemplateOptions templateOptions)
-         throws RunNodesException {
+            throws RunNodesException {
       return createNodesInGroup(group, count, templateBuilder().any().options(templateOptions).build());
    }
 
@@ -208,12 +213,12 @@ public class BaseComputeService implements ComputeService {
 
    @Override
    public Set<? extends NodeMetadata> createNodesInGroup(String group, int count, Template template)
-         throws RunNodesException {
+            throws RunNodesException {
       checkNotNull(group, "group cannot be null");
       checkNotNull(template.getLocation(), "location");
       logger.debug(">> running %d node%s group(%s) location(%s) image(%s) hardwareProfile(%s) options(%s)", count,
-            count > 1 ? "s" : "", group, template.getLocation().getId(), template.getImage().getId(), template
-                  .getHardware().getId(), template.getOptions());
+               count > 1 ? "s" : "", group, template.getLocation().getId(), template.getImage().getId(), template
+                        .getHardware().getId(), template.getOptions());
       Set<NodeMetadata> goodNodes = newLinkedHashSet();
       Map<NodeMetadata, Exception> badNodes = newLinkedHashMap();
       Multimap<NodeMetadata, CustomizationResponse> customizationResponses = LinkedHashMultimap.create();
@@ -222,9 +227,9 @@ public class BaseComputeService implements ComputeService {
          template.getOptions().runScript(initAdminAccess.apply(template.getOptions().getRunScript()));
 
       Map<?, Future<Void>> responses = runNodesAndAddToSetStrategy.execute(group, count, template, goodNodes, badNodes,
-            customizationResponses);
+               customizationResponses);
       Map<?, Exception> executionExceptions = awaitCompletion(responses, executor, null, logger, "runNodesWithTag("
-            + group + ")");
+               + group + ")");
       Function<NodeMetadata, NodeMetadata> fn = persistNodeCredentials.always(template.getOptions().getRunScript());
       badNodes = Maps2.transformKeys(badNodes, fn);
       goodNodes = ImmutableSet.copyOf(Iterables.transform(goodNodes, fn));
@@ -236,7 +241,7 @@ public class BaseComputeService implements ComputeService {
 
    @Override
    public Set<? extends NodeMetadata> createNodesInGroup(String group, int count, TemplateOptions templateOptions)
-         throws RunNodesException {
+            throws RunNodesException {
       return createNodesInGroup(group, count, templateBuilder().any().options(templateOptions).build());
    }
 
@@ -282,27 +287,27 @@ public class BaseComputeService implements ComputeService {
    public Set<? extends NodeMetadata> destroyNodesMatching(Predicate<NodeMetadata> filter) {
       logger.debug(">> destroying nodes matching(%s)", filter);
       Set<NodeMetadata> set = newLinkedHashSet(transformParallel(nodesMatchingFilterAndNotTerminated(filter),
-            new Function<NodeMetadata, Future<NodeMetadata>>() {
+               new Function<NodeMetadata, Future<NodeMetadata>>() {
 
-               // TODO make an async interface instead of re-wrapping
-               @Override
-               public Future<NodeMetadata> apply(final NodeMetadata from) {
-                  return executor.submit(new Callable<NodeMetadata>() {
+                  // TODO make an async interface instead of re-wrapping
+                  @Override
+                  public Future<NodeMetadata> apply(final NodeMetadata from) {
+                     return executor.submit(new Callable<NodeMetadata>() {
 
-                     @Override
-                     public NodeMetadata call() throws Exception {
-                        destroyNode(from.getId());
-                        return from;
-                     }
+                        @Override
+                        public NodeMetadata call() throws Exception {
+                           destroyNode(from.getId());
+                           return from;
+                        }
 
-                     @Override
-                     public String toString() {
-                        return "destroyNode(" + from.getId() + ")";
-                     }
-                  });
-               }
+                        @Override
+                        public String toString() {
+                           return "destroyNode(" + from.getId() + ")";
+                        }
+                     });
+                  }
 
-            }, executor, null, logger, "destroyNodesMatching(" + filter + ")"));
+               }, executor, null, logger, "destroyNodesMatching(" + filter + ")"));
       logger.debug("<< destroyed(%d)", set.size());
       return set;
    }
@@ -316,7 +321,7 @@ public class BaseComputeService implements ComputeService {
     *            if none found
     */
    Iterable<? extends NodeMetadata> nodesMatchingFilterAndNotTerminatedExceptionIfNotFound(
-         Predicate<NodeMetadata> filter) {
+            Predicate<NodeMetadata> filter) {
       Iterable<? extends NodeMetadata> nodes = nodesMatchingFilterAndNotTerminated(filter);
       if (Iterables.size(nodes) == 0)
          throw new NoSuchElementException("no nodes matched filter: " + filter);
@@ -406,15 +411,15 @@ public class BaseComputeService implements ComputeService {
    public void rebootNodesMatching(Predicate<NodeMetadata> filter) {
       logger.debug(">> rebooting nodes matching(%s)", filter);
       transformParallel(nodesMatchingFilterAndNotTerminatedExceptionIfNotFound(filter),
-            new Function<NodeMetadata, Future<Void>>() {
-               // TODO use native async
-               @Override
-               public Future<Void> apply(NodeMetadata from) {
-                  rebootNode(from.getId());
-                  return immediateFuture(null);
-               }
+               new Function<NodeMetadata, Future<Void>>() {
+                  // TODO use native async
+                  @Override
+                  public Future<Void> apply(NodeMetadata from) {
+                     rebootNode(from.getId());
+                     return immediateFuture(null);
+                  }
 
-            }, executor, null, logger, "rebootNodesMatching(" + filter + ")");
+               }, executor, null, logger, "rebootNodesMatching(" + filter + ")");
       logger.debug("<< rebooted");
    }
 
@@ -437,15 +442,15 @@ public class BaseComputeService implements ComputeService {
    public void resumeNodesMatching(Predicate<NodeMetadata> filter) {
       logger.debug(">> resuming nodes matching(%s)", filter);
       transformParallel(nodesMatchingFilterAndNotTerminatedExceptionIfNotFound(filter),
-            new Function<NodeMetadata, Future<Void>>() {
-               // TODO use native async
-               @Override
-               public Future<Void> apply(NodeMetadata from) {
-                  resumeNode(from.getId());
-                  return immediateFuture(null);
-               }
+               new Function<NodeMetadata, Future<Void>>() {
+                  // TODO use native async
+                  @Override
+                  public Future<Void> apply(NodeMetadata from) {
+                     resumeNode(from.getId());
+                     return immediateFuture(null);
+                  }
 
-            }, executor, null, logger, "resumeNodesMatching(" + filter + ")");
+               }, executor, null, logger, "resumeNodesMatching(" + filter + ")");
       logger.debug("<< resumed");
    }
 
@@ -468,15 +473,15 @@ public class BaseComputeService implements ComputeService {
    public void suspendNodesMatching(Predicate<NodeMetadata> filter) {
       logger.debug(">> suspending nodes matching(%s)", filter);
       transformParallel(nodesMatchingFilterAndNotTerminatedExceptionIfNotFound(filter),
-            new Function<NodeMetadata, Future<Void>>() {
-               // TODO use native async
-               @Override
-               public Future<Void> apply(NodeMetadata from) {
-                  suspendNode(from.getId());
-                  return immediateFuture(null);
-               }
+               new Function<NodeMetadata, Future<Void>>() {
+                  // TODO use native async
+                  @Override
+                  public Future<Void> apply(NodeMetadata from) {
+                     suspendNode(from.getId());
+                     return immediateFuture(null);
+                  }
 
-            }, executor, null, logger, "suspendNodesMatching(" + filter + ")");
+               }, executor, null, logger, "suspendNodesMatching(" + filter + ")");
       logger.debug("<< suspended");
    }
 
@@ -485,7 +490,7 @@ public class BaseComputeService implements ComputeService {
     */
    @Override
    public Map<NodeMetadata, ExecResponse> runScriptOnNodesMatching(Predicate<NodeMetadata> filter, Payload runScript)
-         throws RunScriptOnNodesException {
+            throws RunScriptOnNodesException {
       return runScriptOnNodesMatching(filter, runScript, RunScriptOptions.NONE);
    }
 
@@ -494,10 +499,10 @@ public class BaseComputeService implements ComputeService {
     */
    @Override
    public Map<NodeMetadata, ExecResponse> runScriptOnNodesMatching(Predicate<NodeMetadata> filter, Payload runScript,
-         RunScriptOptions options) throws RunScriptOnNodesException {
+            RunScriptOptions options) throws RunScriptOnNodesException {
       try {
-         return runScriptOnNodesMatching(filter,
-               Statements.exec(Strings2.toStringAndClose(checkNotNull(runScript, "runScript").getInput())), options);
+         return runScriptOnNodesMatching(filter, Statements.exec(Strings2.toStringAndClose(checkNotNull(runScript,
+                  "runScript").getInput())), options);
       } catch (IOException e) {
          Throwables.propagate(e);
          return null;
@@ -509,7 +514,7 @@ public class BaseComputeService implements ComputeService {
     */
    @Override
    public Map<NodeMetadata, ExecResponse> runScriptOnNodesMatching(Predicate<NodeMetadata> filter, String runScript)
-         throws RunScriptOnNodesException {
+            throws RunScriptOnNodesException {
       return runScriptOnNodesMatching(filter, Statements.exec(checkNotNull(runScript, "runScript")));
    }
 
@@ -518,15 +523,15 @@ public class BaseComputeService implements ComputeService {
     */
    @Override
    public Map<NodeMetadata, ExecResponse> runScriptOnNodesMatching(Predicate<NodeMetadata> filter, Statement runScript)
-         throws RunScriptOnNodesException {
+            throws RunScriptOnNodesException {
       return runScriptOnNodesMatching(filter, runScript, RunScriptOptions.NONE);
    }
 
    @Override
    public Map<? extends NodeMetadata, ExecResponse> runScriptOnNodesMatching(Predicate<NodeMetadata> filter,
-         String runScript, RunScriptOptions options) throws RunScriptOnNodesException {
+            String runScript, RunScriptOptions options) throws RunScriptOnNodesException {
       return runScriptOnNodesMatching(filter, Statements.exec(checkNotNull(runScript, "runScript")),
-            RunScriptOptions.NONE);
+               RunScriptOptions.NONE);
    }
 
    /**
@@ -534,7 +539,7 @@ public class BaseComputeService implements ComputeService {
     */
    @Override
    public Map<NodeMetadata, ExecResponse> runScriptOnNodesMatching(Predicate<NodeMetadata> filter, Statement runScript,
-         RunScriptOptions options) throws RunScriptOnNodesException {
+            RunScriptOptions options) throws RunScriptOnNodesException {
 
       checkNotNull(filter, "filter");
       checkNotNull(runScript, "runScript");
@@ -548,11 +553,11 @@ public class BaseComputeService implements ComputeService {
       runScript = initAdminAccess.apply(runScript);
 
       Iterable<? extends RunScriptOnNode> scriptRunners = transformNodesIntoInitializedScriptRunners(
-            nodesMatchingFilterAndNotTerminatedExceptionIfNotFound(filter), runScript, options, badNodes);
+               nodesMatchingFilterAndNotTerminatedExceptionIfNotFound(filter), runScript, options, badNodes);
       if (Iterables.size(scriptRunners) > 0) {
          for (RunScriptOnNode runner : scriptRunners) {
             responses.put(runner.getNode(), executor.submit(new RunScriptOnNodeAndAddToGoodMapOrPutExceptionIntoBadMap(
-                  runner, goodNodes, badNodes)));
+                     runner, goodNodes, badNodes)));
          }
          exceptions = awaitCompletion(responses, executor, null, logger, "runScriptOnNodesMatching(" + filter + ")");
       }
@@ -566,13 +571,50 @@ public class BaseComputeService implements ComputeService {
       }
       return goodNodes;
    }
+   
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public ExecResponse runScriptOnNode(String id, String runScript) {
+      return runScriptOnNode(id, runScript, RunScriptOptions.NONE);
+   }
+   
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public ExecResponse runScriptOnNode(String id, String runScript, RunScriptOptions options) {
+      return runScriptOnNode(id, Statements.exec(checkNotNull(runScript, "runScript")), options);
+   }
+   
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public ExecResponse runScriptOnNode(String id, Statement runScript) {
+      return runScriptOnNode(id, runScript, RunScriptOptions.NONE);
+   }
+   
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public ExecResponse runScriptOnNode(String id, Statement runScript, RunScriptOptions options) {
+      NodeMetadata node = this.getNodeMetadata(id);
+      if (node == null)
+         throw new NoSuchElementException(id);
+      if (node.getState() != NodeState.RUNNING)
+         throw new IllegalStateException("node " + id
+                  + " needs to be running before executing a script on it. current state: " + node.getState());
+      return runScriptOnNodeFactory.create(node, runScript, options).init().call();
+   }
 
    private Iterable<? extends RunScriptOnNode> transformNodesIntoInitializedScriptRunners(
-         Iterable<? extends NodeMetadata> nodes, Statement script, RunScriptOptions options,
-         Map<NodeMetadata, Exception> badNodes) {
-      return filter(
-            transformParallel(nodes, new TransformNodesIntoInitializedScriptRunners(script, options, badNodes),
-                  executor, null, logger, "initialize script runners"), notNull());
+            Iterable<? extends NodeMetadata> nodes, Statement script, RunScriptOptions options,
+            Map<NodeMetadata, Exception> badNodes) {
+      return filter(transformParallel(nodes, new TransformNodesIntoInitializedScriptRunners(script, options, badNodes),
+               executor, null, logger, "initialize script runners"), notNull());
    }
 
    private Set<? extends NodeMetadata> detailsOnAllNodes() {
@@ -585,13 +627,13 @@ public class BaseComputeService implements ComputeService {
    }
 
    private final class TransformNodesIntoInitializedScriptRunners implements
-         Function<NodeMetadata, Future<RunScriptOnNode>> {
+            Function<NodeMetadata, Future<RunScriptOnNode>> {
       private final Map<NodeMetadata, Exception> badNodes;
       private final Statement script;
       private final RunScriptOptions options;
 
       private TransformNodesIntoInitializedScriptRunners(Statement script, RunScriptOptions options,
-            Map<NodeMetadata, Exception> badNodes) {
+               Map<NodeMetadata, Exception> badNodes) {
          this.badNodes = checkNotNull(badNodes, "badNodes");
          this.script = checkNotNull(script, "script");
          this.options = checkNotNull(options, "options");
@@ -602,7 +644,7 @@ public class BaseComputeService implements ComputeService {
          checkNotNull(node, "node");
          if (options.getOverridingCredentials() != null) {
             Builder<? extends Credentials> builder = node.getCredentials() != null ? node.getCredentials().toBuilder()
-                  : new Credentials.Builder<Credentials>();
+                     : new Credentials.Builder<Credentials>();
             if (options.getOverridingCredentials().identity != null)
                builder.identity(options.getOverridingCredentials().identity);
             if (options.getOverridingCredentials().credential != null)
diff --git a/compute/src/main/java/org/jclouds/compute/options/TemplateOptions.java b/compute/src/main/java/org/jclouds/compute/options/TemplateOptions.java
index 6956bd7cf9..9717b6695f 100644
--- a/compute/src/main/java/org/jclouds/compute/options/TemplateOptions.java
+++ b/compute/src/main/java/org/jclouds/compute/options/TemplateOptions.java
@@ -23,6 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.Set;
 
 import org.jclouds.domain.Credentials;
 import org.jclouds.io.Payload;
@@ -31,6 +32,7 @@ import org.jclouds.scriptbuilder.domain.Statements;
 import org.jclouds.util.Strings2;
 
 import com.google.common.base.Throwables;
+import com.google.common.collect.ImmutableSet;
 
 /**
  * Contains options supported in the {@code ComputeService#runNodesWithTag} operation. <h2>
@@ -70,6 +72,8 @@ public class TemplateOptions extends RunScriptOptions implements Cloneable {
          to.blockOnPort(this.getPort(), this.getSeconds());
       if (this.isIncludeMetadata())
          to.withMetadata();
+      if (this.getTags().size() > 0)
+         to.tags(getTags());
       if (!this.shouldBlockUntilRunning())
          to.blockUntilRunning(false);
       if (!this.shouldBlockOnComplete())
@@ -276,6 +280,8 @@ public class TemplateOptions extends RunScriptOptions implements Cloneable {
 
    protected Statement script;
 
+   protected Set<String> tags = ImmutableSet.of();
+
    protected String privateKey;
 
    protected String publicKey;
@@ -292,6 +298,10 @@ public class TemplateOptions extends RunScriptOptions implements Cloneable {
       return script;
    }
 
+   public Set<String> getTags() {
+      return tags;
+   }
+
    public String getPrivateKey() {
       return privateKey;
    }
@@ -350,7 +360,7 @@ public class TemplateOptions extends RunScriptOptions implements Cloneable {
     */
    public TemplateOptions installPrivateKey(String privateKey) {
       checkArgument(checkNotNull(privateKey, "privateKey").startsWith("-----BEGIN RSA PRIVATE KEY-----"),
-            "key should start with -----BEGIN RSA PRIVATE KEY-----");
+               "key should start with -----BEGIN RSA PRIVATE KEY-----");
       this.privateKey = privateKey;
       return this;
    }
@@ -403,6 +413,14 @@ public class TemplateOptions extends RunScriptOptions implements Cloneable {
       }
    }
 
+   /**
+    * assigns tags to the created nodes
+    */
+   public TemplateOptions tags(Iterable<String> tags) {
+      this.tags = ImmutableSet.copyOf(checkNotNull(tags, "tags"));
+      return this;
+   }
+
    /**
     * Opens the set of ports to public access.
     */
@@ -461,6 +479,14 @@ public class TemplateOptions extends RunScriptOptions implements Cloneable {
          return options.inboundPorts(ports);
       }
 
+      /**
+       * @see TemplateOptions#tags
+       */
+      public static TemplateOptions tags(Iterable<String> tags) {
+         TemplateOptions options = new TemplateOptions();
+         return options.tags(tags);
+      }
+
       /**
        * @see TemplateOptions#blockUntilRunning
        */
@@ -556,9 +582,9 @@ public class TemplateOptions extends RunScriptOptions implements Cloneable {
    @Override
    public String toString() {
       return "[inboundPorts=" + Arrays.toString(inboundPorts) + ", privateKey=" + (privateKey != null) + ", publicKey="
-            + (publicKey != null) + ", runScript=" + (script != null) + ", blockUntilRunning=" + blockUntilRunning
-            + ", blockOnComplete=" + blockOnComplete + ", port:seconds=" + port + ":" + seconds
-            + ", metadata/details: " + includeMetadata + "]";
+               + (publicKey != null) + ", runScript=" + (script != null) + ", blockUntilRunning=" + blockUntilRunning
+               + ", blockOnComplete=" + blockOnComplete + ", port:seconds=" + port + ":" + seconds
+               + ", metadata/details: " + includeMetadata + "]";
    }
 
    public TemplateOptions blockUntilRunning(boolean blockUntilRunning) {
diff --git a/compute/src/main/java/org/jclouds/compute/reference/ComputeServiceConstants.java b/compute/src/main/java/org/jclouds/compute/reference/ComputeServiceConstants.java
index 57b0aef3f1..2e1db1224d 100644
--- a/compute/src/main/java/org/jclouds/compute/reference/ComputeServiceConstants.java
+++ b/compute/src/main/java/org/jclouds/compute/reference/ComputeServiceConstants.java
@@ -57,7 +57,7 @@ public interface ComputeServiceConstants {
    public static class ReferenceData {
       @Inject(optional = true)
       @Named(PROPERTY_OS_VERSION_MAP_JSON)
-      public String osVersionMapJson = "{\"centos\":{\"\":\"\",\"5\":\"5.0\",\"5.2\":\"5.2\",\"5.3\":\"5.3\",\"5.4\":\"5.4\",\"5.5\":\"5.5\"},\"rhel\":{\"\":\"\",\"5\":\"5.0\",\"5.2\":\"5.2\",\"5.3\":\"5.3\",\"5.4\":\"5.4\",\"5.5\":\"5.5\"},\"solaris\":{\"\":\"\",\"10\":\"10\"},\"ubuntu\":{\"\":\"\",\"hardy\":\"8.04\",\"karmic\":\"9.10\",\"lucid\":\"10.04\",\"maverick\":\"10.10\",\"natty\":\"11.04\"},\"windows\":{\"\":\"\",\"2003\":\"2003\",\"2003 Standard\":\"2003\",\"2003 R2\":\"2003 R2\",\"2008\":\"2008\",\"2008 Web\":\"2008\",\"2008 Server\":\"2008\",\"Server 2008\":\"2008\",\"2008 R2\":\"2008 R2\",\"Server 2008 R2\":\"2008 R2\",\"2008 Server R2\":\"2008 R2\",\"2008 SP2\":\"2008 SP2\",\"Server 2008 SP2\":\"2008 SP2\"}}";
+      public String osVersionMapJson = "{\"suse\":{\"\":\"\",\"11\":\"11\",\"11 SP1\":\"11 SP1\"},\"centos\":{\"\":\"\",\"5\":\"5.0\",\"5.2\":\"5.2\",\"5.3\":\"5.3\",\"5.4\":\"5.4\",\"5.5\":\"5.5\"},\"rhel\":{\"\":\"\",\"5\":\"5.0\",\"5.2\":\"5.2\",\"5.3\":\"5.3\",\"5.4\":\"5.4\",\"5.5\":\"5.5\"},\"solaris\":{\"\":\"\",\"10\":\"10\"},\"ubuntu\":{\"\":\"\",\"hardy\":\"8.04\",\"karmic\":\"9.10\",\"lucid\":\"10.04\",\"maverick\":\"10.10\",\"natty\":\"11.04\"},\"windows\":{\"\":\"\",\"2003\":\"2003\",\"2003 Standard\":\"2003\",\"2003 R2\":\"2003 R2\",\"2008\":\"2008\",\"2008 Web\":\"2008\",\"2008 Server\":\"2008\",\"Server 2008\":\"2008\",\"2008 R1\":\"2008 R1\",\"2008 R2\":\"2008 R2\",\"Server 2008 R2\":\"2008 R2\",\"2008 Server R2\":\"2008 R2\",\"2008 SP2\":\"2008 SP2\",\"Server 2008 SP2\":\"2008 SP2\"}}";
    }
 
    @Singleton
diff --git a/compute/src/main/java/org/jclouds/compute/stub/config/StubComputeServiceAdapter.java b/compute/src/main/java/org/jclouds/compute/stub/config/StubComputeServiceAdapter.java
index 3e8207b350..cae56cc3e3 100644
--- a/compute/src/main/java/org/jclouds/compute/stub/config/StubComputeServiceAdapter.java
+++ b/compute/src/main/java/org/jclouds/compute/stub/config/StubComputeServiceAdapter.java
@@ -45,8 +45,9 @@ import org.jclouds.rest.ResourceNotFoundException;
 
 import com.google.common.base.Supplier;
 import com.google.common.base.Throwables;
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
+import com.google.common.collect.ImmutableList.Builder;
 
 /**
  * 
@@ -85,6 +86,7 @@ public class StubComputeServiceAdapter implements JCloudsNativeComputeServiceAda
       String id = idProvider.get() + "";
       builder.ids(id);
       builder.name(name);
+      builder.tags(template.getOptions().getTags());
       builder.group(group);
       builder.location(location.get());
       builder.imageId(template.getImage().getId());
@@ -110,18 +112,19 @@ public class StubComputeServiceAdapter implements JCloudsNativeComputeServiceAda
    @Override
    public Iterable<Image> listImages() {
       Credentials defaultCredentials = new Credentials("root", null);
-      Set<Image> images = Sets.newLinkedHashSet();
+      // initializing as a List, as ImmutableSet does not allow you to put duplicates
+      Builder<Image> images = ImmutableList.<Image>builder();
       int id = 1;
       for (boolean is64Bit : new boolean[] { true, false })
          for (Entry<OsFamily, Map<String, String>> osVersions : this.osToVersionMap.entrySet()) {
-            for (String version : Sets.newLinkedHashSet(osVersions.getValue().values())) {
+            for (String version : ImmutableSet.copyOf(osVersions.getValue().values())) {
                String desc = String.format("stub %s %s", osVersions.getKey(), is64Bit);
                images.add(new ImageBuilder().ids(id++ + "").name(osVersions.getKey().name()).location(location.get())
                         .operatingSystem(new OperatingSystem(osVersions.getKey(), desc, version, null, desc, is64Bit))
                         .description(desc).defaultCredentials(defaultCredentials).build());
             }
          }
-      return images;
+      return images.build();
    }
 
    @Override
diff --git a/compute/src/main/java/org/jclouds/compute/util/ComputeServiceUtils.java b/compute/src/main/java/org/jclouds/compute/util/ComputeServiceUtils.java
index b1902166d5..7af92b8b42 100644
--- a/compute/src/main/java/org/jclouds/compute/util/ComputeServiceUtils.java
+++ b/compute/src/main/java/org/jclouds/compute/util/ComputeServiceUtils.java
@@ -105,6 +105,8 @@ public class ComputeServiceUtils {
     * @return null if group cannot be parsed
     */
    public static String parseGroupFromName(String from) {
+      if (from == null)
+         return null;
       Matcher matcher = DELIMETED_BY_HYPHEN_ENDING_IN_HYPHEN_HEX.matcher(from);
       return matcher.find() ? matcher.group(1) : null;
    }
diff --git a/compute/src/test/clojure/org/jclouds/compute2_test.clj b/compute/src/test/clojure/org/jclouds/compute2_test.clj
index 8d3b18aea3..d41af627a1 100644
--- a/compute/src/test/clojure/org/jclouds/compute2_test.clj
+++ b/compute/src/test/clojure/org/jclouds/compute2_test.clj
@@ -20,10 +20,19 @@
 (ns org.jclouds.compute2-test
   (:use [org.jclouds.compute2] :reload-all)
   (:use clojure.test)
+  (:require [org.jclouds.ssh-test :as ssh-test])
   (:import
-   org.jclouds.compute.domain.OsFamily
-   clojure.contrib.condition.Condition))
-
+    org.jclouds.compute.domain.OsFamily
+    clojure.contrib.condition.Condition
+    java.net.InetAddress
+    org.jclouds.scriptbuilder.domain.Statements
+    org.jclouds.compute.options.TemplateOptions
+    org.jclouds.compute.options.TemplateOptions$Builder
+    org.jclouds.compute.options.RunScriptOptions
+    org.jclouds.compute.options.RunScriptOptions$Builder
+    org.jclouds.domain.Credentials
+    java.util.NoSuchElementException
+    ))
 
 (defmacro with-private-vars [[ns fns] & tests]
   "Refers private fns from ns and runs tests in context.  From users mailing
@@ -34,16 +43,16 @@ list, Alan Dipert and MeikelBrandmeyer."
 (deftest os-families-test
   (is (some #{"centos"} (map str (os-families)))))
 
+(def *compute* (compute-service "stub" "" "" :extensions [(ssh-test/ssh-test-client ssh-test/no-op-ssh-client)]))
+
 (defn clean-stub-fixture
   "This should allow basic tests to easily be run with another service."
   [compute-service]
   (fn [f]
     (doseq [node (nodes compute-service)]
-      (destroy-node (.getId node)))
+      (destroy-node compute-service (.getId node)))
     (f)))
 
-(def *compute* (compute-service "stub" "" ""))
-
 (use-fixtures :each (clean-stub-fixture *compute*))
 
 (deftest compute-service?-test
@@ -54,34 +63,64 @@ list, Alan Dipert and MeikelBrandmeyer."
   (is (compute-service? *compute*))
   (is (compute-service? (compute-service (compute-context *compute*)))))
 
-(defn in-group [group] #(= (.getGroup %) group))
+(defn in-group? [group] #(= (.getGroup %) group))
 
 (deftest nodes-test
-  (is (empty? (nodes *compute*)))
   (is (create-node *compute* "fred" (build-template *compute* {} )))
-  (is (= 1 (count (nodes *compute*))))
   (is (= 1 (count (nodes-in-group *compute* "fred"))))
   ;; pass in a function that selects node metadata based on NodeMetadata field
-  (is (= 1 (count (nodes-with-details-matching *compute* (in-group "fred")))))
+  (is (= 1 (count (nodes-with-details-matching *compute* (in-group? "fred")))))
   ;; or make your query inline
   (is (= 1 (count (nodes-with-details-matching *compute* #(= (.getGroup %) "fred")))))
   ;; or get real fancy, and use the underlying Predicate object jclouds uses
   (is (= 1 (count (nodes-with-details-matching *compute*
     (reify com.google.common.base.Predicate
       (apply [this input] (= (.getGroup input) "fred")))))))
-  (is (= 0 (count (nodes-with-details-matching *compute* (in-group "othergroup")))))
-  (suspend-nodes-matching *compute* (in-group "fred"))
-  (is (suspended? (first (nodes-with-details-matching *compute* (in-group "fred")))))
-  (resume-nodes-matching *compute* (in-group "fred"))
+  (is (= 0 (count (nodes-with-details-matching *compute* (in-group? "othergroup")))))
+  (suspend-nodes-matching *compute* (in-group? "fred"))
+  (is (suspended? (first (nodes-with-details-matching *compute* (in-group? "fred")))))
+  (resume-nodes-matching *compute* (in-group? "fred"))
   (is (running? (first (nodes-in-group *compute* "fred"))))
-  (reboot-nodes-matching *compute* (in-group "fred"))
+  (reboot-nodes-matching *compute* (in-group? "fred"))
   (is (running? (first (nodes-in-group *compute* "fred"))))
   (is (create-nodes *compute* "fred" 2 (build-template *compute* {} )))
   (is (= 3 (count (nodes-in-group *compute* "fred"))))
   (is (= "fred" (group (first (nodes *compute*)))))
-  (destroy-nodes-matching *compute* (in-group "fred"))
+  (destroy-nodes-matching *compute* (in-group? "fred"))
   (is (terminated? (first (nodes-in-group *compute* "fred")))))
 
+(defn localhost? [node]
+  "Returns true if the localhost address is in the node's private ips"
+  (seq? (some #(= (InetAddress/getLocalHost) %) (private-ips node))))
+
+(deftest compound-predicate-test
+  (is (create-node *compute* "my-group" (build-template *compute* {})))
+  (is (= 0 (count (nodes-with-details-matching *compute* #(and (suspended? %) (not (localhost? %)))))))
+  (is (= 0 (count (nodes-with-details-matching *compute* #(and (suspended? %) (localhost? %))))))
+  (is (= 0 (count (nodes-with-details-matching *compute* #(and (running? %) (localhost? %))))))
+  (is (= 1 (count (nodes-with-details-matching *compute* #(and (running? %) (not (localhost? %))))))))
+
+(deftest run-script-on-nodes-matching-with-options-test
+  (let [echo (Statements/exec "echo hello")
+        script-options (.. (RunScriptOptions$Builder/overrideCredentialsWith (Credentials. "user" "password"))
+                        (runAsRoot false)
+                        (wrapInInitScript false))
+        pred #(= (.getGroup %) "scriptednode")]
+    (is (create-node *compute* "scriptednode" (build-template *compute* {})))
+    (is (run-script-on-nodes-matching *compute* pred echo script-options))
+    (is (thrown? NoSuchElementException
+      (run-script-on-nodes-matching *compute* #(= (.getGroup %) "nonexistingnode") echo script-options)))))
+
+(deftest run-script-on-node-with-options-test
+  (let [echo (Statements/exec "echo hello")
+        script-options (.. (RunScriptOptions$Builder/overrideCredentialsWith (Credentials. "user" "password"))
+                        (runAsRoot false)
+                        (wrapInInitScript false))
+        test_node (create-node *compute* "scriptednode" (build-template *compute* {}))]
+    (is (run-script-on-node *compute* (id test_node) echo script-options))
+    (is (thrown? NoSuchElementException
+      (run-script-on-node *compute* "nonexistingnode" echo script-options)))))
+
 (deftest build-template-test
   (let [service (compute-service "stub" "user" "password")]
     (testing "nullary"
diff --git a/compute/src/test/clojure/org/jclouds/ssh_test.clj b/compute/src/test/clojure/org/jclouds/ssh_test.clj
index c0356d8339..ea85c59886 100644
--- a/compute/src/test/clojure/org/jclouds/ssh_test.clj
+++ b/compute/src/test/clojure/org/jclouds/ssh_test.clj
@@ -17,6 +17,16 @@
 ; ====================================================================
 ;
 
+(ns org.jclouds.ssh-test
+  (:require
+   [clojure.contrib.logging :as logging])
+  (:import
+   org.jclouds.ssh.SshClient
+   org.jclouds.domain.Credentials
+   org.jclouds.io.Payload
+   org.jclouds.net.IPSocket
+   org.jclouds.compute.domain.ExecResponse))
+
 (defn instantiate [impl-class & args]
   (let [constructor (first
                      (filter
@@ -73,7 +83,12 @@
   (^org.jclouds.ssh.SshClient
    create
    [_ ^IPSocket socket ^String username ^bytes password-or-key]
-   (factory-fn socket username password-or-key)))
+   (factory-fn socket username password-or-key))
+  (^org.jclouds.ssh.SshClient
+     create
+     [_ ^IPSocket socket ^Credentials credentials]
+     (factory-fn socket (.identity credentials) (.credential credentials)))
+  )
 
 (deftype Module
     [factory binder]
diff --git a/compute/src/test/java/org/jclouds/compute/BaseComputeServiceLiveTest.java b/compute/src/test/java/org/jclouds/compute/BaseComputeServiceLiveTest.java
index b2611b7fd8..b7237e647e 100755
--- a/compute/src/test/java/org/jclouds/compute/BaseComputeServiceLiveTest.java
+++ b/compute/src/test/java/org/jclouds/compute/BaseComputeServiceLiveTest.java
@@ -30,6 +30,7 @@ import static com.google.common.collect.Maps.uniqueIndex;
 import static com.google.common.collect.Sets.filter;
 import static com.google.common.collect.Sets.newTreeSet;
 import static org.jclouds.compute.ComputeTestUtils.buildScript;
+import static org.jclouds.compute.options.RunScriptOptions.Builder.wrapInInitScript;
 import static org.jclouds.compute.options.TemplateOptions.Builder.blockOnComplete;
 import static org.jclouds.compute.options.TemplateOptions.Builder.overrideCredentialsWith;
 import static org.jclouds.compute.predicates.NodePredicates.TERMINATED;
@@ -44,12 +45,12 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.NoSuchElementException;
 import java.util.Properties;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
+import java.util.Map.Entry;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -160,8 +161,8 @@ public abstract class BaseComputeServiceLiveTest {
       if (context != null)
          context.close();
       Properties props = setupProperties();
-      context = new ComputeServiceContextFactory(setupRestProperties()).createContext(provider,
-            ImmutableSet.of(new Log4JLoggingModule(), getSshModule()), props);
+      context = new ComputeServiceContextFactory(setupRestProperties()).createContext(provider, ImmutableSet.of(
+               new Log4JLoggingModule(), getSshModule()), props);
       client = context.getComputeService();
    }
 
@@ -182,7 +183,7 @@ public abstract class BaseComputeServiceLiveTest {
       ComputeServiceContext context = null;
       try {
          context = new ComputeServiceContextFactory(setupRestProperties()).createContext(provider, "MOMMA", "MIA",
-               ImmutableSet.<Module> of(new Log4JLoggingModule()));
+                  ImmutableSet.<Module> of(new Log4JLoggingModule()));
          context.getComputeService().listNodes();
       } catch (AuthorizationException e) {
          throw e;
@@ -207,7 +208,7 @@ public abstract class BaseComputeServiceLiveTest {
    @Test(enabled = true, expectedExceptions = NoSuchElementException.class)
    public void testCorrectExceptionRunningNodesNotFound() throws Exception {
       client.runScriptOnNodesMatching(runningInGroup("zebras-are-awesome"), buildScript(new OperatingSystem.Builder()
-            .family(OsFamily.UBUNTU).description("ffoo").build()));
+               .family(OsFamily.UBUNTU).description("ffoo").build()));
    }
 
    // since surefire and eclipse don't otherwise guarantee the order, we are
@@ -231,17 +232,22 @@ public abstract class BaseComputeServiceLiveTest {
          OperatingSystem os = get(nodes, 0).getOperatingSystem();
          try {
             Map<? extends NodeMetadata, ExecResponse> responses = runScriptWithCreds(group, os, new Credentials(
-                  good.identity, "romeo"));
+                     good.identity, "romeo"));
             assert false : "shouldn't pass with a bad password\n" + responses;
          } catch (RunScriptOnNodesException e) {
             assert getRootCause(e).getMessage().contains("Auth fail") : e;
          }
 
          for (Entry<? extends NodeMetadata, ExecResponse> response : client.runScriptOnNodesMatching(
-               runningInGroup(group), Statements.exec("echo hello"),
-               overrideCredentialsWith(good).wrapInInitScript(false).runAsRoot(false)).entrySet())
+                  runningInGroup(group), Statements.exec("echo hello"),
+                  overrideCredentialsWith(good).wrapInInitScript(false).runAsRoot(false)).entrySet())
             assert response.getValue().getOutput().trim().equals("hello") : response.getKey() + ": "
-                  + response.getValue();
+                     + response.getValue();
+            
+         // test single-node execution
+         ExecResponse response = client.runScriptOnNode(get(nodes, 0).getId(), "echo hello", wrapInInitScript(false)
+                  .runAsRoot(false));
+         assert response.getOutput().trim().equals("hello") : get(nodes, 0).getId() + ": " + response;
 
          runScriptWithCreds(group, os, good);
 
@@ -298,7 +304,8 @@ public abstract class BaseComputeServiceLiveTest {
       // template.getOptions().installPrivateKey(keyPair.get("private")).authorizePublicKey(keyPair.get("public"))
       // .runScript(buildScript(template.getImage().getOperatingSystem()));
       template.getOptions().runScript(
-            Statements.newStatementList(AdminAccess.standard(), buildScript(template.getImage().getOperatingSystem())));
+               Statements.newStatementList(AdminAccess.standard(),
+                        buildScript(template.getImage().getOperatingSystem())));
    }
 
    protected void checkImageIdMatchesTemplate(NodeMetadata node) {
@@ -309,8 +316,8 @@ public abstract class BaseComputeServiceLiveTest {
    protected void checkOsMatchesTemplate(NodeMetadata node) {
       if (node.getOperatingSystem() != null)
          assert node.getOperatingSystem().getFamily().equals(template.getImage().getOperatingSystem().getFamily()) : String
-               .format("expecting family %s but got %s", template.getImage().getOperatingSystem().getFamily(),
-                     node.getOperatingSystem());
+                  .format("expecting family %s but got %s", template.getImage().getOperatingSystem().getFamily(), node
+                           .getOperatingSystem());
    }
 
    void assertLocationSameOrChild(Location test, Location expected) {
@@ -342,10 +349,10 @@ public abstract class BaseComputeServiceLiveTest {
    }
 
    protected Map<? extends NodeMetadata, ExecResponse> runScriptWithCreds(final String group, OperatingSystem os,
-         Credentials creds) throws RunScriptOnNodesException {
+            Credentials creds) throws RunScriptOnNodesException {
       try {
          return client.runScriptOnNodesMatching(runningInGroup(group), buildScript(os), overrideCredentialsWith(creds)
-               .nameTask("runScriptWithCreds"));
+                  .nameTask("runScriptWithCreds"));
       } catch (SshException e) {
          throw e;
       }
@@ -375,16 +382,16 @@ public abstract class BaseComputeServiceLiveTest {
 
    @Test(enabled = true, dependsOnMethods = "testCreateAnotherNodeWithANewContextToEnsureSharedMemIsntRequired")
    public void testGet() throws Exception {
-      Map<String, ? extends NodeMetadata> metadataMap = newLinkedHashMap(uniqueIndex(
-            filter(client.listNodesDetailsMatching(all()), and(inGroup(group), not(TERMINATED))),
-            new Function<NodeMetadata, String>() {
+      Map<String, ? extends NodeMetadata> metadataMap = newLinkedHashMap(uniqueIndex(filter(client
+               .listNodesDetailsMatching(all()), and(inGroup(group), not(TERMINATED))),
+               new Function<NodeMetadata, String>() {
 
-               @Override
-               public String apply(NodeMetadata from) {
-                  return from.getId();
-               }
+                  @Override
+                  public String apply(NodeMetadata from) {
+                     return from.getId();
+                  }
 
-            }));
+               }));
       for (NodeMetadata node : nodes) {
          metadataMap.remove(node.getId());
          NodeMetadata metadata = client.getNodeMetadata(node.getId());
@@ -403,7 +410,7 @@ public abstract class BaseComputeServiceLiveTest {
 
    protected void assertNodeZero(Collection<? extends NodeMetadata> metadataSet) {
       assert metadataSet.size() == 0 : String.format("nodes left in set: [%s] which didn't match set: [%s]",
-            metadataSet, nodes);
+               metadataSet, nodes);
    }
 
    @Test(enabled = true, dependsOnMethods = "testGet")
@@ -491,12 +498,12 @@ public abstract class BaseComputeServiceLiveTest {
       }
 
       template = client.templateBuilder().options(blockOnComplete(false).blockOnPort(8080, 600).inboundPorts(22, 8080))
-            .build();
+               .build();
 
       // note this is a dependency on the template resolution
       template.getOptions().runScript(
-            RunScriptData.createScriptInstallAndStartJBoss(keyPair.get("public"), template.getImage()
-                  .getOperatingSystem()));
+               RunScriptData.createScriptInstallAndStartJBoss(keyPair.get("public"), template.getImage()
+                        .getOperatingSystem()));
       try {
          NodeMetadata node = getOnlyElement(client.createNodesInGroup(group, 1, template));
 
@@ -530,26 +537,26 @@ public abstract class BaseComputeServiceLiveTest {
          assert location != location.getParent() : location;
          assert location.getScope() != null : location;
          switch (location.getScope()) {
-         case PROVIDER:
-            assertProvider(location);
-            break;
-         case REGION:
-            assertProvider(location.getParent());
-            break;
-         case ZONE:
-            Location provider = location.getParent().getParent();
-            // zone can be a direct descendant of provider
-            if (provider == null)
-               provider = location.getParent();
-            assertProvider(provider);
-            break;
-         case HOST:
-            Location provider2 = location.getParent().getParent().getParent();
-            // zone can be a direct descendant of provider
-            if (provider2 == null)
-               provider2 = location.getParent().getParent();
-            assertProvider(provider2);
-            break;
+            case PROVIDER:
+               assertProvider(location);
+               break;
+            case REGION:
+               assertProvider(location.getParent());
+               break;
+            case ZONE:
+               Location provider = location.getParent().getParent();
+               // zone can be a direct descendant of provider
+               if (provider == null)
+                  provider = location.getParent();
+               assertProvider(provider);
+               break;
+            case HOST:
+               Location provider2 = location.getParent().getParent().getParent();
+               // zone can be a direct descendant of provider
+               if (provider2 == null)
+                  provider2 = location.getParent().getParent();
+               assertProvider(provider2);
+               break;
          }
       }
    }
@@ -582,10 +589,10 @@ public abstract class BaseComputeServiceLiveTest {
 
    public void testListSizes() throws Exception {
       for (Hardware hardware : client.listHardwareProfiles()) {
-         assert hardware.getProviderId() != null;
-         assert getCores(hardware) > 0;
-         assert hardware.getVolumes().size() >= 0;
-         assert hardware.getRam() > 0;
+         assert hardware.getProviderId() != null : hardware;
+         assert getCores(hardware) > 0 : hardware;
+         assert hardware.getVolumes().size() >= 0 : hardware;
+         assert hardware.getRam() > 0 : hardware;
          assertEquals(hardware.getType(), ComputeType.HARDWARE);
       }
    }
@@ -637,7 +644,7 @@ public abstract class BaseComputeServiceLiveTest {
          assertEquals(hello.getOutput().trim(), "hello");
          ExecResponse exec = ssh.exec("java -version");
          assert exec.getError().indexOf("1.6") != -1 || exec.getOutput().indexOf("1.6") != -1 : exec + "\n"
-               + ssh.exec("cat /tmp/bootstrap/stdout.log /tmp/bootstrap/stderr.log");
+                  + ssh.exec("cat /tmp/bootstrap/stdout.log /tmp/bootstrap/stderr.log");
       } finally {
          if (ssh != null)
             ssh.disconnect();
diff --git a/compute/src/test/java/org/jclouds/compute/BaseTemplateBuilderLiveTest.java b/compute/src/test/java/org/jclouds/compute/BaseTemplateBuilderLiveTest.java
index 1d0f88031a..c393d92700 100644
--- a/compute/src/test/java/org/jclouds/compute/BaseTemplateBuilderLiveTest.java
+++ b/compute/src/test/java/org/jclouds/compute/BaseTemplateBuilderLiveTest.java
@@ -167,7 +167,7 @@ public abstract class BaseTemplateBuilderLiveTest {
       Template defaultTemplate = context.getComputeService().templateBuilder().build();
 
       Template template = context.getComputeService().templateBuilder().imageId(defaultTemplate.getImage().getId())
-               .build();
+               .locationId(defaultTemplate.getLocation().getId()).build();
       assertEquals(template.getImage(), defaultTemplate.getImage());
    }
 
diff --git a/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java b/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java
index 037e3b1bac..78cfb9c3bd 100644
--- a/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java
+++ b/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java
@@ -144,15 +144,20 @@ public class StubComputeServiceIntegrationTest extends BaseComputeServiceLiveTes
             runScriptAndService(client1, 1);
 
             expect(factory.create(new IPSocket("144.175.1.2", 22), new Credentials("root", "password2"))).andReturn(
-                  client2).times(3);
+                  client2).times(4);
             expect(factory.create(new IPSocket("144.175.1.2", 22), new Credentials("root", "romeo"))).andThrow(
                   new SshException("Auth fail"));
 
-            // run script without backgrounding
+            // run script without backgrounding (via predicate)
             client2.connect();
             expect(client2.exec("echo hello\n")).andReturn(new ExecResponse("hello\n", "", 0));
             client2.disconnect();
-
+            
+            // run script without backgrounding (via id)
+            client2.connect();
+            expect(client2.exec("echo hello\n")).andReturn(new ExecResponse("hello\n", "", 0));
+            client2.disconnect();
+            
             client2.connect();
             try {
                runScript(client2, "runScriptWithCreds",
diff --git a/core/pom.xml b/core/pom.xml
index d8e796d94a..80361b4bef 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -2,7 +2,7 @@
     <!--
 
 
-        Copyright (C) 2010 Cloud Conscious, LLC.
+        Copyright (C) 2011 Cloud Conscious, LLC.
         <info@cloudconscious.com>
 
         ====================================================================
@@ -30,7 +30,7 @@
     </parent>
     <artifactId>jclouds-core</artifactId>
     <name>jclouds Components Core</name>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
     <description>Core components to access jclouds services</description>
 
     <scm>
@@ -105,7 +105,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>1.6</version>
+            <version>1.7.1</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
@@ -119,6 +119,43 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.3.1</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <!--
+                        These files are excluded to avoid corrupting the classpath with ProviderMetadata implementation
+                        classes that should only be availble when running the core tests.
+                    -->
+                    <excludes>
+                        <exclude>META-INF/services/</exclude>
+                        <exclude>org/jclouds/providers/ProvidersTest.class</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>com.google.gson;-split-package:=merge-first,
+                                        org.jclouds.*;version=${project.version}</Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <profiles>
         <profile>
             <id>distribution</id>
diff --git a/core/src/main/java/com/google/gson/JsonLiteral.java b/core/src/main/java/com/google/gson/JsonLiteral.java
index bef99b7ea7..e3cb87bc02 100644
--- a/core/src/main/java/com/google/gson/JsonLiteral.java
+++ b/core/src/main/java/com/google/gson/JsonLiteral.java
@@ -23,11 +23,12 @@ import static com.google.common.base.Preconditions.checkNotNull;
 import java.io.IOException;
 
 /**
- * The gson project use package to control access to their objects. However,
- * this prevents us from doing valid work, like controling the json emitted on a
- * per-object basis. This is here to afford us to do this.
+ * The gson project use package to control access to their objects. However, this prevents us from
+ * doing valid work, like controling the json emitted on a per-object basis. This is here to afford
+ * us to do this.
  * 
  * @author Adrian Cole
+ * @see <a href="http://code.google.com/p/google-gson/issues/detail?id=326"/>
  */
 public final class JsonLiteral extends JsonElement {
    private final CharSequence literal;
diff --git a/core/src/main/java/com/google/gson/MapTypeAdapter.java b/core/src/main/java/com/google/gson/MapTypeAdapter.java
deleted file mode 100644
index cfab58edc9..0000000000
--- a/core/src/main/java/com/google/gson/MapTypeAdapter.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- *
- * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
- *
- * ====================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
- */
-package com.google.gson;
-
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Set;
-
-import org.jclouds.json.internal.ParseObjectFromElement;
-
-@SuppressWarnings({ "unchecked", "rawtypes" })
-public class MapTypeAdapter implements JsonSerializer<Map>, JsonDeserializer<Map>, InstanceCreator<Map> {
-
-   public JsonElement serialize(Map src, Type typeOfSrc, JsonSerializationContext context) {
-      JsonObject map = new JsonObject();
-      Type childGenericType = null;
-      if (typeOfSrc instanceof ParameterizedType) {
-         childGenericType = new TypeInfoMap(typeOfSrc).getValueType();
-      }
-
-      for (Map.Entry entry : (Set<Map.Entry>) src.entrySet()) {
-         Object value = entry.getValue();
-
-         JsonElement valueElement;
-         if (value == null) {
-            valueElement = JsonNull.createJsonNull();
-         } else {
-            Type childType = (childGenericType == null) ? value.getClass() : childGenericType;
-            valueElement = context.serialize(value, childType);
-         }
-         map.add(String.valueOf(entry.getKey()), valueElement);
-      }
-      return map;
-   }
-
-   public Map deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-      // Use ObjectConstructor to create instance instead of hard-coding a specific type.
-      // This handles cases where users are using their own subclass of Map.
-      Map<Object, Object> map = constructMapType(typeOfT, context);
-      TypeInfoMap mapTypeInfo = new TypeInfoMap(typeOfT);
-      for (Map.Entry<String, JsonElement> entry : json.getAsJsonObject().entrySet()) {
-         Object key = context.deserialize(new JsonPrimitive(entry.getKey()), mapTypeInfo.getKeyType());
-         // START JCLOUDS PATCH
-         Object value = null;
-         if (mapTypeInfo.getValueType() == Object.class) {
-            value = ParseObjectFromElement.SINGLETON.apply(entry.getValue());
-         }
-         if (value == null) {
-            value = context.deserialize(entry.getValue(), mapTypeInfo.getValueType());
-         }
-         // END JCLOUDS PATCH
-         map.put(key, value);
-      }
-      return map;
-   }
-
-   private Map constructMapType(Type mapType, JsonDeserializationContext context) {
-      JsonDeserializationContextDefault contextImpl = (JsonDeserializationContextDefault) context;
-      ObjectConstructor objectConstructor = contextImpl.getObjectConstructor();
-      return (Map) objectConstructor.construct(mapType);
-   }
-
-   public Map createInstance(Type type) {
-      return new LinkedHashMap();
-   }
-
-   @Override
-   public String toString() {
-      return MapTypeAdapter.class.getSimpleName();
-   }
-}
\ No newline at end of file
diff --git a/core/src/main/java/com/google/gson/ObjectMapTypeAdapter.java b/core/src/main/java/com/google/gson/ObjectMapTypeAdapter.java
new file mode 100644
index 0000000000..ed91ae86ee
--- /dev/null
+++ b/core/src/main/java/com/google/gson/ObjectMapTypeAdapter.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.gson;
+
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.Map;
+import java.util.Set;
+
+import org.jclouds.json.internal.ParseObjectFromElement;
+
+import com.google.gson.internal.$Gson$Types;
+
+/**
+ * Default serialization and deserialization of a map type. This implementation really only works
+ * well with simple primitive types as the map key. If the key is not a simple primitive then the
+ * object is {@code toString}ed and that value is used as its key.
+ *   <p/>
+ *   Patched depending on <a href="http://code.google.com/p/google-gson/issues/detail?id=325">this</a>
+ * @author Joel Leitch
+ */
+@SuppressWarnings("unchecked")
+public final class ObjectMapTypeAdapter extends BaseMapTypeAdapter {
+
+  public JsonElement serialize(Map src, Type typeOfSrc, JsonSerializationContext context) {
+    JsonObject map = new JsonObject();
+    Type childGenericType = null;
+    if (typeOfSrc instanceof ParameterizedType) {
+      Class<?> rawTypeOfSrc = $Gson$Types.getRawType(typeOfSrc);
+      childGenericType = $Gson$Types.getMapKeyAndValueTypes(typeOfSrc, rawTypeOfSrc)[1];
+    }
+
+    for (Map.Entry entry : (Set<Map.Entry>) src.entrySet()) {
+      Object value = entry.getValue();
+
+      JsonElement valueElement;
+      if (value == null) {
+        valueElement = JsonNull.createJsonNull();
+      } else {
+        Type childType = (childGenericType == null)
+            ? value.getClass() : childGenericType;
+        valueElement = serialize(context, value, childType);
+      }
+      map.add(String.valueOf(entry.getKey()), valueElement);
+    }
+    return map;
+  }
+
+  public Map deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
+      throws JsonParseException {
+    // Use ObjectConstructor to create instance instead of hard-coding a specific type.
+    // This handles cases where users are using their own subclass of Map.
+    Map<Object, Object> map = constructMapType(typeOfT, context);
+    Type[] keyAndValueTypes = $Gson$Types.getMapKeyAndValueTypes(typeOfT, $Gson$Types.getRawType(typeOfT));
+    for (Map.Entry<String, JsonElement> entry : json.getAsJsonObject().entrySet()) {
+      Object key = context.deserialize(new JsonPrimitive(entry.getKey()), keyAndValueTypes[0]);
+      // START JCLOUDS PATCH
+      // http://code.google.com/p/google-gson/issues/detail?id=325
+      Object value = null;
+      if (keyAndValueTypes[1] == Object.class) {
+         value = ParseObjectFromElement.SINGLETON.apply(entry.getValue());
+      }
+      if (value == null) {
+         value = context.deserialize(entry.getValue(), keyAndValueTypes[1]);
+      }
+      // END JCLOUDS PATCH
+      map.put(key, value);
+    }
+    return map;
+  }
+
+  @Override
+  public String toString() {
+    return MapTypeAdapter.class.getSimpleName();
+  }
+}
\ No newline at end of file
diff --git a/core/src/main/java/com/google/gson/Streams.java b/core/src/main/java/com/google/gson/Streams.java
index 24e2167553..c6b05f89bf 100644
--- a/core/src/main/java/com/google/gson/Streams.java
+++ b/core/src/main/java/com/google/gson/Streams.java
@@ -1,8 +1,6 @@
-/**
+/*
+ * Copyright (C) 2010 Google Inc.
  *
- * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
- *
- * ====================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -14,8 +12,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * ====================================================================
  */
+
 package com.google.gson;
 
 import com.google.gson.stream.JsonReader;
@@ -104,7 +102,8 @@ final class Streams {
       if (serializeNulls) {
         writer.nullValue();
       }
-//BEGIN JCLOUDS PATCH
+    //BEGIN JCLOUDS PATCH
+    // * @see <a href="http://code.google.com/p/google-gson/issues/detail?id=326"/>
     } else if (element instanceof JsonLiteral ) {
        writer.value(JsonLiteral.class.cast(element));
        //END JCLOUDS PATCH
diff --git a/core/src/main/java/com/google/gson/stream/JsonWriter.java b/core/src/main/java/com/google/gson/stream/JsonWriter.java
index bd01290581..bcf12bac95 100644
--- a/core/src/main/java/com/google/gson/stream/JsonWriter.java
+++ b/core/src/main/java/com/google/gson/stream/JsonWriter.java
@@ -1,21 +1,19 @@
-/**
+/*
+ * Copyright (C) 2010 Google Inc.
  *
- * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
- *
- * ====================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * ====================================================================
  */
+
 package com.google.gson.stream;
 
 import java.io.Closeable;
@@ -344,7 +342,7 @@ public final class JsonWriter implements Closeable {
     return this;
   }
 //BEGIN JCLOUDS PATCH
-
+// * @see <a href="http://code.google.com/p/google-gson/issues/detail?id=326"/>
   /**
    * Writes {@code value} literally
    *
@@ -356,7 +354,6 @@ public final class JsonWriter implements Closeable {
     return this;
   }
   //END JCLOUDS PATCH
-
   /**
    * Encodes {@code value}.
    *
diff --git a/core/src/main/java/org/jclouds/domain/JsonBall.java b/core/src/main/java/org/jclouds/domain/JsonBall.java
index 227d5797d3..b5f524ad48 100644
--- a/core/src/main/java/org/jclouds/domain/JsonBall.java
+++ b/core/src/main/java/org/jclouds/domain/JsonBall.java
@@ -27,6 +27,7 @@ import org.jclouds.util.Patterns;
  * As String is final, using a different marker to imply this is a json object
  * 
  * @author Adrian Cole
+ * @see <a href="http://code.google.com/p/google-gson/issues/detail?id=326"/>
  */
 public class JsonBall implements java.io.Serializable, Comparable<String>, CharSequence {
 
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/GetFirstInstanceInList.java b/core/src/main/java/org/jclouds/http/functions/UnwrapOnlyJsonValueInSet.java
similarity index 69%
rename from sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/GetFirstInstanceInList.java
rename to core/src/main/java/org/jclouds/http/functions/UnwrapOnlyJsonValueInSet.java
index 87480deaa1..e1fc24b7b0 100644
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/GetFirstInstanceInList.java
+++ b/core/src/main/java/org/jclouds/http/functions/UnwrapOnlyJsonValueInSet.java
@@ -16,13 +16,14 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.ibmdev.functions;
+package org.jclouds.http.functions;
+
+import java.util.Set;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import org.jclouds.http.HttpResponse;
-import org.jclouds.ibmdev.domain.Instance;
 
 import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
@@ -31,16 +32,20 @@ import com.google.common.collect.Iterables;
  * @author Adrian Cole
  */
 @Singleton
-public class GetFirstInstanceInList implements Function<HttpResponse, Instance> {
-   private ParseInstancesFromJson listParser;
+public class UnwrapOnlyJsonValueInSet<T> implements Function<HttpResponse, T> {
+
+   private final UnwrapOnlyJsonValue<Set<T>> json;
 
    @Inject
-   public GetFirstInstanceInList(ParseInstancesFromJson mapper) {
-      this.listParser = mapper;
+   UnwrapOnlyJsonValueInSet(UnwrapOnlyJsonValue<Set<T>> json) {
+      this.json = json;
    }
 
    @Override
-   public Instance apply(HttpResponse from) {
-      return Iterables.getOnlyElement(listParser.apply(from));
+   public T apply(HttpResponse arg0) {
+      Set<T> set = json.apply(arg0);
+      if (set == null || set.size() == 0)
+         return null;
+      return Iterables.getOnlyElement(set);
    }
 }
\ No newline at end of file
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseImageFromJson.java b/core/src/main/java/org/jclouds/io/CopyInputStreamInputSupplierMap.java
similarity index 57%
rename from sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseImageFromJson.java
rename to core/src/main/java/org/jclouds/io/CopyInputStreamInputSupplierMap.java
index fc3ba33060..909a470303 100644
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseImageFromJson.java
+++ b/core/src/main/java/org/jclouds/io/CopyInputStreamInputSupplierMap.java
@@ -16,34 +16,32 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.ibmdev.functions;
+package org.jclouds.io;
+
+import java.io.InputStream;
+import java.util.Map;
 
 import javax.inject.Inject;
-import javax.inject.Singleton;
 
-import org.jclouds.http.HttpResponse;
-import org.jclouds.http.functions.ParseJson;
-import org.jclouds.ibmdev.domain.Image;
+import org.jclouds.collect.InputSupplierMap;
 
-import com.google.common.base.Function;
+import com.google.common.annotations.Beta;
+import com.google.common.io.InputSupplier;
 
 /**
+ * 
  * @author Adrian Cole
  */
-@Singleton
-public class ParseImageFromJson implements Function<HttpResponse, Image> {
-
-   private final ParseJson<Image> json;
-
+@Beta
+public class CopyInputStreamInputSupplierMap extends InputSupplierMap<String, InputStream> {
    @Inject
-   ParseImageFromJson(ParseJson<Image> json) {
-      this.json = json;
+   public CopyInputStreamInputSupplierMap(Map<String, InputSupplier<InputStream>> toMap,
+         CopyInputStreamIntoSupplier putFunction) {
+      super(toMap, putFunction);
    }
 
-   @Override
-   public Image apply(HttpResponse arg0) {
-      Image input = json.apply(arg0);
-      ParseUtils.CLEAN_IMAGE.apply(input);
-      return input;
+   public CopyInputStreamInputSupplierMap(Map<String, InputSupplier<InputStream>> toMap) {
+      super(toMap, new CopyInputStreamIntoSupplier());
    }
+
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/jclouds/io/CopyInputStreamIntoSupplier.java b/core/src/main/java/org/jclouds/io/CopyInputStreamIntoSupplier.java
new file mode 100644
index 0000000000..e83157dcfe
--- /dev/null
+++ b/core/src/main/java/org/jclouds/io/CopyInputStreamIntoSupplier.java
@@ -0,0 +1,64 @@
+/**
+ *
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.io;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.annotation.Resource;
+
+import org.jclouds.logging.Logger;
+
+import com.google.common.annotations.Beta;
+import com.google.common.base.Function;
+import com.google.common.io.ByteStreams;
+import com.google.common.io.Closeables;
+import com.google.common.io.InputSupplier;
+
+/**
+ * 
+ * @author Adrian Cole
+ */
+@Beta
+public class CopyInputStreamIntoSupplier implements Function<InputStream, InputSupplier<InputStream>> {
+   @Resource
+   protected Logger logger = Logger.NULL;
+
+   @SuppressWarnings("unchecked")
+   @Override
+   public InputSupplier<InputStream> apply(InputStream from) {
+      if (from == null)
+         return new InputSupplier<InputStream>() {
+
+            @Override
+            public InputStream getInput() throws IOException {
+               return null;
+            }
+
+         };
+      try {
+         return InputSupplier.class.cast(ByteStreams.newInputStreamSupplier(ByteStreams.toByteArray(from)));
+      } catch (Exception e) {
+         logger.warn(e, "ignoring problem retrieving credentials");
+         return null;
+      } finally {
+         Closeables.closeQuietly(from);
+      }
+   }
+}
\ No newline at end of file
diff --git a/core/src/main/java/org/jclouds/json/config/GsonModule.java b/core/src/main/java/org/jclouds/json/config/GsonModule.java
index e0353efc7c..38a852cee1 100644
--- a/core/src/main/java/org/jclouds/json/config/GsonModule.java
+++ b/core/src/main/java/org/jclouds/json/config/GsonModule.java
@@ -24,6 +24,8 @@ import java.util.Enumeration;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
@@ -36,12 +38,11 @@ import org.jclouds.json.internal.EnumTypeAdapterThatReturnsFromValue;
 import org.jclouds.json.internal.GsonWrapper;
 
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMap.Builder;
 import com.google.common.collect.Maps;
+import com.google.common.collect.ImmutableMap.Builder;
 import com.google.common.primitives.Bytes;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.google.gson.JcloudsGsonPackageAccessor;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonElement;
@@ -50,7 +51,7 @@ import com.google.gson.JsonParseException;
 import com.google.gson.JsonPrimitive;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
-import com.google.gson.MapTypeAdapter;
+import com.google.gson.ObjectMapTypeAdapter;
 import com.google.gson.reflect.TypeToken;
 import com.google.inject.AbstractModule;
 import com.google.inject.ImplementedBy;
@@ -68,12 +69,12 @@ public class GsonModule extends AbstractModule {
    @Provides
    @Singleton
    Gson provideGson(JsonBallAdapter jsonAdapter, DateAdapter adapter, ByteListAdapter byteListAdapter,
-         ByteArrayAdapter byteArrayAdapter, SerializePropertiesDefaults propertiesAdapter, JsonAdapterBindings bindings)
-         throws ClassNotFoundException, Exception {
+            ByteArrayAdapter byteArrayAdapter, SerializePropertiesDefaults propertiesAdapter,
+            JsonAdapterBindings bindings) throws ClassNotFoundException, Exception {
       GsonBuilder builder = new GsonBuilder();
-      JcloudsGsonPackageAccessor.registerTypeHierarchyAdapter(builder, Enum.class,
-            new EnumTypeAdapterThatReturnsFromValue());
-      JcloudsGsonPackageAccessor.registerTypeHierarchyAdapter(builder, Map.class, new MapTypeAdapter());
+      Logger.getLogger("com.google.gson.ParameterizedTypeHandlerMap").setLevel(Level.OFF);
+      builder.registerTypeHierarchyAdapter(Enum.class, new EnumTypeAdapterThatReturnsFromValue());
+      builder.registerTypeHierarchyAdapter(Map.class, new ObjectMapTypeAdapter());
       builder.registerTypeAdapter(JsonBall.class, jsonAdapter);
       builder.registerTypeAdapter(Date.class, adapter);
       builder.registerTypeAdapter(Properties.class, propertiesAdapter);
@@ -86,6 +87,7 @@ public class GsonModule extends AbstractModule {
       return builder.create();
    }
 
+   // http://code.google.com/p/google-gson/issues/detail?id=326
    @ImplementedBy(JsonBallAdapterImpl.class)
    public static interface JsonBallAdapter extends JsonSerializer<JsonBall>, JsonDeserializer<JsonBall> {
 
@@ -99,7 +101,7 @@ public class GsonModule extends AbstractModule {
       }
 
       public JsonBall deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
-            throws JsonParseException {
+               throws JsonParseException {
          return new JsonBall(json.toString());
       }
 
@@ -125,7 +127,7 @@ public class GsonModule extends AbstractModule {
 
       @Override
       public List<Byte> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
-            throws JsonParseException {
+               throws JsonParseException {
          return Bytes.asList(CryptoStreams.hex(json.getAsString()));
       }
 
@@ -141,7 +143,7 @@ public class GsonModule extends AbstractModule {
 
       @Override
       public byte[] deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
-            throws JsonParseException {
+               throws JsonParseException {
          return CryptoStreams.hex(json.getAsString());
       }
 
@@ -165,7 +167,7 @@ public class GsonModule extends AbstractModule {
       }
 
       public Date deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
-            throws JsonParseException {
+               throws JsonParseException {
          String toParse = json.getAsJsonPrimitive().getAsString();
          try {
             return dateService.iso8601DateParse(toParse);
@@ -212,7 +214,7 @@ public class GsonModule extends AbstractModule {
       }
 
       public Date deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
-            throws JsonParseException {
+               throws JsonParseException {
          String toParse = json.getAsJsonPrimitive().getAsString();
          Date toReturn = dateService.cDateParse(toParse);
          return toReturn;
@@ -228,7 +230,7 @@ public class GsonModule extends AbstractModule {
       }
 
       public Date deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
-            throws JsonParseException {
+               throws JsonParseException {
          long toParse = json.getAsJsonPrimitive().getAsLong();
          if (toParse == -1)
             return null;
diff --git a/core/src/main/java/org/jclouds/json/internal/JsonObjectAsMap.java b/core/src/main/java/org/jclouds/json/internal/JsonObjectAsMap.java
index c25969dc6a..f307da024f 100644
--- a/core/src/main/java/org/jclouds/json/internal/JsonObjectAsMap.java
+++ b/core/src/main/java/org/jclouds/json/internal/JsonObjectAsMap.java
@@ -27,7 +27,7 @@ import com.google.gson.JsonObject;
 
 /**
  * Exposes the JsonObject as a map so that we can use gauva apis on it.
- * 
+ * http://code.google.com/p/google-gson/issues/detail?id=325
  * @author Adrian Cole
  */
 public enum JsonObjectAsMap implements Function<JsonObject, Map<String, JsonElement>> {
diff --git a/core/src/main/java/org/jclouds/json/internal/ParseObjectFromElement.java b/core/src/main/java/org/jclouds/json/internal/ParseObjectFromElement.java
index ed3a293b97..8aa5ca8ca2 100644
--- a/core/src/main/java/org/jclouds/json/internal/ParseObjectFromElement.java
+++ b/core/src/main/java/org/jclouds/json/internal/ParseObjectFromElement.java
@@ -24,12 +24,11 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonPrimitive;
-import com.google.gson.MapTypeAdapter;
 
 /**
  * This is a class that helps the default {@link MapTypeAdapter} make a sane object graph when the
  * value is set to {@code Object}
- * 
+ * http://code.google.com/p/google-gson/issues/detail?id=325
  * @author Adrian Cole
  */
 public enum ParseObjectFromElement implements Function<JsonElement, Object> {
diff --git a/core/src/main/java/org/jclouds/providers/BaseProviderMetadata.java b/core/src/main/java/org/jclouds/providers/BaseProviderMetadata.java
new file mode 100644
index 0000000000..039236bff1
--- /dev/null
+++ b/core/src/main/java/org/jclouds/providers/BaseProviderMetadata.java
@@ -0,0 +1,158 @@
+/**
+ *
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.providers;
+
+import java.net.URI;
+import java.util.Set;
+
+import com.google.common.collect.ImmutableSet;
+
+/**
+ * The BaseProviderMetadata class is an abstraction of {@link ProviderMetadata} to be extended by
+ * those implementing ProviderMetadata.
+ * 
+ * (Note: This class must be abstract to allow {@link java.util.ServiceLoader} to work properly.
+ * 
+ * @author Jeremy Whitlock <jwhitlock@apache.org>
+ */
+public abstract class BaseProviderMetadata implements ProviderMetadata {
+
+   /**
+    * @see java.lang.Object#hashCode()
+    */
+   @Override
+   public int hashCode() {
+      final int prime = 31;
+      int result = 1;
+      URI console = getConsole();
+      URI homepage = getHomepage();
+      URI docs = getApiDocumentation();
+      String id = getId();
+      String name = getName();
+      String identityName = getIdentityName();
+      String credentialName = getCredentialName();
+      String type = getType();
+      Set<String> linkedServices = getLinkedServices();
+
+      result = prime * result + ((console == null) ? 0 : console.hashCode());
+      result = prime * result + ((homepage == null) ? 0 : homepage.hashCode());
+      result = prime * result + ((docs == null) ? 0 : docs.hashCode());
+      result = prime * result + ((id == null) ? 0 : id.hashCode());
+      result = prime * result + ((name == null) ? 0 : name.hashCode());
+      result = prime * result + ((identityName == null) ? 0 : identityName.hashCode());
+      result = prime * result + ((credentialName == null) ? 0 : credentialName.hashCode());
+      result = prime * result + ((type == null) ? 0 : type.hashCode());
+      result = prime * result + ((linkedServices == null) ? 0 : linkedServices.hashCode());
+
+      return result;
+   }
+
+   /**
+    * @see java.lang.Object#equals(java.lang.Object)
+    */
+   @Override
+   public boolean equals(Object obj) {
+      URI tConsole = getConsole();
+      URI tHomepage = getHomepage();
+      URI tDocs = getApiDocumentation();
+      String tId = getId();
+      String tName = getName();
+      String tIdentityName = getIdentityName();
+      String tCredentialName = getCredentialName();
+      String tType = getType();
+      Set<String> tLinkedServices = getLinkedServices();
+
+      if (this == obj)
+         return true;
+      if (obj == null)
+         return false;
+      if (getClass() != obj.getClass())
+         return false;
+
+      ProviderMetadata other = (ProviderMetadata) obj;
+      URI oConsole = other.getConsole();
+      URI oHomepage = other.getHomepage();
+      URI oDocs = other.getApiDocumentation();
+      String oId = other.getId();
+      String oName = other.getName();
+      String oIdentityName = other.getIdentityName();
+      String oCredentialName = other.getCredentialName();
+      String oType = other.getType();
+      Set<String> oLinkedServices = other.getLinkedServices();
+
+      if (tConsole == null) {
+         if (oConsole != null)
+            return false;
+      } else if (!tConsole.equals(oConsole))
+         return false;
+      if (tDocs == null) {
+         if (oDocs != null)
+            return false;
+      } else if (!tDocs.equals(oDocs))
+         return false;
+      if (tHomepage == null) {
+         if (oHomepage != null)
+            return false;
+      } else if (!tHomepage.equals(oHomepage))
+         return false;
+      if (tId == null) {
+         if (oId != null)
+            return false;
+      } else if (!tId.equals(oId))
+         return false;
+      if (tName == null) {
+         if (oName != null)
+            return false;
+      } else if (!tName.equals(oName))
+         return false;
+      if (tIdentityName == null) {
+         if (oIdentityName != null)
+            return false;
+      } else if (!tIdentityName.equals(oIdentityName))
+         return false;
+      if (tCredentialName == null) {
+         if (oCredentialName != null)
+            return false;
+      } else if (!tCredentialName.equals(oCredentialName))
+         return false;
+      if (tType == null) {
+         if (oType != null)
+            return false;
+      } else if (!tType.equals(oType))
+         return false;
+      if (tLinkedServices == null) {
+         if (oLinkedServices != null)
+            return false;
+      } else if (!tLinkedServices.equals(oLinkedServices))
+         return false;
+      return true;
+   }
+
+   @Override
+   public String toString() {
+      return "[id=" + getId() + ", type=" + getType() + ", name=" + getName() + ", identityName=" + getIdentityName()
+               + ", credentialName=" + getCredentialName() + ", homePage=" + getHomepage() + ", console="
+               + getConsole() + ", apiDocs=" + getApiDocumentation() + ", linkedServices=" + getLinkedServices() + "]";
+   }
+
+   @Override
+   public Set<String> getLinkedServices() {
+      return ImmutableSet.of(getId());
+   }
+}
diff --git a/core/src/main/java/org/jclouds/providers/ProviderMetadata.java b/core/src/main/java/org/jclouds/providers/ProviderMetadata.java
index 2866aebdcc..20fab4e720 100644
--- a/core/src/main/java/org/jclouds/providers/ProviderMetadata.java
+++ b/core/src/main/java/org/jclouds/providers/ProviderMetadata.java
@@ -19,51 +19,78 @@
 package org.jclouds.providers;
 
 import java.net.URI;
+import java.util.Set;
+
+import javax.annotation.Nullable;
 
 /**
- * The ProviderMetadata interface allows jclouds to provide a plugin framework
- * for gathering cloud provider metadata.
- *
+ * The ProviderMetadata interface allows jclouds to provide a plugin framework for gathering cloud
+ * provider metadata.
+ * 
  * @author Jeremy Whitlock <jwhitlock@apache.org>
  */
 public interface ProviderMetadata {
 
    public static final String BLOBSTORE_TYPE = "blobstore";
    public static final String COMPUTE_TYPE = "compute";
+   public static final String LOADBALANCER_TYPE = "loadbalancer";
+   public static final String TABLE_TYPE = "table";
+   public static final String QUEUE_TYPE = "queue";
 
-  /**
-   * Returns an identifier unique to the provider.
-   *
-   * @return the provider's unique identifier
-   */
-  public String getId();
+   /**
+    * 
+    * @return the provider's unique identifier
+    */
+   public String getId();
 
-  /**
-   * Returns the provider type.
-   *
-   * @return the provider's type
-   */
-  public String getType();
+   /**
+    * 
+    * @return the provider's type
+    */
+   public String getType();
 
-  /**
-   * Returns the name of the provider.
-   *
-   * @return the name (display name) of the provider
-   */
-  public String getName();
+   /**
+    * 
+    * @return the name (display name) of the provider
+    */
+   public String getName();
 
-  /**
-   * Returns the URI to the provider's homepage.
-   *
-   * @return the url for the provider's homepage
-   */
-  public URI getHomepage();
+   /**
+    * 
+    * @return the name (display name) of an identity on this provider (ex. user, email, account,
+    *         apikey)
+    */
+   public String getIdentityName();
 
-  /**
-   * Returns the URI to the provider's console.
-   *
-   * @return the url for the provider's console
-   */
-  public URI getConsole();
+   /**
+    * 
+    * @return the name (display name) of a credential on this provider, or null if there is none
+    *         (ex. password, secret, rsaKey)
+    */
+   @Nullable
+   public String getCredentialName();
 
+   /**
+    * 
+    * @return the url for the provider's homepage
+    */
+   public URI getHomepage();
+
+   /**
+    * 
+    * @return the url for the provider's console
+    */
+   public URI getConsole();
+
+   /**
+    * 
+    * @return the url for the API documentation related to this service
+    */
+   public URI getApiDocumentation();
+
+   /**
+    * 
+    * @return all known services linked to the same account on this provider
+    */
+   public Set<String> getLinkedServices();
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/jclouds/providers/Providers.java b/core/src/main/java/org/jclouds/providers/Providers.java
index 7688fe99fe..b646ae1fe8 100644
--- a/core/src/main/java/org/jclouds/providers/Providers.java
+++ b/core/src/main/java/org/jclouds/providers/Providers.java
@@ -26,15 +26,14 @@ import java.util.ServiceLoader;
 
 /**
  * The Providers class provides static methods for accessing providers.
- *
+ * 
  * @author Jeremy Whitlock <jwhitlock@apache.org>
  */
 public class Providers {
 
    /**
-    * Returns the providers located on the classpath via
-    * {@link java.util.ServiceLoader}.
-    *
+    * Returns the providers located on the classpath via {@link java.util.ServiceLoader}.
+    * 
     * @return all available providers loaded from classpath via ServiceLoader
     */
    private static Iterable<ProviderMetadata> fromServiceLoader() {
@@ -43,7 +42,7 @@ public class Providers {
 
    /**
     * Returns all available providers.
-    *
+    * 
     * @return all available providers
     */
    public static Iterable<ProviderMetadata> all() {
@@ -52,24 +51,23 @@ public class Providers {
 
    /**
     * Returns the first provider with the provided id
-    *
+    * 
     * @param id
     *           the id of the provider to return
-    *
+    * 
     * @return the provider with the given id
-    *
+    * 
     * @throws NoSuchElementException
-    *           whenever there are no providers with the provided id
+    *            whenever there are no providers with the provided id
     */
-   public static ProviderMetadata withId(String id)
-      throws NoSuchElementException {
+   public static ProviderMetadata withId(String id) throws NoSuchElementException {
       return find(all(), ProviderPredicates.id(id));
    }
 
    /**
     * Returns the providers that are of type
     * {@link org.jclouds.providers.ProviderMetadata#BLOBSTORE_TYPE}.
-    *
+    * 
     * @return the blobstore providers
     */
    public static Iterable<ProviderMetadata> allBlobStore() {
@@ -79,19 +77,49 @@ public class Providers {
    /**
     * Returns the providers that are of type
     * {@link org.jclouds.providers.ProviderMetadata#COMPUTE_TYPE}.
-    *
+    * 
     * @return the compute service providers
     */
    public static Iterable<ProviderMetadata> allCompute() {
       return filter(all(), ProviderPredicates.type(ProviderMetadata.COMPUTE_TYPE));
    }
 
+   /**
+    * Returns the providers that are of type
+    * {@link org.jclouds.providers.ProviderMetadata#QUEUE_TYPE}.
+    * 
+    * @return the queue service providers
+    */
+   public static Iterable<ProviderMetadata> allQueue() {
+      return filter(all(), ProviderPredicates.type(ProviderMetadata.QUEUE_TYPE));
+   }
+
+   /**
+    * Returns the providers that are of type
+    * {@link org.jclouds.providers.ProviderMetadata#TABLE_TYPE}.
+    * 
+    * @return the table service providers
+    */
+   public static Iterable<ProviderMetadata> allTable() {
+      return filter(all(), ProviderPredicates.type(ProviderMetadata.TABLE_TYPE));
+   }
+
+   /**
+    * Returns the providers that are of type
+    * {@link org.jclouds.providers.ProviderMetadata#LOADBALANCER_TYPE}.
+    * 
+    * @return the load balancer service providers
+    */
+   public static Iterable<ProviderMetadata> allLoadBalancer() {
+      return filter(all(), ProviderPredicates.type(ProviderMetadata.LOADBALANCER_TYPE));
+   }
+
    /**
     * Returns the providers that are of the provided type.
-    *
+    * 
     * @param type
     *           the type to providers to return
-    *
+    * 
     * @return the providers of the provided type
     */
    public static Iterable<ProviderMetadata> ofType(String type) {
diff --git a/core/src/main/java/org/jclouds/rest/config/CredentialStoreModule.java b/core/src/main/java/org/jclouds/rest/config/CredentialStoreModule.java
index 4baf672602..05a7e5102a 100644
--- a/core/src/main/java/org/jclouds/rest/config/CredentialStoreModule.java
+++ b/core/src/main/java/org/jclouds/rest/config/CredentialStoreModule.java
@@ -20,7 +20,6 @@ package org.jclouds.rest.config;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import java.io.IOException;
 import java.io.InputStream;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -29,9 +28,9 @@ import javax.annotation.Resource;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import org.jclouds.collect.InputSupplierMap;
 import org.jclouds.collect.TransformingMap;
 import org.jclouds.domain.Credentials;
+import org.jclouds.io.CopyInputStreamInputSupplierMap;
 import org.jclouds.json.Json;
 import org.jclouds.logging.Logger;
 import org.jclouds.rest.ConfiguresCredentialStore;
@@ -39,8 +38,6 @@ import org.jclouds.util.Strings2;
 
 import com.google.common.annotations.Beta;
 import com.google.common.base.Function;
-import com.google.common.io.ByteStreams;
-import com.google.common.io.Closeables;
 import com.google.common.io.InputSupplier;
 import com.google.inject.AbstractModule;
 import com.google.inject.Provides;
@@ -97,48 +94,6 @@ public class CredentialStoreModule extends AbstractModule {
       }
    }
 
-   @Singleton
-   public static class CopyInputStreamInputSupplierMap extends InputSupplierMap<String, InputStream> {
-      @Singleton
-      public static class CopyInputStreamIntoSupplier implements Function<InputStream, InputSupplier<InputStream>> {
-         @Resource
-         protected Logger logger = Logger.NULL;
-
-         @SuppressWarnings("unchecked")
-         @Override
-         public InputSupplier<InputStream> apply(InputStream from) {
-            if (from == null)
-               return new InputSupplier<InputStream>() {
-
-                  @Override
-                  public InputStream getInput() throws IOException {
-                     return null;
-                  }
-
-               };
-            try {
-               return InputSupplier.class.cast(ByteStreams.newInputStreamSupplier(ByteStreams.toByteArray(from)));
-            } catch (Exception e) {
-               logger.warn(e, "ignoring problem retrieving credentials");
-               return null;
-            } finally {
-               Closeables.closeQuietly(from);
-            }
-         }
-      }
-
-      @Inject
-      public CopyInputStreamInputSupplierMap(Map<String, InputSupplier<InputStream>> toMap,
-            CopyInputStreamIntoSupplier putFunction) {
-         super(toMap, putFunction);
-      }
-
-      public CopyInputStreamInputSupplierMap(Map<String, InputSupplier<InputStream>> toMap) {
-         super(toMap, new CopyInputStreamIntoSupplier());
-      }
-
-   }
-
    @Singleton
    public static class CredentialsFromJsonInputStream implements Function<InputStream, Credentials> {
       @Resource
diff --git a/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java b/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java
index d1d3527fb9..36627ff5df 100755
--- a/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java
+++ b/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java
@@ -82,6 +82,7 @@ import org.jclouds.http.functions.ReturnInputStream;
 import org.jclouds.http.functions.ReturnStringIf2xx;
 import org.jclouds.http.functions.ReturnTrueIf2xx;
 import org.jclouds.http.functions.UnwrapOnlyJsonValue;
+import org.jclouds.http.functions.UnwrapOnlyJsonValueInSet;
 import org.jclouds.http.functions.UnwrapOnlyNestedJsonValue;
 import org.jclouds.http.functions.UnwrapOnlyNestedJsonValueInSet;
 import org.jclouds.http.functions.ParseSax.HandlerWithResult;
@@ -743,34 +744,7 @@ public class RestAnnotationProcessor<T> {
                   || TypeLiteral.get(method.getGenericReturnType()).equals(futureHttpResponseLiteral)) {
             return Key.get((Class) IdentityFunction.class);
          } else if (getAcceptHeadersOrNull(method).contains(MediaType.APPLICATION_JSON)) {
-            Type returnVal;
-            if (method.getReturnType().getTypeParameters().length == 0) {
-               returnVal = method.getReturnType();
-            } else if (method.getReturnType().equals(ListenableFuture.class)) {
-               ParameterizedType futureType = ((ParameterizedType) method.getGenericReturnType());
-               returnVal = futureType.getActualTypeArguments()[0];
-               if (returnVal instanceof WildcardType)
-                  returnVal = WildcardType.class.cast(returnVal).getUpperBounds()[0];
-            } else {
-               returnVal = method.getGenericReturnType();
-            }
-            ParameterizedType parserType;
-            if (method.isAnnotationPresent(Unwrap.class)) {
-               int depth = method.getAnnotation(Unwrap.class).depth();
-               Class edgeCollection = method.getAnnotation(Unwrap.class).edgeCollection();
-               if (depth == 1 && edgeCollection == Map.class)
-                  parserType = Types.newParameterizedType(UnwrapOnlyJsonValue.class, returnVal);
-               else if (depth == 2 && edgeCollection == Map.class)
-                  parserType = Types.newParameterizedType(UnwrapOnlyNestedJsonValue.class, returnVal);
-               else if (depth == 3 && edgeCollection == Set.class)
-                  parserType = Types.newParameterizedType(UnwrapOnlyNestedJsonValueInSet.class, returnVal);
-               else
-                  throw new IllegalStateException(String.format(
-                           "depth(%d) edgeCollection(%s) not yet supported for @Unwrap", depth, edgeCollection));
-            } else {
-               parserType = Types.newParameterizedType(ParseJson.class, returnVal);
-            }
-            return (Key<? extends Function<HttpResponse, ?>>) Key.get(parserType);
+            return getJsonParserKeyForMethod(method);
          } else if (method.getReturnType().equals(String.class)
                   || TypeLiteral.get(method.getGenericReturnType()).equals(futureStringLiteral)) {
             return Key.get(ReturnStringIf2xx.class);
@@ -784,6 +758,49 @@ public class RestAnnotationProcessor<T> {
       return Key.get(annotation.value());
    }
 
+   public static Key<? extends Function<HttpResponse, ?>> getJsonParserKeyForMethod(Method method) {
+      Type returnVal = getReturnTypeForMethod(method);
+      return getJsonParserKeyForMethodAnType(method, returnVal);
+   }
+
+   public static Type getReturnTypeForMethod(Method method) {
+      Type returnVal;
+      if (method.getReturnType().getTypeParameters().length == 0) {
+         returnVal = method.getReturnType();
+      } else if (method.getReturnType().equals(ListenableFuture.class)) {
+         ParameterizedType futureType = ((ParameterizedType) method.getGenericReturnType());
+         returnVal = futureType.getActualTypeArguments()[0];
+         if (returnVal instanceof WildcardType)
+            returnVal = WildcardType.class.cast(returnVal).getUpperBounds()[0];
+      } else {
+         returnVal = method.getGenericReturnType();
+      }
+      return returnVal;
+   }
+
+   @SuppressWarnings( { "unchecked", "rawtypes" })
+   public static Key<? extends Function<HttpResponse, ?>> getJsonParserKeyForMethodAnType(Method method, Type returnVal) {
+      ParameterizedType parserType;
+      if (method.isAnnotationPresent(Unwrap.class)) {
+         int depth = method.getAnnotation(Unwrap.class).depth();
+         Class edgeCollection = method.getAnnotation(Unwrap.class).edgeCollection();
+         if (depth == 1 && edgeCollection == Map.class)
+            parserType = Types.newParameterizedType(UnwrapOnlyJsonValue.class, returnVal);
+         else if (depth == 2 && edgeCollection == Map.class)
+            parserType = Types.newParameterizedType(UnwrapOnlyNestedJsonValue.class, returnVal);
+         else if (depth == 2 && edgeCollection == Set.class)
+            parserType = Types.newParameterizedType(UnwrapOnlyJsonValueInSet.class, returnVal);
+         else if (depth == 3 && edgeCollection == Set.class)
+            parserType = Types.newParameterizedType(UnwrapOnlyNestedJsonValueInSet.class, returnVal);
+         else
+            throw new IllegalStateException(String.format("depth(%d) edgeCollection(%s) not yet supported for @Unwrap",
+                     depth, edgeCollection));
+      } else {
+         parserType = Types.newParameterizedType(ParseJson.class, returnVal);
+      }
+      return (Key<? extends Function<HttpResponse, ?>>) Key.get(parserType);
+   }
+
    public static Class<? extends HandlerWithResult<?>> getSaxResponseParserClassOrNull(Method method) {
       XMLResponseParser annotation = method.getAnnotation(XMLResponseParser.class);
       if (annotation != null) {
diff --git a/core/src/main/resources/rest.properties b/core/src/main/resources/rest.properties
index 664ee1076a..27b3da4a8f 100644
--- a/core/src/main/resources/rest.properties
+++ b/core/src/main/resources/rest.properties
@@ -126,8 +126,8 @@ openhosting-east1.contextbuilder=org.jclouds.openhosting.OpenHostingEast1Context
 cloudsigma-zrh.propertiesbuilder=org.jclouds.cloudsigma.CloudSigmaZurichPropertiesBuilder
 cloudsigma-zrh.contextbuilder=org.jclouds.cloudsigma.CloudSigmaContextBuilder
 
-ibmdev.propertiesbuilder=org.jclouds.ibmdev.IBMDeveloperCloudPropertiesBuilder
-ibmdev.contextbuilder=org.jclouds.ibmdev.IBMDeveloperCloudContextBuilder
+ibm-smartcloud.propertiesbuilder=org.jclouds.ibm.smartcloud.IBMSmartCloudPropertiesBuilder
+ibm-smartcloud.contextbuilder=org.jclouds.ibm.smartcloud.IBMSmartCloudContextBuilder
 
 stub.contextbuilder=org.jclouds.compute.stub.StubComputeServiceContextBuilder
 # example of where to change your endpoint
diff --git a/core/src/test/java/org/jclouds/json/BaseParserTest.java b/core/src/test/java/org/jclouds/json/BaseParserTest.java
index c9fd77926e..423099f4e0 100644
--- a/core/src/test/java/org/jclouds/json/BaseParserTest.java
+++ b/core/src/test/java/org/jclouds/json/BaseParserTest.java
@@ -20,18 +20,24 @@ package org.jclouds.json;
 
 import static org.testng.Assert.assertEquals;
 
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
 import org.jclouds.http.HttpResponse;
-import org.jclouds.http.functions.UnwrapOnlyNestedJsonValue;
+import org.jclouds.io.Payload;
 import org.jclouds.io.Payloads;
 import org.jclouds.json.config.GsonModule;
+import org.jclouds.rest.internal.RestAnnotationProcessor;
 import org.testng.annotations.Test;
 
 import com.google.common.base.Function;
+import com.google.common.base.Throwables;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
-import com.google.inject.Key;
-import com.google.inject.TypeLiteral;
-import com.google.inject.util.Types;
 
 /**
  * 
@@ -39,22 +45,41 @@ import com.google.inject.util.Types;
  */
 public abstract class BaseParserTest<T, G> {
 
+   @Retention(value = RetentionPolicy.RUNTIME)
+   @Target(value = { ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD })
+   @Qualifier
+   public @interface Nested {
+
+   }
+
+   @SuppressWarnings("unchecked")
+   protected Function<HttpResponse, T> parser(Injector i) {
+      try {
+         return (Function<HttpResponse, T>) i.getInstance(RestAnnotationProcessor.getJsonParserKeyForMethod(getClass()
+                  .getMethod("expected")));
+      } catch (Exception e) {
+         Throwables.propagate(e);
+         return null;
+      }
+   }
+
    @Test
    public void test() {
-
       T expects = expected();
-
-      Function<HttpResponse, T> parser = getParser(getInjector());
-      T response = parser.apply(new HttpResponse(200, "ok", Payloads.newInputStreamPayload(getClass()
-               .getResourceAsStream(resource()))));
+      Function<HttpResponse, T> parser = parser(injector());
+      T response = parser.apply(new HttpResponse(200, "ok", payload()));
       compare(expects, response);
    }
 
+   protected Payload payload() {
+      return Payloads.newInputStreamPayload(getClass().getResourceAsStream(resource()));
+   }
+
    public void compare(T expects, T response) {
       assertEquals(response.toString(), expects.toString());
    }
 
-   protected Injector getInjector() {
+   protected Injector injector() {
       return Guice.createInjector(new GsonModule() {
 
          @Override
@@ -67,15 +92,9 @@ public abstract class BaseParserTest<T, G> {
 
    }
 
-   @SuppressWarnings("unchecked")
-   protected Function<HttpResponse, T> getParser(Injector i) {
-      return (Function<HttpResponse, T>) i.getInstance(Key.get(TypeLiteral.get(
-               Types.newParameterizedType(UnwrapOnlyNestedJsonValue.class, type())).getType()));
+   protected String resource() {
+      throw new IllegalStateException("please define resource such as \"/testaddresses.json\"");
    }
 
-   public abstract Class<G> type();
-
-   public abstract String resource();
-
    public abstract T expected();
 }
diff --git a/core/src/test/java/org/jclouds/json/BaseSetParserTest.java b/core/src/test/java/org/jclouds/json/BaseSetParserTest.java
index b966abd745..a781cc3219 100644
--- a/core/src/test/java/org/jclouds/json/BaseSetParserTest.java
+++ b/core/src/test/java/org/jclouds/json/BaseSetParserTest.java
@@ -22,15 +22,7 @@ import static org.testng.Assert.assertEquals;
 
 import java.util.Set;
 
-import org.jclouds.http.HttpResponse;
-import org.jclouds.http.functions.UnwrapOnlyNestedJsonValue;
-
-import com.google.common.base.Function;
 import com.google.common.collect.ImmutableSortedSet;
-import com.google.inject.Injector;
-import com.google.inject.Key;
-import com.google.inject.TypeLiteral;
-import com.google.inject.util.Types;
 
 /**
  * 
@@ -38,15 +30,6 @@ import com.google.inject.util.Types;
  */
 public abstract class BaseSetParserTest<T> extends BaseParserTest<Set<T>, T> {
 
-   @SuppressWarnings("unchecked")
-   // crazy stuff due to type erasure
-   @Override
-   protected Function<HttpResponse, Set<T>> getParser(Injector i) {
-      return (Function<HttpResponse, Set<T>>) i.getInstance(Key.get(TypeLiteral.get(
-               Types.newParameterizedType(UnwrapOnlyNestedJsonValue.class, Types
-                        .newParameterizedType(Set.class, type()))).getType()));
-   }
-
    public void compare(Set<T> expects, Set<T> response) {
       assertEquals(ImmutableSortedSet.copyOf(response).toString(), ImmutableSortedSet.copyOf(expects).toString());
    }
diff --git a/core/src/test/java/org/jclouds/json/JsonTest.java b/core/src/test/java/org/jclouds/json/JsonTest.java
index 9224822a84..cb3e145f46 100644
--- a/core/src/test/java/org/jclouds/json/JsonTest.java
+++ b/core/src/test/java/org/jclouds/json/JsonTest.java
@@ -37,6 +37,52 @@ import com.google.inject.TypeLiteral;
 public class JsonTest {
    private Json json = Guice.createInjector(new GsonModule()).getInstance(Json.class);
 
+   private static class ObjectNoDefaultConstructor {
+      private final String stringValue;
+      private final int intValue;
+
+      public ObjectNoDefaultConstructor(String stringValue, int intValue) {
+         this.stringValue = stringValue;
+         this.intValue = intValue;
+      }
+
+      @Override
+      public int hashCode() {
+         final int prime = 31;
+         int result = 1;
+         result = prime * result + intValue;
+         result = prime * result + ((stringValue == null) ? 0 : stringValue.hashCode());
+         return result;
+      }
+
+      @Override
+      public boolean equals(Object obj) {
+         if (this == obj)
+            return true;
+         if (obj == null)
+            return false;
+         if (getClass() != obj.getClass())
+            return false;
+         ObjectNoDefaultConstructor other = (ObjectNoDefaultConstructor) obj;
+         if (intValue != other.intValue)
+            return false;
+         if (stringValue == null) {
+            if (other.stringValue != null)
+               return false;
+         } else if (!stringValue.equals(other.stringValue))
+            return false;
+         return true;
+      }
+   }
+
+   public void testObjectNoDefaultConstructor() {
+      ObjectNoDefaultConstructor obj = new ObjectNoDefaultConstructor("foo", 1);
+      assertEquals(json.toJson(obj), "{\"stringValue\":\"foo\",\"intValue\":1}");
+      ObjectNoDefaultConstructor obj2 = json.fromJson(json.toJson(obj), ObjectNoDefaultConstructor.class);
+      assertEquals(obj2, obj);
+      assertEquals(json.toJson(obj2), json.toJson(obj));
+   }
+
    private static class EnumInside {
       private static enum Test {
          FOO, BAR;
@@ -66,7 +112,7 @@ public class JsonTest {
       map.put("map", ImmutableMap.of("key", "value"));
       map.put("list", ImmutableList.of("key", "value"));
       assertEquals(json.toJson(map),
-            "{\"string\":\"string\",\"map\":{\"key\":\"value\"},\"list\":[\"key\",\"value\"],\"boolean\":true,\"number\":1}");
+               "{\"string\":\"string\",\"map\":{\"key\":\"value\"},\"list\":[\"key\",\"value\"],\"boolean\":true,\"number\":1}");
       Map<String, Object> map2 = json.fromJson(json.toJson(map), new TypeLiteral<Map<String, Object>>() {
       }.getType());
       assertEquals(map2, map);
@@ -121,12 +167,12 @@ public class JsonTest {
 
    public void testDeserializeEnumWithParser() {
       assertEquals(json.fromJson("{enumValue : \"FOO\"}", EnumInsideWithParser.class).enumValue,
-            EnumInsideWithParser.Test.FOO);
+               EnumInsideWithParser.Test.FOO);
    }
 
    public void testDeserializeEnumWithParserAndBadValue() {
       assertEquals(json.fromJson("{enumValue : \"sd\"}", EnumInsideWithParser.class).enumValue,
-            EnumInsideWithParser.Test.UNRECOGNIZED);
+               EnumInsideWithParser.Test.UNRECOGNIZED);
    }
 
 }
diff --git a/core/src/test/java/org/jclouds/providers/BaseProviderMetadataTest.java b/core/src/test/java/org/jclouds/providers/BaseProviderMetadataTest.java
new file mode 100644
index 0000000000..1ee8f73553
--- /dev/null
+++ b/core/src/test/java/org/jclouds/providers/BaseProviderMetadataTest.java
@@ -0,0 +1,73 @@
+/**
+ *
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.providers;
+
+import static org.testng.Assert.assertEquals;
+
+import java.util.Set;
+
+import org.testng.annotations.Test;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
+
+/**
+ * 
+ * @author Jeremy Whitlock <jwhitlock@apache.org>
+ */
+@Test(groups = "unit")
+public abstract class BaseProviderMetadataTest {
+   protected Set<String> allTypes = ImmutableSet.of(ProviderMetadata.BLOBSTORE_TYPE, ProviderMetadata.COMPUTE_TYPE,
+            ProviderMetadata.LOADBALANCER_TYPE, ProviderMetadata.QUEUE_TYPE, ProviderMetadata.TABLE_TYPE);
+
+   private final ProviderMetadata toTest;
+   private final String expectedType;
+
+   public BaseProviderMetadataTest(ProviderMetadata toTest, String expectedType) {
+      this.toTest = toTest;
+      this.expectedType = expectedType;
+   }
+
+   @Test
+   public void testWithId() {
+      ProviderMetadata providerMetadata = Providers.withId(toTest.getId());
+
+      assertEquals(toTest, providerMetadata);
+      assert providerMetadata.getLinkedServices().contains(toTest.getId());
+   }
+
+   // it is ok to have multiple services in the same classpath (ex. ec2 vs elb)
+   @Test
+   public void testOfTypeContains() {
+      ImmutableSet<ProviderMetadata> ofType = ImmutableSet.copyOf(Providers.ofType(expectedType));
+      assert ofType.contains(toTest) : String.format("%s not found in %s", toTest, ofType);
+   }
+
+   @Test
+   public void testAllContains() {
+      ImmutableSet<ProviderMetadata> all = ImmutableSet.copyOf(Providers.all());
+      assert all.contains(toTest) : String.format("%s not found in %s", toTest, all);
+   }
+
+   @Test
+   public void testInRestProperties() {
+      Iterable<String> providers = org.jclouds.rest.Providers.getSupportedProviders();
+      assert Iterables.contains(providers, toTest.getId()) : providers;
+   }
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/jclouds/providers/JcloudsTestBlobStoreProviderMetadata.java b/core/src/test/java/org/jclouds/providers/JcloudsTestBlobStoreProviderMetadata.java
index 7ddc6f7310..41fa1533d6 100644
--- a/core/src/test/java/org/jclouds/providers/JcloudsTestBlobStoreProviderMetadata.java
+++ b/core/src/test/java/org/jclouds/providers/JcloudsTestBlobStoreProviderMetadata.java
@@ -21,14 +21,14 @@ package org.jclouds.providers;
 import java.net.URI;
 
 /**
- * Implementation of {@ link org.jclouds.types.ProviderMetadata} for testing.
- *
+ * Implementation of @ link org.jclouds.types.ProviderMetadata} for testing.
+ * 
  * @author Jeremy Whitlock <jwhitlock@apache.org>
  */
-public class JcloudsTestBlobStoreProviderMetadata implements ProviderMetadata {
+public class JcloudsTestBlobStoreProviderMetadata extends BaseProviderMetadata {
 
    /**
-    * {@ see org.jclouds.types.ProviderMetadata#getId()}
+    * {@inheritDoc}
     */
    @Override
    public String getId() {
@@ -36,7 +36,7 @@ public class JcloudsTestBlobStoreProviderMetadata implements ProviderMetadata {
    }
 
    /**
-    * {@ see org.jclouds.types.ProviderMetadata#getType()}
+    * {@inheritDoc}
     */
    @Override
    public String getType() {
@@ -44,7 +44,7 @@ public class JcloudsTestBlobStoreProviderMetadata implements ProviderMetadata {
    }
 
    /**
-    * {@ see org.jclouds.types.ProviderMetadata#getName()}
+    * {@inheritDoc}
     */
    @Override
    public String getName() {
@@ -52,7 +52,23 @@ public class JcloudsTestBlobStoreProviderMetadata implements ProviderMetadata {
    }
 
    /**
-    * {@ see org.jclouds.types.ProviderMetadata#getHomepage()}
+    * {@inheritDoc}
+    */
+   @Override
+   public String getCredentialName() {
+      return "user";
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public String getIdentityName() {
+      return "password";
+   }
+
+   /**
+    * {@inheritDoc}
     */
    @Override
    public URI getHomepage() {
@@ -60,11 +76,19 @@ public class JcloudsTestBlobStoreProviderMetadata implements ProviderMetadata {
    }
 
    /**
-    * {@ see org.jclouds.types.ProviderMetadata#getConsole()}
+    * {@inheritDoc}
     */
    @Override
    public URI getConsole() {
       return URI.create("http://jclouds.org/console");
    }
 
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public URI getApiDocumentation() {
+      return URI.create("http://jclouds.org/documentation");
+   }
+
 }
\ No newline at end of file
diff --git a/core/src/test/java/org/jclouds/providers/JcloudsTestComputeProviderMetadata.java b/core/src/test/java/org/jclouds/providers/JcloudsTestComputeProviderMetadata.java
index 93289c4dab..a412edb1e3 100644
--- a/core/src/test/java/org/jclouds/providers/JcloudsTestComputeProviderMetadata.java
+++ b/core/src/test/java/org/jclouds/providers/JcloudsTestComputeProviderMetadata.java
@@ -21,11 +21,11 @@ package org.jclouds.providers;
 import java.net.URI;
 
 /**
- * Implementation of {@ link org.jclouds.types.ProviderMetadata} for testing.
- *
+ * Implementation of @ link org.jclouds.types.ProviderMetadata} for testing.
+ * 
  * @author Jeremy Whitlock <jwhitlock@apache.org>
  */
-public class JcloudsTestComputeProviderMetadata implements ProviderMetadata {
+public class JcloudsTestComputeProviderMetadata extends BaseProviderMetadata {
 
    /**
     * {@ see org.jclouds.types.ProviderMetadata#getId()}
@@ -51,6 +51,22 @@ public class JcloudsTestComputeProviderMetadata implements ProviderMetadata {
       return "Test Compute Provider";
    }
 
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public String getCredentialName() {
+      return "user";
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public String getIdentityName() {
+      return "password";
+   }
+
    /**
     * {@ see org.jclouds.types.ProviderMetadata#getHomepage()}
     */
@@ -67,4 +83,12 @@ public class JcloudsTestComputeProviderMetadata implements ProviderMetadata {
       return URI.create("http://jclouds.org/console");
    }
 
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public URI getApiDocumentation() {
+      return URI.create("http://jclouds.org/documentation");
+   }
+
 }
\ No newline at end of file
diff --git a/core/src/test/java/org/jclouds/providers/ProvidersTest.java b/core/src/test/java/org/jclouds/providers/ProvidersTest.java
index d4f957d7e3..2cc1ab31ca 100644
--- a/core/src/test/java/org/jclouds/providers/ProvidersTest.java
+++ b/core/src/test/java/org/jclouds/providers/ProvidersTest.java
@@ -33,10 +33,13 @@ import org.testng.annotations.Test;
 @Test( groups = "unit" )
 public class ProvidersTest {
 
+   private final ProviderMetadata testBlobstoreProvider = new JcloudsTestBlobStoreProviderMetadata();
+   private final ProviderMetadata testComputeProvider = new JcloudsTestComputeProviderMetadata();
+
    @Test
    public void testWithId() {
       ProviderMetadata providerMetadata;
-
+    
       try {
          providerMetadata = Providers.withId("fake-id");
          fail("Looking for a provider with an id that doesn't exist should " +
@@ -45,9 +48,9 @@ public class ProvidersTest {
          ; // Expected
       }
 
-      providerMetadata = Providers.withId("test-blobstore-provider");
+      providerMetadata = Providers.withId(testBlobstoreProvider.getId());
 
-      assertEquals("Test Blobstore Provider", providerMetadata.getName());
+      assertEquals(testBlobstoreProvider, providerMetadata);
    }
 
    @Test
@@ -55,21 +58,13 @@ public class ProvidersTest {
       Iterable<ProviderMetadata> providersMetadata = Providers.ofType(ProviderMetadata.BLOBSTORE_TYPE);
 
       for (ProviderMetadata providerMetadata : providersMetadata) {
-         assertEquals("Test Blobstore Provider", providerMetadata.getName());
-         assertEquals("test-blobstore-provider", providerMetadata.getId());
-         assertEquals(ProviderMetadata.BLOBSTORE_TYPE, providerMetadata.getType());
-         assertEquals("http://jclouds.org", providerMetadata.getHomepage().toString());
-         assertEquals("http://jclouds.org/console", providerMetadata.getConsole().toString());
+         assertEquals(testBlobstoreProvider, providerMetadata);
       }
 
       providersMetadata = Providers.ofType(ProviderMetadata.COMPUTE_TYPE);
 
       for (ProviderMetadata providerMetadata : providersMetadata) {
-         assertEquals("Test Compute Provider", providerMetadata.getName());
-         assertEquals("test-compute-provider", providerMetadata.getId());
-         assertEquals(ProviderMetadata.COMPUTE_TYPE, providerMetadata.getType());
-         assertEquals("http://jclouds.org", providerMetadata.getHomepage().toString());
-         assertEquals("http://jclouds.org/console", providerMetadata.getConsole().toString());
+         assertEquals(testComputeProvider, providerMetadata);
       }
 
       providersMetadata = Providers.ofType("fake-type");
@@ -83,16 +78,9 @@ public class ProvidersTest {
 
       for (ProviderMetadata providerMetadata : providersMetadata) {
          if (providerMetadata.getName().equals("Test Blobstore Provider")) {
-            assertEquals("test-blobstore-provider", providerMetadata.getId());
-            assertEquals(ProviderMetadata.BLOBSTORE_TYPE, providerMetadata.getType());
-            assertEquals("http://jclouds.org", providerMetadata.getHomepage().toString());
-            assertEquals("http://jclouds.org/console", providerMetadata.getConsole().toString());
+            assertEquals(testBlobstoreProvider, providerMetadata);
          } else {
-            assertEquals("Test Compute Provider", providerMetadata.getName());
-            assertEquals("test-compute-provider", providerMetadata.getId());
-            assertEquals(ProviderMetadata.COMPUTE_TYPE, providerMetadata.getType());
-            assertEquals("http://jclouds.org", providerMetadata.getHomepage().toString());
-            assertEquals("http://jclouds.org/console", providerMetadata.getConsole().toString());
+            assertEquals(testComputeProvider, providerMetadata);
          }
       }
    }
diff --git a/core/src/test/java/org/jclouds/rest/CredentialStoreModuleTest.java b/core/src/test/java/org/jclouds/rest/CredentialStoreModuleTest.java
index 6176e861ce..7ed4ef04c7 100755
--- a/core/src/test/java/org/jclouds/rest/CredentialStoreModuleTest.java
+++ b/core/src/test/java/org/jclouds/rest/CredentialStoreModuleTest.java
@@ -28,10 +28,10 @@ import java.util.concurrent.ConcurrentHashMap;
 
 import org.jclouds.crypto.PemsTest;
 import org.jclouds.domain.Credentials;
+import org.jclouds.io.CopyInputStreamInputSupplierMap;
 import org.jclouds.json.Json;
 import org.jclouds.json.config.GsonModule;
 import org.jclouds.rest.config.CredentialStoreModule;
-import org.jclouds.rest.config.CredentialStoreModule.CopyInputStreamInputSupplierMap;
 import org.jclouds.util.Strings2;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
@@ -46,7 +46,7 @@ import com.google.inject.TypeLiteral;
  * 
  * @author Adrian Cole
  */
-@Test(groups = "unit", sequential = true)
+@Test(groups = "unit", singleThreaded = true)
 public class CredentialStoreModuleTest {
    Json json = createInjector().getInstance(Json.class);
 
diff --git a/core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java b/core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java
index 7b1a94c379..7bc2fe2e06 100755
--- a/core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java
+++ b/core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java
@@ -97,6 +97,7 @@ import org.jclouds.http.functions.ReturnInputStream;
 import org.jclouds.http.functions.ReturnStringIf2xx;
 import org.jclouds.http.functions.ReturnTrueIf2xx;
 import org.jclouds.http.functions.UnwrapOnlyJsonValue;
+import org.jclouds.http.functions.UnwrapOnlyJsonValueInSet;
 import org.jclouds.http.functions.UnwrapOnlyNestedJsonValue;
 import org.jclouds.http.functions.UnwrapOnlyNestedJsonValueInSet;
 import org.jclouds.http.internal.PayloadEnclosingImpl;
@@ -833,7 +834,13 @@ public class RestAnnotationProcessorTest extends BaseRestClientTest {
       @Unwrap(depth = 2)
       @Consumes(MediaType.APPLICATION_JSON)
       ListenableFuture<Long> testUnwrapDepth2Long();
-
+      
+      @GET
+      @Path("/")
+      @Unwrap(depth = 2, edgeCollection = Set.class)
+      @Consumes(MediaType.APPLICATION_JSON)
+      ListenableFuture<String> testUnwrapDepth2Set();
+      
       @GET
       @Path("/")
       @Unwrap(depth = 3, edgeCollection = Set.class)
@@ -1033,6 +1040,23 @@ public class RestAnnotationProcessorTest extends BaseRestClientTest {
                .<String> of());
    }
 
+   @SuppressWarnings("unchecked")
+   public void testUnwrapDepth2Set() throws SecurityException, NoSuchMethodException, IOException {
+      Method method = TestPut.class.getMethod("testUnwrapDepth2Set");
+      HttpRequest request = factory(TestPut.class).createRequest(method);
+
+      assertResponseParserClassEquals(method, request, UnwrapOnlyJsonValueInSet.class);
+      // now test that it works!
+
+      Function<HttpResponse, Map<String, String>> parser = (Function<HttpResponse, Map<String, String>>) RestAnnotationProcessor
+               .createResponseParser(parserFactory, injector, method, request);
+
+      assertEquals(parser.apply(new HttpResponse(200, "ok",
+               newStringPayload("{\"runit\":[\"0.7.0\"]}"))), "0.7.0");
+
+      assertEquals(parser.apply(new HttpResponse(200, "ok", newStringPayload("{\"runit\":[]}"))), null);
+   }
+
    @SuppressWarnings("unchecked")
    public void testUnwrapDepth2Long() throws SecurityException, NoSuchMethodException, IOException {
       Method method = TestPut.class.getMethod("testUnwrapDepth2Long");
diff --git a/drivers/apachehc/pom.xml b/drivers/apachehc/pom.xml
index 259e2d3418..230050a0c4 100644
--- a/drivers/apachehc/pom.xml
+++ b/drivers/apachehc/pom.xml
@@ -2,7 +2,7 @@
 <!--
 
 
-    Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+    Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
 
     ====================================================================
     Licensed under the Apache License, Version 2.0 (the "License");
@@ -32,7 +32,7 @@
     <groupId>org.jclouds.driver</groupId>
     <artifactId>jclouds-apachehc</artifactId>
     <name>jclouds Apache Http Components Client</name>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
     <description>Apache HttpComponents client</description>
 
     <!-- bootstrapping: need to fetch the project POM -->
@@ -72,4 +72,20 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.http.apachehc.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
diff --git a/drivers/bouncycastle/pom.xml b/drivers/bouncycastle/pom.xml
index 509947753f..e04f55fc33 100644
--- a/drivers/bouncycastle/pom.xml
+++ b/drivers/bouncycastle/pom.xml
@@ -2,7 +2,7 @@
 <!--
 
 
-    Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+    Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
 
     ====================================================================
     Licensed under the Apache License, Version 2.0 (the "License");
@@ -33,6 +33,7 @@
     <artifactId>jclouds-bouncycastle</artifactId>
     <name>jclouds bouncycastle EncryptionService Module</name>
     <description>jclouds bouncycastle EncryptionService Module</description>
+    <packaging>bundle</packaging>
 
     <!-- bootstrapping: need to fetch the project POM -->
     <repositories>
@@ -65,4 +66,21 @@
             <scope>compile</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>    
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration> 
+                    <instructions>      
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.encryption.bouncycastle.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>     
+                </configuration>
+            </plugin>   
+        </plugins>
+    </build>
+
 </project>
diff --git a/drivers/enterprise/pom.xml b/drivers/enterprise/pom.xml
index 0d7f5df73c..c615581773 100644
--- a/drivers/enterprise/pom.xml
+++ b/drivers/enterprise/pom.xml
@@ -2,7 +2,7 @@
 <!--
 
 
-    Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+    Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
 
     ====================================================================
     Licensed under the Apache License, Version 2.0 (the "License");
@@ -33,6 +33,7 @@
     <artifactId>jclouds-enterprise</artifactId>
     <name>jclouds enterprise Module</name>
     <description>jclouds enterprise configuration</description>
+    <packaging>bundle</packaging>
 
     <!-- bootstrapping: need to fetch the project POM -->
     <repositories>
@@ -79,4 +80,20 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>    
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration> 
+                    <instructions>      
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.enterprise.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>     
+                </configuration>
+            </plugin>   
+        </plugins>
+    </build>
 </project>
diff --git a/drivers/gae/pom.xml b/drivers/gae/pom.xml
index b3efa6df2c..c0def2b73e 100644
--- a/drivers/gae/pom.xml
+++ b/drivers/gae/pom.xml
@@ -2,7 +2,7 @@
 	<!--
 
 
-		Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+		Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
 
 		====================================================================
 		Licensed under the Apache License, Version 2.0 (the "License"); you
@@ -31,6 +31,7 @@
     <artifactId>jclouds-gae</artifactId>
     <name>jclouds Google App Engine Components</name>
     <description>Google App Engine Components</description>
+    <packaging>bundle</packaging>
 
     <!-- bootstrapping: need to fetch the project POM -->
     <repositories>
@@ -96,6 +97,17 @@
                     <parallel>classes</parallel>
                 </configuration>
             </plugin>
+            <plugin>    
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration> 
+                    <instructions>      
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.gae.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>     
+                </configuration>
+            </plugin>   
         </plugins>
     </build>
 </project>
diff --git a/drivers/joda/pom.xml b/drivers/joda/pom.xml
index 46e1193d7b..f188822bcf 100644
--- a/drivers/joda/pom.xml
+++ b/drivers/joda/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>jclouds-joda</artifactId>
     <name>jclouds joda DateService Module</name>
     <description>jclouds joda DateService Module</description>
+    <packaging>bundle</packaging>
 
     <!-- bootstrapping: need to fetch the project POM -->
     <repositories>
@@ -65,5 +66,22 @@
             <scope>compile</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>    
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration> 
+                    <instructions>      
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.date.joda.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>     
+                </configuration>
+            </plugin>   
+        </plugins>
+    </build>
+
 </project>
 
diff --git a/drivers/jsch/pom.xml b/drivers/jsch/pom.xml
index 3312006077..7b74008307 100644
--- a/drivers/jsch/pom.xml
+++ b/drivers/jsch/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>jclouds-jsch</artifactId>
     <name>jclouds jsch ssh client</name>
     <description>jclouds jsch ssh client</description>
+    <packaging>bundle</packaging>
 
     <!-- bootstrapping: need to fetch the project POM -->
     <repositories>
@@ -74,4 +75,20 @@
             <version>1.4</version>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>    
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration> 
+                    <instructions>      
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.ssh.jsch.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>     
+                </configuration>
+            </plugin>   
+        </plugins>
+    </build>
 </project>
diff --git a/drivers/log4j/pom.xml b/drivers/log4j/pom.xml
index d29b710675..17cfdcbb6e 100644
--- a/drivers/log4j/pom.xml
+++ b/drivers/log4j/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>jclouds-log4j</artifactId>
     <name>jclouds Log4J Logging Module</name>
     <description>jclouds Log4J Logging Module</description>
+    <packaging>bundle</packaging>
 
     <!-- bootstrapping: need to fetch the project POM -->
     <repositories>
@@ -65,4 +66,21 @@
             <scope>compile</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>    
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration> 
+                    <instructions>      
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.logging.log4j.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>     
+                </configuration>
+            </plugin>   
+        </plugins>
+    </build>
+
 </project>
diff --git a/drivers/netty/pom.xml b/drivers/netty/pom.xml
index 779bd1c909..77c9717183 100644
--- a/drivers/netty/pom.xml
+++ b/drivers/netty/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>jclouds-netty</artifactId>
     <name>jclouds netty payload module</name>
     <description>jclouds netty payload module</description>
+    <packaging>bundle</packaging>
 
     <!-- bootstrapping: need to fetch the project POM -->
     <repositories>
@@ -78,5 +79,21 @@
             <scope>compile</scope>
         </dependency>
     </dependencies>
-</project>
 
+    <build>
+        <plugins>
+            <plugin>    
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration> 
+                    <instructions>      
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.netty.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>     
+                </configuration>
+            </plugin>   
+        </plugins>
+    </build>
+
+</project>
diff --git a/drivers/slf4j/pom.xml b/drivers/slf4j/pom.xml
index 2efee1fa53..6d0760c45d 100644
--- a/drivers/slf4j/pom.xml
+++ b/drivers/slf4j/pom.xml
@@ -2,7 +2,7 @@
 <!--
 
 
-    Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+    Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
 
     ====================================================================
     Licensed under the Apache License, Version 2.0 (the "License");
@@ -31,8 +31,9 @@
     </parent>
     <groupId>org.jclouds.driver</groupId>
     <artifactId>jclouds-slf4j</artifactId>
-    <name>jclouds Log4J Logging Module</name>
-    <description>jclouds Log4J Logging Module</description>
+    <name>jclouds SLF4J Logging Module</name>
+    <description>jclouds SLF4J Logging Module</description>
+    <packaging>bundle</packaging>
 
     <!-- bootstrapping: need to fetch the project POM -->
     <repositories>
@@ -65,4 +66,21 @@
             <scope>compile</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>    
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration> 
+                    <instructions>      
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.logging.slf4j.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>     
+                </configuration>
+            </plugin>   
+        </plugins>
+    </build>
+
 </project>
diff --git a/loadbalancer/pom.xml b/loadbalancer/pom.xml
index 0436777819..7fd66622ea 100644
--- a/loadbalancer/pom.xml
+++ b/loadbalancer/pom.xml
@@ -32,6 +32,7 @@
     <artifactId>jclouds-loadbalancer</artifactId>
     <name>jclouds loadbalancer core</name>
     <description>jclouds components to access loadbalancer providers</description>
+    <packaging>bundle</packaging>
 
     <!-- bootstrapping: need to fetch the project POM -->
     <repositories>
@@ -75,4 +76,20 @@
            <scope>test</scope>
         </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.loadbalancer.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                        <Fragment-Host>jclouds-core;version="${project.version}"</Fragment-Host>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/project/pom.xml b/project/pom.xml
index d1054b8655..200680d0a5 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -525,6 +525,17 @@ pageTracker._trackPageview();
                     <artifactId>maven-release-plugin</artifactId>
                     <version>2.1</version>
                 </plugin>                
+                <plugin>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>maven-bundle-plugin</artifactId>
+                    <version>2.3.4</version>
+                    <extensions>true</extensions>
+                    <configuration>
+                        <instructions>
+                            <_nouses>true</_nouses>
+                       </instructions>
+                   </configuration>
+                </plugin>
             </plugins>            
         </pluginManagement>
     </build>
diff --git a/providers/aws-ec2/pom.xml b/providers/aws-ec2/pom.xml
index d566f55547..8634072915 100644
--- a/providers/aws-ec2/pom.xml
+++ b/providers/aws-ec2/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>aws-ec2</artifactId>
     <name>jclouds Amazon EC2 provider</name>
     <description>EC2 implementation targeted to Amazon Web Services</description>
+    <packaging>bundle</packaging>
 
     <properties>
         <test.aws-ec2.endpoint>https://ec2.us-east-1.amazonaws.com</test.aws-ec2.endpoint>
@@ -141,6 +142,21 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>    
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.aws.ec2.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
 
diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/AWSEC2ProviderMetadata.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/AWSEC2ProviderMetadata.java
new file mode 100644
index 0000000000..4932440b60
--- /dev/null
+++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/AWSEC2ProviderMetadata.java
@@ -0,0 +1,108 @@
+/**
+ *
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.aws.ec2;
+
+import java.net.URI;
+import java.util.Set;
+
+import org.jclouds.providers.BaseProviderMetadata;
+import org.jclouds.providers.ProviderMetadata;
+
+import com.google.common.collect.ImmutableSet;
+
+/**
+ * Implementation of {@ link org.jclouds.types.ProviderMetadata} for Amazon's
+ * Elastic Compute Cloud (EC2) provider.
+ *
+ * @author Jeremy Whitlock <jwhitlock@apache.org>
+ */
+public class AWSEC2ProviderMetadata extends BaseProviderMetadata {
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public String getId() {
+      return "aws-ec2";
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public String getType() {
+      return ProviderMetadata.COMPUTE_TYPE;
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public String getName() {
+      return "Amazon Elastic Compute Cloud (EC2)";
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public String getIdentityName() {
+      return "Access Key ID";
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public String getCredentialName() {
+      return "Secret Access Key";
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public URI getHomepage() {
+      return URI.create("http://aws.amazon.com/ec2/");
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public URI getConsole() {
+      return URI.create("https://console.aws.amazon.com/ec2/home");
+   }
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public URI getApiDocumentation() {
+      return URI.create("http://docs.amazonwebservices.com/AWSEC2/latest/APIReference");
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public Set<String> getLinkedServices() {
+      return ImmutableSet.of("aws-s3", "aws-ec2", "aws-elb", "aws-simpledb");
+   }
+
+}
\ No newline at end of file
diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2ComputeService.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2ComputeService.java
index 63ffece204..b0a4d8ae9c 100644
--- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2ComputeService.java
+++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2ComputeService.java
@@ -36,6 +36,7 @@ import org.jclouds.aws.ec2.domain.PlacementGroup;
 import org.jclouds.aws.ec2.domain.PlacementGroup.State;
 import org.jclouds.collect.Memoized;
 import org.jclouds.compute.ComputeServiceContext;
+import org.jclouds.compute.callables.RunScriptOnNode;
 import org.jclouds.compute.domain.Hardware;
 import org.jclouds.compute.domain.Image;
 import org.jclouds.compute.domain.NodeMetadata;
@@ -85,7 +86,8 @@ public class AWSEC2ComputeService extends EC2ComputeService {
          @Named("NODE_RUNNING") Predicate<NodeMetadata> nodeRunning,
          @Named("NODE_TERMINATED") Predicate<NodeMetadata> nodeTerminated,
          @Named("NODE_SUSPENDED") Predicate<NodeMetadata> nodeSuspended,
-         InitializeRunScriptOnNodeOrPlaceInBadMap.Factory initScriptRunnerFactory, InitAdminAccess initAdminAccess,
+         InitializeRunScriptOnNodeOrPlaceInBadMap.Factory initScriptRunnerFactory,
+         RunScriptOnNode.Factory runScriptOnNodeFactory, InitAdminAccess initAdminAccess,
          PersistNodeCredentials persistNodeCredentials, Timeouts timeouts,
          @Named(Constants.PROPERTY_USER_THREADS) ExecutorService executor, AWSEC2Client ec2Client,
          Map<RegionAndName, KeyPair> credentialsMap, @Named("SECURITY") Map<RegionAndName, String> securityGroupMap,
@@ -94,8 +96,8 @@ public class AWSEC2ComputeService extends EC2ComputeService {
       super(context, credentialStore, images, sizes, locations, listNodesStrategy, getNodeMetadataStrategy,
             runNodesAndAddToSetStrategy, rebootNodeStrategy, destroyNodeStrategy, startNodeStrategy, stopNodeStrategy,
             templateBuilderProvider, templateOptionsProvider, nodeRunning, nodeTerminated, nodeSuspended,
-            initScriptRunnerFactory, initAdminAccess, persistNodeCredentials, timeouts, executor, ec2Client,
-            credentialsMap, securityGroupMap);
+            initScriptRunnerFactory, runScriptOnNodeFactory, initAdminAccess, persistNodeCredentials, timeouts,
+            executor, ec2Client, credentialsMap, securityGroupMap);
       this.ec2Client = ec2Client;
       this.placementGroupMap = placementGroupMap;
       this.placementGroupDeleted = placementGroupDeleted;
diff --git a/providers/aws-ec2/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/aws-ec2/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
new file mode 100644
index 0000000000..636b065928
--- /dev/null
+++ b/providers/aws-ec2/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
@@ -0,0 +1 @@
+org.jclouds.aws.ec2.AWSEC2ProviderMetadata
diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/AWSEC2ProviderTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/AWSEC2ProviderTest.java
new file mode 100644
index 0000000000..38b9361748
--- /dev/null
+++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/AWSEC2ProviderTest.java
@@ -0,0 +1,37 @@
+/**
+ *
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.aws.ec2;
+
+import org.jclouds.aws.ec2.AWSEC2ProviderMetadata;
+import org.jclouds.providers.BaseProviderMetadataTest;
+import org.jclouds.providers.ProviderMetadata;
+import org.testng.annotations.Test;
+
+/**
+ * The AWSEC2ProviderTest tests the org.jclouds.providers.AWSEC2Provider class.
+ * 
+ * @author Jeremy Whitlock <jwhitlock@apache.org>
+ */
+@Test(groups = "unit", testName = "AWSEC2ProviderTest")
+public class AWSEC2ProviderTest extends BaseProviderMetadataTest {
+
+   public AWSEC2ProviderTest() {
+      super(new AWSEC2ProviderMetadata(), ProviderMetadata.COMPUTE_TYPE);
+   }
+}
\ No newline at end of file
diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/strategy/AWSEC2ImageParserTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/strategy/AWSEC2ImageParserTest.java
index c796c76c71..b4879582ec 100644
--- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/strategy/AWSEC2ImageParserTest.java
+++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/strategy/AWSEC2ImageParserTest.java
@@ -125,11 +125,11 @@ public class AWSEC2ImageParserTest {
 
       assertEquals(
                new Gson().toJson(Iterables.get(result, 1)),
-               "{\"operatingSystem\":{\"family\":\"UBUNTU\",\"arch\":\"paravirtual\",\"version\":\"9.10\",\"description\":\"411009282317/RightImage_Ubuntu_9.10_x64_v4.5.3_EBS_Alpha\",\"is64Bit\":true},\"version\":\"4.5.3_EBS_Alpha\",\"description\":\"RightImage_Ubuntu_9.10_x64_v4.5.3_EBS_Alpha\",\"defaultCredentials\":{\"identity\":\"root\"},\"id\":\"us-east-1/ami-c19db6b5\",\"type\":\"IMAGE\",\"providerId\":\"ami-c19db6b5\",\"location\":{\"scope\":\"REGION\",\"id\":\"us-east-1\",\"description\":\"us-east-1\",\"iso3166Codes\":[],\"metadata\":{}},\"userMetadata\":{\"owner\":\"411009282317\",\"rootDeviceType\":\"ebs\"}}");
+               "{\"operatingSystem\":{\"family\":\"UBUNTU\",\"arch\":\"paravirtual\",\"version\":\"9.10\",\"description\":\"411009282317/RightImage_Ubuntu_9.10_x64_v4.5.3_EBS_Alpha\",\"is64Bit\":true},\"version\":\"4.5.3_EBS_Alpha\",\"description\":\"RightImage_Ubuntu_9.10_x64_v4.5.3_EBS_Alpha\",\"defaultCredentials\":{\"identity\":\"root\"},\"id\":\"us-east-1/ami-c19db6b5\",\"type\":\"IMAGE\",\"tags\":[],\"providerId\":\"ami-c19db6b5\",\"location\":{\"scope\":\"REGION\",\"id\":\"us-east-1\",\"description\":\"us-east-1\",\"iso3166Codes\":[],\"metadata\":{}},\"userMetadata\":{\"owner\":\"411009282317\",\"rootDeviceType\":\"ebs\"}}");
 
       assertEquals(
                new Gson().toJson(Iterables.get(result, 2)),
-               "{\"operatingSystem\":{\"family\":\"WINDOWS\",\"arch\":\"hvm\",\"version\":\"2003\",\"description\":\"411009282317/RightImage Windows_2003_i386_v5.4.3\",\"is64Bit\":false},\"version\":\"5.4.3\",\"description\":\"Built by RightScale\",\"defaultCredentials\":{\"identity\":\"root\"},\"id\":\"us-east-1/ami-710c2605\",\"type\":\"IMAGE\",\"providerId\":\"ami-710c2605\",\"location\":{\"scope\":\"REGION\",\"id\":\"us-east-1\",\"description\":\"us-east-1\",\"iso3166Codes\":[],\"metadata\":{}},\"userMetadata\":{\"owner\":\"411009282317\",\"rootDeviceType\":\"ebs\"}}");
+               "{\"operatingSystem\":{\"family\":\"WINDOWS\",\"arch\":\"hvm\",\"version\":\"2003\",\"description\":\"411009282317/RightImage Windows_2003_i386_v5.4.3\",\"is64Bit\":false},\"version\":\"5.4.3\",\"description\":\"Built by RightScale\",\"defaultCredentials\":{\"identity\":\"root\"},\"id\":\"us-east-1/ami-710c2605\",\"type\":\"IMAGE\",\"tags\":[],\"providerId\":\"ami-710c2605\",\"location\":{\"scope\":\"REGION\",\"id\":\"us-east-1\",\"description\":\"us-east-1\",\"iso3166Codes\":[],\"metadata\":{}},\"userMetadata\":{\"owner\":\"411009282317\",\"rootDeviceType\":\"ebs\"}}");
    }
 
    public void testParseAmznImage() {
diff --git a/providers/aws-s3/pom.xml b/providers/aws-s3/pom.xml
index 30edbe413e..118fc1bd83 100644
--- a/providers/aws-s3/pom.xml
+++ b/providers/aws-s3/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>aws-s3</artifactId>
     <name>jclouds Amazon Simple Storage Service (S3) provider</name>
     <description>Simple Storage Service (S3) implementation targeted to Amazon Web Services</description>
+    <packaging>bundle</packaging>
 
     <properties>
         <test.initializer>org.jclouds.aws.s3.blobstore.integration.AWSS3TestInitializer</test.initializer>
@@ -165,6 +166,21 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>    
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.aws.s3.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
 
diff --git a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java
new file mode 100644
index 0000000000..173dff1956
--- /dev/null
+++ b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java
@@ -0,0 +1,109 @@
+/**
+ *
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.aws.s3;
+
+import java.net.URI;
+import java.util.Set;
+
+import org.jclouds.providers.BaseProviderMetadata;
+import org.jclouds.providers.ProviderMetadata;
+
+import com.google.common.collect.ImmutableSet;
+
+/**
+ * Implementation of @ link org.jclouds.types.ProviderMetadata} for Amazon's Simple Storage Service
+ * (S3) provider.
+ * 
+ * @author Adrian Cole
+ */
+public class AWSS3ProviderMetadata extends BaseProviderMetadata {
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public String getId() {
+      return "aws-s3";
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public String getType() {
+      return ProviderMetadata.BLOBSTORE_TYPE;
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public String getName() {
+      return "Amazon Simple Storage Service (S3)";
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public String getIdentityName() {
+      return "Access Key ID";
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public String getCredentialName() {
+      return "Secret Access Key";
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public URI getHomepage() {
+      return URI.create("http://aws.amazon.com/s3/");
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public URI getConsole() {
+      return URI.create("https://console.aws.amazon.com/s3/home");
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public URI getApiDocumentation() {
+      return URI.create("http://docs.amazonwebservices.com/AmazonS3/latest/API");
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public Set<String> getLinkedServices() {
+      return ImmutableSet.of("aws-s3", "aws-ec2", "aws-elb", "aws-simpledb");
+   }
+
+}
\ No newline at end of file
diff --git a/providers/aws-s3/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/aws-s3/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
new file mode 100644
index 0000000000..be3179d7be
--- /dev/null
+++ b/providers/aws-s3/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
@@ -0,0 +1 @@
+org.jclouds.aws.s3.AWSS3ProviderMetadata
diff --git a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/ProvidersInPropertiesTest.java b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/AWSS3ProviderTest.java
similarity index 68%
rename from providers/aws-s3/src/test/java/org/jclouds/aws/s3/ProvidersInPropertiesTest.java
rename to providers/aws-s3/src/test/java/org/jclouds/aws/s3/AWSS3ProviderTest.java
index e63a4b95dd..397c4ba7bf 100644
--- a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/ProvidersInPropertiesTest.java
+++ b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/AWSS3ProviderTest.java
@@ -18,23 +18,19 @@
  */
 package org.jclouds.aws.s3;
 
-import org.jclouds.rest.Providers;
+import org.jclouds.providers.BaseProviderMetadataTest;
+import org.jclouds.providers.ProviderMetadata;
 import org.testng.annotations.Test;
 
-import com.google.common.collect.Iterables;
-
 /**
+ * The AWSS3ProviderTest tests the org.jclouds.providers.AWSS3Provider class.
  * 
  * @author Adrian Cole
- * 
  */
-@Test(groups = "unit")
-public class ProvidersInPropertiesTest {
-   
-   @Test
-   public void testSupportedProviders() {
-      Iterable<String> providers = Providers.getSupportedProviders();
-      assert Iterables.contains(providers, "aws-s3") : providers;
-   }
+@Test(groups = "unit", testName = "AWSS3ProviderTest")
+public class AWSS3ProviderTest extends BaseProviderMetadataTest {
 
-}
+   public AWSS3ProviderTest() {
+      super(new AWSS3ProviderMetadata(), ProviderMetadata.BLOBSTORE_TYPE);
+   }
+}
\ No newline at end of file
diff --git a/providers/azureblob/pom.xml b/providers/azureblob/pom.xml
index aa20937509..4d5389cfb7 100644
--- a/providers/azureblob/pom.xml
+++ b/providers/azureblob/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>azureblob</artifactId>
     <name>jclouds Azure Storage provider</name>
     <description>jclouds components to access Azure Blob Service</description>
+    <packaging>bundle</packaging>
 
     <properties>
         <test.initializer>org.jclouds.azureblob.blobstore.integration.AzureBlobTestInitializer</test.initializer>
@@ -138,6 +139,21 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>    
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.azureblob.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
 
diff --git a/providers/bluelock-vcdirector/pom.xml b/providers/bluelock-vcdirector/pom.xml
index 7008d578c6..648c9d57a0 100644
--- a/providers/bluelock-vcdirector/pom.xml
+++ b/providers/bluelock-vcdirector/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>bluelock-vcdirector</artifactId>
     <name>jclouds BlueLock vCloud Director provider</name>
     <description>vCloud implementation targeted to BlueLock</description>
+    <packaging>bundle</packaging>
 
     <properties>
         <test.bluelock-vcdirector.endpoint>https://vcenterprise.bluelock.com/api</test.bluelock-vcdirector.endpoint>
@@ -143,6 +144,21 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>    
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.vcloud.bluelock.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
 
diff --git a/providers/cloudfiles-uk/pom.xml b/providers/cloudfiles-uk/pom.xml
index b2d1169944..cb512c9597 100644
--- a/providers/cloudfiles-uk/pom.xml
+++ b/providers/cloudfiles-uk/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>cloudfiles-uk</artifactId>
     <name>jclouds CloudFiles UK provider</name>
     <description>CloudFiles implementation targeted to Rackspace UK</description>
+    <packaging>bundle</packaging>
 
     <properties>
         <test.initializer>org.jclouds.rackspace.cloudfiles.blobstore.integration.CloudFilesUKTestInitializer</test.initializer>
@@ -146,6 +147,21 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>    
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.rackspace.cloudfiles.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
 
diff --git a/providers/cloudfiles-us/pom.xml b/providers/cloudfiles-us/pom.xml
index 43aea106b5..f0457f37db 100644
--- a/providers/cloudfiles-us/pom.xml
+++ b/providers/cloudfiles-us/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>cloudfiles-us</artifactId>
     <name>jclouds CloudFiles US provider</name>
     <description>CloudFiles implementation targeted to Rackspace US</description>
+    <packaging>bundle</packaging>
 
     <properties>
         <test.initializer>org.jclouds.rackspace.cloudfiles.blobstore.integration.CloudFilesUSTestInitializer</test.initializer>
@@ -146,6 +147,21 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.rackspace.cloudfiles.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
 
diff --git a/providers/cloudloadbalancers-us/pom.xml b/providers/cloudloadbalancers-us/pom.xml
index d75be50da9..1cca29a863 100644
--- a/providers/cloudloadbalancers-us/pom.xml
+++ b/providers/cloudloadbalancers-us/pom.xml
@@ -34,6 +34,7 @@
     <artifactId>cloudloadbalancers-us</artifactId>
     <name>jclouds cloudloadbalancers-us core</name>
     <description>jclouds components to access cloudloadbalancers-us</description>
+    <packaging>bundle</packaging>
     
     <properties>
         <test.cloudloadbalancers-us.endpoint>https://auth.api.rackspacecloud.com</test.cloudloadbalancers-us.endpoint>
@@ -122,4 +123,20 @@
             </build>
         </profile>
     </profiles>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.rackspace.cloudloadbalancers.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/providers/cloudloadbalancers-us/src/main/java/org/jclouds/cloudloadbalancers/domain/LoadBalancer.java b/providers/cloudloadbalancers-us/src/main/java/org/jclouds/cloudloadbalancers/domain/LoadBalancer.java
index e8321bf339..757ecc092a 100644
--- a/providers/cloudloadbalancers-us/src/main/java/org/jclouds/cloudloadbalancers/domain/LoadBalancer.java
+++ b/providers/cloudloadbalancers-us/src/main/java/org/jclouds/cloudloadbalancers/domain/LoadBalancer.java
@@ -141,7 +141,7 @@ public class LoadBalancer extends BaseLoadBalancer<Node, LoadBalancer> {
       }
 
       @Override
-      public Builder port(int port) {
+      public Builder port(Integer port) {
          return Builder.class.cast(super.port(port));
       }
 
@@ -218,7 +218,7 @@ public class LoadBalancer extends BaseLoadBalancer<Node, LoadBalancer> {
    private final Date updated;
    private final boolean connectionLoggingEnabled;
 
-   public LoadBalancer(String region, int id, String name, String protocol, int port, String algorithm, Status status,
+   public LoadBalancer(String region, int id, String name, String protocol, Integer port, String algorithm, Status status,
             Iterable<VirtualIP> virtualIPs, Iterable<Node> nodes, String sessionPersistenceType, String clusterName,
             Date created, Date updated, boolean connectionLoggingEnabled) {
       super(name, protocol, port, algorithm, nodes);
diff --git a/providers/cloudloadbalancers-us/src/main/java/org/jclouds/cloudloadbalancers/domain/LoadBalancerRequest.java b/providers/cloudloadbalancers-us/src/main/java/org/jclouds/cloudloadbalancers/domain/LoadBalancerRequest.java
index f69e4a54df..9d7bbec8a5 100644
--- a/providers/cloudloadbalancers-us/src/main/java/org/jclouds/cloudloadbalancers/domain/LoadBalancerRequest.java
+++ b/providers/cloudloadbalancers-us/src/main/java/org/jclouds/cloudloadbalancers/domain/LoadBalancerRequest.java
@@ -105,7 +105,7 @@ public class LoadBalancerRequest extends BaseLoadBalancer<NodeRequest, LoadBalan
       }
 
       @Override
-      public Builder port(int port) {
+      public Builder port(Integer port) {
          return Builder.class.cast(super.port(port));
       }
 
diff --git a/providers/cloudloadbalancers-us/src/main/java/org/jclouds/cloudloadbalancers/domain/internal/BaseLoadBalancer.java b/providers/cloudloadbalancers-us/src/main/java/org/jclouds/cloudloadbalancers/domain/internal/BaseLoadBalancer.java
index 3dfa03a124..0826e28a5d 100644
--- a/providers/cloudloadbalancers-us/src/main/java/org/jclouds/cloudloadbalancers/domain/internal/BaseLoadBalancer.java
+++ b/providers/cloudloadbalancers-us/src/main/java/org/jclouds/cloudloadbalancers/domain/internal/BaseLoadBalancer.java
@@ -18,7 +18,6 @@
  */
 package org.jclouds.cloudloadbalancers.domain.internal;
 
-import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.Set;
@@ -50,7 +49,7 @@ public class BaseLoadBalancer<N extends BaseNode<N>, T extends BaseLoadBalancer<
    public static class Builder<N extends BaseNode<N>, T extends BaseLoadBalancer<N, T>> {
       protected String name;
       protected String protocol;
-      protected int port = -1;
+      protected Integer port;
       protected String algorithm;
       protected Set<N> nodes = Sets.newLinkedHashSet();
 
@@ -64,7 +63,7 @@ public class BaseLoadBalancer<N extends BaseNode<N>, T extends BaseLoadBalancer<
          return this;
       }
 
-      public Builder<N, T> port(int port) {
+      public Builder<N, T> port(Integer port) {
          this.port = port;
          return this;
       }
@@ -103,17 +102,16 @@ public class BaseLoadBalancer<N extends BaseNode<N>, T extends BaseLoadBalancer<
 
    protected String name;
    protected String protocol;
-   protected int port;
+   protected Integer port;
    protected String algorithm;
    // so tests will come out consistently
    protected SortedSet<N> nodes = ImmutableSortedSet.of();
 
-   public BaseLoadBalancer(String name, String protocol, int port, String algorithm, Iterable<N> nodes) {
+   public BaseLoadBalancer(String name, String protocol, Integer port, String algorithm, Iterable<N> nodes) {
       this.name = checkNotNull(name, "name");
-      this.protocol = checkNotNull(protocol, "protocol");
-      checkArgument(port != -1, "port must be specified");
-      this.port = port;
-      this.algorithm = algorithm;
+      this.protocol = protocol;// null on deleted LB
+      this.port = port;// null on deleted LB
+      this.algorithm = algorithm;// null on deleted LB
       this.nodes = ImmutableSortedSet.copyOf(checkNotNull(nodes, "nodes"));
    }
 
@@ -130,7 +128,7 @@ public class BaseLoadBalancer<N extends BaseNode<N>, T extends BaseLoadBalancer<
       return protocol;
    }
 
-   public int getPort() {
+   public Integer getPort() {
       return port;
    }
 
@@ -144,8 +142,8 @@ public class BaseLoadBalancer<N extends BaseNode<N>, T extends BaseLoadBalancer<
 
    @Override
    public int hashCode() {
-      final int prime = 31;
-      int result = 1;
+      final Integer prime = 31;
+      Integer result = 1;
       result = prime * result + ((name == null) ? 0 : name.hashCode());
       return result;
    }
diff --git a/providers/cloudloadbalancers-us/src/main/java/org/jclouds/cloudloadbalancers/features/LoadBalancerAsyncClient.java b/providers/cloudloadbalancers-us/src/main/java/org/jclouds/cloudloadbalancers/features/LoadBalancerAsyncClient.java
index c62319c891..ee50ea4b04 100644
--- a/providers/cloudloadbalancers-us/src/main/java/org/jclouds/cloudloadbalancers/features/LoadBalancerAsyncClient.java
+++ b/providers/cloudloadbalancers-us/src/main/java/org/jclouds/cloudloadbalancers/features/LoadBalancerAsyncClient.java
@@ -106,6 +106,7 @@ public interface LoadBalancerAsyncClient {
    @DELETE
    @ExceptionParser(ReturnVoidOnNotFoundOr404.class)
    @Path("/loadbalancers/{id}")
+   @Consumes("*/*")
    ListenableFuture<Void> removeLoadBalancer(@PathParam("id") int id);
 
 }
diff --git a/providers/cloudloadbalancers-us/src/test/java/org/jclouds/cloudloadbalancers/features/LoadBalancerAsyncClientTest.java b/providers/cloudloadbalancers-us/src/test/java/org/jclouds/cloudloadbalancers/features/LoadBalancerAsyncClientTest.java
index cefc0bebce..16692d3763 100644
--- a/providers/cloudloadbalancers-us/src/test/java/org/jclouds/cloudloadbalancers/features/LoadBalancerAsyncClientTest.java
+++ b/providers/cloudloadbalancers-us/src/test/java/org/jclouds/cloudloadbalancers/features/LoadBalancerAsyncClientTest.java
@@ -147,7 +147,7 @@ public class LoadBalancerAsyncClientTest extends BaseCloudLoadBalancersAsyncClie
 
       assertRequestLineEquals(httpRequest,
                "DELETE https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/1234/loadbalancers/5 HTTP/1.1");
-      assertNonPayloadHeadersEqual(httpRequest, "");
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: */*\n");
       assertPayloadEquals(httpRequest, null, null, false);
 
       assertResponseParserClassEquals(method, httpRequest, ReleasePayloadAndReturn.class);
diff --git a/providers/cloudloadbalancers-us/src/test/java/org/jclouds/cloudloadbalancers/features/LoadBalancerClientLiveTest.java b/providers/cloudloadbalancers-us/src/test/java/org/jclouds/cloudloadbalancers/features/LoadBalancerClientLiveTest.java
index a6199de47f..9eddff9a5d 100644
--- a/providers/cloudloadbalancers-us/src/test/java/org/jclouds/cloudloadbalancers/features/LoadBalancerClientLiveTest.java
+++ b/providers/cloudloadbalancers-us/src/test/java/org/jclouds/cloudloadbalancers/features/LoadBalancerClientLiveTest.java
@@ -44,7 +44,6 @@ import com.google.common.collect.Sets;
 public class LoadBalancerClientLiveTest extends BaseCloudLoadBalancersClientLiveTest {
    private Set<LoadBalancer> lbs = Sets.newLinkedHashSet();
 
-   // ticket 130960 getting 500 errors deleting load balancers
    @AfterGroups(groups = "live")
    protected void tearDown() {
       for (LoadBalancer lb : lbs) {
@@ -60,6 +59,8 @@ public class LoadBalancerClientLiveTest extends BaseCloudLoadBalancersClientLive
          assert null != response;
          assertTrue(response.size() >= 0);
          for (LoadBalancer lb : response) {
+            if (lb.getStatus() == LoadBalancer.Status.DELETED)
+               continue;
             assert lb.getRegion() != null : lb;
             assert lb.getName() != null : lb;
             assert lb.getId() != -1 : lb;
@@ -73,17 +74,21 @@ public class LoadBalancerClientLiveTest extends BaseCloudLoadBalancersClientLive
             assert lb.getNodes().size() == 0 : lb;
 
             LoadBalancer getDetails = client.getLoadBalancerClient(region).getLoadBalancer(lb.getId());
-            assertEquals(getDetails.getRegion(), lb.getRegion());
-            assertEquals(getDetails.getName(), lb.getName());
-            assertEquals(getDetails.getId(), lb.getId());
-            assertEquals(getDetails.getProtocol(), lb.getProtocol());
-            assertEquals(getDetails.getPort(), lb.getPort());
-            assertEquals(getDetails.getStatus(), lb.getStatus());
-            assertEquals(getDetails.getCreated(), lb.getCreated());
-            assertEquals(getDetails.getUpdated(), lb.getUpdated());
-            assertEquals(getDetails.getVirtualIPs(), lb.getVirtualIPs());
-            // node info not available during list;
-            assert getDetails.getNodes().size() > 0 : lb;
+            try {
+               assertEquals(getDetails.getRegion(), lb.getRegion());
+               assertEquals(getDetails.getName(), lb.getName());
+               assertEquals(getDetails.getId(), lb.getId());
+               assertEquals(getDetails.getProtocol(), lb.getProtocol());
+               assertEquals(getDetails.getPort(), lb.getPort());
+               assertEquals(getDetails.getStatus(), lb.getStatus());
+               assertEquals(getDetails.getCreated(), lb.getCreated());
+               assertEquals(getDetails.getUpdated(), lb.getUpdated());
+               assertEquals(getDetails.getVirtualIPs(), lb.getVirtualIPs());
+               // node info not available during list;
+               assert getDetails.getNodes().size() > 0 : lb;
+            } catch (AssertionError e) {
+               throw new AssertionError(String.format("%s\n%s - %s", e.getMessage(),getDetails, lb));
+            }
          }
       }
    }
@@ -122,7 +127,7 @@ public class LoadBalancerClientLiveTest extends BaseCloudLoadBalancersClientLive
       assertEquals(lb.getRegion(), region);
       assertEquals(lb.getName(), name);
       assertEquals(lb.getProtocol(), "HTTP");
-      assertEquals(lb.getPort(), 80);
+      assertEquals(lb.getPort(), new Integer(80));
       assertEquals(Iterables.get(lb.getVirtualIPs(), 0).getType(), Type.PUBLIC);
    }
 
diff --git a/providers/cloudloadbalancers-us/src/test/java/org/jclouds/cloudloadbalancers/functions/UnwrapLoadBalancerTest.java b/providers/cloudloadbalancers-us/src/test/java/org/jclouds/cloudloadbalancers/functions/UnwrapLoadBalancerTest.java
index e93fcae313..44dffb8673 100644
--- a/providers/cloudloadbalancers-us/src/test/java/org/jclouds/cloudloadbalancers/functions/UnwrapLoadBalancerTest.java
+++ b/providers/cloudloadbalancers-us/src/test/java/org/jclouds/cloudloadbalancers/functions/UnwrapLoadBalancerTest.java
@@ -39,11 +39,6 @@ import com.google.inject.Injector;
 @Test(groups = "unit")
 public class UnwrapLoadBalancerTest extends BaseItemParserTest<LoadBalancer> {
 
-   @Override
-   public Class<LoadBalancer> type() {
-      return LoadBalancer.class;
-   }
-
    @Override
    public String resource() {
       return "/getloadbalancer.json";
@@ -73,7 +68,7 @@ public class UnwrapLoadBalancerTest extends BaseItemParserTest<LoadBalancer> {
    }
 
    @Override
-   protected Function<HttpResponse, LoadBalancer> getParser(Injector i) {
+   protected Function<HttpResponse, LoadBalancer> parser(Injector i) {
       return i.getInstance(UnwrapLoadBalancer.class).setRegion("DFW");
    }
 }
diff --git a/providers/cloudloadbalancers-us/src/test/java/org/jclouds/cloudloadbalancers/functions/UnwrapLoadBalancersTest.java b/providers/cloudloadbalancers-us/src/test/java/org/jclouds/cloudloadbalancers/functions/UnwrapLoadBalancersTest.java
index 9a55b7a3fb..c34aa7c3ba 100644
--- a/providers/cloudloadbalancers-us/src/test/java/org/jclouds/cloudloadbalancers/functions/UnwrapLoadBalancersTest.java
+++ b/providers/cloudloadbalancers-us/src/test/java/org/jclouds/cloudloadbalancers/functions/UnwrapLoadBalancersTest.java
@@ -39,11 +39,6 @@ import com.google.inject.Injector;
 @Test(groups = "unit")
 public class UnwrapLoadBalancersTest extends BaseSetParserTest<LoadBalancer> {
 
-   @Override
-   public Class<LoadBalancer> type() {
-      return LoadBalancer.class;
-   }
-
    @Override
    public String resource() {
       return "/listloadbalancers.json";
@@ -70,7 +65,7 @@ public class UnwrapLoadBalancersTest extends BaseSetParserTest<LoadBalancer> {
    }
 
    @Override
-   protected Function<HttpResponse, Set<LoadBalancer>> getParser(Injector i) {
+   protected Function<HttpResponse, Set<LoadBalancer>> parser(Injector i) {
       return i.getInstance(UnwrapLoadBalancers.class).setRegion("DFW");
    }
 }
diff --git a/providers/cloudonestorage/pom.xml b/providers/cloudonestorage/pom.xml
index b035c2d9c8..faf627d65f 100644
--- a/providers/cloudonestorage/pom.xml
+++ b/providers/cloudonestorage/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>cloudonestorage</artifactId>
     <name>jclouds CloudOne Storage as a Service provider</name>
     <description>Atmos implementation targeted to Peer1 CloudOne Storage as a Service</description>
+    <packaging>bundle</packaging>
 
     <properties>
         <test.initializer>org.jclouds.cloudonestorage.blobstore.integration.CloudOneStorageTestInitializer</test.initializer>
@@ -139,6 +140,21 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.cloudonestorage.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
 
diff --git a/providers/cloudservers-uk/pom.xml b/providers/cloudservers-uk/pom.xml
index a3450706cb..cf661a8faf 100644
--- a/providers/cloudservers-uk/pom.xml
+++ b/providers/cloudservers-uk/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>cloudservers-uk</artifactId>
     <name>jclouds CloudServers UK provider</name>
     <description>CloudServers implementation targeted to Rackspace UK</description>
+    <packaging>bundle</packaging>
 
     <properties>
         <test.cloudservers-uk.endpoint>https://lon.auth.api.rackspacecloud.com</test.cloudservers-uk.endpoint>
@@ -141,6 +142,21 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.rackspace.cloudservers.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
 
diff --git a/providers/cloudservers-us/pom.xml b/providers/cloudservers-us/pom.xml
index fa90b3d3fd..19ac0bf45f 100644
--- a/providers/cloudservers-us/pom.xml
+++ b/providers/cloudservers-us/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>cloudservers-us</artifactId>
     <name>jclouds CloudServers US provider</name>
     <description>CloudServers implementation targeted to Rackspace US</description>
+    <packaging>bundle</packaging>
 
     <properties>
         <test.cloudservers-us.endpoint>https://auth.api.rackspacecloud.com</test.cloudservers-us.endpoint>
@@ -141,6 +142,20 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.rackspace.cloudservers.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
-
diff --git a/providers/cloudsigma-zrh/pom.xml b/providers/cloudsigma-zrh/pom.xml
index e2755db738..c73e1220f7 100644
--- a/providers/cloudsigma-zrh/pom.xml
+++ b/providers/cloudsigma-zrh/pom.xml
@@ -34,6 +34,7 @@
     <artifactId>cloudsigma-zrh</artifactId>
     <name>jclouds CloudSigma provider</name>
     <description>ComputeService binding to the CloudSigma datacenter in Zürich</description>
+    <packaging>bundle</packaging>
     
     <properties>
         <!-- when instances are hung, open a ticket and add here -->
@@ -134,4 +135,21 @@
             </build>
         </profile>
     </profiles>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.cloudsigma.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
diff --git a/providers/elastichosts-lon-b/pom.xml b/providers/elastichosts-lon-b/pom.xml
index 5c81c79319..a9cacc91be 100644
--- a/providers/elastichosts-lon-b/pom.xml
+++ b/providers/elastichosts-lon-b/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>elastichosts-lon-b</artifactId>
     <name>jclouds ElasticHosts BlueSquare London provider</name>
     <description>ElasticHosts implementation targeted to BlueSquare London</description>
+    <packaging>bundle</packaging>
 
     <properties>
         <test.elastichosts-lon-b.endpoint>https://api.lon-b.elastichosts.com</test.elastichosts-lon-b.endpoint>
@@ -136,6 +137,21 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.elastichosts.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
 
diff --git a/providers/elastichosts-lon-p/pom.xml b/providers/elastichosts-lon-p/pom.xml
index 430c555e7a..b6428a30d2 100644
--- a/providers/elastichosts-lon-p/pom.xml
+++ b/providers/elastichosts-lon-p/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>elastichosts-lon-p</artifactId>
     <name>jclouds ElasticHosts Peer1 London provider</name>
     <description>ElasticHosts implementation targeted to Peer1 London</description>
+    <packaging>bundle</packaging>
 
     <properties>
         <test.elastichosts-lon-p.endpoint>https://api.lon-p.elastichosts.com</test.elastichosts-lon-p.endpoint>
@@ -136,6 +137,21 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.elastichosts.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
 
diff --git a/providers/elastichosts-sat-p/pom.xml b/providers/elastichosts-sat-p/pom.xml
index 45afee45a0..9d033963d1 100644
--- a/providers/elastichosts-sat-p/pom.xml
+++ b/providers/elastichosts-sat-p/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>elastichosts-sat-p</artifactId>
     <name>jclouds ElasticHosts Peer1 San Antonio provider</name>
     <description>ElasticHosts implementation targeted to Peer1 San Antonio</description>
+    <packaging>bundle</packaging>
 
     <properties>
         <test.elastichosts-sat-p.endpoint>https://api.sat-p.elastichosts.com</test.elastichosts-sat-p.endpoint>
@@ -136,6 +137,21 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.elastichosts.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
 
diff --git a/providers/eucalyptus-partnercloud-ec2/pom.xml b/providers/eucalyptus-partnercloud-ec2/pom.xml
index 745a89c7ea..10f626e397 100644
--- a/providers/eucalyptus-partnercloud-ec2/pom.xml
+++ b/providers/eucalyptus-partnercloud-ec2/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>eucalyptus-partnercloud-ec2</artifactId>
     <name>jclouds Eucalyptus Partner Cloud EC2 provider</name>
     <description>Eucalyptus (EC2) implementation targeted to the Eucalyptus Partner Cloud</description>
+    <packaging>bundle</packaging>
 
     <properties>
         <test.eucalyptus-partnercloud-ec2.endpoint>http://partnercloud.eucalyptus.com:8773/services/Eucalyptus</test.eucalyptus-partnercloud-ec2.endpoint>
@@ -155,6 +156,21 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.epc.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
 
diff --git a/providers/eucalyptus-partnercloud-s3/pom.xml b/providers/eucalyptus-partnercloud-s3/pom.xml
index f27ed56f13..b21814f6d9 100644
--- a/providers/eucalyptus-partnercloud-s3/pom.xml
+++ b/providers/eucalyptus-partnercloud-s3/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>eucalyptus-partnercloud-s3</artifactId>
     <name>jclouds Eucalyptus Partner Cloud provider</name>
     <description>Walrus (S3) implementation targeted to the Eucalyptus Partner Cloud</description>
+    <packaging>bundle</packaging>
 
     <properties>
         <test.initializer>org.jclouds.epc.blobstore.EucalyptusPartnerCloudWalrusTestInitializer</test.initializer>
@@ -151,6 +152,20 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.epc.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
-
diff --git a/providers/gogrid/pom.xml b/providers/gogrid/pom.xml
index d7168c4b2e..cb335d0d07 100644
--- a/providers/gogrid/pom.xml
+++ b/providers/gogrid/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>gogrid</artifactId>
     <name>jclouds GoGrid provider</name>
     <description>ComputeService implementation of GoGrid datacenters</description>
+    <packaging>bundle</packaging>
 
     <properties>
         <!-- when instances are hung, open a ticket and add here -->
@@ -132,4 +133,20 @@
             </build>
         </profile>
     </profiles>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.gogrid.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/GoGridComputeService.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/GoGridComputeService.java
index 4946eeedd6..c2e82e3788 100644
--- a/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/GoGridComputeService.java
+++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/GoGridComputeService.java
@@ -30,6 +30,7 @@ import javax.inject.Singleton;
 import org.jclouds.Constants;
 import org.jclouds.collect.Memoized;
 import org.jclouds.compute.ComputeServiceContext;
+import org.jclouds.compute.callables.RunScriptOnNode;
 import org.jclouds.compute.domain.Hardware;
 import org.jclouds.compute.domain.Image;
 import org.jclouds.compute.domain.NodeMetadata;
@@ -71,12 +72,13 @@ public class GoGridComputeService extends BaseComputeService {
          @Named("NODE_TERMINATED") Predicate<NodeMetadata> nodeTerminated,
          @Named("NODE_SUSPENDED") Predicate<NodeMetadata> nodeSuspended,
          InitializeRunScriptOnNodeOrPlaceInBadMap.Factory initScriptRunnerFactory, InitAdminAccess initAdminAccess,
-         PersistNodeCredentials persistNodeCredentials, Timeouts timeouts,
+         RunScriptOnNode.Factory runScriptOnNodeFactory, PersistNodeCredentials persistNodeCredentials, Timeouts timeouts,
          @Named(Constants.PROPERTY_USER_THREADS) ExecutorService executor) {
       super(context, credentialStore, images, hardwareProfiles, locations, listNodesStrategy, getNodeMetadataStrategy,
             runNodesAndAddToSetStrategy, rebootNodeStrategy, destroyNodeStrategy, resumeNodeStrategy,
             suspendNodeStrategy, templateBuilderProvider, templateOptionsProvider, nodeRunning, nodeTerminated,
-            nodeSuspended, initScriptRunnerFactory, initAdminAccess, persistNodeCredentials, timeouts, executor);
+            nodeSuspended, initScriptRunnerFactory, initAdminAccess, runScriptOnNodeFactory, persistNodeCredentials, timeouts,
+            executor);
    }
 
    /**
diff --git a/providers/googlestorage/pom.xml b/providers/googlestorage/pom.xml
index 7bb13e9189..1f4b81442a 100644
--- a/providers/googlestorage/pom.xml
+++ b/providers/googlestorage/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>googlestorage</artifactId>
     <name>jclouds Google Storage for Developers provider</name>
     <description>Simple Storage Service (S3) implementation targeted to Google Storage for Developers</description>
+    <packaging>bundle</packaging>
 
     <properties>
         <test.initializer>org.jclouds.googlestorage.blobstore.GoogleStorageTestInitializer</test.initializer>
@@ -139,6 +140,20 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.googlestorage.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
-
diff --git a/providers/hosteurope-storage/pom.xml b/providers/hosteurope-storage/pom.xml
index a17ac14c26..2777fe6129 100644
--- a/providers/hosteurope-storage/pom.xml
+++ b/providers/hosteurope-storage/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>hosteurope-storage</artifactId>
     <name>jclouds Host Europe Cloud Storage provider</name>
     <description>Scality RING (ScalityRS2) implementation targeted to Host Europe Cloud Storage</description>
+    <packaging>bundle</packaging>
 
     <properties>
         <test.initializer>org.jclouds.hosteurope.storage.blobstore.HostEuropeStorageTestInitializer</test.initializer>
@@ -146,6 +147,21 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.hosteurope.storage.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
 
diff --git a/providers/ninefold-storage/pom.xml b/providers/ninefold-storage/pom.xml
index be157c21b3..bf6230ad8f 100644
--- a/providers/ninefold-storage/pom.xml
+++ b/providers/ninefold-storage/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>ninefold-storage</artifactId>
     <name>jclouds ninefold storage provider</name>
     <description>BlobStore implementation targeted to ninefold storage</description>
+    <packaging>bundle</packaging>
 
     <properties>
         <test.initializer>org.jclouds.ninefold.storage.blobstore.integration.NinefoldStorageTestInitializer</test.initializer>
@@ -139,6 +140,20 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.ninefold.storage.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
-
diff --git a/providers/openhosting-east1/pom.xml b/providers/openhosting-east1/pom.xml
index 02ed369e1e..4bd389b46e 100644
--- a/providers/openhosting-east1/pom.xml
+++ b/providers/openhosting-east1/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>openhosting-east1</artifactId>
     <name>jclouds Open Hosting East1 provider</name>
     <description>Open Hosting implementation targeted to East1</description>
+    <packaging>bundle</packaging>
 
     <properties>
         <test.openhosting-east1.endpoint>https://api.east1.openhosting.com</test.openhosting-east1.endpoint>
@@ -136,6 +137,20 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.openhosting.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
-
diff --git a/providers/savvis-symphonyvpdc/pom.xml b/providers/savvis-symphonyvpdc/pom.xml
index 34edc7e952..0c19c904d2 100644
--- a/providers/savvis-symphonyvpdc/pom.xml
+++ b/providers/savvis-symphonyvpdc/pom.xml
@@ -34,6 +34,7 @@
     <artifactId>savvis-symphonyvpdc</artifactId>
     <name>jclouds savvis-vpdc vpdc</name>
     <description>jclouds components to access Savvis Symphony VPDC</description>
+    <packaging>bundle</packaging>
     
     <!-- bootstrapping: need to fetch the project POM -->
     <repositories>
@@ -52,11 +53,11 @@
     <properties>
         <!-- when instances are hung, open a ticket and add here -->
         <jclouds.compute.blacklist-nodes>node-924</jclouds.compute.blacklist-nodes>
-        <test.savvis-symphonyvpdc.endpoint>https://api.symphonyvpdc.savvis.net/rest/api</test.savvis-symphonyvpdc.endpoint>
-        <test.savvis-symphonyvpdc.apiversion>0.8</test.savvis-symphonyvpdc.apiversion>
+        <test.savvis-symphonyvpdc.endpoint>https://api.symphonyvpdc.savvis.net/vpdc</test.savvis-symphonyvpdc.endpoint>
+        <test.savvis-symphonyvpdc.apiversion>1.0</test.savvis-symphonyvpdc.apiversion>
         <test.savvis-symphonyvpdc.identity>FIXME</test.savvis-symphonyvpdc.identity>
         <test.savvis-symphonyvpdc.credential>FIXME</test.savvis-symphonyvpdc.credential>
-        <test.savvis-symphonyvpdc.vpdc-email>FIXME</test.savvis-symphonyvpdc.vpdc-email>
+        <test.savvis-symphonyvpdc.vdc-email>FIXME</test.savvis-symphonyvpdc.vdc-email>
         <test.savvis-symphonyvpdc.loginUser>FIXME</test.savvis-symphonyvpdc.loginUser>
         <test.savvis-symphonyvpdc.loginPassword>FIXME</test.savvis-symphonyvpdc.loginPassword>
     </properties>
@@ -143,7 +144,7 @@
                                             <value>${test.savvis-symphonyvpdc.credential}</value>
                                         </property>
                                         <property>
-                                            <name>savvis-symphonyvpdc.vpdc-email</name>
+                                            <name>test.savvis-symphonyvpdc.vdc-email</name>
                                             <value>${test.savvis-symphonyvpdc.vdc-email}</value>
                                         </property>
                                         <property>
@@ -167,4 +168,20 @@
             </build>
         </profile>
     </profiles>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.savvis.vpdc.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/binders/BaseBindVMSpecToXmlPayload.java b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/binders/BaseBindVMSpecToXmlPayload.java
new file mode 100644
index 0000000000..7737be725a
--- /dev/null
+++ b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/binders/BaseBindVMSpecToXmlPayload.java
@@ -0,0 +1,210 @@
+/**
+ *
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.savvis.vpdc.binders;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkState;
+
+import java.util.Map;
+import java.util.Properties;
+import java.util.Map.Entry;
+
+import javax.ws.rs.core.MediaType;
+import javax.xml.parsers.FactoryConfigurationError;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.jclouds.cim.ResourceAllocationSettingData.ResourceType;
+import org.jclouds.compute.domain.CIMOperatingSystem;
+import org.jclouds.http.HttpRequest;
+import org.jclouds.rest.MapBinder;
+import org.jclouds.rest.binders.BindToStringPayload;
+import org.jclouds.rest.internal.GeneratedHttpRequest;
+import org.jclouds.savvis.vpdc.domain.VMSpec;
+
+import com.google.common.base.Throwables;
+import com.jamesmurty.utils.XMLBuilder;
+
+/**
+ * 
+ * @author Adrian Cole
+ * 
+ */
+public abstract class BaseBindVMSpecToXmlPayload<T> extends BindToStringPayload implements MapBinder {
+   @Override
+   public <R extends HttpRequest> R bindToRequest(R request, Object toBind) {
+      throw new IllegalStateException("BindVMSpecToXmlPayload needs parameters");
+   }
+
+   protected abstract T findSpecInArgsOrNull(GeneratedHttpRequest<?> gRequest);
+
+   @Override
+   public <R extends HttpRequest> R bindToRequest(R request, Map<String, String> postParams) {
+      checkArgument(checkNotNull(request, "request") instanceof GeneratedHttpRequest<?>,
+               "this binder is only valid for GeneratedHttpRequests!");
+      GeneratedHttpRequest<?> gRequest = (GeneratedHttpRequest<?>) request;
+      checkState(gRequest.getArgs() != null, "args should be initialized at this point");
+
+      request = super.bindToRequest(request, generateXml(findSpecInArgsOrNull(gRequest)));
+      request.getPayload().getContentMetadata().setContentType(MediaType.APPLICATION_XML);
+      return request;
+   }
+
+   public String generateXml(T spec) {
+      try {
+         XMLBuilder rootBuilder = buildRoot();
+         bindSpec(spec, rootBuilder);
+         Properties outputProperties = new Properties();
+         outputProperties.put(javax.xml.transform.OutputKeys.OMIT_XML_DECLARATION, "yes");
+         return rootBuilder.asString(outputProperties);
+      } catch (Exception e) {
+         Throwables.propagate(e);
+         return null;
+      }
+   }
+
+   protected abstract void bindSpec(T spec, XMLBuilder rootBuilder) throws ParserConfigurationException,
+            FactoryConfigurationError;
+
+   protected void checkSpec(VMSpec spec) {
+      checkNotNull(spec, "VMSpec");
+      checkNotNull(spec.getName(), "name");
+      checkNotNull(spec.getNetworkTierName(), "networkTierName");
+   }
+
+   protected void addOperatingSystemAndVirtualHardware(VMSpec spec, XMLBuilder vAppBuilder) {
+      addOperatingSystemSection(vAppBuilder, spec.getOperatingSystem());
+      // TODO: Savvis returns network names with a - instead of space on getNetworkInVDC
+      // call,
+      // fix this once savvis api starts returning correctly
+      addVirtualHardwareSection(vAppBuilder, spec.getName(), spec.getNetworkTierName().replace("-", " "), spec);
+   }
+
+   void addVirtualHardwareSection(XMLBuilder rootBuilder, String name, String networkName, VMSpec spec) {
+      XMLBuilder virtualHardwareSectionBuilder = rootBuilder.e("ovf:VirtualHardwareSection");
+      virtualHardwareSectionBuilder.e("ovf:Info").t("Virtual Hardware");
+      addSystem(virtualHardwareSectionBuilder, name);
+      addItems(virtualHardwareSectionBuilder, spec, networkName);
+   }
+
+   void addItems(XMLBuilder virtualHardwareSectionBuilder, VMSpec spec, String networkName) {
+      // todo make this work with fractional, which I think means setting speed to half
+      addCPU(virtualHardwareSectionBuilder, (int) spec.getProcessorCount());
+      addMemory(virtualHardwareSectionBuilder, spec.getMemoryInGig());
+      addNetwork(virtualHardwareSectionBuilder, networkName);
+      addDisks(virtualHardwareSectionBuilder, spec);
+   }
+
+   private void addSystem(XMLBuilder virtualHardwareSectionBuilder, String name) {
+      XMLBuilder systemBuilder = virtualHardwareSectionBuilder.e("ovf:System");
+      systemBuilder.e("vssd:Description").t("Virtual Hardware Family");
+      systemBuilder.e("vssd:ElementName").t(name);
+      systemBuilder.e("vssd:InstanceID").t("1");
+      systemBuilder.e("vssd:VirtualSystemIdentifier").t(name);
+   }
+
+   private void addOperatingSystemSection(XMLBuilder rootBuilder, CIMOperatingSystem operatingSystem) {
+      XMLBuilder sectionBuilder = rootBuilder.e("ovf:OperatingSystemSection").a("ovf:id",
+               operatingSystem.getOsType().getCode() + "");
+      sectionBuilder.e("ovf:Info").t("Specifies the operating system installed");
+      sectionBuilder.e("ovf:Description").t(operatingSystem.getDescription());
+   }
+
+   private void addCPU(XMLBuilder sectionBuilder, int processorCount) {
+      XMLBuilder cpuBuilder = sectionBuilder.e("ovf:Item");
+      cpuBuilder.e("rasd:AllocationUnits").t("3 GHz");
+      cpuBuilder.e("rasd:Description").t("Number of Virtual CPUs");
+      cpuBuilder.e("rasd:ElementName").t(processorCount + " CPU");
+      cpuBuilder.e("rasd:InstanceID").t("1");
+      cpuBuilder.e("rasd:ResourceType").t(ResourceType.PROCESSOR.value());
+      cpuBuilder.e("rasd:VirtualQuantity").t(processorCount + "");
+   }
+
+   private void addMemory(XMLBuilder sectionBuilder, int memoryInGig) {
+      XMLBuilder memoryBuilder = sectionBuilder.e("ovf:Item");
+      memoryBuilder.e("rasd:AllocationUnits").t("Gigabytes");
+      memoryBuilder.e("rasd:Description").t("Memory Size");
+      memoryBuilder.e("rasd:ElementName").t("Memory");
+      memoryBuilder.e("rasd:InstanceID").t("2");
+      memoryBuilder.e("rasd:ResourceType").t(ResourceType.MEMORY.value());
+      memoryBuilder.e("rasd:VirtualQuantity").t(memoryInGig + "");
+   }
+
+   private void addNetwork(XMLBuilder sectionBuilder, String networkName) {
+      XMLBuilder networkBuilder = sectionBuilder.e("ovf:Item");
+      networkBuilder.e("rasd:Caption").t("false");
+      networkBuilder.e("rasd:Connection").t(networkName);
+      networkBuilder.e("rasd:ElementName").t("Network");
+      networkBuilder.e("rasd:InstanceID").t("3");
+      networkBuilder.e("rasd:ResourceType").t(ResourceType.ETHERNET_ADAPTER.value());
+      networkBuilder.e("rasd:VirtualQuantity").t("1");
+   }
+
+   private void addDisks(XMLBuilder sectionBuilder, VMSpec spec) {
+      XMLBuilder bootDiskBuilder = sectionBuilder.e("ovf:Item");
+      bootDiskBuilder.e("rasd:AllocationUnits").t("Gigabytes");
+      bootDiskBuilder.e("rasd:Caption").t("");
+      bootDiskBuilder.e("rasd:Description").t("Hard Disk");
+      bootDiskBuilder.e("rasd:ElementName").t(spec.getBootDeviceName());
+      bootDiskBuilder.e("rasd:HostResource").t("boot");
+      bootDiskBuilder.e("rasd:InstanceID").t("4");
+      bootDiskBuilder.e("rasd:ResourceType").t(ResourceType.BASE_PARTITIONABLE_UNIT.value());
+      bootDiskBuilder.e("rasd:VirtualQuantity").t(spec.getBootDiskSize() + "");
+
+      int instanceId = 5;
+      for (Entry<String, Integer> dataDisk : spec.getDataDiskDeviceNameToSizeInGig().entrySet()) {
+         XMLBuilder dataDiskBuilder = sectionBuilder.e("ovf:Item");
+         dataDiskBuilder.e("rasd:AllocationUnits").t("Gigabytes");
+         dataDiskBuilder.e("rasd:Caption").t("");
+         dataDiskBuilder.e("rasd:Description").t("Hard Disk");
+         dataDiskBuilder.e("rasd:ElementName").t(dataDisk.getKey());
+         dataDiskBuilder.e("rasd:HostResource").t("data");
+         dataDiskBuilder.e("rasd:InstanceID").t("" + instanceId++);
+         dataDiskBuilder.e("rasd:ResourceType").t(ResourceType.PARTITIONABLE_UNIT.value());
+         dataDiskBuilder.e("rasd:VirtualQuantity").t(dataDisk.getValue() + "");
+      }
+   }
+
+   protected XMLBuilder buildRoot() throws ParserConfigurationException, FactoryConfigurationError {
+      XMLBuilder rootBuilder = XMLBuilder.create("vApp:VApp").a("xmlns:vApp", "http://www.vmware.com/vcloud/v0.8").a(
+               "xmlns:ovf", "http://schemas.dmtf.org/ovf/envelope/1").a("xmlns:vssd",
+               "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData").a("xmlns:common",
+               "http://schemas.dmtf.org/wbem/wscim/1/common").a("xmlns:rasd",
+               "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData");
+      return rootBuilder;
+   }
+
+   protected XMLBuilder buildChildren(XMLBuilder rootBuilder) throws ParserConfigurationException,
+            FactoryConfigurationError {
+      XMLBuilder vAppChildrenBuilder = rootBuilder.e("vApp:Children");
+      return vAppChildrenBuilder;
+   }
+
+   protected XMLBuilder buildRootForName(XMLBuilder rootBuilder, String name) throws ParserConfigurationException,
+            FactoryConfigurationError {
+      XMLBuilder vAppBuilder = rootBuilder.e("vApp:VApp").a("name", name).a("type",
+               "application/vnd.vmware.vcloud.vApp+xml");
+      return vAppBuilder;
+   }
+
+   protected String ifNullDefaultTo(String value, String defaultValue) {
+      return value != null ? value : checkNotNull(defaultValue, "defaultValue");
+   }
+
+}
diff --git a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/binders/BindVMSpecToXmlPayload.java b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/binders/BindVMSpecToXmlPayload.java
index c80178d6b9..a3e8a4f18e 100644
--- a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/binders/BindVMSpecToXmlPayload.java
+++ b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/binders/BindVMSpecToXmlPayload.java
@@ -18,26 +18,10 @@
  */
 package org.jclouds.savvis.vpdc.binders;
 
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Properties;
-
 import javax.inject.Singleton;
-import javax.ws.rs.core.MediaType;
 import javax.xml.parsers.FactoryConfigurationError;
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.jclouds.cim.ResourceAllocationSettingData.ResourceType;
-import org.jclouds.compute.domain.CIMOperatingSystem;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.rest.MapBinder;
-import org.jclouds.rest.binders.BindToStringPayload;
 import org.jclouds.rest.internal.GeneratedHttpRequest;
 import org.jclouds.savvis.vpdc.domain.VMSpec;
 
@@ -49,173 +33,23 @@ import com.jamesmurty.utils.XMLBuilder;
  * 
  */
 @Singleton
-public class BindVMSpecToXmlPayload extends BindToStringPayload implements MapBinder {
-   @Override
-   public <R extends HttpRequest> R bindToRequest(R request, Object toBind) {
-      throw new IllegalStateException("BindVMSpecToXmlPayload needs parameters");
+public class BindVMSpecToXmlPayload extends BaseBindVMSpecToXmlPayload<VMSpec> {
 
-   }
-
-   protected List<VMSpec> findSpecInArgsOrNull(GeneratedHttpRequest<?> gRequest) {
+   protected VMSpec findSpecInArgsOrNull(GeneratedHttpRequest<?> gRequest) {
       for (Object arg : gRequest.getArgs()) {
          if (arg instanceof VMSpec) {
-        	 List<VMSpec> vmSpecs = new ArrayList<VMSpec>();
-        	 vmSpecs.add((VMSpec) arg); 
-            return vmSpecs;
-         } else if (arg instanceof ArrayList) {
-            List<VMSpec> configurations = (List<VMSpec>) arg;
-            return (configurations.size() > 0) ? configurations : null;
+            return VMSpec.class.cast(arg);
          }
       }
-      return null;
+      throw new IllegalArgumentException("Iterbable<VMSpec> must be included in the argument list");
    }
 
    @Override
-   public <R extends HttpRequest> R bindToRequest(R request, Map<String, String> postParams) {
-      checkArgument(checkNotNull(request, "request") instanceof GeneratedHttpRequest<?>,
-            "this binder is only valid for GeneratedHttpRequests!");
-      GeneratedHttpRequest<?> gRequest = (GeneratedHttpRequest<?>) request;
-      checkState(gRequest.getArgs() != null, "args should be initialized at this point");
-
-      request = super.bindToRequest(request,
-            generateXml(findSpecInArgsOrNull(gRequest)));
-      request.getPayload().getContentMetadata().setContentType(MediaType.APPLICATION_XML);
-      return request;
-   }
-
-   public String generateXml(List<VMSpec> specs) {
-	  try {
-		  XMLBuilder rootBuilder = buildRoot();
-		  XMLBuilder vAppChildrenBuilder = buildChildren(rootBuilder);
-		  for (VMSpec spec : specs) {
-			  checkNotNull(spec, "VMSpec");
-			  checkNotNull(spec.getName(), "name");
-			  checkNotNull(spec.getNetwork(), "network");
-			  checkNotNull(spec.getNetwork().getName(), "networkName");
-			  XMLBuilder vAppBuilder = buildRootForName(vAppChildrenBuilder, spec.getName());
-			  addOperatingSystemSection(vAppBuilder, spec.getOperatingSystem());
-			  // TODO: Savvis returns network names with a - instead of space on getNetworkInVDC call,
-			  // fix this once savvis api starts returning correctly
-			  addVirtualHardwareSection(vAppBuilder, spec.getName(), spec.getNetwork().getName().replace("-", " "), spec);
-		  } 
-		  Properties outputProperties = new Properties();
-		  outputProperties.put(javax.xml.transform.OutputKeys.OMIT_XML_DECLARATION, "yes");
-		  return rootBuilder.asString(outputProperties);
-	  } catch (Exception e) {
-		  return null;
-	  }
-   }
-
-   void addVirtualHardwareSection(XMLBuilder rootBuilder, String name, String networkName, VMSpec spec) {
-      XMLBuilder virtualHardwareSectionBuilder = rootBuilder.e("ovf:VirtualHardwareSection");
-      virtualHardwareSectionBuilder.e("ovf:Info").t("Virtual Hardware");
-      addSystem(virtualHardwareSectionBuilder, name);
-      addItems(virtualHardwareSectionBuilder, spec, networkName);
-   }
-
-   void addItems(XMLBuilder virtualHardwareSectionBuilder, VMSpec spec, String networkName) {
-      //todo make this work with fractional, which I think means setting speed to half
-      addCPU(virtualHardwareSectionBuilder, (int)spec.getProcessorCount());
-      addMemory(virtualHardwareSectionBuilder, spec.getMemoryInGig());
-      addNetwork(virtualHardwareSectionBuilder, networkName);
-      addDisks(virtualHardwareSectionBuilder, spec);
-   }
-
-   private void addSystem(XMLBuilder virtualHardwareSectionBuilder, String name) {
-      XMLBuilder systemBuilder = virtualHardwareSectionBuilder.e("ovf:System");
-      systemBuilder.e("vssd:Description").t("Virtual Hardware Family");
-      systemBuilder.e("vssd:ElementName").t(name);
-      systemBuilder.e("vssd:InstanceID").t("1");
-      systemBuilder.e("vssd:VirtualSystemIdentifier").t(name);
-   }
-
-   private void addOperatingSystemSection(XMLBuilder rootBuilder, CIMOperatingSystem operatingSystem) {
-      XMLBuilder sectionBuilder = rootBuilder.e("ovf:OperatingSystemSection").a("ovf:id",
-            operatingSystem.getOsType().getCode() + "");
-      sectionBuilder.e("ovf:Info").t("Specifies the operating system installed");
-      sectionBuilder.e("ovf:Description").t(operatingSystem.getDescription());
-   }
-
-   private void addCPU(XMLBuilder sectionBuilder, int processorCount) {
-      XMLBuilder cpuBuilder = sectionBuilder.e("ovf:Item");
-      cpuBuilder.e("rasd:AllocationUnits").t("3 GHz");
-      cpuBuilder.e("rasd:Description").t("Number of Virtual CPUs");
-      cpuBuilder.e("rasd:ElementName").t(processorCount + " CPU");
-      cpuBuilder.e("rasd:InstanceID").t("1");
-      cpuBuilder.e("rasd:ResourceType").t(ResourceType.PROCESSOR.value());
-      cpuBuilder.e("rasd:VirtualQuantity").t(processorCount + "");
-   }
-
-   private void addMemory(XMLBuilder sectionBuilder, int memoryInGig) {
-      XMLBuilder memoryBuilder = sectionBuilder.e("ovf:Item");
-      memoryBuilder.e("rasd:AllocationUnits").t("Gigabytes");
-      memoryBuilder.e("rasd:Description").t("Memory Size");
-      memoryBuilder.e("rasd:ElementName").t("Memory");
-      memoryBuilder.e("rasd:InstanceID").t("2");
-      memoryBuilder.e("rasd:ResourceType").t(ResourceType.MEMORY.value());
-      memoryBuilder.e("rasd:VirtualQuantity").t(memoryInGig + "");
-   }
-
-   private void addNetwork(XMLBuilder sectionBuilder, String networkName) {
-      XMLBuilder networkBuilder = sectionBuilder.e("ovf:Item");
-      networkBuilder.e("rasd:Caption").t("false");
-      networkBuilder.e("rasd:Connection").t(networkName);
-      networkBuilder.e("rasd:ElementName").t("Network");
-      networkBuilder.e("rasd:InstanceID").t("3");
-      networkBuilder.e("rasd:ResourceType").t(ResourceType.ETHERNET_ADAPTER.value());
-      networkBuilder.e("rasd:VirtualQuantity").t("1");
-   }
-
-   private void addDisks(XMLBuilder sectionBuilder, VMSpec spec) {
-      XMLBuilder bootDiskBuilder = sectionBuilder.e("ovf:Item");
-      bootDiskBuilder.e("rasd:AllocationUnits").t("Gigabytes");
-      bootDiskBuilder.e("rasd:Caption").t("");
-      bootDiskBuilder.e("rasd:Description").t("Hard Disk");
-      bootDiskBuilder.e("rasd:ElementName").t(spec.getBootDeviceName());
-      bootDiskBuilder.e("rasd:HostResource").t("boot");
-      bootDiskBuilder.e("rasd:InstanceID").t("4");
-      bootDiskBuilder.e("rasd:ResourceType").t(ResourceType.BASE_PARTITIONABLE_UNIT.value());
-      bootDiskBuilder.e("rasd:VirtualQuantity").t(spec.getBootDiskSize() + "");
-
-      int instanceId = 5;
-      for (Entry<String, Integer> dataDisk : spec.getDataDiskDeviceNameToSizeInGig().entrySet()) {
-         XMLBuilder dataDiskBuilder = sectionBuilder.e("ovf:Item");
-         dataDiskBuilder.e("rasd:AllocationUnits").t("Gigabytes");
-         dataDiskBuilder.e("rasd:Caption").t("");
-         dataDiskBuilder.e("rasd:Description").t("Hard Disk");
-         dataDiskBuilder.e("rasd:ElementName").t(dataDisk.getKey());
-         dataDiskBuilder.e("rasd:HostResource").t("data");
-         dataDiskBuilder.e("rasd:InstanceID").t("" + instanceId++);
-         dataDiskBuilder.e("rasd:ResourceType").t(ResourceType.PARTITIONABLE_UNIT.value());
-         dataDiskBuilder.e("rasd:VirtualQuantity").t(dataDisk.getValue() + "");
-      }
-   }
-   
-   protected XMLBuilder buildRoot() throws ParserConfigurationException, FactoryConfigurationError {
-      XMLBuilder rootBuilder = XMLBuilder.create("vApp:VApp")
-      		.a("xmlns:vApp", "http://www.vmware.com/vcloud/v0.8")
-      		.a("xmlns:ovf", "http://schemas.dmtf.org/ovf/envelope/1")
-      		.a("xmlns:vssd", "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData")
-            .a("xmlns:common", "http://schemas.dmtf.org/wbem/wscim/1/common")
-            .a("xmlns:rasd", "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData")
-      		.a("name", "");
-      return rootBuilder;
-   }
-   
-   protected XMLBuilder buildChildren(XMLBuilder rootBuilder) throws ParserConfigurationException, FactoryConfigurationError {
-	   XMLBuilder vAppChildrenBuilder = rootBuilder.e("vApp:Children");
-	   return vAppChildrenBuilder;
-   }
-   
-   protected XMLBuilder buildRootForName(XMLBuilder rootBuilder, String name) throws ParserConfigurationException, FactoryConfigurationError {
-      XMLBuilder vAppBuilder = rootBuilder.e("vApp:VApp")
-            .a("name", name)
-            .a("type", "application/vnd.vmware.vcloud.vApp+xml");
-      return vAppBuilder;
-   }
-
-   protected String ifNullDefaultTo(String value, String defaultValue) {
-      return value != null ? value : checkNotNull(defaultValue, "defaultValue");
+   protected void bindSpec(VMSpec spec, XMLBuilder rootBuilder) throws ParserConfigurationException,
+            FactoryConfigurationError {
+      checkSpec(spec);
+      rootBuilder.a("name", spec.getName()).a("type", "application/vnd.vmware.vcloud.vApp+xml").a("href", "");
+      addOperatingSystemAndVirtualHardware(spec, rootBuilder);
    }
 
 }
diff --git a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/binders/BindVMSpecsToXmlPayload.java b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/binders/BindVMSpecsToXmlPayload.java
new file mode 100644
index 0000000000..583dc63716
--- /dev/null
+++ b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/binders/BindVMSpecsToXmlPayload.java
@@ -0,0 +1,64 @@
+/**
+ *
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.savvis.vpdc.binders;
+
+import static com.google.common.base.Preconditions.checkArgument;
+
+import javax.inject.Singleton;
+import javax.xml.parsers.FactoryConfigurationError;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.jclouds.rest.internal.GeneratedHttpRequest;
+import org.jclouds.savvis.vpdc.domain.VMSpec;
+
+import com.google.common.collect.Iterables;
+import com.jamesmurty.utils.XMLBuilder;
+
+/**
+ * 
+ * @author Adrian Cole
+ * 
+ */
+@Singleton
+public class BindVMSpecsToXmlPayload extends BaseBindVMSpecToXmlPayload<Iterable<VMSpec>> {
+
+   @SuppressWarnings("unchecked")
+   protected Iterable<VMSpec> findSpecInArgsOrNull(GeneratedHttpRequest<?> gRequest) {
+      for (Object arg : gRequest.getArgs()) {
+         if (arg instanceof Iterable<?>) {
+            Iterable<VMSpec> specs = (Iterable<VMSpec>) arg;
+            checkArgument(Iterables.size(specs) > 0,
+                     "At least one VMSpec must be included in the argument list");
+            return specs;
+         }
+      }
+      throw new IllegalArgumentException("Iterbable<VMSpec> must be included in the argument list");
+   }
+
+   @Override
+   protected void bindSpec(Iterable<VMSpec> specs, XMLBuilder rootBuilder) throws ParserConfigurationException, FactoryConfigurationError {
+      rootBuilder.a("name", "");
+      XMLBuilder specBuilder = buildChildren(rootBuilder);
+      for (VMSpec spec : specs) {
+         checkSpec(spec);
+         XMLBuilder vAppBuilder = buildRootForName(specBuilder, spec.getName());
+         addOperatingSystemAndVirtualHardware(spec, vAppBuilder);
+      }
+   }
+}
diff --git a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/compute/strategy/VPDCComputeServiceAdapter.java b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/compute/strategy/VPDCComputeServiceAdapter.java
index 37a133747f..e8f6e1bbee 100644
--- a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/compute/strategy/VPDCComputeServiceAdapter.java
+++ b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/compute/strategy/VPDCComputeServiceAdapter.java
@@ -85,6 +85,8 @@ public class VPDCComputeServiceAdapter implements ComputeServiceAdapter<VM, VMSp
       String billingSiteId = template.getLocation().getParent().getParent().getId();
 
       VMSpec.Builder specBuilder = VMSpec.builder();
+      specBuilder.name(name);
+      specBuilder.networkTierName(networkTierName);
       specBuilder.operatingSystem(CIMOperatingSystem.class.cast(template.getImage().getOperatingSystem()));
       specBuilder.processorCount(template.getHardware().getProcessors().size());
       specBuilder.memoryInGig(template.getHardware().getRam() / 1024);
@@ -96,7 +98,7 @@ public class VPDCComputeServiceAdapter implements ComputeServiceAdapter<VM, VMSp
             specBuilder.addDataDrive(volume.getDevice(), volume.getSize().intValue());
       }
 
-      Task task = client.getVMClient().addVMIntoVDC(billingSiteId, vpdcId, networkTierName, name, specBuilder.build());
+      Task task = client.getVMClient().addVMIntoVDC(billingSiteId, vpdcId, specBuilder.build());
       // make sure there's no error
       if (task.getError() != null)
          throw new RuntimeException("cloud not add vm: " + task.getError().toString());
diff --git a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/domain/VMSpec.java b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/domain/VMSpec.java
index bce859a123..dfc6af5cfc 100644
--- a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/domain/VMSpec.java
+++ b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/domain/VMSpec.java
@@ -40,8 +40,8 @@ public class VMSpec {
    }
 
    public static class Builder {
-	  private String name;
-	  private Network network;
+      private String name;
+      private String networkTierName;
       private CIMOperatingSystem operatingSystem;
       private int processorCount = 1;
       private int memoryInGig = 1;
@@ -51,15 +51,15 @@ public class VMSpec {
       private Map<String, Integer> dataDriveDeviceNameToSizeInGig = Maps.newLinkedHashMap();
 
       public Builder name(String name) {
-	     this.name = checkNotNull(name, "name");
-	     return this;
-	  }
-      
-      public Builder network(Network network) {
-	     this.network = checkNotNull(network, "network");
-	     return this;
+         this.name = checkNotNull(name, "name");
+         return this;
       }
-      
+
+      public Builder networkTierName(String networkTierName) {
+         this.networkTierName = checkNotNull(networkTierName, "networkTierName");
+         return this;
+      }
+
       public Builder operatingSystem(CIMOperatingSystem operatingSystem) {
          this.operatingSystem = checkNotNull(operatingSystem, "operatingSystem");
          return this;
@@ -96,19 +96,19 @@ public class VMSpec {
 
       public Builder addDataDrives(Map<String, Integer> dataDriveDeviceNameToSizeInGig) {
          this.dataDriveDeviceNameToSizeInGig = ImmutableMap.copyOf(checkNotNull(dataDriveDeviceNameToSizeInGig,
-               "dataDriveDeviceNameToSizeInGig"));
+                  "dataDriveDeviceNameToSizeInGig"));
          return this;
       }
 
       public VMSpec build() {
-         return new VMSpec(name, network, operatingSystem, processorCount, memoryInGig, bootDeviceName, bootDriveSize,
-               dataDriveDeviceNameToSizeInGig);
+         return new VMSpec(name, networkTierName, operatingSystem, processorCount, memoryInGig, bootDeviceName,
+                  bootDriveSize, dataDriveDeviceNameToSizeInGig);
       }
 
       public static Builder fromVMSpec(VMSpec in) {
-         return new Builder().operatingSystem(in.getOperatingSystem()).memoryInGig(in.getMemoryInGig())
-               .bootDeviceName(in.getBootDeviceName()).bootDiskSize(in.getBootDiskSize())
-               .addDataDrives(in.getDataDiskDeviceNameToSizeInGig()).processorCount(in.getProcessorCount());
+         return new Builder().operatingSystem(in.getOperatingSystem()).memoryInGig(in.getMemoryInGig()).bootDeviceName(
+                  in.getBootDeviceName()).bootDiskSize(in.getBootDiskSize()).addDataDrives(
+                  in.getDataDiskDeviceNameToSizeInGig()).processorCount(in.getProcessorCount());
       }
 
    }
@@ -119,7 +119,7 @@ public class VMSpec {
    }
 
    private final String name;
-   private final Network network;
+   private final String networkTierName;
    private final CIMOperatingSystem operatingSystem;
    private final int processorCount;
    private final int memoryInGig;
@@ -127,10 +127,11 @@ public class VMSpec {
    private final int bootDriveSize;
    private final Map<String, Integer> dataDriveDeviceNameToSizeInGig;
 
-   protected VMSpec(String name, Network network, CIMOperatingSystem operatingSystem, int processorCount, int memoryInGig, String bootDeviceName,
-         int bootDriveSize, Map<String, Integer> dataDriveDeviceNameToSizeInGig) {
-	  this.name = name;
-	  this.network = network;
+   protected VMSpec(String name, String networkTierName, CIMOperatingSystem operatingSystem, int processorCount,
+            int memoryInGig, String bootDeviceName, int bootDriveSize,
+            Map<String, Integer> dataDriveDeviceNameToSizeInGig) {
+      this.name = name;
+      this.networkTierName = networkTierName;
       this.operatingSystem = checkNotNull(operatingSystem, "operatingSystem not specified");
       checkProcessorCount(processorCount);
       this.processorCount = processorCount;
@@ -140,16 +141,16 @@ public class VMSpec {
       checkArgument(bootDriveSize > 0, "bootDriveSize must be positive");
       this.bootDriveSize = bootDriveSize;
       this.dataDriveDeviceNameToSizeInGig = ImmutableMap.copyOf(checkNotNull(dataDriveDeviceNameToSizeInGig,
-            "dataDriveDeviceNameToSizeInGig"));
+               "dataDriveDeviceNameToSizeInGig"));
    }
 
    public String getName() {
-		return name;
-	}
+      return name;
+   }
 
-   public Network getNetwork() {
-		return network;
-	}
+   public String getNetworkTierName() {
+      return networkTierName;
+   }
 
    public CIMOperatingSystem getOperatingSystem() {
       return operatingSystem;
@@ -228,9 +229,10 @@ public class VMSpec {
 
    @Override
    public String toString() {
-      return "[name= " + name + ", operatingSystem=" + operatingSystem + ", processorCount=" + processorCount + ", memoryInGig="
-            + memoryInGig + ", network="  + network.getName() + ", bootDeviceName=" + bootDeviceName + ", bootDriveSize=" + bootDriveSize
-            + ", dataDriveDeviceNameToSizeInGig=" + dataDriveDeviceNameToSizeInGig + "]";
+      return "[name= " + name + ", operatingSystem=" + operatingSystem + ", processorCount=" + processorCount
+               + ", memoryInGig=" + memoryInGig + ", networkTierName=" + networkTierName + ", bootDeviceName="
+               + bootDeviceName + ", bootDriveSize=" + bootDriveSize + ", dataDriveDeviceNameToSizeInGig="
+               + dataDriveDeviceNameToSizeInGig + "]";
    }
 
 }
\ No newline at end of file
diff --git a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/VMAsyncClient.java b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/VMAsyncClient.java
index a1175f4420..02d71715bb 100644
--- a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/VMAsyncClient.java
+++ b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/VMAsyncClient.java
@@ -19,7 +19,6 @@
 package org.jclouds.savvis.vpdc.features;
 
 import java.net.URI;
-import java.util.List;
 import java.util.Set;
 
 import javax.annotation.Nullable;
@@ -40,6 +39,7 @@ import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404;
 import org.jclouds.savvis.vpdc.binders.BindCaptureVAppTemplateToXmlPayload;
 import org.jclouds.savvis.vpdc.binders.BindCloneVMToXmlPayload;
 import org.jclouds.savvis.vpdc.binders.BindVMSpecToXmlPayload;
+import org.jclouds.savvis.vpdc.binders.BindVMSpecsToXmlPayload;
 import org.jclouds.savvis.vpdc.domain.Task;
 import org.jclouds.savvis.vpdc.domain.VMSpec;
 import org.jclouds.savvis.vpdc.filters.SetVCloudTokenCookie;
@@ -68,8 +68,7 @@ public interface VMAsyncClient {
    @MapBinder(BindVMSpecToXmlPayload.class)
    ListenableFuture<Task> addVMIntoVDC(
             @PathParam("billingSiteId") @Nullable @ParamParser(DefaultOrgIfNull.class) String billingSiteId,
-            @PathParam("vpdcId") String vpdcId, @PayloadParam("networkName") String networkTierName,
-            @PayloadParam("name") String vAppName, VMSpec spec);
+            @PathParam("vpdcId") String vpdcId, VMSpec spec);
 
    /**
     * @see VMClient#addVMIntoVDC
@@ -78,8 +77,18 @@ public interface VMAsyncClient {
    @XMLResponseParser(TaskHandler.class)
    @Path("vApp/")
    @MapBinder(BindVMSpecToXmlPayload.class)
-   ListenableFuture<Task> addVMIntoVDC(@EndpointParam URI vpdc, @PayloadParam("networkName") String networkTierName,
-            @PayloadParam("name") String vAppName, VMSpec spec);
+   ListenableFuture<Task> addVMIntoVDC(@EndpointParam URI vpdc, VMSpec spec);
+
+   /**
+    * @see VMClient#addMultipleVMsIntoVDC
+    */
+   @GET
+   @XMLResponseParser(TasksListHandler.class)
+   @Path("v{jclouds.api-version}/org/{billingSiteId}/vdc/{vpdcId}/vApp/")
+   @MapBinder(BindVMSpecsToXmlPayload.class)
+   ListenableFuture<Set<Task>> addMultipleVMsIntoVDC(
+            @PathParam("billingSiteId") @Nullable @ParamParser(DefaultOrgIfNull.class) String billingSiteId,
+            @PathParam("vpdcId") String vpdcId, Iterable<VMSpec> vmSpecs);
    
    /**
     * @see VMClient#addMultipleVMsIntoVDC
@@ -87,8 +96,8 @@ public interface VMAsyncClient {
    @GET
    @XMLResponseParser(TasksListHandler.class)
    @Path("vApp/")
-   @MapBinder(BindVMSpecToXmlPayload.class)
-   ListenableFuture<Set<Task>> addMultipleVMsIntoVDC(@EndpointParam URI vpdc, List<VMSpec> vmSpecs);
+   @MapBinder(BindVMSpecsToXmlPayload.class)
+   ListenableFuture<Set<Task>> addMultipleVMsIntoVDC(@EndpointParam URI vpdc, Iterable<VMSpec> vmSpecs);
 
    /**
     * @see VMClient#captureVApp
@@ -97,9 +106,10 @@ public interface VMAsyncClient {
    @XMLResponseParser(TaskHandler.class)
    @Path("v{jclouds.api-version}/org/{billingSiteId}/vdc/{vpdcId}/action/captureVApp")
    @MapBinder(BindCaptureVAppTemplateToXmlPayload.class)
-   ListenableFuture<Task> captureVApp(@PathParam("billingSiteId") @Nullable @ParamParser(DefaultOrgIfNull.class) String billingSiteId,
-           @PathParam("vpdcId") String vpdcId, URI vAppUri);
-   
+   ListenableFuture<Task> captureVApp(
+            @PathParam("billingSiteId") @Nullable @ParamParser(DefaultOrgIfNull.class) String billingSiteId,
+            @PathParam("vpdcId") String vpdcId, URI vAppUri);
+
    /**
     * @see VMClient#cloneVApp
     */
@@ -107,9 +117,9 @@ public interface VMAsyncClient {
    @XMLResponseParser(TaskHandler.class)
    @Path("action/cloneVApp")
    @MapBinder(BindCloneVMToXmlPayload.class)
-   ListenableFuture<Task> cloneVApp(@EndpointParam URI vAppUri, @PayloadParam("name") String newVAppName, 
-		   @PayloadParam("networkTierName") String networkTierName);
-   
+   ListenableFuture<Task> cloneVApp(@EndpointParam URI vAppUri, @PayloadParam("name") String newVAppName,
+            @PayloadParam("networkTierName") String networkTierName);
+
    /**
     * @see VMClient#removeVMFromVDC
     */
@@ -128,7 +138,7 @@ public interface VMAsyncClient {
    @XMLResponseParser(TaskHandler.class)
    @ExceptionParser(ReturnNullOnNotFoundOr404.class)
    ListenableFuture<Task> removeVM(@EndpointParam URI vm);
-   
+
    /**
     * @see VMClient#powerOffVM
     */
@@ -137,7 +147,7 @@ public interface VMAsyncClient {
    @Path("action/powerOff")
    @ExceptionParser(ReturnNullOnNotFoundOr404.class)
    ListenableFuture<Task> powerOffVM(@EndpointParam URI vm);
-   
+
    /**
     * @see VMClient#powerOnVM
     */
diff --git a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/VMClient.java b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/VMClient.java
index 086d4120b7..c94038d527 100644
--- a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/VMClient.java
+++ b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/VMClient.java
@@ -19,7 +19,6 @@
 package org.jclouds.savvis.vpdc.features;
 
 import java.net.URI;
-import java.util.List;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
@@ -44,14 +43,12 @@ public interface VMClient {
     *           billing site Id, or null for default
     * @param vpdcId
     *           vpdc Id
-    * @param networkTierName
-    *           network tier name
     * @param spec
     *           how to
     * 
     * @return VM in progress
     */
-   Task addVMIntoVDC(String billingSiteId, String vpdcId, String networkTierName, String name, VMSpec spec);
+   Task addVMIntoVDC(String billingSiteId, String vpdcId, VMSpec spec);
 
    /**
     * 
@@ -59,43 +56,56 @@ public interface VMClient {
     *           href of the vpdc
     * @see #addVMIntoVDC
     */
-   Task addVMIntoVDC(URI vpdc, String networkTierName, String name, VMSpec spec);
-   
+   Task addVMIntoVDC(URI vpdc, VMSpec spec);
+
    /**
+    * Add/Deploy new VMs into VDC
+    * 
+    * @param billingSiteId
+    *           billing site Id, or null for default
+    * @param vpdcId
+    *           vpdc Id
+    * @param vmSpecs
+    *           vm configurations
+    * @return VM's in progress
+    */
+   Set<Task> addMultipleVMsIntoVDC(String billingSiteId, String vpdcId, Iterable<VMSpec> vmSpecs);
+
+   /**
+    * Add/Deploy new VMs into VDC
     * 
     * @param vpdc
     *           href of the vpdc
     * @param vmSpecs
-    *           vm configurations          
+    *           vm configurations
     * @return VM's in progress
     */
-   Set<Task> addMultipleVMsIntoVDC(URI vpdc, List<VMSpec> vmSpecs);
+   Set<Task> addMultipleVMsIntoVDC(URI vpdc, Iterable<VMSpec> vmSpecs);
 
    /**
     * 
-    *  @param billingSiteId
+    * @param billingSiteId
     *           billing site Id, or null for default
     * @param vpdcId
     *           vpdc Id
     * @param vAppUri
-    * 			href of the vApp
-    * @return
-    * 			Task with vAppTemplate href
+    *           href of the vApp
+    * @return Task with vAppTemplate href
     */
    Task captureVApp(String billingSiteId, String vpdcId, URI vAppUri);
-   
+
    /**
     * 
     * @param vAppUri
-    * 			href of the vApp
+    *           href of the vApp
     * @param newVAppName
-    * 			name for the new vApp
+    *           name for the new vApp
     * @param networkTierName
-    * 			network tier name for vApp
+    *           network tier name for vApp
     * @return
     */
    Task cloneVApp(URI vAppUri, String newVAppName, String networkTierName);
-   
+
    /**
     * Remove a VM
     * <p/>
@@ -126,21 +136,21 @@ public interface VMClient {
     * @see #removeVMFromVDC
     */
    Task removeVM(URI vm);
-   
+
    /**
     * Power off a VM
     * 
     * @param vm
-    * 			href of the vm
+    *           href of the vm
     * @return
     */
    Task powerOffVM(URI vm);
-   
+
    /**
     * Power on a VM
     * 
     * @param vm
-    * 			href of the vm
+    *           href of the vm
     * @return
     */
    Task powerOnVM(URI vm);
diff --git a/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/binders/BindVMSpecToXmlPayloadTest.java b/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/binders/BindVMSpecsToXmlPayloadTest.java
similarity index 70%
rename from providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/binders/BindVMSpecToXmlPayloadTest.java
rename to providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/binders/BindVMSpecsToXmlPayloadTest.java
index ad60d2bd90..6d3c49eeb9 100644
--- a/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/binders/BindVMSpecToXmlPayloadTest.java
+++ b/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/binders/BindVMSpecsToXmlPayloadTest.java
@@ -21,36 +21,34 @@ package org.jclouds.savvis.vpdc.binders;
 import static org.testng.Assert.assertEquals;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Set;
 
 import org.jclouds.cim.OSType;
 import org.jclouds.compute.domain.CIMOperatingSystem;
-import org.jclouds.savvis.vpdc.domain.Network;
 import org.jclouds.savvis.vpdc.domain.VMSpec;
 import org.jclouds.util.Strings2;
 import org.testng.annotations.Test;
 
 import com.google.common.base.Predicate;
+import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.gson.Gson;
 import com.google.inject.TypeLiteral;
 
 /**
- * Tests behavior of {@code BindVMSpecToXmlPayload}
+ * Tests behavior of {@code BindVMSpecsToXmlPayload}
  * 
  * @author Adrian Cole
  */
 @Test(groups = "unit")
-public class BindVMSpecToXmlPayloadTest {
+public class BindVMSpecsToXmlPayloadTest {
 
    public void test() throws IOException {
-      CIMOperatingSystem os = Iterables.find(new Gson().<Set<CIMOperatingSystem>> fromJson(
-            Strings2.toStringAndClose(getClass().getResourceAsStream(
-                  "/savvis-symphonyvpdc/predefined_operatingsystems.json")),
-            new TypeLiteral<Set<CIMOperatingSystem>>() {
-            }.getType()), new Predicate<CIMOperatingSystem>() {
+      CIMOperatingSystem os = Iterables.find(new Gson().<Set<CIMOperatingSystem>> fromJson(Strings2
+               .toStringAndClose(getClass()
+                        .getResourceAsStream("/savvis-symphonyvpdc/predefined_operatingsystems.json")),
+               new TypeLiteral<Set<CIMOperatingSystem>>() {
+               }.getType()), new Predicate<CIMOperatingSystem>() {
 
          @Override
          public boolean apply(CIMOperatingSystem arg0) {
@@ -59,14 +57,10 @@ public class BindVMSpecToXmlPayloadTest {
 
       });
 
-      Network network = Network.builder().name("VM Tier01").build();
-
       String expected = Strings2.toStringAndClose(getClass().getResourceAsStream("/vm-multiple-default.xml"));
 
-      VMSpec spec = VMSpec.builder().name("Test VM").operatingSystem(os).network(network).build();
-      List<VMSpec> specs = new ArrayList<VMSpec>();
-      specs.add(spec);
-      
-      assertEquals(new BindVMSpecToXmlPayload().generateXml(specs), expected);
+      VMSpec spec = VMSpec.builder().name("Test VM").operatingSystem(os).networkTierName("VM Tier01").build();
+
+      assertEquals(new BindVMSpecsToXmlPayload().generateXml(ImmutableSet.of(spec)), expected);
    }
 }
diff --git a/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/features/FirewallAsyncClientTest.java b/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/features/FirewallAsyncClientTest.java
index a575707887..9d15ec78e2 100644
--- a/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/features/FirewallAsyncClientTest.java
+++ b/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/features/FirewallAsyncClientTest.java
@@ -40,38 +40,44 @@ import com.google.inject.TypeLiteral;
 @Test(groups = "unit")
 public class FirewallAsyncClientTest extends BaseVPDCAsyncClientTest<FirewallAsyncClient> {
 
-	public void testAddFirewallRule() throws NoSuchMethodException, IOException{
-		Method method = FirewallAsyncClient.class.getMethod("addFirewallRule", String.class, String.class, FirewallRule.class);
-		HttpRequest request = processor.createRequest(method, "11", "22", FirewallRule.builder().firewallType("SERVER_TIER_FIREWALL").isEnabled(true).source("internet")
-			  	.destination("VM Tier01").port("22").protocol("Tcp").policy("allow").description("Server Tier Firewall Rule").isLogged(false).build());
+   public void testAddFirewallRule() throws NoSuchMethodException, IOException {
+      Method method = FirewallAsyncClient.class.getMethod("addFirewallRule", String.class, String.class,
+               FirewallRule.class);
+      HttpRequest request = processor.createRequest(method, "11", "22", FirewallRule.builder().firewallType(
+               "SERVER_TIER_FIREWALL").isEnabled(true).source("internet").destination("VM Tier01").port("22").protocol(
+               "Tcp").policy("allow").description("Server Tier Firewall Rule").isLogged(false).build());
 
-		assertRequestLineEquals(request, "PUT https://api.symphonyvpdc.savvis.net/vpdc/v1.0/org/11/vdc/22/FirewallService/ HTTP/1.1");
-		assertNonPayloadHeadersEqual(request, "");
-		assertPayloadEquals(request, Strings2.toStringAndClose(getClass().getResourceAsStream("/firewallService-default.xml")),
-	               "application/xml", false);
+      assertRequestLineEquals(request,
+               "PUT https://api.symphonyvpdc.savvis.net/vpdc/v1.0/org/11/vdc/22/FirewallService/ HTTP/1.1");
+      assertNonPayloadHeadersEqual(request, "");
+      assertPayloadEquals(request, Strings2.toStringAndClose(getClass().getResourceAsStream(
+               "/firewallService-default.xml")), "application/xml", false);
 
-		assertResponseParserClassEquals(method, request, ParseSax.class);
-		assertSaxResponseParserClassEquals(method, TaskHandler.class);
+      assertResponseParserClassEquals(method, request, ParseSax.class);
+      assertSaxResponseParserClassEquals(method, TaskHandler.class);
 
-		checkFilters(request);
-	}
-	
-	public void testDeleteFirewallRule() throws NoSuchMethodException, IOException{
-		Method method = FirewallAsyncClient.class.getMethod("deleteFirewallRule", String.class, String.class, FirewallRule.class);
-		HttpRequest request = processor.createRequest(method, "11", "22", FirewallRule.builder().firewallType("SERVER_TIER_FIREWALL").isEnabled(true).source("internet")
-			  	.destination("VM Tier01").port("22").protocol("Tcp").policy("allow").description("Server Tier Firewall Rule").isLogged(false).build());
+      checkFilters(request);
+   }
 
-		assertRequestLineEquals(request, "DELETE https://api.symphonyvpdc.savvis.net/vpdc/v1.0/org/11/vdc/22/FirewallService/ HTTP/1.1");
-		assertNonPayloadHeadersEqual(request, "");
-		assertPayloadEquals(request, Strings2.toStringAndClose(getClass().getResourceAsStream("/firewallService-default.xml")),
-	               "application/xml", false);
+   public void testDeleteFirewallRule() throws NoSuchMethodException, IOException {
+      Method method = FirewallAsyncClient.class.getMethod("deleteFirewallRule", String.class, String.class,
+               FirewallRule.class);
+      HttpRequest request = processor.createRequest(method, "11", "22", FirewallRule.builder().firewallType(
+               "SERVER_TIER_FIREWALL").isEnabled(true).source("internet").destination("VM Tier01").port("22").protocol(
+               "Tcp").policy("allow").description("Server Tier Firewall Rule").isLogged(false).build());
 
-		assertResponseParserClassEquals(method, request, ParseSax.class);
-		assertSaxResponseParserClassEquals(method, TaskHandler.class);
-		assertExceptionParserClassEquals(method, ReturnNullOnNotFoundOr404.class);
+      assertRequestLineEquals(request,
+               "DELETE https://api.symphonyvpdc.savvis.net/vpdc/v1.0/org/11/vdc/22/FirewallService/ HTTP/1.1");
+      assertNonPayloadHeadersEqual(request, "");
+      assertPayloadEquals(request, Strings2.toStringAndClose(getClass().getResourceAsStream(
+               "/firewallService-default.xml")), "application/xml", false);
 
-		checkFilters(request);
-	}
+      assertResponseParserClassEquals(method, request, ParseSax.class);
+      assertSaxResponseParserClassEquals(method, TaskHandler.class);
+      assertExceptionParserClassEquals(method, ReturnNullOnNotFoundOr404.class);
+
+      checkFilters(request);
+   }
 
    @Override
    protected TypeLiteral<RestAnnotationProcessor<FirewallAsyncClient>> createTypeLiteral() {
diff --git a/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/features/VMAsyncClientTest.java b/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/features/VMAsyncClientTest.java
index ef040102bd..8c5fcbd326 100644
--- a/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/features/VMAsyncClientTest.java
+++ b/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/features/VMAsyncClientTest.java
@@ -21,8 +21,6 @@ package org.jclouds.savvis.vpdc.features;
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Set;
 
 import org.jclouds.cim.OSType;
@@ -32,7 +30,6 @@ import org.jclouds.http.functions.ParseSax;
 import org.jclouds.rest.functions.MapHttp4xxCodesToExceptions;
 import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404;
 import org.jclouds.rest.internal.RestAnnotationProcessor;
-import org.jclouds.savvis.vpdc.domain.Network;
 import org.jclouds.savvis.vpdc.domain.VMSpec;
 import org.jclouds.savvis.vpdc.xml.TaskHandler;
 import org.jclouds.savvis.vpdc.xml.TasksListHandler;
@@ -40,6 +37,7 @@ import org.jclouds.util.Strings2;
 import org.testng.annotations.Test;
 
 import com.google.common.base.Predicate;
+import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.inject.Key;
 import com.google.inject.TypeLiteral;
@@ -53,8 +51,7 @@ import com.google.inject.TypeLiteral;
 public class VMAsyncClientTest extends BaseVPDCAsyncClientTest<VMAsyncClient> {
 
    public void testAddVMIntoVDCURI() throws SecurityException, NoSuchMethodException, IOException {
-      Method method = VMAsyncClient.class
-               .getMethod("addVMIntoVDC", URI.class, String.class, String.class, VMSpec.class);
+      Method method = VMAsyncClient.class.getMethod("addVMIntoVDC", URI.class, VMSpec.class);
 
       CIMOperatingSystem os = Iterables.find(injector.getInstance(Key.get(new TypeLiteral<Set<CIMOperatingSystem>>() {
       })), new Predicate<CIMOperatingSystem>() {
@@ -67,8 +64,8 @@ public class VMAsyncClientTest extends BaseVPDCAsyncClientTest<VMAsyncClient> {
       });
 
       HttpRequest request = processor.createRequest(method, URI
-               .create("https://api.symphonyvpdc.savvis.net/rest/api/v0.8/org/11/vdc/22"), "VM Tier01", "DemoHost-1",
-               VMSpec.builder().operatingSystem(os).build());
+               .create("https://api.symphonyvpdc.savvis.net/rest/api/v0.8/org/11/vdc/22"), VMSpec.builder().name(
+               "DemoHost-1").networkTierName("VM Tier01").operatingSystem(os).build());
 
       assertRequestLineEquals(request,
                "GET https://api.symphonyvpdc.savvis.net/rest/api/v0.8/org/11/vdc/22/vApp/ HTTP/1.1");
@@ -84,8 +81,7 @@ public class VMAsyncClientTest extends BaseVPDCAsyncClientTest<VMAsyncClient> {
    }
 
    public void testAddVMIntoVDC() throws SecurityException, NoSuchMethodException, IOException {
-      Method method = VMAsyncClient.class.getMethod("addVMIntoVDC", String.class, String.class, String.class,
-               String.class, VMSpec.class);
+      Method method = VMAsyncClient.class.getMethod("addVMIntoVDC", String.class, String.class, VMSpec.class);
 
       CIMOperatingSystem os = Iterables.find(injector.getInstance(Key.get(new TypeLiteral<Set<CIMOperatingSystem>>() {
       })), new Predicate<CIMOperatingSystem>() {
@@ -97,11 +93,10 @@ public class VMAsyncClientTest extends BaseVPDCAsyncClientTest<VMAsyncClient> {
 
       });
 
-      HttpRequest request = processor.createRequest(method, "11", "22", "VM Tier01", "DemoHost-1", VMSpec.builder()
-               .operatingSystem(os).build());
+      HttpRequest request = processor.createRequest(method, "11", "22", VMSpec.builder().operatingSystem(os).name(
+               "DemoHost-1").networkTierName("VM Tier01").build());
 
-      assertRequestLineEquals(request,
-               "GET https://api.symphonyvpdc.savvis.net/rest/api/v0.8/org/11/vdc/22/vApp/ HTTP/1.1");
+      assertRequestLineEquals(request, "GET https://api.symphonyvpdc.savvis.net/vpdc/v1.0/org/11/vdc/22/vApp/ HTTP/1.1");
       assertNonPayloadHeadersEqual(request, "");
       assertPayloadEquals(request, Strings2.toStringAndClose(getClass().getResourceAsStream("/vm-default.xml")),
                "application/xml", false);
@@ -113,38 +108,6 @@ public class VMAsyncClientTest extends BaseVPDCAsyncClientTest<VMAsyncClient> {
       checkFilters(request);
    }
    
-   public void testAddMultipleVMsIntoVDC() throws SecurityException, NoSuchMethodException, IOException {
-      Method method = VMAsyncClient.class.getMethod("addMultipleVMsIntoVDC", URI.class, List.class);
-
-      CIMOperatingSystem os = Iterables.find(injector.getInstance(Key.get(new TypeLiteral<Set<CIMOperatingSystem>>() {
-      })), new Predicate<CIMOperatingSystem>() {
-
-         @Override
-         public boolean apply(CIMOperatingSystem arg0) {
-            return arg0.getOsType() == OSType.RHEL_64;
-         }
-
-      });
-
-      Network network = Network.builder().name("VM Tier01").build();
-      List<VMSpec> vmSpecs = new ArrayList<VMSpec>();
-      vmSpecs.add(VMSpec.builder().name("Test VM").operatingSystem(os).network(network).build());
-      
-      HttpRequest request = processor.createRequest(method, URI.create("https://api.symphonyvpdc.savvis.net/rest/api/v0.8/org/11/vdc/22"), vmSpecs);
-
-      assertRequestLineEquals(request,
-               "GET https://api.symphonyvpdc.savvis.net/rest/api/v0.8/org/11/vdc/22/vApp/ HTTP/1.1");
-      assertNonPayloadHeadersEqual(request, "");
-      assertPayloadEquals(request, Strings2.toStringAndClose(getClass().getResourceAsStream("/vm-multiple-default.xml")),
-               "application/xml", false);
-
-      assertResponseParserClassEquals(method, request, ParseSax.class);
-      assertSaxResponseParserClassEquals(method, TasksListHandler.class);
-      assertExceptionParserClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
-      checkFilters(request);
-   }
-   
    public void testCaptureVApp() throws SecurityException, NoSuchMethodException, IOException {
       Method method = VMAsyncClient.class.getMethod("captureVApp", String.class, String.class, URI.class);
       HttpRequest request = processor.createRequest(method, "100000.0", "2736", URI.create("https://api.symphonyvpdc.savvis.net/vpdc/v1.0/org/100000.0/vdc/2736/vApp/1001"));
@@ -177,6 +140,65 @@ public class VMAsyncClientTest extends BaseVPDCAsyncClientTest<VMAsyncClient> {
       checkFilters(request);
    }
    
+   public void testAddMultipleVMsIntoVDCURI() throws SecurityException, NoSuchMethodException, IOException {
+      Method method = VMAsyncClient.class.getMethod("addMultipleVMsIntoVDC", URI.class, Iterable.class);
+
+      CIMOperatingSystem os = Iterables.find(injector.getInstance(Key.get(new TypeLiteral<Set<CIMOperatingSystem>>() {
+      })), new Predicate<CIMOperatingSystem>() {
+
+         @Override
+         public boolean apply(CIMOperatingSystem arg0) {
+            return arg0.getOsType() == OSType.RHEL_64;
+         }
+
+      });
+
+      HttpRequest request = processor.createRequest(method, URI
+               .create("https://api.symphonyvpdc.savvis.net/rest/api/v0.8/org/11/vdc/22"), ImmutableSet.of(VMSpec
+               .builder().name("Test VM").networkTierName("VM Tier01").operatingSystem(os).build()));
+
+      assertRequestLineEquals(request,
+               "GET https://api.symphonyvpdc.savvis.net/rest/api/v0.8/org/11/vdc/22/vApp/ HTTP/1.1");
+      assertNonPayloadHeadersEqual(request, "");
+      assertPayloadEquals(request, Strings2.toStringAndClose(getClass().getResourceAsStream("/vm-multiple-default.xml")),
+               "application/xml", false);
+
+      assertResponseParserClassEquals(method, request, ParseSax.class);
+      assertSaxResponseParserClassEquals(method, TasksListHandler.class);
+      assertExceptionParserClassEquals(method, MapHttp4xxCodesToExceptions.class);
+
+      checkFilters(request);
+   }
+
+   public void testAddMultipleVMsIntoVDC() throws SecurityException, NoSuchMethodException, IOException {
+      Method method = VMAsyncClient.class
+               .getMethod("addMultipleVMsIntoVDC", String.class, String.class, Iterable.class);
+
+      CIMOperatingSystem os = Iterables.find(injector.getInstance(Key.get(new TypeLiteral<Set<CIMOperatingSystem>>() {
+      })), new Predicate<CIMOperatingSystem>() {
+
+         @Override
+         public boolean apply(CIMOperatingSystem arg0) {
+            return arg0.getOsType() == OSType.RHEL_64;
+         }
+
+      });
+
+      HttpRequest request = processor.createRequest(method, "11", "22", ImmutableSet.of(VMSpec.builder()
+               .operatingSystem(os).name("Test VM").networkTierName("VM Tier01").build()));
+
+      assertRequestLineEquals(request, "GET https://api.symphonyvpdc.savvis.net/vpdc/v1.0/org/11/vdc/22/vApp/ HTTP/1.1");
+      assertNonPayloadHeadersEqual(request, "");
+      assertPayloadEquals(request, Strings2.toStringAndClose(getClass().getResourceAsStream("/vm-multiple-default.xml")),
+               "application/xml", false);
+
+      assertResponseParserClassEquals(method, request, ParseSax.class);
+      assertSaxResponseParserClassEquals(method, TasksListHandler.class);
+      assertExceptionParserClassEquals(method, MapHttp4xxCodesToExceptions.class);
+
+      checkFilters(request);
+   }
+
    public void testRemoveVMFromVDC() throws SecurityException, NoSuchMethodException, IOException {
       Method method = VMAsyncClient.class.getMethod("removeVMFromVDC", String.class, String.class, String.class);
       HttpRequest request = processor.createRequest(method, "11", "22", "33");
@@ -209,7 +231,7 @@ public class VMAsyncClientTest extends BaseVPDCAsyncClientTest<VMAsyncClient> {
 
       checkFilters(request);
    }
-   
+
    public void testPowerOffVM() throws SecurityException, NoSuchMethodException, IOException {
       Method method = VMAsyncClient.class.getMethod("powerOffVM", URI.class);
       HttpRequest request = processor.createRequest(method, URI
@@ -226,23 +248,23 @@ public class VMAsyncClientTest extends BaseVPDCAsyncClientTest<VMAsyncClient> {
 
       checkFilters(request);
    }
-   
+
    public void testPowerOnVM() throws SecurityException, NoSuchMethodException, IOException {
-	      Method method = VMAsyncClient.class.getMethod("powerOnVM", URI.class);
-	      HttpRequest request = processor.createRequest(method, URI
-	               .create("https://api.symphonyvpdc.savvis.net/rest/api/v0.8/org/11/vdc/22/vApp/33"));
+      Method method = VMAsyncClient.class.getMethod("powerOnVM", URI.class);
+      HttpRequest request = processor.createRequest(method, URI
+               .create("https://api.symphonyvpdc.savvis.net/rest/api/v0.8/org/11/vdc/22/vApp/33"));
 
-	      assertRequestLineEquals(request,
-	               "POST https://api.symphonyvpdc.savvis.net/rest/api/v0.8/org/11/vdc/22/vApp/33/action/powerOn HTTP/1.1");
-	      assertNonPayloadHeadersEqual(request, "");
-	      assertPayloadEquals(request, null, null, false);
+      assertRequestLineEquals(request,
+               "POST https://api.symphonyvpdc.savvis.net/rest/api/v0.8/org/11/vdc/22/vApp/33/action/powerOn HTTP/1.1");
+      assertNonPayloadHeadersEqual(request, "");
+      assertPayloadEquals(request, null, null, false);
 
-	      assertResponseParserClassEquals(method, request, ParseSax.class);
-	      assertSaxResponseParserClassEquals(method, TaskHandler.class);
-	      assertExceptionParserClassEquals(method, ReturnNullOnNotFoundOr404.class);
+      assertResponseParserClassEquals(method, request, ParseSax.class);
+      assertSaxResponseParserClassEquals(method, TaskHandler.class);
+      assertExceptionParserClassEquals(method, ReturnNullOnNotFoundOr404.class);
 
-	      checkFilters(request);
-	   }
+      checkFilters(request);
+   }
 
    @Override
    protected TypeLiteral<RestAnnotationProcessor<VMAsyncClient>> createTypeLiteral() {
diff --git a/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/features/VMClientLiveTest.java b/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/features/VMClientLiveTest.java
index 78a5747e06..1a6bc1eb18 100644
--- a/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/features/VMClientLiveTest.java
+++ b/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/features/VMClientLiveTest.java
@@ -22,8 +22,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
 import static org.testng.Assert.assertEquals;
 
 import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
@@ -39,8 +37,8 @@ import org.jclouds.savvis.vpdc.domain.Resource;
 import org.jclouds.savvis.vpdc.domain.Task;
 import org.jclouds.savvis.vpdc.domain.VDC;
 import org.jclouds.savvis.vpdc.domain.VM;
-import org.jclouds.savvis.vpdc.domain.VM.Status;
 import org.jclouds.savvis.vpdc.domain.VMSpec;
+import org.jclouds.savvis.vpdc.domain.VM.Status;
 import org.jclouds.savvis.vpdc.options.GetVMOptions;
 import org.jclouds.savvis.vpdc.reference.VCloudMediaType;
 import org.jclouds.ssh.SshClient;
@@ -50,7 +48,9 @@ import org.testng.annotations.BeforeGroups;
 import org.testng.annotations.Test;
 
 import com.google.common.base.Predicate;
+import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
+import com.google.common.collect.ImmutableSet.Builder;
 import com.google.common.net.HostSpecifier;
 
 @Test(groups = "live")
@@ -59,7 +59,7 @@ public class VMClientLiveTest extends BaseVPDCClientLiveTest {
    private VMClient client;
    private VM vm;
    private RetryablePredicate<IPSocket> socketTester;
-   
+
    private String username = checkNotNull(System.getProperty("test." + provider + ".loginUser"), "test." + provider
             + ".loginUser");
    private String password = checkNotNull(System.getProperty("test." + provider + ".loginPassword"), "test." + provider
@@ -118,8 +118,8 @@ public class VMClientLiveTest extends BaseVPDCClientLiveTest {
 
       // TODO: determine the sizes available in the VDC, for example there's
       // a minimum size of boot disk, and also a preset combination of cpu count vs ram
-      Task task = client.addVMIntoVDC(billingSiteId, vpdcId, networkTierName, name, VMSpec.builder()
-               .operatingSystem(os).memoryInGig(2).addDataDrive("/data01", 25).build());
+      Task task = client.addVMIntoVDC(billingSiteId, vpdcId, VMSpec.builder().name(name).networkTierName(
+               networkTierName).operatingSystem(os).memoryInGig(2).addDataDrive("/data01", 25).build());
 
       // make sure there's no error
       assert task.getId() != null && task.getError() == null : task;
@@ -139,9 +139,9 @@ public class VMClientLiveTest extends BaseVPDCClientLiveTest {
                   // the jclouds-wire.log
                   @Override
                   public boolean apply(Resource arg0) {
-            		 String description = restContext.getApi().getBrowsingClient().getVDCInOrg(billingSiteId,
-            				 arg0.getId()).getDescription();
-            		 return description.indexOf(email) != -1;
+                     String description = restContext.getApi().getBrowsingClient().getVDCInOrg(billingSiteId,
+                              arg0.getId()).getDescription();
+                     return description.indexOf(email) != -1;
                   }
 
                }).getId();
@@ -149,8 +149,9 @@ public class VMClientLiveTest extends BaseVPDCClientLiveTest {
       String networkTierName = Iterables.get(
                restContext.getApi().getBrowsingClient().getVDCInOrg(billingSiteId, vpdcId).getAvailableNetworks(), 0)
                .getId();
-      Network networkTier = restContext.getApi().getBrowsingClient().getNetworkInVDC(billingSiteId, vpdcId, networkTierName);
-      
+      Network networkTier = restContext.getApi().getBrowsingClient().getNetworkInVDC(billingSiteId, vpdcId,
+               networkTierName);
+
       String name = prefix;
 
       // delete any old VM
@@ -164,32 +165,34 @@ public class VMClientLiveTest extends BaseVPDCClientLiveTest {
                   }
 
                });
-      
-      // TODO: Savvis returns network names with a - instead of space on getNetworkInVDC call,
-	  // fix this once savvis api starts returning correctly
-      System.out.printf("vpdcId %s, vpdcName %s, networkName %s, name %s, os %s%n", vpdcId, vpdc.getName(), networkTier.getName().replace("-", " "), name, os);
 
-      List<VMSpec> vmSpecs = new ArrayList<VMSpec>();
+      // TODO: Savvis returns network names with a - instead of space on getNetworkInVDC call,
+      // fix this once savvis api starts returning correctly
+      System.out.printf("vpdcId %s, vpdcName %s, networkName %s, name %s, os %s%n", vpdcId, vpdc.getName(), networkTier
+               .getName().replace("-", " "), name, os);
+
+      Builder<VMSpec> vmSpecs = ImmutableSet.<VMSpec> builder();
       int noOfVms = 2;
       for (int i = 0; i < noOfVms; i++) {
-    	  // TODO: determine the sizes available in the VDC, for example there's
-    	  // a minimum size of boot disk, and also a preset combination of cpu count vs ram
-    	  VMSpec vmSpec = VMSpec.builder().name(name + i).operatingSystem(os).memoryInGig(2).network(networkTier).addDataDrive("/data01", 25).build();
-    	  vmSpecs.add(vmSpec);
+         // TODO: determine the sizes available in the VDC, for example there's
+         // a minimum size of boot disk, and also a preset combination of cpu count vs ram
+         VMSpec vmSpec = VMSpec.builder().name(name + i).operatingSystem(os).memoryInGig(2).networkTierName(
+                  networkTierName).addDataDrive("/data01", 25).build();
+         vmSpecs.add(vmSpec);
       }
-      
-      Set<Task> tasks = client.addMultipleVMsIntoVDC(vpdc.getHref(), vmSpecs);
-      
+
+      Set<Task> tasks = client.addMultipleVMsIntoVDC(vpdc.getHref(), vmSpecs.build());
+
       for (Task task : tasks) {
-    	  // make sure there's no error
-    	  assert task.getId() != null && task.getError() == null : task;
-    	  
-    	  assert this.taskTester.apply(task.getId());
+         // make sure there's no error
+         assert task.getId() != null && task.getError() == null : task;
+
+         assert this.taskTester.apply(task.getId());
       }
    }
-   
+
    public void testCaptureVAppTemplate() throws Exception {
-	  billingSiteId = restContext.getApi().getBrowsingClient().getOrg(null).getId();// default
+      billingSiteId = restContext.getApi().getBrowsingClient().getOrg(null).getId();// default
       vpdcId = Iterables.find(restContext.getApi().getBrowsingClient().getOrg(billingSiteId).getVDCs(),
                new Predicate<Resource>() {
 
@@ -198,36 +201,36 @@ public class VMClientLiveTest extends BaseVPDCClientLiveTest {
                   // the jclouds-wire.log
                   @Override
                   public boolean apply(Resource arg0) {
-            		 String description = restContext.getApi().getBrowsingClient().getVDCInOrg(billingSiteId,
-            				 arg0.getId()).getDescription();
-            		 return description.indexOf(email) != -1;
+                     String description = restContext.getApi().getBrowsingClient().getVDCInOrg(billingSiteId,
+                              arg0.getId()).getDescription();
+                     return description.indexOf(email) != -1;
                   }
 
                }).getId();
 
-	      VDC vpdc = restContext.getApi().getBrowsingClient().getVDCInOrg(billingSiteId, vpdcId);
-	      
-	      for (Resource vApp : Iterables.filter(vpdc.getResourceEntities(), new Predicate<Resource>() {
+      VDC vpdc = restContext.getApi().getBrowsingClient().getVDCInOrg(billingSiteId, vpdcId);
 
-              @Override
-              public boolean apply(Resource arg0) {
-        		 return VCloudMediaType.VAPP_XML.equals(arg0.getType());
-              }
+      for (Resource vApp : Iterables.filter(vpdc.getResourceEntities(), new Predicate<Resource>() {
 
-           })) {
-	    	  
-	    	  System.out.printf("Capturing VAppTemplate for vApp - %s%n", vApp.getName());
-	    	  Task task = client.captureVApp(billingSiteId, vpdcId, vApp.getHref());
-	    	
-	          // make sure there's no error
-	          assert task.getId() != null && task.getError() == null : task;
+         @Override
+         public boolean apply(Resource arg0) {
+            return VCloudMediaType.VAPP_XML.equals(arg0.getType());
+         }
 
-	          assert this.taskTester.apply(task.getId());
-	      }
+      })) {
+
+         System.out.printf("Capturing VAppTemplate for vApp - %s%n", vApp.getName());
+         Task task = client.captureVApp(billingSiteId, vpdcId, vApp.getHref());
+
+         // make sure there's no error
+         assert task.getId() != null && task.getError() == null : task;
+
+         assert this.taskTester.apply(task.getId());
+      }
    }
-   
+
    public void testCloneVApp() throws Exception {
-	  billingSiteId = restContext.getApi().getBrowsingClient().getOrg(null).getId();// default
+      billingSiteId = restContext.getApi().getBrowsingClient().getOrg(null).getId();// default
       vpdcId = Iterables.find(restContext.getApi().getBrowsingClient().getOrg(billingSiteId).getVDCs(),
                new Predicate<Resource>() {
 
@@ -236,37 +239,37 @@ public class VMClientLiveTest extends BaseVPDCClientLiveTest {
                   // the jclouds-wire.log
                   @Override
                   public boolean apply(Resource arg0) {
-            		 String description = restContext.getApi().getBrowsingClient().getVDCInOrg(billingSiteId,
-            				 arg0.getId()).getDescription();
-            		 return description.indexOf(email) != -1;
+                     String description = restContext.getApi().getBrowsingClient().getVDCInOrg(billingSiteId,
+                              arg0.getId()).getDescription();
+                     return description.indexOf(email) != -1;
                   }
 
                }).getId();
 
-	      VDC vpdc = restContext.getApi().getBrowsingClient().getVDCInOrg(billingSiteId, vpdcId);
-	      
-	      String networkTierName = Iterables.get(vpdc.getAvailableNetworks(), 0).getId();
-	      
-	      for (Resource vApp : Iterables.filter(vpdc.getResourceEntities(), new Predicate<Resource>() {
+      VDC vpdc = restContext.getApi().getBrowsingClient().getVDCInOrg(billingSiteId, vpdcId);
 
-              @Override
-              public boolean apply(Resource arg0) {
-        		 return VCloudMediaType.VAPP_XML.equals(arg0.getType());
-              }
+      String networkTierName = Iterables.get(vpdc.getAvailableNetworks(), 0).getId();
 
-           })) {
-	    	  
-	    	 System.out.printf("Cloning VApp - %s%n", vApp.getName());
-	    	 
-	    	 Task task = client.cloneVApp(vApp.getHref(), "clonedvm", networkTierName);
-	    	
-	         // make sure there's no error
-	         assert task.getId() != null && task.getError() == null : task;
+      for (Resource vApp : Iterables.filter(vpdc.getResourceEntities(), new Predicate<Resource>() {
 
-	         assert this.taskTester.apply(task.getId());
-	      }
+         @Override
+         public boolean apply(Resource arg0) {
+            return VCloudMediaType.VAPP_XML.equals(arg0.getType());
+         }
+
+      })) {
+
+         System.out.printf("Cloning VApp - %s%n", vApp.getName());
+
+         Task task = client.cloneVApp(vApp.getHref(), "clonedvm", networkTierName);
+
+         // make sure there's no error
+         assert task.getId() != null && task.getError() == null : task;
+
+         assert this.taskTester.apply(task.getId());
+      }
    }
-   
+
    private void conditionallyCheckSSH() {
       String ip = Iterables.get(vm.getNetworkConnectionSections(), 0).getIpAddress();
       assert HostSpecifier.isValid(ip);
@@ -296,88 +299,88 @@ public class VMClientLiveTest extends BaseVPDCClientLiveTest {
 
    @Test(enabled = false)
    public void testPowerOffVM() throws Exception {
-	   billingSiteId = restContext.getApi().getBrowsingClient().getOrg(null).getId();// default
-	   vpdcId = Iterables.find(restContext.getApi().getBrowsingClient().getOrg(billingSiteId).getVDCs(),
-	               new Predicate<Resource>() {
-	
-	                  // try to find the first VDC owned by the current user
-	                  // check here for what the email property might be, or in
-	                  // the jclouds-wire.log
-	                  @Override
-	                  public boolean apply(Resource arg0) {
-	                     String description = restContext.getApi().getBrowsingClient().getVDCInOrg(billingSiteId,
-	                              arg0.getId()).getDescription();
-	                     return description.indexOf(email) != -1;
-	                  }
-	
-	               }).getId();
+      billingSiteId = restContext.getApi().getBrowsingClient().getOrg(null).getId();// default
+      vpdcId = Iterables.find(restContext.getApi().getBrowsingClient().getOrg(billingSiteId).getVDCs(),
+               new Predicate<Resource>() {
+
+                  // try to find the first VDC owned by the current user
+                  // check here for what the email property might be, or in
+                  // the jclouds-wire.log
+                  @Override
+                  public boolean apply(Resource arg0) {
+                     String description = restContext.getApi().getBrowsingClient().getVDCInOrg(billingSiteId,
+                              arg0.getId()).getDescription();
+                     return description.indexOf(email) != -1;
+                  }
+
+               }).getId();
 
       VDC vpdc = restContext.getApi().getBrowsingClient().getVDCInOrg(billingSiteId, vpdcId);
       URI vmURI = Iterables.find(vpdc.getResourceEntities(), new Predicate<Resource>() {
-			  		@Override
-			  		public boolean apply(Resource arg0) {
-			  			if(VCloudMediaType.VAPP_XML.equals(arg0.getType())){
-			  				VM response1 = restContext.getApi().getBrowsingClient().getVM(arg0.getHref(), (GetVMOptions[]) null);
-			  				System.out.printf("powering off vm - %s%n", response1.getName());
-			  				if(response1.getStatus().equals(Status.ON)){
-			  					return true;
-			  				}
-			  			}
-			  			return false;
-			  		}
-			  		
-			  	}).getHref();
-      
+         @Override
+         public boolean apply(Resource arg0) {
+            if (VCloudMediaType.VAPP_XML.equals(arg0.getType())) {
+               VM response1 = restContext.getApi().getBrowsingClient().getVM(arg0.getHref(), (GetVMOptions[]) null);
+               System.out.printf("powering off vm - %s%n", response1.getName());
+               if (response1.getStatus().equals(Status.ON)) {
+                  return true;
+               }
+            }
+            return false;
+         }
+
+      }).getHref();
+
       Task task = client.powerOffVM(vmURI);
-      
+
       // make sure there's no error
       assert task.getId() != null && task.getError() == null : task;
 
       assert this.taskTester.apply(task.getId());
    }
-   
+
    @Test(enabled = false)
    public void testPowerOnVM() throws Exception {
-	   billingSiteId = restContext.getApi().getBrowsingClient().getOrg(null).getId();// default
-	   vpdcId = Iterables.find(restContext.getApi().getBrowsingClient().getOrg(billingSiteId).getVDCs(),
-	               new Predicate<Resource>() {
-	
-	                  // try to find the first VDC owned by the current user
-	                  // check here for what the email property might be, or in
-	                  // the jclouds-wire.log
-	                  @Override
-	                  public boolean apply(Resource arg0) {
-	                     String description = restContext.getApi().getBrowsingClient().getVDCInOrg(billingSiteId,
-	                              arg0.getId()).getDescription();
-	                     return description.indexOf(email) != -1;
-	                  }
-	
-	               }).getId();
+      billingSiteId = restContext.getApi().getBrowsingClient().getOrg(null).getId();// default
+      vpdcId = Iterables.find(restContext.getApi().getBrowsingClient().getOrg(billingSiteId).getVDCs(),
+               new Predicate<Resource>() {
+
+                  // try to find the first VDC owned by the current user
+                  // check here for what the email property might be, or in
+                  // the jclouds-wire.log
+                  @Override
+                  public boolean apply(Resource arg0) {
+                     String description = restContext.getApi().getBrowsingClient().getVDCInOrg(billingSiteId,
+                              arg0.getId()).getDescription();
+                     return description.indexOf(email) != -1;
+                  }
+
+               }).getId();
 
       VDC vpdc = restContext.getApi().getBrowsingClient().getVDCInOrg(billingSiteId, vpdcId);
       URI vmURI = Iterables.find(vpdc.getResourceEntities(), new Predicate<Resource>() {
-			  		@Override
-			  		public boolean apply(Resource arg0) {
-			  			if(VCloudMediaType.VAPP_XML.equals(arg0.getType())){
-			  				VM response1 = restContext.getApi().getBrowsingClient().getVM(arg0.getHref(), (GetVMOptions[]) null);
-			  				System.out.printf("powering on vm - %s%n", response1.getName());
-			  				if(response1.getStatus().equals(Status.OFF)){
-			  					return true;
-			  				}
-			  			}
-			  			return false;
-			  		}
-			  		
-			  	}).getHref();
-      
+         @Override
+         public boolean apply(Resource arg0) {
+            if (VCloudMediaType.VAPP_XML.equals(arg0.getType())) {
+               VM response1 = restContext.getApi().getBrowsingClient().getVM(arg0.getHref(), (GetVMOptions[]) null);
+               System.out.printf("powering on vm - %s%n", response1.getName());
+               if (response1.getStatus().equals(Status.OFF)) {
+                  return true;
+               }
+            }
+            return false;
+         }
+
+      }).getHref();
+
       Task task = client.powerOnVM(vmURI);
-      
+
       // make sure there's no error
       assert task.getId() != null && task.getError() == null : task;
 
       assert this.taskTester.apply(task.getId());
    }
-   
+
    @AfterGroups(groups = "live")
    protected void tearDown() {
       if (vm != null) {
diff --git a/providers/scaleup-storage/pom.xml b/providers/scaleup-storage/pom.xml
index c7b8412a4d..e467e2d68b 100644
--- a/providers/scaleup-storage/pom.xml
+++ b/providers/scaleup-storage/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>scaleup-storage</artifactId>
     <name>jclouds ScaleUp Cloud Storage provider</name>
     <description>Scality RING (ScalityRS2) implementation targeted to ScaleUp Cloud Storage</description>
+    <packaging>bundle</packaging>
 
     <properties>
         <test.initializer>org.jclouds.scaleup.storage.blobstore.ScaleUpStorageTestInitializer</test.initializer>
@@ -146,6 +147,22 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.scaleup.storage.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 
 </project>
 
diff --git a/providers/serverlove-z1-man/pom.xml b/providers/serverlove-z1-man/pom.xml
index 5c7cf8d6e7..5202e05444 100644
--- a/providers/serverlove-z1-man/pom.xml
+++ b/providers/serverlove-z1-man/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>serverlove-z1-man</artifactId>
     <name>jclouds Serverlove Manchester provider</name>
     <description>Serverlove implementation targeted to Manchester</description>
+    <packaging>bundle</packaging>
 
     <properties>
         <test.serverlove-z1-man.endpoint>https://api.z1-man.serverlove.com</test.serverlove-z1-man.endpoint>
@@ -136,6 +137,20 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.serverlove.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
-
diff --git a/providers/skalicloud-sdg-my/pom.xml b/providers/skalicloud-sdg-my/pom.xml
index a251165220..f164b3f3db 100644
--- a/providers/skalicloud-sdg-my/pom.xml
+++ b/providers/skalicloud-sdg-my/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>skalicloud-sdg-my</artifactId>
     <name>jclouds SkaliCloud Malaysia provider</name>
     <description>SkaliCloud implementation targeted to Malaysia</description>
+    <packaging>bundle</packaging>
 
     <properties>
         <test.skalicloud-sdg-my.endpoint>https://api.sdg-my.skalicloud.com</test.skalicloud-sdg-my.endpoint>
@@ -136,6 +137,20 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.skalicloud.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
-
diff --git a/providers/slicehost/pom.xml b/providers/slicehost/pom.xml
index 8285a30452..eb2b07edb7 100644
--- a/providers/slicehost/pom.xml
+++ b/providers/slicehost/pom.xml
@@ -32,6 +32,8 @@
     <artifactId>slicehost</artifactId>
     <name>jclouds Slicehost provider</name>
     <description>ComputeService implementation of Slicehost datacenters</description>
+    <packaging>bundle</packaging>
+
     <properties>
         <!-- when instances are hung, open a ticket and add here -->
         <jclouds.compute.blacklist-nodes>trmkrun-ccc,test.trmk-924</jclouds.compute.blacklist-nodes>
@@ -127,4 +129,20 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.slicehost.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
diff --git a/providers/synaptic-storage/pom.xml b/providers/synaptic-storage/pom.xml
index dbf9a2828a..8cacb47f7b 100644
--- a/providers/synaptic-storage/pom.xml
+++ b/providers/synaptic-storage/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>synaptic-storage</artifactId>
     <name>jclouds Synaptic Storage as a Service provider</name>
     <description>Atmos implementation targeted to ATT Synaptic Storage as a Service</description>
+    <packaging>bundle</packaging>
 
     <properties>
         <test.initializer>org.jclouds.synaptic.storage.blobstore.integration.SynapticStorageTestInitializer</test.initializer>
@@ -139,6 +140,20 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.synaptic.storage.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
-
diff --git a/providers/tiscali-storage/pom.xml b/providers/tiscali-storage/pom.xml
index 4edfecdc14..aa892c5ba7 100644
--- a/providers/tiscali-storage/pom.xml
+++ b/providers/tiscali-storage/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>tiscali-storage</artifactId>
     <name>jclouds Tisali Cloud Storage provider</name>
     <description>Scality RING (ScalityRS2) implementation targeted to Tisali Cloud Storage</description>
+    <packaging>bundle</packaging>
 
     <properties>
         <test.initializer>org.jclouds.tiscali.storage.blobstore.TiscaliStorageTestInitializer</test.initializer>
@@ -147,6 +148,20 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.tiscali.storage.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
-
diff --git a/providers/trmk-ecloud/pom.xml b/providers/trmk-ecloud/pom.xml
index 6bd0b394f8..004c9c2418 100644
--- a/providers/trmk-ecloud/pom.xml
+++ b/providers/trmk-ecloud/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>trmk-ecloud</artifactId>
     <name>jclouds Terremark Enterprise Cloud provider</name>
     <description>jclouds Terremark Enterprise Cloud provider</description>
+    <packaging>bundle</packaging>
 
     <properties>
         <test.trmk-ecloud.endpoint>https://services.enterprisecloud.terremark.com/api</test.trmk-ecloud.endpoint>
@@ -151,6 +152,20 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.vcloud.terremark.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
-
diff --git a/providers/trmk-ecloud/src/main/java/org/jclouds/vcloud/terremark/TerremarkECloudProviderMetadata.java b/providers/trmk-ecloud/src/main/java/org/jclouds/vcloud/terremark/TerremarkECloudProviderMetadata.java
new file mode 100644
index 0000000000..1b1da29cf3
--- /dev/null
+++ b/providers/trmk-ecloud/src/main/java/org/jclouds/vcloud/terremark/TerremarkECloudProviderMetadata.java
@@ -0,0 +1,97 @@
+/**
+ *
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.vcloud.terremark;
+
+import java.net.URI;
+
+import org.jclouds.providers.BaseProviderMetadata;
+import org.jclouds.providers.ProviderMetadata;
+
+/**
+ * Implementation of {@link org.jclouds.types.ProviderMetadata} for Terremark's Enterprise Cloud.
+ * 
+ * @author Adrian Cole
+ */
+public class TerremarkECloudProviderMetadata extends BaseProviderMetadata {
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public String getId() {
+      return "trmk-ecloud";
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public String getType() {
+      return ProviderMetadata.COMPUTE_TYPE;
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public String getName() {
+      return "Terremark Enterprise Cloud";
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public String getIdentityName() {
+      return "email";
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public String getCredentialName() {
+      return "password";
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public URI getHomepage() {
+      return URI.create("http://www.terremark.com/services/cloudcomputing/theenterprisecloud.aspx");
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public URI getConsole() {
+      return URI.create("https://icenter.digitalops.net");
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public URI getApiDocumentation() {
+      return URI.create("http://support.theenterprisecloud.com/kb/default.asp?id=533&Lang=1&SID=");
+   }
+
+}
\ No newline at end of file
diff --git a/providers/trmk-ecloud/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/trmk-ecloud/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
new file mode 100644
index 0000000000..c61780f664
--- /dev/null
+++ b/providers/trmk-ecloud/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
@@ -0,0 +1 @@
+org.jclouds.vcloud.terremark.TerremarkECloudProviderMetadata
diff --git a/providers/trmk-ecloud/src/test/java/org/jclouds/vcloud/terremark/TerremarkECloudProviderTest.java b/providers/trmk-ecloud/src/test/java/org/jclouds/vcloud/terremark/TerremarkECloudProviderTest.java
new file mode 100644
index 0000000000..20e4e82b95
--- /dev/null
+++ b/providers/trmk-ecloud/src/test/java/org/jclouds/vcloud/terremark/TerremarkECloudProviderTest.java
@@ -0,0 +1,36 @@
+/**
+ *
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.vcloud.terremark;
+
+import org.jclouds.providers.BaseProviderMetadataTest;
+import org.jclouds.providers.ProviderMetadata;
+import org.testng.annotations.Test;
+
+/**
+ * The TerremarkECloudProviderTest tests the org.jclouds.providers.TerremarkECloudProvider class.
+ * 
+ * @author Adrian Cole
+ */
+@Test(groups = "unit", testName = "TerremarkECloudProviderTest")
+public class TerremarkECloudProviderTest extends BaseProviderMetadataTest {
+
+   public TerremarkECloudProviderTest() {
+      super(new TerremarkECloudProviderMetadata(), ProviderMetadata.COMPUTE_TYPE);
+   }
+}
\ No newline at end of file
diff --git a/providers/trmk-vcloudexpress/pom.xml b/providers/trmk-vcloudexpress/pom.xml
index 8313b65baf..a1ab8bcb86 100644
--- a/providers/trmk-vcloudexpress/pom.xml
+++ b/providers/trmk-vcloudexpress/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>trmk-vcloudexpress</artifactId>
     <name>jclouds Terremark vCloud Express provider</name>
     <description>jclouds Terremark vCloud Express provider</description>
+    <packaging>bundle</packaging>
 
     <properties>
         <test.trmk-vcloudexpress.endpoint>https://services.vcloudexpress.terremark.com/api</test.trmk-vcloudexpress.endpoint>
@@ -150,6 +151,20 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.vcloud.terremark.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
-
diff --git a/providers/trmk-vcloudexpress/src/main/java/org/jclouds/vcloud/terremark/TerremarkVCloudExpressProviderMetadata.java b/providers/trmk-vcloudexpress/src/main/java/org/jclouds/vcloud/terremark/TerremarkVCloudExpressProviderMetadata.java
new file mode 100644
index 0000000000..b731643ec1
--- /dev/null
+++ b/providers/trmk-vcloudexpress/src/main/java/org/jclouds/vcloud/terremark/TerremarkVCloudExpressProviderMetadata.java
@@ -0,0 +1,97 @@
+/**
+ *
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.vcloud.terremark;
+
+import java.net.URI;
+
+import org.jclouds.providers.BaseProviderMetadata;
+import org.jclouds.providers.ProviderMetadata;
+
+/**
+ * Implementation of {@link org.jclouds.types.ProviderMetadata} for Terremark's vCloud Express.
+ * 
+ * @author Adrian Cole
+ */
+public class TerremarkVCloudExpressProviderMetadata extends BaseProviderMetadata {
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public String getId() {
+      return "trmk-vcloudexpress";
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public String getType() {
+      return ProviderMetadata.COMPUTE_TYPE;
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public String getIdentityName() {
+      return "email";
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public String getCredentialName() {
+      return "password";
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public String getName() {
+      return "Terremark vCloud Express";
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public URI getHomepage() {
+      return URI.create("https://vcloudexpress.terremark.com/");
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public URI getConsole() {
+      return URI.create("https://my.vcloudexpress.terremark.com");
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public URI getApiDocumentation() {
+      return URI.create("https://community.vcloudexpress.terremark.com/en-us/product_docs/m/vcefiles/2342.aspx");
+   }
+
+}
\ No newline at end of file
diff --git a/providers/trmk-vcloudexpress/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/trmk-vcloudexpress/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
new file mode 100644
index 0000000000..826eb45584
--- /dev/null
+++ b/providers/trmk-vcloudexpress/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
@@ -0,0 +1 @@
+org.jclouds.vcloud.terremark.TerremarkVCloudExpressProviderMetadata
diff --git a/providers/trmk-vcloudexpress/src/test/java/org/jclouds/vcloud/terremark/ProvidersInPropertiesTest.java b/providers/trmk-vcloudexpress/src/test/java/org/jclouds/vcloud/terremark/TerremarkVCloudExpressProviderTest.java
similarity index 58%
rename from providers/trmk-vcloudexpress/src/test/java/org/jclouds/vcloud/terremark/ProvidersInPropertiesTest.java
rename to providers/trmk-vcloudexpress/src/test/java/org/jclouds/vcloud/terremark/TerremarkVCloudExpressProviderTest.java
index 7208060ea7..9e8a81d09a 100644
--- a/providers/trmk-vcloudexpress/src/test/java/org/jclouds/vcloud/terremark/ProvidersInPropertiesTest.java
+++ b/providers/trmk-vcloudexpress/src/test/java/org/jclouds/vcloud/terremark/TerremarkVCloudExpressProviderTest.java
@@ -18,31 +18,20 @@
  */
 package org.jclouds.vcloud.terremark;
 
-import org.jclouds.compute.util.ComputeServiceUtils;
-import org.jclouds.rest.Providers;
+import org.jclouds.providers.BaseProviderMetadataTest;
+import org.jclouds.providers.ProviderMetadata;
+import org.jclouds.vcloud.terremark.TerremarkVCloudExpressProviderMetadata;
 import org.testng.annotations.Test;
 
-import com.google.common.collect.Iterables;
-
 /**
+ * The TerremarkVCloudExpressProviderTest tests the org.jclouds.providers.TerremarkVCloudExpressProvider class.
  * 
  * @author Adrian Cole
- * 
  */
-@Test(groups = "unit")
-public class ProvidersInPropertiesTest {
-
-   @Test
-   public void testSupportedProviders() {
-      Iterable<String> providers = Providers.getSupportedProviders();
-      assert Iterables.contains(providers, "trmk-vcloudexpress") : providers;
+@Test(groups = "unit", testName = "TerremarkVCloudExpressProviderTest")
+public class TerremarkVCloudExpressProviderTest extends BaseProviderMetadataTest {
 
+   public TerremarkVCloudExpressProviderTest() {
+      super(new TerremarkVCloudExpressProviderMetadata(), ProviderMetadata.COMPUTE_TYPE);
    }
-
-   @Test
-   public void testSupportedComputeServiceProviders() {
-      Iterable<String> providers = ComputeServiceUtils.getSupportedProviders();
-      assert Iterables.contains(providers, "trmk-vcloudexpress") : providers;
-   }
-
-}
+}
\ No newline at end of file
diff --git a/sandbox-apis/cloudstack/pom.xml b/sandbox-apis/cloudstack/pom.xml
index 6054bd25ae..8f5c415ea4 100644
--- a/sandbox-apis/cloudstack/pom.xml
+++ b/sandbox-apis/cloudstack/pom.xml
@@ -34,7 +34,8 @@
     <artifactId>cloudstack</artifactId>
     <name>jclouds cloudstack core</name>
     <description>jclouds components to access cloudstack</description>
-    
+    <packaging>bundle</packaging>
+
     <!-- bootstrapping: need to fetch the project POM -->
     <repositories>
         <repository>
@@ -148,4 +149,20 @@
             </build>
         </profile>
     </profiles>
+
+    <build>
+        <plugins>
+            <plugin>    
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.cloudstack.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkOffering.java b/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkOffering.java
index 6f4581126a..cd70eea1a6 100644
--- a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkOffering.java
+++ b/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkOffering.java
@@ -50,6 +50,7 @@ public class NetworkOffering implements Comparable<NetworkOffering> {
       private boolean isDefault;
       private boolean supportsVLAN;
       private TrafficType trafficType;
+      private GuestIPType guestIPType;
       private Set<String> tags = ImmutableSet.of();
 
       public Builder id(long id) {
@@ -102,6 +103,11 @@ public class NetworkOffering implements Comparable<NetworkOffering> {
          return this;
       }
 
+      public Builder guestIPType(GuestIPType guestIPType) {
+         this.guestIPType = guestIPType;
+         return this;
+      }
+
       public Builder tags(Set<String> tags) {
          this.tags = ImmutableSet.copyOf(checkNotNull(tags, "tags"));
          return this;
@@ -109,7 +115,7 @@ public class NetworkOffering implements Comparable<NetworkOffering> {
 
       public NetworkOffering build() {
          return new NetworkOffering(id, name, displayText, created, availability, supportsVLAN, maxConnections,
-               isDefault, trafficType, networkRate, tags);
+               isDefault, trafficType, guestIPType, networkRate, tags);
       }
    }
 
@@ -127,13 +133,15 @@ public class NetworkOffering implements Comparable<NetworkOffering> {
    private boolean supportsVLAN;
    @SerializedName("traffictype")
    private TrafficType trafficType;
+   @SerializedName("guestiptype")
+   private GuestIPType guestIPType;
    @SerializedName("networkrate")
    private int networkRate = -1;
    private String tags;
 
    public NetworkOffering(long id, String name, String displayText, @Nullable Date created, String availability,
          boolean supportsVLAN, @Nullable Integer maxConnections, boolean isDefault, TrafficType trafficType,
-         int networkRate, Set<String> tags) {
+         GuestIPType guestIPType, int networkRate, Set<String> tags) {
       this.id = id;
       this.name = name;
       this.displayText = displayText;
@@ -143,6 +151,7 @@ public class NetworkOffering implements Comparable<NetworkOffering> {
       this.maxConnections = maxConnections;
       this.isDefault = isDefault;
       this.trafficType = trafficType;
+      this.guestIPType = guestIPType;
       this.networkRate = networkRate;
       this.tags = tags.size() == 0 ? null : Joiner.on(',').join(tags);
    }
@@ -207,7 +216,8 @@ public class NetworkOffering implements Comparable<NetworkOffering> {
 
    /**
     * 
-    * @return the max number of concurrent connection the network offering supports
+    * @return the max number of concurrent connection the network offering
+    *         supports
     */
    @Nullable
    public Integer getMaxConnections() {
@@ -230,6 +240,14 @@ public class NetworkOffering implements Comparable<NetworkOffering> {
       return trafficType;
    }
 
+   /**
+    * 
+    * @return the guest ip type for this network offering
+    */
+   public GuestIPType getGuestIPType() {
+      return guestIPType;
+   }
+
    /**
     * 
     * @return data transfer rate in megabits per second allowed.
diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AddressAsyncClient.java b/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AddressAsyncClient.java
index 306d2f5c55..df659af9a1 100644
--- a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AddressAsyncClient.java
+++ b/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AddressAsyncClient.java
@@ -73,13 +73,13 @@ public interface AddressAsyncClient {
    ListenableFuture<PublicIPAddress> getPublicIPAddress(@QueryParam("id") long id);
 
    /**
-    * @see AddressClient#associateIPAddress
+    * @see AddressClient#associateIPAddressInZone
     */
    @GET
    @QueryParams(keys = "command", values = "associateIpAddress")
    @Unwrap
    @Consumes(MediaType.APPLICATION_JSON)
-   ListenableFuture<AsyncCreateResponse> associateIPAddress(@QueryParam("zoneid") long zoneId,
+   ListenableFuture<AsyncCreateResponse> associateIPAddressInZone(@QueryParam("zoneid") long zoneId,
             AssociateIPAddressOptions... options);
 
    /**
diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AddressClient.java b/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AddressClient.java
index 91dfdccce8..7f58caeb18 100644
--- a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AddressClient.java
+++ b/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AddressClient.java
@@ -62,7 +62,7 @@ public interface AddressClient {
     *           the ID of the availability zone you want to acquire an public IP address from
     * @return IPAddress
     */
-   AsyncCreateResponse associateIPAddress(long zoneId, AssociateIPAddressOptions... options);
+   AsyncCreateResponse associateIPAddressInZone(long zoneId, AssociateIPAddressOptions... options);
 
    /**
     * Disassociates an ip address from the account.
diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkAsyncClient.java b/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkAsyncClient.java
index 22bf0b7281..763f3c19ee 100644
--- a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkAsyncClient.java
+++ b/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkAsyncClient.java
@@ -27,6 +27,7 @@ import javax.ws.rs.core.MediaType;
 
 import org.jclouds.cloudstack.domain.Network;
 import org.jclouds.cloudstack.filters.QuerySigner;
+import org.jclouds.cloudstack.options.CreateNetworkOptions;
 import org.jclouds.cloudstack.options.ListNetworksOptions;
 import org.jclouds.rest.annotations.ExceptionParser;
 import org.jclouds.rest.annotations.QueryParams;
@@ -69,4 +70,24 @@ public interface NetworkAsyncClient {
    @ExceptionParser(ReturnNullOnNotFoundOr404.class)
    ListenableFuture<Network> getNetwork(@QueryParam("id") long id);
 
+   /**
+    * @see NetworkClient#createNetworkInZone
+    */
+   @GET
+   @QueryParams(keys = "command", values = "createNetwork")
+   @Unwrap(depth = 2)
+   @Consumes(MediaType.APPLICATION_JSON)
+   ListenableFuture<Network> createNetworkInZone(@QueryParam("zoneid") long zoneId,
+         @QueryParam("networkofferingid") long networkOfferingId, @QueryParam("name") String name,
+         @QueryParam("displaytext") String displayText, CreateNetworkOptions... options);
+
+   /**
+    * @see NetworkClient#deleteNetwork
+    */
+   @GET
+   @QueryParams(keys = "command", values = "deleteNetwork")
+   @Unwrap(depth = 2)
+   @Consumes(MediaType.APPLICATION_JSON)
+   @ExceptionParser(ReturnNullOnNotFoundOr404.class)
+   ListenableFuture<Long> deleteNetwork(@QueryParam("id") long id);
 }
diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkClient.java b/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkClient.java
index 8c9cf1441d..1be3093d77 100644
--- a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkClient.java
+++ b/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkClient.java
@@ -22,6 +22,7 @@ import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 import org.jclouds.cloudstack.domain.Network;
+import org.jclouds.cloudstack.options.CreateNetworkOptions;
 import org.jclouds.cloudstack.options.ListNetworksOptions;
 import org.jclouds.concurrent.Timeout;
 
@@ -53,4 +54,31 @@ public interface NetworkClient {
     */
    Network getNetwork(long id);
 
+   /**
+    * Creates a network
+    * 
+    * @param zoneId
+    *           the Zone ID for the Vlan ip range
+    * @param networkOfferingId
+    *           the network offering id
+    * @param name
+    *           the name of the network
+    * @param displayText
+    *           the display text of the network
+    * @param options
+    *           optional parameters
+    * @return newly created network
+    */
+   Network createNetworkInZone(long zoneId, long networkOfferingId, String name, String displayText,
+         CreateNetworkOptions... options);
+
+   /**
+    * Deletes a network
+    * 
+    * @param id
+    *           the ID of the network
+    * @return job id related to destroying the network, or null if resource was not
+    *         found
+    */
+   Long deleteNetwork(long id);
 }
diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineAsyncClient.java b/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineAsyncClient.java
index 6de988d67b..dd48109d36 100644
--- a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineAsyncClient.java
+++ b/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineAsyncClient.java
@@ -72,14 +72,14 @@ public interface VirtualMachineAsyncClient {
    ListenableFuture<VirtualMachine> getVirtualMachine(@QueryParam("id") long id);
 
    /**
-    * @see VirtualMachineClient#deployVirtualMachine
+    * @see VirtualMachineClient#deployVirtualMachineInZone
     */
    @GET
    @QueryParams(keys = "command", values = "deployVirtualMachine")
    @Unwrap
    @Consumes(MediaType.APPLICATION_JSON)
-   ListenableFuture<AsyncCreateResponse> deployVirtualMachine(@QueryParam("serviceofferingid") long serviceOfferingId,
-            @QueryParam("templateid") long templateId, @QueryParam("zoneid") long zoneId,
+   ListenableFuture<AsyncCreateResponse> deployVirtualMachineInZone( @QueryParam("zoneid") long zoneId, @QueryParam("serviceofferingid") long serviceOfferingId,
+            @QueryParam("templateid") long templateId,
             DeployVirtualMachineOptions... options);
 
    /**
diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineClient.java b/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineClient.java
index 8882ff2236..1389309807 100644
--- a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineClient.java
+++ b/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineClient.java
@@ -59,15 +59,16 @@ public interface VirtualMachineClient {
     * Creates and automatically starts a virtual machine based on a service offering, disk offering,
     * and template.
     * 
+    * @param zoneId
+    *           availability zone for the virtual machine
     * @param serviceOfferingId
     *           the ID of the service offering for the virtual machine
     * @param templateId
     *           the ID of the template for the virtual machine
-    * @param zoneId
-    *           availability zone for the virtual machine
+    * 
     * @return virtual machine
     */
-   AsyncCreateResponse deployVirtualMachine(long serviceOfferingId, long templateId, long zoneId,
+   AsyncCreateResponse deployVirtualMachineInZone(long zoneId, long serviceOfferingId, long templateId,
             DeployVirtualMachineOptions... options);
 
    /**
diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ReuseOrAssociateNewPublicIPAddress.java b/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ReuseOrAssociateNewPublicIPAddress.java
index 091c4c46c3..3777a47913 100644
--- a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ReuseOrAssociateNewPublicIPAddress.java
+++ b/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ReuseOrAssociateNewPublicIPAddress.java
@@ -82,7 +82,7 @@ public class ReuseOrAssociateNewPublicIPAddress implements Function<Network, Pub
 
    public static PublicIPAddress associateIPAddressInNetwork(Network network, CloudStackClient client,
             Predicate<Long> jobComplete) {
-      AsyncCreateResponse job = client.getAddressClient().associateIPAddress(network.getZoneId(),
+      AsyncCreateResponse job = client.getAddressClient().associateIPAddressInZone(network.getZoneId(),
                networkId(network.getId()));
       checkState(jobComplete.apply(job.getJobId()), "job %d failed to complete", job.getJobId());
       PublicIPAddress ip = client.getAsyncJobClient().<PublicIPAddress> getAsyncJob(job.getJobId()).getResult();
diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateNetworkOptions.java b/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateNetworkOptions.java
new file mode 100644
index 0000000000..1897a0cf04
--- /dev/null
+++ b/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateNetworkOptions.java
@@ -0,0 +1,202 @@
+/**
+ *
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.cloudstack.options;
+
+import com.google.common.collect.ImmutableSet;
+
+/**
+ * Options used to control what networks information is returned
+ * 
+ * @see <a href="http://download.cloud.com/releases/2.2.0/api/user/listNetworks.html" />
+ * @author Adrian Cole
+ */
+public class CreateNetworkOptions extends AccountInDomainOptions {
+
+   public static final CreateNetworkOptions NONE = new CreateNetworkOptions();
+
+   /**
+    * @param isDefault
+    *           true if network is default, false otherwise
+    */
+   public CreateNetworkOptions isDefault(boolean isDefault) {
+      this.queryParameters.replaceValues("isdefault", ImmutableSet.of(isDefault + ""));
+      return this;
+   }
+
+   /**
+    * @param isShared
+    *           true if network is shared, false otherwise
+    */
+   public CreateNetworkOptions isShared(boolean isShared) {
+      this.queryParameters.replaceValues("isshared", ImmutableSet.of(isShared + ""));
+      return this;
+   }
+
+   /**
+    * @param startIP
+    *           the beginning IP address in the VLAN IP range
+    */
+   public CreateNetworkOptions startIP(String startIP) {
+      this.queryParameters.replaceValues("startip", ImmutableSet.of(startIP));
+      return this;
+   }
+
+   /**
+    * @param endIP
+    *           the ending IP address in the VLAN IP range
+    */
+   public CreateNetworkOptions endIP(String endIP) {
+      this.queryParameters.replaceValues("endip", ImmutableSet.of(endIP));
+      return this;
+   }
+
+   /**
+    * @param gateway
+    *           the gateway of the VLAN IP range
+    */
+   public CreateNetworkOptions gateway(String gateway) {
+      this.queryParameters.replaceValues("gateway", ImmutableSet.of(gateway));
+      return this;
+   }
+
+   /**
+    * @param netmask
+    *           the netmask of the VLAN IP range
+    */
+   public CreateNetworkOptions netmask(String netmask) {
+      this.queryParameters.replaceValues("netmask", ImmutableSet.of(netmask));
+      return this;
+   }
+
+   /**
+    * @param networkDomain
+    *           network domain
+    */
+   public CreateNetworkOptions networkDomain(String networkDomain) {
+      this.queryParameters.replaceValues("networkdomain", ImmutableSet.of(networkDomain));
+      return this;
+   }
+
+   /**
+    * @param vlan
+    *           the ID or VID of the VLAN. Default is an "untagged" VLAN.
+    */
+   public CreateNetworkOptions vlan(String vlan) {
+      this.queryParameters.replaceValues("vlan", ImmutableSet.of(vlan));
+      return this;
+   }
+
+   public static class Builder {
+      /**
+       * @see CreateNetworkOptions#isDefault
+       */
+      public static CreateNetworkOptions isDefault(boolean isDefault) {
+         CreateNetworkOptions options = new CreateNetworkOptions();
+         return options.isDefault(isDefault);
+      }
+
+      /**
+       * @see CreateNetworkOptions#isShared
+       */
+      public static CreateNetworkOptions isShared(boolean isShared) {
+         CreateNetworkOptions options = new CreateNetworkOptions();
+         return options.isShared(isShared);
+      }
+
+      /**
+       * @see CreateNetworkOptions#startIP(String)
+       */
+      public static CreateNetworkOptions startIP(String startIP) {
+         CreateNetworkOptions options = new CreateNetworkOptions();
+         return options.startIP(startIP);
+      }
+
+      /**
+       * @see CreateNetworkOptions#endIP(String)
+       */
+      public static CreateNetworkOptions endIP(String endIP) {
+         CreateNetworkOptions options = new CreateNetworkOptions();
+         return options.endIP(endIP);
+      }
+
+      /**
+       * @see CreateNetworkOptions#gateway(String)
+       */
+      public static CreateNetworkOptions gateway(String gateway) {
+         CreateNetworkOptions options = new CreateNetworkOptions();
+         return options.gateway(gateway);
+      }
+
+      /**
+       * @see CreateNetworkOptions#netmask(String)
+       */
+      public static CreateNetworkOptions netmask(String netmask) {
+         CreateNetworkOptions options = new CreateNetworkOptions();
+         return options.netmask(netmask);
+      }
+
+      /**
+       * @see CreateNetworkOptions#networkDomain(String)
+       */
+      public static CreateNetworkOptions networkDomain(String networkDomain) {
+         CreateNetworkOptions options = new CreateNetworkOptions();
+         return options.networkDomain(networkDomain);
+      }
+
+      /**
+       * @see CreateNetworkOptions#vlan(String)
+       */
+      public static CreateNetworkOptions vlan(String vlan) {
+         CreateNetworkOptions options = new CreateNetworkOptions();
+         return options.vlan(vlan);
+      }
+
+      /**
+       * @see CreateNetworkOptions#accountInDomain
+       */
+      public static CreateNetworkOptions accountInDomain(String account, long domain) {
+         CreateNetworkOptions options = new CreateNetworkOptions();
+         return options.accountInDomain(account, domain);
+      }
+
+      /**
+       * @see CreateNetworkOptions#domainId
+       */
+      public static CreateNetworkOptions domainId(long domainId) {
+         CreateNetworkOptions options = new CreateNetworkOptions();
+         return options.domainId(domainId);
+      }
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public CreateNetworkOptions accountInDomain(String account, long domain) {
+      return CreateNetworkOptions.class.cast(super.accountInDomain(account, domain));
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public CreateNetworkOptions domainId(long domainId) {
+      return CreateNetworkOptions.class.cast(super.domainId(domainId));
+   }
+}
diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/NetworkOfferingPredicates.java b/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/NetworkOfferingPredicates.java
new file mode 100644
index 0000000000..9b9b5100f6
--- /dev/null
+++ b/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/NetworkOfferingPredicates.java
@@ -0,0 +1,61 @@
+/**
+ *
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.cloudstack.predicates;
+
+import static com.google.common.base.Predicates.alwaysTrue;
+
+import org.jclouds.cloudstack.domain.GuestIPType;
+import org.jclouds.cloudstack.domain.NetworkOffering;
+import org.jclouds.cloudstack.domain.TrafficType;
+
+import com.google.common.base.Predicate;
+
+/**
+ * 
+ * @author Adrian Cole
+ */
+public class NetworkOfferingPredicates {
+
+   /**
+    * 
+    * @return true, if the offering supports creation of GuestVirtual Networks
+    */
+   public static Predicate<NetworkOffering> supportsGuestVirtualNetworks() {
+      return new Predicate<NetworkOffering>() {
+
+         @Override
+         public boolean apply(NetworkOffering arg0) {
+            return arg0.getTrafficType() == TrafficType.GUEST && arg0.getGuestIPType() == GuestIPType.VIRTUAL;
+         }
+
+         @Override
+         public String toString() {
+            return "supportsGuestVirtualNetworks()";
+         }
+      };
+   }
+
+   /**
+    * 
+    * @return always returns true.
+    */
+   public static Predicate<NetworkOffering> any() {
+      return alwaysTrue();
+   }
+}
diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/ZonePredicates.java b/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/ZonePredicates.java
new file mode 100644
index 0000000000..90afa1c682
--- /dev/null
+++ b/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/ZonePredicates.java
@@ -0,0 +1,89 @@
+/**
+ *
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.cloudstack.predicates;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Predicates.alwaysTrue;
+import static com.google.common.base.Predicates.and;
+import static com.google.common.base.Predicates.not;
+
+import org.jclouds.cloudstack.domain.NetworkType;
+import org.jclouds.cloudstack.domain.Zone;
+
+import com.google.common.base.Predicate;
+
+/**
+ * 
+ * @author Adrian Cole
+ */
+public class ZonePredicates {
+   /**
+    * 
+    * @return true, if the zone supports {@link NetworkType.ADVANCED}
+    */
+   public static Predicate<Zone> supportsAdvancedNetworks() {
+      return new Predicate<Zone>() {
+
+         @Override
+         public boolean apply(Zone input) {
+            return NetworkType.ADVANCED.equals(checkNotNull(input, "zone").getNetworkType());
+         }
+
+         @Override
+         public String toString() {
+            return "supportsAvancedNetworks()";
+         }
+      };
+   }
+
+   /**
+    * 
+    * @return true, if the zone supports security groups
+    */
+   public static Predicate<Zone> supportsSecurityGroups() {
+      return new Predicate<Zone>() {
+
+         @Override
+         public boolean apply(Zone input) {
+            return input.isSecurityGroupsEnabled();
+         }
+
+         @Override
+         public String toString() {
+            return "supportsSecurityGroups()";
+         }
+      };
+   }
+
+   /**
+    * 
+    * @return true, if the zone supports creation of GuestVirtual Networks
+    */
+   public static Predicate<Zone> supportsGuestVirtualNetworks() {
+      return and(supportsAdvancedNetworks(), not(supportsSecurityGroups()));
+   }
+
+   /**
+    * 
+    * @return always returns true.
+    */
+   public static Predicate<Zone> any() {
+      return alwaysTrue();
+   }
+}
diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AccountClientLiveTest.java b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AccountClientLiveTest.java
index 5a41e1fd2d..3c4526fba4 100644
--- a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AccountClientLiveTest.java
+++ b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AccountClientLiveTest.java
@@ -75,7 +75,8 @@ public class AccountClientLiveTest extends BaseCloudStackClientLiveTest {
       assert account.getVMLimit() == null || account.getVMLimit() >= 0 : account;
       assert account.getVMsRunning() >= 0 : account;
       assert account.getVMsStopped() >= 0 : account;
-      assert account.getVMs() >= 0 : account;
+      // TODO update to 2.2.4 as this is a bug in 2.2.3
+      // assert account.getVMs() >= 0 : account;
       assert account.getVolumesAvailable() == null || account.getVolumesAvailable() >= 0 : account;
       assert account.getVolumeLimit() == null || account.getVolumeLimit() >= 0 : account;
       assert account.getVolumes() >= 0 : account;
diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AddressAsyncClientTest.java b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AddressAsyncClientTest.java
index 4129a18482..88e90f03f1 100644
--- a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AddressAsyncClientTest.java
+++ b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AddressAsyncClientTest.java
@@ -100,8 +100,8 @@ public class AddressAsyncClientTest extends BaseCloudStackAsyncClientTest<Addres
 
    }
 
-   public void testAssociateIPAddress() throws SecurityException, NoSuchMethodException, IOException {
-      Method method = AddressAsyncClient.class.getMethod("associateIPAddress", 
+   public void testAssociateIPAddressInZone() throws SecurityException, NoSuchMethodException, IOException {
+      Method method = AddressAsyncClient.class.getMethod("associateIPAddressInZone", 
             long.class, AssociateIPAddressOptions[].class);
       HttpRequest httpRequest = processor.createRequest(method, 6);
 
diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AddressClientLiveTest.java b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AddressClientLiveTest.java
index 6eab77d7ef..b691fa81b6 100644
--- a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AddressClientLiveTest.java
+++ b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AddressClientLiveTest.java
@@ -53,7 +53,7 @@ public class AddressClientLiveTest extends BaseCloudStackClientLiveTest {
    public void testAssociateDisassociatePublicIPAddress() throws Exception {
       if (!networksEnabled)
          return;
-      AsyncCreateResponse job = client.getAddressClient().associateIPAddress(
+      AsyncCreateResponse job = client.getAddressClient().associateIPAddressInZone(
                Iterables.get(client.getNetworkClient().listNetworks(), 0).getZoneId());
       checkState(jobComplete.apply(job.getJobId()), "job %d failed to complete", job.getJobId());
       ip = client.getAsyncJobClient().<PublicIPAddress> getAsyncJob(job.getJobId()).getResult();
diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/NetworkAsyncClientTest.java b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/NetworkAsyncClientTest.java
index 4f312b094e..ad19cbb479 100644
--- a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/NetworkAsyncClientTest.java
+++ b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/NetworkAsyncClientTest.java
@@ -22,10 +22,12 @@ import java.io.IOException;
 import java.lang.reflect.Method;
 
 import org.jclouds.cloudstack.domain.NetworkType;
+import org.jclouds.cloudstack.options.CreateNetworkOptions;
 import org.jclouds.cloudstack.options.ListNetworksOptions;
 import org.jclouds.http.HttpRequest;
 import org.jclouds.http.functions.UnwrapOnlyNestedJsonValue;
 import org.jclouds.http.functions.UnwrapOnlyNestedJsonValueInSet;
+import org.jclouds.rest.functions.MapHttp4xxCodesToExceptions;
 import org.jclouds.rest.functions.ReturnEmptySetOnNotFoundOr404;
 import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404;
 import org.jclouds.rest.internal.RestAnnotationProcessor;
@@ -46,7 +48,7 @@ public class NetworkAsyncClientTest extends BaseCloudStackAsyncClientTest<Networ
       HttpRequest httpRequest = processor.createRequest(method);
 
       assertRequestLineEquals(httpRequest,
-            "GET http://localhost:8080/client/api?response=json&command=listNetworks HTTP/1.1");
+               "GET http://localhost:8080/client/api?response=json&command=listNetworks HTTP/1.1");
       assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
       assertPayloadEquals(httpRequest, null, null, false);
 
@@ -61,10 +63,10 @@ public class NetworkAsyncClientTest extends BaseCloudStackAsyncClientTest<Networ
    public void testListNetworksOptions() throws SecurityException, NoSuchMethodException, IOException {
       Method method = NetworkAsyncClient.class.getMethod("listNetworks", ListNetworksOptions[].class);
       HttpRequest httpRequest = processor.createRequest(method, ListNetworksOptions.Builder.type(NetworkType.ADVANCED)
-            .domainId(6).id(5));
+               .domainId(6).id(5));
 
       assertRequestLineEquals(httpRequest,
-            "GET http://localhost:8080/client/api?response=json&command=listNetworks&type=Advanced&domainid=6&id=5 HTTP/1.1");
+               "GET http://localhost:8080/client/api?response=json&command=listNetworks&type=Advanced&domainid=6&id=5 HTTP/1.1");
       assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
       assertPayloadEquals(httpRequest, null, null, false);
 
@@ -81,7 +83,7 @@ public class NetworkAsyncClientTest extends BaseCloudStackAsyncClientTest<Networ
       HttpRequest httpRequest = processor.createRequest(method, "id");
 
       assertRequestLineEquals(httpRequest,
-            "GET http://localhost:8080/client/api?response=json&command=listNetworks&id=id HTTP/1.1");
+               "GET http://localhost:8080/client/api?response=json&command=listNetworks&id=id HTTP/1.1");
       assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
       assertPayloadEquals(httpRequest, null, null, false);
 
@@ -93,6 +95,61 @@ public class NetworkAsyncClientTest extends BaseCloudStackAsyncClientTest<Networ
 
    }
 
+   public void testCreateNetworkInZone() throws SecurityException, NoSuchMethodException, IOException {
+      Method method = NetworkAsyncClient.class.getMethod("createNetworkInZone", long.class, long.class, String.class,
+               String.class, CreateNetworkOptions[].class);
+      HttpRequest httpRequest = processor.createRequest(method, 1, 2, "named", "lovely");
+
+      assertRequestLineEquals(httpRequest,
+               "GET http://localhost:8080/client/api?response=json&command=createNetwork&zoneid=1&name=named&networkofferingid=2&displaytext=lovely HTTP/1.1");
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
+      assertPayloadEquals(httpRequest, null, null, false);
+
+      assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyNestedJsonValue.class);
+      assertSaxResponseParserClassEquals(method, null);
+      assertExceptionParserClassEquals(method, MapHttp4xxCodesToExceptions.class);
+
+      checkFilters(httpRequest);
+
+   }
+
+   public void testCreateNetworkInZoneOptions() throws SecurityException, NoSuchMethodException, IOException {
+      Method method = NetworkAsyncClient.class.getMethod("createNetworkInZone", long.class, long.class, String.class,
+               String.class, CreateNetworkOptions[].class);
+
+      HttpRequest httpRequest = processor.createRequest(method, 1, 2, "named", "lovely", CreateNetworkOptions.Builder
+               .netmask("255.255.255.0").domainId(6));
+
+      assertRequestLineEquals(httpRequest,
+               "GET http://localhost:8080/client/api?response=json&command=createNetwork&zoneid=1&name=named&networkofferingid=2&displaytext=lovely&netmask=255.255.255.0&domainid=6 HTTP/1.1");
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
+      assertPayloadEquals(httpRequest, null, null, false);
+
+      assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyNestedJsonValue.class);
+      assertSaxResponseParserClassEquals(method, null);
+      assertExceptionParserClassEquals(method, MapHttp4xxCodesToExceptions.class);
+
+      checkFilters(httpRequest);
+
+   }
+
+   public void testDeleteNetwork() throws SecurityException, NoSuchMethodException, IOException {
+      Method method = NetworkAsyncClient.class.getMethod("deleteNetwork", long.class);
+      HttpRequest httpRequest = processor.createRequest(method, 5);
+
+      assertRequestLineEquals(httpRequest,
+               "GET http://localhost:8080/client/api?response=json&command=deleteNetwork&id=5 HTTP/1.1");
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
+      assertPayloadEquals(httpRequest, null, null, false);
+
+      assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyNestedJsonValue.class);
+      assertSaxResponseParserClassEquals(method, null);
+      assertExceptionParserClassEquals(method, ReturnNullOnNotFoundOr404.class);
+
+      checkFilters(httpRequest);
+
+   }
+
    @Override
    protected TypeLiteral<RestAnnotationProcessor<NetworkAsyncClient>> createTypeLiteral() {
       return new TypeLiteral<RestAnnotationProcessor<NetworkAsyncClient>>() {
diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/NetworkClientLiveTest.java b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/NetworkClientLiveTest.java
index 02294df405..2f83ad3a48 100644
--- a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/NetworkClientLiveTest.java
+++ b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/NetworkClientLiveTest.java
@@ -18,14 +18,22 @@
  */
 package org.jclouds.cloudstack.features;
 
+import static com.google.common.collect.Iterables.find;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
+import java.util.NoSuchElementException;
 import java.util.Set;
 
 import org.jclouds.cloudstack.domain.GuestIPType;
 import org.jclouds.cloudstack.domain.Network;
+import org.jclouds.cloudstack.domain.NetworkOffering;
+import org.jclouds.cloudstack.domain.Zone;
 import org.jclouds.cloudstack.options.ListNetworksOptions;
+import org.jclouds.cloudstack.predicates.NetworkOfferingPredicates;
+import org.jclouds.cloudstack.predicates.ZonePredicates;
+import org.testng.annotations.AfterGroups;
+import org.testng.annotations.BeforeGroups;
 import org.testng.annotations.Test;
 
 import com.google.common.collect.Iterables;
@@ -38,7 +46,46 @@ import com.google.common.collect.Iterables;
 @Test(groups = "live", singleThreaded = true, testName = "NetworkClientLiveTest")
 public class NetworkClientLiveTest extends BaseCloudStackClientLiveTest {
 
+   private boolean networksSupported;
+
+   private Zone zone;
+   private NetworkOffering offering;
+
+   private Network network;
+
+   @BeforeGroups(groups = "live")
+   public void setupClient() {
+      super.setupClient();
+
+      try {
+         // you can create guest direct network by Admin user, but since we are
+         // not admin, let's try to create a guest virtual one
+         zone = find(client.getZoneClient().listZones(), ZonePredicates.supportsGuestVirtualNetworks());
+         offering = Iterables.find(client.getOfferingClient().listNetworkOfferings(),
+               NetworkOfferingPredicates.supportsGuestVirtualNetworks());
+         networksSupported = true;
+      } catch (NoSuchElementException e) {
+      }
+   }
+
+   public void testCreateNetwork() throws Exception {
+      if (!networksSupported)
+         return;
+      network = client.getNetworkClient().createNetworkInZone(zone.getId(), offering.getId(), prefix, prefix);
+      checkNetwork(network);
+   }
+
+   @AfterGroups(groups = "live")
+   protected void tearDown() {
+      if (network != null) {
+         jobComplete.apply(client.getNetworkClient().deleteNetwork(network.getId()));
+      }
+      super.tearDown();
+   }
+
    public void testListNetworks() throws Exception {
+      if (!networksSupported)
+         return;
       Set<Network> response = client.getNetworkClient().listNetworks();
       assert null != response;
       long networkCount = response.size();
@@ -48,43 +95,47 @@ public class NetworkClientLiveTest extends BaseCloudStackClientLiveTest {
                ListNetworksOptions.Builder.id(network.getId())));
          assertEquals(network, newDetails);
          assertEquals(network, client.getNetworkClient().getNetwork(network.getId()));
-         assert network.getId() > 0 : network;
-         assert network.getName() != null : network;
-         assert network.getDNS().size() != 0 : network;
-         assert network.getGuestIPType() != null && network.getGuestIPType() != GuestIPType.UNRECOGNIZED : network;
-         assert network.getAccount() != null : network;
-         assert network.getBroadcastDomainType() != null : network;
-         assert network.getDisplayText() != null : network;
-         assert network.getNetworkDomain() != null : network;
-         assert network.getNetworkOfferingAvailability() != null : network;
-         assert network.getNetworkOfferingDisplayText() != null : network;
-         assert network.getNetworkOfferingId() > 0 : network;
-         assert network.getNetworkOfferingName() != null : network;
-         assert network.getRelated() > 0 : network;
-         assert network.getServices().size() != 0 : network;
-         assert network.getState() != null : network;
-         assert network.getTrafficType() != null : network;
-         assert network.getZoneId() > 0 : network;
-         assert network.getDomain() != null : network;
-         assert network.getDomainId() > 0 : network;
-         switch (network.getGuestIPType()) {
-         case VIRTUAL:
-            assert network.getNetmask() == null : network;
-            assert network.getGateway() == null : network;
-            assert network.getVLAN() == null : network;
-            assert network.getStartIP() == null : network;
-            assert network.getEndIP() == null : network;
-            break;
-         case DIRECT:
-            assert network.getNetmask() != null : network;
-            assert network.getGateway() != null : network;
-            assert network.getVLAN() != null : network;
-            assertEquals(network.getBroadcastURI(), "vlan://" + network.getVLAN());
-            assert network.getStartIP() != null : network;
-            assert network.getEndIP() != null : network;
-            break;
-         }
+         checkNetwork(network);
 
       }
    }
+
+   private void checkNetwork(Network network) {
+      assert network.getId() > 0 : network;
+      assert network.getName() != null : network;
+      assert network.getDNS().size() != 0 : network;
+      assert network.getGuestIPType() != null && network.getGuestIPType() != GuestIPType.UNRECOGNIZED : network;
+      assert network.getAccount() != null : network;
+      assert network.getBroadcastDomainType() != null : network;
+      assert network.getDisplayText() != null : network;
+      assert network.getNetworkDomain() != null : network;
+      assert network.getNetworkOfferingAvailability() != null : network;
+      assert network.getNetworkOfferingDisplayText() != null : network;
+      assert network.getNetworkOfferingId() > 0 : network;
+      assert network.getNetworkOfferingName() != null : network;
+      assert network.getRelated() > 0 : network;
+      assert network.getServices().size() != 0 : network;
+      assert network.getState() != null : network;
+      assert network.getTrafficType() != null : network;
+      assert network.getZoneId() > 0 : network;
+      assert network.getDomain() != null : network;
+      assert network.getDomainId() > 0 : network;
+      switch (network.getGuestIPType()) {
+      case VIRTUAL:
+         assert network.getNetmask() == null : network;
+         assert network.getGateway() == null : network;
+         assert network.getVLAN() == null : network;
+         assert network.getStartIP() == null : network;
+         assert network.getEndIP() == null : network;
+         break;
+      case DIRECT:
+         assert network.getNetmask() != null : network;
+         assert network.getGateway() != null : network;
+         assert network.getVLAN() != null : network;
+         assertEquals(network.getBroadcastURI(), "vlan://" + network.getVLAN());
+         assert network.getStartIP() != null : network;
+         assert network.getEndIP() != null : network;
+         break;
+      }
+   }
 }
diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SecurityGroupClientLiveTest.java b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SecurityGroupClientLiveTest.java
index c75571f997..9ff540d7bd 100644
--- a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SecurityGroupClientLiveTest.java
+++ b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SecurityGroupClientLiveTest.java
@@ -31,7 +31,6 @@ import org.jclouds.cloudstack.domain.VirtualMachine;
 import org.jclouds.cloudstack.domain.Zone;
 import org.jclouds.cloudstack.options.AccountInDomainOptions;
 import org.jclouds.cloudstack.options.ListSecurityGroupsOptions;
-import org.jclouds.cloudstack.options.ListVirtualMachinesOptions;
 import org.jclouds.net.IPSocket;
 import org.jclouds.util.Strings2;
 import org.testng.annotations.AfterGroups;
@@ -170,9 +169,6 @@ public class SecurityGroupClientLiveTest extends BaseCloudStackClientLiveTest {
    public void testCreateVMInSecurityGroup() throws Exception {
       if (!securityGroupsSupported)
          return;
-      for (VirtualMachine vm : client.getVirtualMachineClient().listVirtualMachines(
-            ListVirtualMachinesOptions.Builder.zoneId(zone.getId()))) {
-      }
       vm = VirtualMachineClientLiveTest.createVirtualMachineWithSecurityGroupInZone(zone.getId(), group.getId(),
             client, jobComplete, virtualMachineRunning);
       if (vm.getPassword() != null)
diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VirtualMachineAsyncClientTest.java b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VirtualMachineAsyncClientTest.java
index 3ae7068003..1263c8a1e9 100644
--- a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VirtualMachineAsyncClientTest.java
+++ b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VirtualMachineAsyncClientTest.java
@@ -98,14 +98,14 @@ public class VirtualMachineAsyncClientTest extends BaseCloudStackAsyncClientTest
 
    }
 
-   public void testDeployVirtualMachine() throws SecurityException, NoSuchMethodException, IOException {
-      Method method = VirtualMachineAsyncClient.class.getMethod("deployVirtualMachine", long.class, long.class,
+   public void testDeployVirtualMachineInZone() throws SecurityException, NoSuchMethodException, IOException {
+      Method method = VirtualMachineAsyncClient.class.getMethod("deployVirtualMachineInZone", long.class, long.class,
                long.class, DeployVirtualMachineOptions[].class);
-      HttpRequest httpRequest = processor.createRequest(method, 4, 5, 6);
+      HttpRequest httpRequest = processor.createRequest(method, 6, 4, 5);
 
       assertRequestLineEquals(
                httpRequest,
-               "GET http://localhost:8080/client/api?response=json&command=deployVirtualMachine&serviceofferingid=4&zoneid=6&templateid=5 HTTP/1.1");
+               "GET http://localhost:8080/client/api?response=json&command=deployVirtualMachine&zoneid=6&templateid=5&serviceofferingid=4 HTTP/1.1");
       assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
       assertPayloadEquals(httpRequest, null, null, false);
 
diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VirtualMachineClientLiveTest.java b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VirtualMachineClientLiveTest.java
index 7958071edb..22b5a2c953 100644
--- a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VirtualMachineClientLiveTest.java
+++ b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VirtualMachineClientLiveTest.java
@@ -72,39 +72,39 @@ public class VirtualMachineClientLiveTest extends BaseCloudStackClientLiveTest {
 
    static final Ordering<ServiceOffering> DEFAULT_SIZE_ORDERING = new Ordering<ServiceOffering>() {
       public int compare(ServiceOffering left, ServiceOffering right) {
-         return ComparisonChain.start().compare(left.getCpuNumber(), right.getCpuNumber()).compare(left.getMemory(),
-                  right.getMemory()).result();
+         return ComparisonChain.start().compare(left.getCpuNumber(), right.getCpuNumber())
+               .compare(left.getMemory(), right.getMemory()).result();
       }
    };
 
    public static VirtualMachine createVirtualMachine(CloudStackClient client, RetryablePredicate<Long> jobComplete,
-            RetryablePredicate<VirtualMachine> virtualMachineRunning) {
+         RetryablePredicate<VirtualMachine> virtualMachineRunning) {
       Set<Network> networks = client.getNetworkClient().listNetworks();
       if (networks.size() > 0) {
          return createVirtualMachineInNetwork(get(networks, 0), client, jobComplete, virtualMachineRunning);
       } else {
-         return createVirtualMachineWithSecurityGroupInZone(find(client.getZoneClient().listZones(),
-                  new Predicate<Zone>() {
+         return createVirtualMachineWithSecurityGroupInZone(
+               find(client.getZoneClient().listZones(), new Predicate<Zone>() {
 
-                     @Override
-                     public boolean apply(Zone arg0) {
-                        return arg0.isSecurityGroupsEnabled();
-                     }
+                  @Override
+                  public boolean apply(Zone arg0) {
+                     return arg0.isSecurityGroupsEnabled();
+                  }
 
-                  }).getId(), get(client.getSecurityGroupClient().listSecurityGroups(), 0).getId(), client,
-                  jobComplete, virtualMachineRunning);
+               }).getId(), get(client.getSecurityGroupClient().listSecurityGroups(), 0).getId(), client, jobComplete,
+               virtualMachineRunning);
       }
    }
 
    public static VirtualMachine createVirtualMachineWithSecurityGroupInZone(long zoneId, long groupId,
-            CloudStackClient client, RetryablePredicate<Long> jobComplete,
-            RetryablePredicate<VirtualMachine> virtualMachineRunning) {
+         CloudStackClient client, RetryablePredicate<Long> jobComplete,
+         RetryablePredicate<VirtualMachine> virtualMachineRunning) {
       return createVirtualMachineWithOptionsInZone(new DeployVirtualMachineOptions().securityGroupId(groupId), zoneId,
-               client, jobComplete, virtualMachineRunning);
+            client, jobComplete, virtualMachineRunning);
    }
 
    public static VirtualMachine createVirtualMachineInNetwork(Network network, CloudStackClient client,
-            RetryablePredicate<Long> jobComplete, RetryablePredicate<VirtualMachine> virtualMachineRunning) {
+         RetryablePredicate<Long> jobComplete, RetryablePredicate<VirtualMachine> virtualMachineRunning) {
       DeployVirtualMachineOptions options = new DeployVirtualMachineOptions();
       long zoneId = network.getZoneId();
       options.networkId(network.getId());
@@ -112,8 +112,8 @@ public class VirtualMachineClientLiveTest extends BaseCloudStackClientLiveTest {
    }
 
    public static VirtualMachine createVirtualMachineWithOptionsInZone(DeployVirtualMachineOptions options,
-            final long zoneId, CloudStackClient client, RetryablePredicate<Long> jobComplete,
-            RetryablePredicate<VirtualMachine> virtualMachineRunning) {
+         final long zoneId, CloudStackClient client, RetryablePredicate<Long> jobComplete,
+         RetryablePredicate<VirtualMachine> virtualMachineRunning) {
       // TODO enum, as this is way too easy to mess up.
       Set<String> acceptableCategories = ImmutableSet.of("Ubuntu", "CentOS");
 
@@ -121,9 +121,9 @@ public class VirtualMachineClientLiveTest extends BaseCloudStackClientLiveTest {
       final Predicate<Template> osTypePredicate = new OSCategoryIn(client).apply(acceptableCategories);
 
       Predicate<Template> templatePredicate = Predicates.<Template> and(TemplatePredicates.isReady(),
-               hypervisorPredicate, osTypePredicate);
-      Iterable<Template> templates = filter(client.getTemplateClient().listTemplates(
-               ListTemplatesOptions.Builder.zoneId(zoneId)), templatePredicate);
+            hypervisorPredicate, osTypePredicate);
+      Iterable<Template> templates = filter(
+            client.getTemplateClient().listTemplates(ListTemplatesOptions.Builder.zoneId(zoneId)), templatePredicate);
       if (Iterables.any(templates, TemplatePredicates.isPasswordEnabled())) {
          templates = filter(templates, TemplatePredicates.isPasswordEnabled());
       }
@@ -134,14 +134,14 @@ public class VirtualMachineClientLiveTest extends BaseCloudStackClientLiveTest {
       long serviceOfferingId = DEFAULT_SIZE_ORDERING.min(client.getOfferingClient().listServiceOfferings()).getId();
 
       System.out.printf("serviceOfferingId %d, templateId %d, zoneId %d, options %s%n", serviceOfferingId, templateId,
-               zoneId, options);
-      AsyncCreateResponse job = client.getVirtualMachineClient().deployVirtualMachine(serviceOfferingId, templateId,
-               zoneId, options);
+            zoneId, options);
+      AsyncCreateResponse job = client.getVirtualMachineClient().deployVirtualMachineInZone(zoneId, serviceOfferingId,
+            templateId, options);
       assert jobComplete.apply(job.getJobId());
       AsyncJob<VirtualMachine> jobWithResult = client.getAsyncJobClient().<VirtualMachine> getAsyncJob(job.getJobId());
       if (jobWithResult.getError() != null)
          Throwables.propagate(new ExecutionException(String.format("job %s failed with exception %s", job.getId(),
-                  jobWithResult.getError().toString())) {
+               jobWithResult.getError().toString())) {
             private static final long serialVersionUID = 4371112085613620239L;
          });
       VirtualMachine vm = jobWithResult.getResult();
@@ -221,7 +221,7 @@ public class VirtualMachineClientLiveTest extends BaseCloudStackClientLiveTest {
       assertTrue(response.size() >= 0);
       for (VirtualMachine vm : response) {
          VirtualMachine newDetails = getOnlyElement(client.getVirtualMachineClient().listVirtualMachines(
-                  ListVirtualMachinesOptions.Builder.id(vm.getId())));
+               ListVirtualMachinesOptions.Builder.id(vm.getId())));
          assertEquals(vm.getId(), newDetails.getId());
          checkVm(vm);
       }
@@ -258,20 +258,20 @@ public class VirtualMachineClientLiveTest extends BaseCloudStackClientLiveTest {
          assert nic.getTrafficType() != null : vm;
          assert nic.getGuestIPType() != null : vm;
          switch (vm.getState()) {
-            case RUNNING:
-               assert nic.getNetmask() != null : vm;
-               assert nic.getGateway() != null : vm;
-               assert nic.getIPAddress() != null : vm;
-               break;
-            case STARTING:
-               assert nic.getNetmask() == null : vm;
-               assert nic.getGateway() == null : vm;
-               assert nic.getIPAddress() == null : vm;
-               break;
-            default:
-               assert nic.getNetmask() != null : vm;
-               assert nic.getGateway() != null : vm;
-               assert nic.getIPAddress() != null : vm;
+         case RUNNING:
+            assert nic.getNetmask() != null : vm;
+            assert nic.getGateway() != null : vm;
+            assert nic.getIPAddress() != null : vm;
+            break;
+         case STARTING:
+            assert nic.getNetmask() == null : vm;
+            assert nic.getGateway() == null : vm;
+            assert nic.getIPAddress() == null : vm;
+            break;
+         default:
+            assert nic.getNetmask() != null : vm;
+            assert nic.getGateway() != null : vm;
+            assert nic.getIPAddress() != null : vm;
          }
 
       }
diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/functions/ReuseOrAssociateNewPublicIPAddressTest.java b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/functions/ReuseOrAssociateNewPublicIPAddressTest.java
index a650a9b9e2..24ec778550 100644
--- a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/functions/ReuseOrAssociateNewPublicIPAddressTest.java
+++ b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/functions/ReuseOrAssociateNewPublicIPAddressTest.java
@@ -92,7 +92,7 @@ public class ReuseOrAssociateNewPublicIPAddressTest {
 
       AsyncCreateResponse job = new AsyncCreateResponse(1, 2);
       // make sure we created the job relating to a new ip
-      expect(addressClient.associateIPAddress(zoneId, networkId(networkId))).andReturn(job);
+      expect(addressClient.associateIPAddressInZone(zoneId, networkId(networkId))).andReturn(job);
 
       AsyncJobClient jobClient = createMock(AsyncJobClient.class);
       expect(client.getAsyncJobClient()).andReturn(jobClient).atLeastOnce();
@@ -132,7 +132,7 @@ public class ReuseOrAssociateNewPublicIPAddressTest {
 
       AsyncCreateResponse job = new AsyncCreateResponse(1, 2);
       // make sure we created the job relating to a new ip
-      expect(addressClient.associateIPAddress(zoneId, networkId(networkId))).andReturn(job);
+      expect(addressClient.associateIPAddressInZone(zoneId, networkId(networkId))).andReturn(job);
 
       // the alwaysfalse predicate above should blow up with IllegalStateException
 
diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/CreateNetworkOptionsTest.java b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/CreateNetworkOptionsTest.java
new file mode 100644
index 0000000000..6b2adc6cd8
--- /dev/null
+++ b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/CreateNetworkOptionsTest.java
@@ -0,0 +1,136 @@
+/**
+ *
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.cloudstack.options;
+
+import static org.jclouds.cloudstack.options.CreateNetworkOptions.Builder.accountInDomain;
+import static org.jclouds.cloudstack.options.CreateNetworkOptions.Builder.endIP;
+import static org.jclouds.cloudstack.options.CreateNetworkOptions.Builder.gateway;
+import static org.jclouds.cloudstack.options.CreateNetworkOptions.Builder.isDefault;
+import static org.jclouds.cloudstack.options.CreateNetworkOptions.Builder.isShared;
+import static org.jclouds.cloudstack.options.CreateNetworkOptions.Builder.netmask;
+import static org.jclouds.cloudstack.options.CreateNetworkOptions.Builder.networkDomain;
+import static org.jclouds.cloudstack.options.CreateNetworkOptions.Builder.startIP;
+import static org.jclouds.cloudstack.options.CreateNetworkOptions.Builder.vlan;
+import static org.testng.Assert.assertEquals;
+
+import org.testng.annotations.Test;
+
+import com.google.common.collect.ImmutableList;
+
+/**
+ * Tests behavior of {@code CreateNetworkOptions}
+ * 
+ * @author Adrian Cole
+ */
+@Test(groups = "unit")
+public class CreateNetworkOptionsTest {
+
+   public void testAccountInDomainId() {
+      CreateNetworkOptions options = new CreateNetworkOptions().accountInDomain("adrian", 6);
+      assertEquals(ImmutableList.of("adrian"), options.buildQueryParameters().get("account"));
+      assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
+   }
+
+   public void testAccountInDomainIdStatic() {
+      CreateNetworkOptions options = accountInDomain("adrian", 6);
+      assertEquals(ImmutableList.of("adrian"), options.buildQueryParameters().get("account"));
+      assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
+   }
+
+   public void testIsDefault() {
+      CreateNetworkOptions options = new CreateNetworkOptions().isDefault(true);
+      assertEquals(ImmutableList.of("true"), options.buildQueryParameters().get("isdefault"));
+   }
+
+   public void testIsDefaultStatic() {
+      CreateNetworkOptions options = isDefault(true);
+      assertEquals(ImmutableList.of("true"), options.buildQueryParameters().get("isdefault"));
+   }
+
+   public void testIsShared() {
+      CreateNetworkOptions options = new CreateNetworkOptions().isShared(true);
+      assertEquals(ImmutableList.of("true"), options.buildQueryParameters().get("isshared"));
+   }
+
+   public void testIsSharedStatic() {
+      CreateNetworkOptions options = isShared(true);
+      assertEquals(ImmutableList.of("true"), options.buildQueryParameters().get("isshared"));
+   }
+
+   public void testStartIP() {
+      CreateNetworkOptions options = new CreateNetworkOptions().startIP("1.1.1.1");
+      assertEquals(ImmutableList.of("1.1.1.1"), options.buildQueryParameters().get("startip"));
+   }
+
+   public void testStartIPStatic() {
+      CreateNetworkOptions options = startIP("1.1.1.1");
+      assertEquals(ImmutableList.of("1.1.1.1"), options.buildQueryParameters().get("startip"));
+   }
+
+   public void testEndIP() {
+      CreateNetworkOptions options = new CreateNetworkOptions().endIP("1.1.1.1");
+      assertEquals(ImmutableList.of("1.1.1.1"), options.buildQueryParameters().get("endip"));
+   }
+
+   public void testEndIPStatic() {
+      CreateNetworkOptions options = endIP("1.1.1.1");
+      assertEquals(ImmutableList.of("1.1.1.1"), options.buildQueryParameters().get("endip"));
+   }
+
+   public void testGateway() {
+      CreateNetworkOptions options = new CreateNetworkOptions().gateway("1.1.1.1");
+      assertEquals(ImmutableList.of("1.1.1.1"), options.buildQueryParameters().get("gateway"));
+   }
+
+   public void testGatewayStatic() {
+      CreateNetworkOptions options = gateway("1.1.1.1");
+      assertEquals(ImmutableList.of("1.1.1.1"), options.buildQueryParameters().get("gateway"));
+   }
+
+   public void testNetmask() {
+      CreateNetworkOptions options = new CreateNetworkOptions().netmask("1.1.1.1");
+      assertEquals(ImmutableList.of("1.1.1.1"), options.buildQueryParameters().get("netmask"));
+   }
+
+   public void testNetmaskStatic() {
+      CreateNetworkOptions options = netmask("1.1.1.1");
+      assertEquals(ImmutableList.of("1.1.1.1"), options.buildQueryParameters().get("netmask"));
+   }
+
+   public void testNetworkDomain() {
+      CreateNetworkOptions options = new CreateNetworkOptions().networkDomain("network.com");
+      assertEquals(ImmutableList.of("network.com"), options.buildQueryParameters().get("networkdomain"));
+   }
+
+   public void testNetworkDomainStatic() {
+      CreateNetworkOptions options = networkDomain("network.com");
+      assertEquals(ImmutableList.of("network.com"), options.buildQueryParameters().get("networkdomain"));
+   }
+
+   public void testVlan() {
+      CreateNetworkOptions options = new CreateNetworkOptions().vlan("tag");
+      assertEquals(ImmutableList.of("tag"), options.buildQueryParameters().get("vlan"));
+   }
+
+   public void testVlanStatic() {
+      CreateNetworkOptions options = vlan("tag");
+      assertEquals(ImmutableList.of("tag"), options.buildQueryParameters().get("vlan"));
+   }
+
+}
diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/BaseParserTest.java b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/BaseParserTest.java
deleted file mode 100644
index bbcf7c8dff..0000000000
--- a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/BaseParserTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- *
- * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
- *
- * ====================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
- */
-package org.jclouds.cloudstack.parse;
-
-import static org.testng.Assert.assertEquals;
-
-import org.jclouds.cloudstack.config.CloudStackParserModule;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.http.functions.UnwrapOnlyNestedJsonValue;
-import org.jclouds.io.Payloads;
-import org.jclouds.json.config.GsonModule;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Function;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-import com.google.inject.Key;
-import com.google.inject.TypeLiteral;
-import com.google.inject.util.Types;
-
-/**
- * 
- * @author Adrian Cole
- */
-public abstract class BaseParserTest<T, G> {
-
-   Injector i = Guice.createInjector(new GsonModule() {
-
-      @Override
-      protected void configure() {
-         bind(DateAdapter.class).to(Iso8601DateAdapter.class);
-         super.configure();
-      }
-
-   }, new CloudStackParserModule());
-
-   @Test
-   public void test() {
-
-      T expects = expected();
-
-      Function<HttpResponse, T> parser = getParser();
-      T response = parser.apply(new HttpResponse(200, "ok", Payloads.newInputStreamPayload(getClass()
-            .getResourceAsStream(resource()))));
-      compare(expects, response);
-   }
-
-   public void compare(T expects, T response) {
-      assertEquals(response.toString(), expects.toString());
-   }
-
-   @SuppressWarnings("unchecked")
-   protected Function<HttpResponse, T> getParser(){
-     return  (Function<HttpResponse, T>) i.getInstance(Key.get(TypeLiteral.get(
-            Types.newParameterizedType(UnwrapOnlyNestedJsonValue.class, type())).getType()));
-   }
-
-   public abstract Class<G> type();
-
-   public abstract String resource();
-
-   public abstract T expected();
-}
diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/BaseSetParserTest.java b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/BaseSetParserTest.java
deleted file mode 100644
index af409d635f..0000000000
--- a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/BaseSetParserTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- *
- * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
- *
- * ====================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
- */
-package org.jclouds.cloudstack.parse;
-
-import static org.testng.Assert.assertEquals;
-
-import java.util.Set;
-
-import org.jclouds.http.HttpResponse;
-import org.jclouds.http.functions.UnwrapOnlyNestedJsonValue;
-
-import com.google.common.base.Function;
-import com.google.common.collect.ImmutableSortedSet;
-import com.google.inject.Key;
-import com.google.inject.TypeLiteral;
-import com.google.inject.util.Types;
-
-/**
- * 
- * @author Adrian Cole
- */
-public abstract class BaseSetParserTest<T> extends BaseParserTest<Set<T>, T> {
-
-   @SuppressWarnings("unchecked")
-   // crazy stuff due to type erasure
-   protected Function<HttpResponse, Set<T>> getParser() {
-      return (Function<HttpResponse, Set<T>>) i.getInstance(Key.get(TypeLiteral.get(
-            Types.newParameterizedType(UnwrapOnlyNestedJsonValue.class, Types.newParameterizedType(Set.class, type())))
-            .getType()));
-   }
-
-   public void compare(Set<T> expects, Set<T> response) {
-      assertEquals(ImmutableSortedSet.copyOf(response).toString(), ImmutableSortedSet.copyOf(expects).toString());
-   }
-
-}
diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListAccountsResponseTest.java b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListAccountsResponseTest.java
index 2f0ca69186..d0f807fe47 100644
--- a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListAccountsResponseTest.java
+++ b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListAccountsResponseTest.java
@@ -20,14 +20,20 @@ package org.jclouds.cloudstack.parse;
 
 import java.util.Set;
 
+import org.jclouds.cloudstack.config.CloudStackParserModule;
 import org.jclouds.cloudstack.domain.Account;
+import org.jclouds.cloudstack.domain.User;
 import org.jclouds.cloudstack.domain.Account.State;
 import org.jclouds.cloudstack.domain.Account.Type;
-import org.jclouds.cloudstack.domain.User;
 import org.jclouds.date.internal.SimpleDateFormatDateService;
+import org.jclouds.json.BaseSetParserTest;
+import org.jclouds.json.config.GsonModule;
+import org.jclouds.rest.annotations.Unwrap;
 import org.testng.annotations.Test;
 
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
 
 /**
  * 
@@ -35,10 +41,19 @@ import com.google.common.collect.ImmutableSet;
  */
 @Test(groups = "unit")
 public class ListAccountsResponseTest extends BaseSetParserTest<Account> {
-
+   
    @Override
-   public Class<Account> type() {
-      return Account.class;
+   protected Injector injector() {
+      return Guice.createInjector(new CloudStackParserModule(), new GsonModule() {
+
+         @Override
+         protected void configure() {
+            bind(DateAdapter.class).to(Iso8601DateAdapter.class);
+            super.configure();
+         }
+
+      });
+
    }
 
    @Override
@@ -47,6 +62,7 @@ public class ListAccountsResponseTest extends BaseSetParserTest<Account> {
    }
 
    @Override
+   @Unwrap(depth = 2)
    public Set<Account> expected() {
       return ImmutableSet.<Account> of(Account
             .builder()
diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListCapabilitiesResponseTest.java b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListCapabilitiesResponseTest.java
index b2b7fb3dcf..af47962e3f 100644
--- a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListCapabilitiesResponseTest.java
+++ b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListCapabilitiesResponseTest.java
@@ -19,6 +19,8 @@
 package org.jclouds.cloudstack.parse;
 
 import org.jclouds.cloudstack.domain.Capabilities;
+import org.jclouds.json.BaseItemParserTest;
+import org.jclouds.rest.annotations.Unwrap;
 import org.testng.annotations.Test;
 
 /**
@@ -28,17 +30,13 @@ import org.testng.annotations.Test;
 @Test(groups = "unit")
 public class ListCapabilitiesResponseTest extends BaseItemParserTest<Capabilities> {
 
-   @Override
-   public Class<Capabilities> type() {
-      return Capabilities.class;
-   }
-
    @Override
    public String resource() {
       return "/listcapabilitiesresponse.json";
    }
 
    @Override
+   @Unwrap(depth = 2)
    public Capabilities expected() {
       return Capabilities.builder().securityGroupsEnabled(true).sharedTemplatesEnabled(true).cloudStackVersion("2.2")
             .build();
diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListDiskOfferingsResponseTest.java b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListDiskOfferingsResponseTest.java
index f62bcc01ab..84374214b5 100644
--- a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListDiskOfferingsResponseTest.java
+++ b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListDiskOfferingsResponseTest.java
@@ -22,6 +22,8 @@ import java.util.Set;
 
 import org.jclouds.cloudstack.domain.DiskOffering;
 import org.jclouds.date.internal.SimpleDateFormatDateService;
+import org.jclouds.json.BaseSetParserTest;
+import org.jclouds.rest.annotations.Unwrap;
 import org.testng.annotations.Test;
 
 import com.google.common.collect.ImmutableSet;
@@ -33,17 +35,13 @@ import com.google.common.collect.ImmutableSet;
 @Test(groups = "unit")
 public class ListDiskOfferingsResponseTest extends BaseSetParserTest<DiskOffering> {
 
-   @Override
-   public Class<DiskOffering> type() {
-      return DiskOffering.class;
-   }
-
    @Override
    public String resource() {
       return "/listdiskofferingsresponse.json";
    }
 
    @Override
+   @Unwrap(depth = 2)
    public Set<DiskOffering> expected() {
       return ImmutableSet.<DiskOffering> of(
             DiskOffering.builder().id(3).domainId(1).domain("ROOT").name("Small").displayText("Small Disk, 5 GB")
diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListHypervisorsResponseTest.java b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListHypervisorsResponseTest.java
index 3780f2ebd0..7327b40efd 100644
--- a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListHypervisorsResponseTest.java
+++ b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListHypervisorsResponseTest.java
@@ -22,10 +22,12 @@ import java.util.Set;
 
 import org.jclouds.cloudstack.functions.ParseNamesFromHttpResponse;
 import org.jclouds.http.HttpResponse;
+import org.jclouds.json.BaseSetParserTest;
 import org.testng.annotations.Test;
 
 import com.google.common.base.Function;
 import com.google.common.collect.ImmutableSet;
+import com.google.inject.Injector;
 
 /**
  * 
@@ -34,11 +36,6 @@ import com.google.common.collect.ImmutableSet;
 @Test(groups = "unit")
 public class ListHypervisorsResponseTest extends BaseSetParserTest<String> {
 
-   @Override
-   public Class<String> type() {
-      return String.class;
-   }
-
    @Override
    public String resource() {
       return "/listhypervisorsresponse.json";
@@ -50,7 +47,7 @@ public class ListHypervisorsResponseTest extends BaseSetParserTest<String> {
    }
 
    @Override
-   protected Function<HttpResponse, Set<String>> getParser() {
-      return i.getInstance(ParseNamesFromHttpResponse.class);
+   protected Function<HttpResponse, Set<String>> parser(Injector injector) {
+      return injector.getInstance(ParseNamesFromHttpResponse.class);
    }
 }
diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListNetworkOfferingsResponseTest.java b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListNetworkOfferingsResponseTest.java
index 5addaa7126..5aa82177bb 100644
--- a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListNetworkOfferingsResponseTest.java
+++ b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListNetworkOfferingsResponseTest.java
@@ -22,6 +22,8 @@ import java.util.Set;
 
 import org.jclouds.cloudstack.domain.NetworkOffering;
 import org.jclouds.cloudstack.domain.TrafficType;
+import org.jclouds.json.BaseSetParserTest;
+import org.jclouds.rest.annotations.Unwrap;
 import org.testng.annotations.Test;
 
 import com.google.common.collect.ImmutableSet;
@@ -33,17 +35,13 @@ import com.google.common.collect.ImmutableSet;
 @Test(groups = "unit")
 public class ListNetworkOfferingsResponseTest extends BaseSetParserTest<NetworkOffering> {
 
-   @Override
-   public Class<NetworkOffering> type() {
-      return NetworkOffering.class;
-   }
-
    @Override
    public String resource() {
       return "/listnetworkofferingsresponse.json";
    }
 
    @Override
+   @Unwrap(depth = 2)
    public Set<NetworkOffering> expected() {
       return ImmutableSet.<NetworkOffering> of(
             NetworkOffering.builder().id(7).name("DefaultDirectNetworkOffering").displayText("Direct")
diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListNetworksResponseTest.java b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListNetworksResponseTest.java
index c3b0d70331..f552794b45 100644
--- a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListNetworksResponseTest.java
+++ b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListNetworksResponseTest.java
@@ -25,6 +25,8 @@ import org.jclouds.cloudstack.domain.GuestIPType;
 import org.jclouds.cloudstack.domain.Network;
 import org.jclouds.cloudstack.domain.NetworkService;
 import org.jclouds.cloudstack.domain.TrafficType;
+import org.jclouds.json.BaseSetParserTest;
+import org.jclouds.rest.annotations.Unwrap;
 import org.testng.annotations.Test;
 
 import com.google.common.collect.ImmutableList;
@@ -40,17 +42,13 @@ import com.google.common.collect.ImmutableSortedSet;
 @Test(groups = "unit")
 public class ListNetworksResponseTest extends BaseSetParserTest<Network> {
 
-   @Override
-   public Class<Network> type() {
-      return Network.class;
-   }
-
    @Override
    public String resource() {
       return "/listnetworksresponse.json";
    }
 
    @Override
+   @Unwrap(depth = 2)
    public Set<Network> expected() {
       return ImmutableSet
             .<Network> of(Network
diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListOSCategoriesResponseTest.java b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListOSCategoriesResponseTest.java
index 0795cefcda..4dfae11817 100644
--- a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListOSCategoriesResponseTest.java
+++ b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListOSCategoriesResponseTest.java
@@ -22,10 +22,12 @@ import java.util.Map;
 
 import org.jclouds.cloudstack.functions.ParseIdToNameFromHttpResponse;
 import org.jclouds.http.HttpResponse;
+import org.jclouds.json.BaseItemParserTest;
 import org.testng.annotations.Test;
 
 import com.google.common.base.Function;
 import com.google.common.collect.ImmutableMap;
+import com.google.inject.Injector;
 
 /**
  * 
@@ -41,19 +43,13 @@ public class ListOSCategoriesResponseTest extends BaseItemParserTest<Map<Long, S
 
    @Override
    public Map<Long, String> expected() {
-      return ImmutableMap.<Long, String> builder().put(1l, "CentOS").put(2l, "Debian").put(3l, "Oracle")
-            .put(4l, "RedHat").put(5l, "SUSE").put(6l, "Windows").put(7l, "Other").put(8l, "Novel").put(9l, "Unix")
-            .put(10l, "Ubuntu").build();
+      return ImmutableMap.<Long, String> builder().put(1l, "CentOS").put(2l, "Debian").put(3l, "Oracle").put(4l,
+               "RedHat").put(5l, "SUSE").put(6l, "Windows").put(7l, "Other").put(8l, "Novel").put(9l, "Unix").put(10l,
+               "Ubuntu").build();
    }
 
    @Override
-   protected Function<HttpResponse, Map<Long, String>> getParser() {
-      return i.getInstance(ParseIdToNameFromHttpResponse.class);
-   }
-
-   @SuppressWarnings({ "unchecked", "rawtypes" })
-   @Override
-   public Class<Map<Long, String>> type() {
-      return (Class) Map.class;
+   protected Function<HttpResponse, Map<Long, String>> parser(Injector injector) {
+      return injector.getInstance(ParseIdToNameFromHttpResponse.class);
    }
 }
diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListOSTypesResponseTest.java b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListOSTypesResponseTest.java
new file mode 100644
index 0000000000..091c806403
--- /dev/null
+++ b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListOSTypesResponseTest.java
@@ -0,0 +1,230 @@
+/**
+ *
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.cloudstack.parse;
+
+import java.util.Set;
+
+import org.jclouds.cloudstack.domain.OSType;
+import org.jclouds.json.BaseSetParserTest;
+import org.jclouds.rest.annotations.Unwrap;
+import org.testng.annotations.Test;
+
+import com.google.common.collect.ImmutableSet;
+
+/**
+ * 
+ * @author Adrian Cole
+ */
+@Test(groups = "unit")
+public class ListOSTypesResponseTest extends BaseSetParserTest<OSType> {
+   
+   @Override
+   public String resource() {
+      return "/listostypesresponse.json";
+   }
+
+   @Override
+   @Unwrap(depth = 2)
+   public Set<OSType> expected() {
+      return ImmutableSet.<OSType> builder().add(
+               OSType.builder().id(69).OSCategoryId(7).description("Asianux 3(32-bit)").build()).add(
+               OSType.builder().id(70).OSCategoryId(7).description("Asianux 3(64-bit)").build()).add(
+               OSType.builder().id(1).OSCategoryId(1).description("CentOS 4.5 (32-bit)").build()).add(
+               OSType.builder().id(2).OSCategoryId(1).description("CentOS 4.6 (32-bit)").build()).add(
+               OSType.builder().id(3).OSCategoryId(1).description("CentOS 4.7 (32-bit)").build()).add(
+               OSType.builder().id(4).OSCategoryId(1).description("CentOS 4.8 (32-bit)").build()).add(
+               OSType.builder().id(5).OSCategoryId(1).description("CentOS 5.0 (32-bit)").build()).add(
+               OSType.builder().id(6).OSCategoryId(1).description("CentOS 5.0 (64-bit)").build()).add(
+               OSType.builder().id(7).OSCategoryId(1).description("CentOS 5.1 (32-bit)").build()).add(
+               OSType.builder().id(8).OSCategoryId(1).description("CentOS 5.1 (64-bit)").build()).add(
+               OSType.builder().id(9).OSCategoryId(1).description("CentOS 5.2 (32-bit)").build()).add(
+               OSType.builder().id(10).OSCategoryId(1).description("CentOS 5.2 (64-bit)").build()).add(
+               OSType.builder().id(11).OSCategoryId(1).description("CentOS 5.3 (32-bit)").build()).add(
+               OSType.builder().id(12).OSCategoryId(1).description("CentOS 5.3 (64-bit)").build()).add(
+               OSType.builder().id(13).OSCategoryId(1).description("CentOS 5.4 (32-bit)").build()).add(
+               OSType.builder().id(14).OSCategoryId(1).description("CentOS 5.4 (64-bit)").build()).add(
+               OSType.builder().id(111).OSCategoryId(1).description("CentOS 5.5 (32-bit)").build()).add(
+               OSType.builder().id(112).OSCategoryId(1).description("CentOS 5.5 (64-bit)").build()).add(
+               OSType.builder().id(73).OSCategoryId(2).description("Debian GNU/Linux 4(32-bit)").build()).add(
+               OSType.builder().id(74).OSCategoryId(2).description("Debian GNU/Linux 4(64-bit)").build()).add(
+               OSType.builder().id(72).OSCategoryId(2).description("Debian GNU/Linux 5(64-bit)").build()).add(
+               OSType.builder().id(15).OSCategoryId(2).description("Debian GNU/Linux 5.0 (32-bit)").build()).add(
+               OSType.builder().id(132).OSCategoryId(2).description("Debian GNU/Linux 6(32-bit)").build()).add(
+               OSType.builder().id(133).OSCategoryId(2).description("Debian GNU/Linux 6(64-bit)").build()).add(
+               OSType.builder().id(102).OSCategoryId(6).description("DOS").build()).add(
+               OSType.builder().id(118).OSCategoryId(4).description("Fedora 10").build()).add(
+               OSType.builder().id(117).OSCategoryId(4).description("Fedora 11").build()).add(
+               OSType.builder().id(116).OSCategoryId(4).description("Fedora 12").build()).add(
+               OSType.builder().id(115).OSCategoryId(4).description("Fedora 13").build()).add(
+               OSType.builder().id(120).OSCategoryId(4).description("Fedora 8").build()).add(
+               OSType.builder().id(119).OSCategoryId(4).description("Fedora 9").build()).add(
+               OSType.builder().id(83).OSCategoryId(9).description("FreeBSD (32-bit)").build()).add(
+               OSType.builder().id(84).OSCategoryId(9).description("FreeBSD (64-bit)").build()).add(
+               OSType.builder().id(92).OSCategoryId(6).description("Microsoft Small Bussiness Server 2003").build())
+               .add(OSType.builder().id(78).OSCategoryId(8).description("Novell Netware 5.1").build()).add(
+                        OSType.builder().id(77).OSCategoryId(8).description("Novell Netware 6.x").build()).add(
+                        OSType.builder().id(68).OSCategoryId(7).description("Open Enterprise Server").build()).add(
+                        OSType.builder().id(16).OSCategoryId(3).description("Oracle Enterprise Linux 5.0 (32-bit)")
+                                 .build()).add(
+                        OSType.builder().id(17).OSCategoryId(3).description("Oracle Enterprise Linux 5.0 (64-bit)")
+                                 .build()).add(
+                        OSType.builder().id(18).OSCategoryId(3).description("Oracle Enterprise Linux 5.1 (32-bit)")
+                                 .build()).add(
+                        OSType.builder().id(19).OSCategoryId(3).description("Oracle Enterprise Linux 5.1 (64-bit)")
+                                 .build()).add(
+                        OSType.builder().id(20).OSCategoryId(3).description("Oracle Enterprise Linux 5.2 (32-bit)")
+                                 .build()).add(
+                        OSType.builder().id(21).OSCategoryId(3).description("Oracle Enterprise Linux 5.2 (64-bit)")
+                                 .build()).add(
+                        OSType.builder().id(22).OSCategoryId(3).description("Oracle Enterprise Linux 5.3 (32-bit)")
+                                 .build()).add(
+                        OSType.builder().id(23).OSCategoryId(3).description("Oracle Enterprise Linux 5.3 (64-bit)")
+                                 .build()).add(
+                        OSType.builder().id(24).OSCategoryId(3).description("Oracle Enterprise Linux 5.4 (32-bit)")
+                                 .build()).add(
+                        OSType.builder().id(25).OSCategoryId(3).description("Oracle Enterprise Linux 5.4 (64-bit)")
+                                 .build()).add(
+                        OSType.builder().id(134).OSCategoryId(3).description("Oracle Enterprise Linux 5.5 (32-bit)")
+                                 .build()).add(
+                        OSType.builder().id(135).OSCategoryId(3).description("Oracle Enterprise Linux 5.5 (64-bit)")
+                                 .build()).add(OSType.builder().id(104).OSCategoryId(7).description("OS/2").build())
+               .add(OSType.builder().id(60).OSCategoryId(7).description("Other (32-bit)").build()).add(
+                        OSType.builder().id(103).OSCategoryId(7).description("Other (64-bit)").build()).add(
+                        OSType.builder().id(75).OSCategoryId(7).description("Other 2.6x Linux (32-bit)").build()).add(
+                        OSType.builder().id(76).OSCategoryId(7).description("Other 2.6x Linux (64-bit)").build()).add(
+                        OSType.builder().id(98).OSCategoryId(7).description("Other Linux (32-bit)").build()).add(
+                        OSType.builder().id(99).OSCategoryId(7).description("Other Linux (64-bit)").build()).add(
+                        OSType.builder().id(59).OSCategoryId(10).description("Other Ubuntu (32-bit)").build()).add(
+                        OSType.builder().id(100).OSCategoryId(10).description("Other Ubuntu (64-bit)").build()).add(
+                        OSType.builder().id(131).OSCategoryId(10).description("Red Hat Enterprise Linux 2").build())
+               .add(OSType.builder().id(66).OSCategoryId(4).description("Red Hat Enterprise Linux 3(32-bit)").build())
+               .add(OSType.builder().id(67).OSCategoryId(4).description("Red Hat Enterprise Linux 3(64-bit)").build())
+               .add(OSType.builder().id(106).OSCategoryId(4).description("Red Hat Enterprise Linux 4(64-bit)").build())
+               .add(
+                        OSType.builder().id(26).OSCategoryId(4).description("Red Hat Enterprise Linux 4.5 (32-bit)")
+                                 .build()).add(
+                        OSType.builder().id(27).OSCategoryId(4).description("Red Hat Enterprise Linux 4.6 (32-bit)")
+                                 .build()).add(
+                        OSType.builder().id(28).OSCategoryId(4).description("Red Hat Enterprise Linux 4.7 (32-bit)")
+                                 .build()).add(
+                        OSType.builder().id(29).OSCategoryId(4).description("Red Hat Enterprise Linux 4.8 (32-bit)")
+                                 .build()).add(
+                        OSType.builder().id(30).OSCategoryId(4).description("Red Hat Enterprise Linux 5.0 (32-bit)")
+                                 .build()).add(
+                        OSType.builder().id(31).OSCategoryId(4).description("Red Hat Enterprise Linux 5.0 (64-bit)")
+                                 .build()).add(
+                        OSType.builder().id(32).OSCategoryId(4).description("Red Hat Enterprise Linux 5.1 (32-bit)")
+                                 .build()).add(
+                        OSType.builder().id(33).OSCategoryId(4).description("Red Hat Enterprise Linux 5.1 (64-bit)")
+                                 .build()).add(
+                        OSType.builder().id(34).OSCategoryId(4).description("Red Hat Enterprise Linux 5.2 (32-bit)")
+                                 .build()).add(
+                        OSType.builder().id(35).OSCategoryId(4).description("Red Hat Enterprise Linux 5.2 (64-bit)")
+                                 .build()).add(
+                        OSType.builder().id(36).OSCategoryId(4).description("Red Hat Enterprise Linux 5.3 (32-bit)")
+                                 .build()).add(
+                        OSType.builder().id(37).OSCategoryId(4).description("Red Hat Enterprise Linux 5.3 (64-bit)")
+                                 .build()).add(
+                        OSType.builder().id(38).OSCategoryId(4).description("Red Hat Enterprise Linux 5.4 (32-bit)")
+                                 .build()).add(
+                        OSType.builder().id(39).OSCategoryId(4).description("Red Hat Enterprise Linux 5.4 (64-bit)")
+                                 .build()).add(
+                        OSType.builder().id(113).OSCategoryId(4).description("Red Hat Enterprise Linux 5.5 (32-bit)")
+                                 .build()).add(
+                        OSType.builder().id(114).OSCategoryId(4).description("Red Hat Enterprise Linux 5.5 (64-bit)")
+                                 .build()).add(
+                        OSType.builder().id(136).OSCategoryId(4).description("Red Hat Enterprise Linux 6.0 (32-bit)")
+                                 .build()).add(
+                        OSType.builder().id(137).OSCategoryId(4).description("Red Hat Enterprise Linux 6.0 (64-bit)")
+                                 .build()).add(
+                        OSType.builder().id(85).OSCategoryId(9).description("SCO OpenServer 5").build()).add(
+                        OSType.builder().id(86).OSCategoryId(9).description("SCO UnixWare 7").build()).add(
+                        OSType.builder().id(79).OSCategoryId(9).description("Sun Solaris 10(32-bit)").build()).add(
+                        OSType.builder().id(80).OSCategoryId(9).description("Sun Solaris 10(64-bit)").build()).add(
+                        OSType.builder().id(82).OSCategoryId(9).description("Sun Solaris 8(Experimental)").build())
+               .add(OSType.builder().id(81).OSCategoryId(9).description("Sun Solaris 9(Experimental)").build()).add(
+                        OSType.builder().id(109).OSCategoryId(5).description("SUSE Linux Enterprise 10(32-bit)")
+                                 .build()).add(
+                        OSType.builder().id(110).OSCategoryId(5).description("SUSE Linux Enterprise 10(64-bit)")
+                                 .build()).add(
+                        OSType.builder().id(96).OSCategoryId(5).description("SUSE Linux Enterprise 8(32-bit)").build())
+               .add(OSType.builder().id(97).OSCategoryId(5).description("SUSE Linux Enterprise 8(64-bit)").build())
+               .add(OSType.builder().id(107).OSCategoryId(5).description("SUSE Linux Enterprise 9(32-bit)").build())
+               .add(OSType.builder().id(108).OSCategoryId(5).description("SUSE Linux Enterprise 9(64-bit)").build())
+               .add(
+                        OSType.builder().id(41).OSCategoryId(5).description(
+                                 "SUSE Linux Enterprise Server 10 SP1 (32-bit)").build()).add(
+                        OSType.builder().id(42).OSCategoryId(5).description(
+                                 "SUSE Linux Enterprise Server 10 SP1 (64-bit)").build()).add(
+                        OSType.builder().id(43).OSCategoryId(5).description(
+                                 "SUSE Linux Enterprise Server 10 SP2 (32-bit)").build()).add(
+                        OSType.builder().id(44).OSCategoryId(5).description(
+                                 "SUSE Linux Enterprise Server 10 SP2 (64-bit)").build()).add(
+                        OSType.builder().id(45).OSCategoryId(5).description(
+                                 "SUSE Linux Enterprise Server 10 SP3 (64-bit)").build()).add(
+                        OSType.builder().id(46).OSCategoryId(5).description("SUSE Linux Enterprise Server 11 (32-bit)")
+                                 .build()).add(
+                        OSType.builder().id(47).OSCategoryId(5).description("SUSE Linux Enterprise Server 11 (64-bit)")
+                                 .build()).add(
+                        OSType.builder().id(40).OSCategoryId(5).description(
+                                 "SUSE Linux Enterprise Server 9 SP4 (32-bit)").build()).add(
+                        OSType.builder().id(121).OSCategoryId(10).description("Ubuntu 10.04 (32-bit)").build()).add(
+                        OSType.builder().id(126).OSCategoryId(10).description("Ubuntu 10.04 (64-bit)").build()).add(
+                        OSType.builder().id(125).OSCategoryId(10).description("Ubuntu 8.04 (32-bit)").build()).add(
+                        OSType.builder().id(130).OSCategoryId(10).description("Ubuntu 8.04 (64-bit)").build()).add(
+                        OSType.builder().id(124).OSCategoryId(10).description("Ubuntu 8.10 (32-bit)").build()).add(
+                        OSType.builder().id(129).OSCategoryId(10).description("Ubuntu 8.10 (64-bit)").build()).add(
+                        OSType.builder().id(123).OSCategoryId(10).description("Ubuntu 9.04 (32-bit)").build()).add(
+                        OSType.builder().id(128).OSCategoryId(10).description("Ubuntu 9.04 (64-bit)").build()).add(
+                        OSType.builder().id(122).OSCategoryId(10).description("Ubuntu 9.10 (32-bit)").build()).add(
+                        OSType.builder().id(127).OSCategoryId(10).description("Ubuntu 9.10 (64-bit)").build()).add(
+                        OSType.builder().id(95).OSCategoryId(6).description("Windows 2000 Advanced Server").build())
+               .add(OSType.builder().id(105).OSCategoryId(6).description("Windows 2000 Professional").build()).add(
+                        OSType.builder().id(61).OSCategoryId(6).description("Windows 2000 Server").build())
+               .add(OSType.builder().id(55).OSCategoryId(6).description("Windows 2000 Server SP4 (32-bit)").build())
+               .add(OSType.builder().id(65).OSCategoryId(6).description("Windows 3.1").build()).add(
+                        OSType.builder().id(48).OSCategoryId(6).description("Windows 7 (32-bit)").build()).add(
+                        OSType.builder().id(49).OSCategoryId(6).description("Windows 7 (64-bit)").build()).add(
+                        OSType.builder().id(63).OSCategoryId(6).description("Windows 95").build()).add(
+                        OSType.builder().id(62).OSCategoryId(6).description("Windows 98").build()).add(
+                        OSType.builder().id(64).OSCategoryId(6).description("Windows NT 4").build()).add(
+                        OSType.builder().id(87).OSCategoryId(6).description(
+                                 "Windows Server 2003 DataCenter Edition(32-bit)").build()).add(
+                        OSType.builder().id(88).OSCategoryId(6).description(
+                                 "Windows Server 2003 DataCenter Edition(64-bit)").build()).add(
+                        OSType.builder().id(50).OSCategoryId(6).description(
+                                 "Windows Server 2003 Enterprise Edition(32-bit)").build()).add(
+                        OSType.builder().id(51).OSCategoryId(6).description(
+                                 "Windows Server 2003 Enterprise Edition(64-bit)").build()).add(
+                        OSType.builder().id(89).OSCategoryId(6).description(
+                                 "Windows Server 2003 Standard Edition(32-bit)").build()).add(
+                        OSType.builder().id(90).OSCategoryId(6).description(
+                                 "Windows Server 2003 Standard Edition(64-bit)").build()).add(
+                        OSType.builder().id(91).OSCategoryId(6).description("Windows Server 2003 Web Edition").build())
+               .add(OSType.builder().id(52).OSCategoryId(6).description("Windows Server 2008 (32-bit)").build()).add(
+                        OSType.builder().id(53).OSCategoryId(6).description("Windows Server 2008 (64-bit)").build())
+               .add(OSType.builder().id(54).OSCategoryId(6).description("Windows Server 2008 R2 (64-bit)").build())
+               .add(OSType.builder().id(56).OSCategoryId(6).description("Windows Vista (32-bit)").build()).add(
+                        OSType.builder().id(101).OSCategoryId(6).description("Windows Vista (64-bit)").build()).add(
+                        OSType.builder().id(93).OSCategoryId(6).description("Windows XP (32-bit)").build()).add(
+                        OSType.builder().id(94).OSCategoryId(6).description("Windows XP (64-bit)").build()).add(
+                        OSType.builder().id(57).OSCategoryId(6).description("Windows XP SP2 (32-bit)").build()).add(
+                        OSType.builder().id(58).OSCategoryId(6).description("Windows XP SP3 (32-bit)").build()).build();
+   }
+}
\ No newline at end of file
diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListPortForwardingRulesResponseTest.java b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListPortForwardingRulesResponseTest.java
index b5c6b1b6c1..0712f81db2 100644
--- a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListPortForwardingRulesResponseTest.java
+++ b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListPortForwardingRulesResponseTest.java
@@ -21,6 +21,8 @@ package org.jclouds.cloudstack.parse;
 import java.util.Set;
 
 import org.jclouds.cloudstack.domain.PortForwardingRule;
+import org.jclouds.json.BaseSetParserTest;
+import org.jclouds.rest.annotations.Unwrap;
 import org.testng.annotations.Test;
 
 import com.google.common.collect.ImmutableSet;
@@ -32,17 +34,13 @@ import com.google.common.collect.ImmutableSet;
 @Test(groups = "unit")
 public class ListPortForwardingRulesResponseTest extends BaseSetParserTest<PortForwardingRule> {
 
-   @Override
-   public Class<PortForwardingRule> type() {
-      return PortForwardingRule.class;
-   }
-
    @Override
    public String resource() {
       return "/listportforwardingrulesresponse.json";
    }
 
    @Override
+   @Unwrap(depth = 2)
    public Set<PortForwardingRule> expected() {
       return ImmutableSet.<PortForwardingRule> of(
             PortForwardingRule.builder().id(15).privatePort(22).protocol("tcp").publicPort(2022).virtualMachineId(3)
diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListPublicIPAddressesResponseTest.java b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListPublicIPAddressesResponseTest.java
index bdf348bb5f..de8281871d 100644
--- a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListPublicIPAddressesResponseTest.java
+++ b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListPublicIPAddressesResponseTest.java
@@ -22,6 +22,8 @@ import java.util.Set;
 
 import org.jclouds.cloudstack.domain.PublicIPAddress;
 import org.jclouds.date.internal.SimpleDateFormatDateService;
+import org.jclouds.json.BaseSetParserTest;
+import org.jclouds.rest.annotations.Unwrap;
 import org.testng.annotations.Test;
 
 import com.google.common.collect.ImmutableSet;
@@ -33,17 +35,14 @@ import com.google.common.collect.ImmutableSet;
 @Test(groups = "unit")
 public class ListPublicIPAddressesResponseTest extends BaseSetParserTest<PublicIPAddress> {
 
-   @Override
-   public Class<PublicIPAddress> type() {
-      return PublicIPAddress.class;
-   }
 
    @Override
    public String resource() {
       return "/listpublicipaddressesresponse.json";
    }
-
+   
    @Override
+   @Unwrap(depth = 2)
    public Set<PublicIPAddress> expected() {
       return ImmutableSet.of(PublicIPAddress.builder().id(30).IPAddress("72.52.126.59")
             .allocated(new SimpleDateFormatDateService().iso8601SecondsDateParse("2011-02-19T21:15:01-0800")).zoneId(1)
diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListSecurityGroupsResponseTest.java b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListSecurityGroupsResponseTest.java
index 0420272b98..3848613348 100644
--- a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListSecurityGroupsResponseTest.java
+++ b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListSecurityGroupsResponseTest.java
@@ -22,6 +22,8 @@ import java.util.Set;
 
 import org.jclouds.cloudstack.domain.IngressRule;
 import org.jclouds.cloudstack.domain.SecurityGroup;
+import org.jclouds.json.BaseSetParserTest;
+import org.jclouds.rest.annotations.Unwrap;
 import org.testng.annotations.Test;
 
 import com.google.common.collect.ImmutableSet;
@@ -33,17 +35,13 @@ import com.google.common.collect.ImmutableSet;
 @Test(groups = "unit")
 public class ListSecurityGroupsResponseTest extends BaseSetParserTest<SecurityGroup> {
 
-   @Override
-   public Class<SecurityGroup> type() {
-      return SecurityGroup.class;
-   }
-
    @Override
    public String resource() {
       return "/listsecuritygroupsresponse.json";
    }
 
    @Override
+   @Unwrap(depth = 2)
    public Set<SecurityGroup> expected() {
       return ImmutableSet
             .<SecurityGroup> builder()
diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListServiceOfferingsResponseTest.java b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListServiceOfferingsResponseTest.java
index a6bdd3058d..55ae22a4f9 100644
--- a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListServiceOfferingsResponseTest.java
+++ b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListServiceOfferingsResponseTest.java
@@ -23,6 +23,8 @@ import java.util.Set;
 import org.jclouds.cloudstack.domain.ServiceOffering;
 import org.jclouds.cloudstack.domain.StorageType;
 import org.jclouds.date.internal.SimpleDateFormatDateService;
+import org.jclouds.json.BaseSetParserTest;
+import org.jclouds.rest.annotations.Unwrap;
 import org.testng.annotations.Test;
 
 import com.google.common.collect.ImmutableSet;
@@ -34,17 +36,13 @@ import com.google.common.collect.ImmutableSet;
 @Test(groups = "unit")
 public class ListServiceOfferingsResponseTest extends BaseSetParserTest<ServiceOffering> {
 
-   @Override
-   public Class<ServiceOffering> type() {
-      return ServiceOffering.class;
-   }
-
    @Override
    public String resource() {
       return "/listserviceofferingsresponse.json";
    }
 
    @Override
+   @Unwrap(depth = 2)
    public Set<ServiceOffering> expected() {
       return ImmutableSet.<ServiceOffering> of(
             ServiceOffering.builder().id(1).name("Small Instance")
diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListTemplatesResponseTest.java b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListTemplatesResponseTest.java
index 1bc625613f..80ff5b544c 100644
--- a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListTemplatesResponseTest.java
+++ b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListTemplatesResponseTest.java
@@ -24,6 +24,8 @@ import org.jclouds.cloudstack.domain.Template;
 import org.jclouds.cloudstack.domain.Template.Format;
 import org.jclouds.cloudstack.domain.Template.Type;
 import org.jclouds.date.internal.SimpleDateFormatDateService;
+import org.jclouds.json.BaseSetParserTest;
+import org.jclouds.rest.annotations.Unwrap;
 import org.testng.annotations.Test;
 
 import com.google.common.collect.ImmutableSet;
@@ -35,11 +37,6 @@ import com.google.common.collect.ImmutableSet;
 @Test(groups = "unit")
 public class ListTemplatesResponseTest extends BaseSetParserTest<Template> {
 
-   @Override
-   public Class<Template> type() {
-      return Template.class;
-   }
-
    @Override
    public String resource() {
       // grep listtemplatesresponse ./target/test-data/jclouds-wire.log|tail
@@ -48,6 +45,7 @@ public class ListTemplatesResponseTest extends BaseSetParserTest<Template> {
    }
 
    @Override
+   @Unwrap(depth = 2)
    public Set<Template> expected() {
       return ImmutableSet.of(
             Template.builder().id(2).name("CentOS 5.3(64-bit) no GUI (XenServer)")
diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListVirtualMachinesResponseTest.java b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListVirtualMachinesResponseTest.java
index 8e4b84cef4..496f1b1dad 100644
--- a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListVirtualMachinesResponseTest.java
+++ b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListVirtualMachinesResponseTest.java
@@ -25,6 +25,8 @@ import org.jclouds.cloudstack.domain.NIC;
 import org.jclouds.cloudstack.domain.TrafficType;
 import org.jclouds.cloudstack.domain.VirtualMachine;
 import org.jclouds.date.internal.SimpleDateFormatDateService;
+import org.jclouds.json.BaseSetParserTest;
+import org.jclouds.rest.annotations.Unwrap;
 import org.testng.annotations.Test;
 
 import com.google.common.collect.ImmutableSet;
@@ -36,17 +38,13 @@ import com.google.common.collect.ImmutableSet;
 @Test(groups = "unit")
 public class ListVirtualMachinesResponseTest extends BaseSetParserTest<VirtualMachine> {
 
-   @Override
-   public Class<VirtualMachine> type() {
-      return VirtualMachine.class;
-   }
-
    @Override
    public String resource() {
       return "/listvirtualmachinesresponse.json";
    }
 
    @Override
+   @Unwrap(depth = 2)
    public Set<VirtualMachine> expected() {
       return ImmutableSet.of(VirtualMachine
             .builder()
diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListZonesResponseTest.java b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListZonesResponseTest.java
index 185c981c85..e1d2bdbeb4 100644
--- a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListZonesResponseTest.java
+++ b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListZonesResponseTest.java
@@ -22,6 +22,8 @@ import java.util.Set;
 
 import org.jclouds.cloudstack.domain.NetworkType;
 import org.jclouds.cloudstack.domain.Zone;
+import org.jclouds.json.BaseSetParserTest;
+import org.jclouds.rest.annotations.Unwrap;
 import org.testng.annotations.Test;
 
 import com.google.common.collect.ImmutableSet;
@@ -33,17 +35,13 @@ import com.google.common.collect.ImmutableSet;
 @Test(groups = "unit")
 public class ListZonesResponseTest extends BaseSetParserTest<Zone> {
 
-   @Override
-   public Class<Zone> type() {
-      return Zone.class;
-   }
-
    @Override
    public String resource() {
       return "/listzonesresponse.json";
    }
 
    @Override
+   @Unwrap(depth = 2)
    public Set<Zone> expected() {
       return ImmutableSet.of(Zone.builder().id(1).name("San Jose 1").networkType(NetworkType.ADVANCED)
             .securityGroupsEnabled(false).build(),
diff --git a/sandbox-apis/cloudstack/src/test/resources/listostypesresponse.json b/sandbox-apis/cloudstack/src/test/resources/listostypesresponse.json
new file mode 100644
index 0000000000..c892e39359
--- /dev/null
+++ b/sandbox-apis/cloudstack/src/test/resources/listostypesresponse.json
@@ -0,0 +1 @@
+{ "listostypesresponse" : { "ostype" : [  {"id":69,"oscategoryid":7,"description":"Asianux 3(32-bit)"}, {"id":70,"oscategoryid":7,"description":"Asianux 3(64-bit)"}, {"id":1,"oscategoryid":1,"description":"CentOS 4.5 (32-bit)"}, {"id":2,"oscategoryid":1,"description":"CentOS 4.6 (32-bit)"}, {"id":3,"oscategoryid":1,"description":"CentOS 4.7 (32-bit)"}, {"id":4,"oscategoryid":1,"description":"CentOS 4.8 (32-bit)"}, {"id":5,"oscategoryid":1,"description":"CentOS 5.0 (32-bit)"}, {"id":6,"oscategoryid":1,"description":"CentOS 5.0 (64-bit)"}, {"id":7,"oscategoryid":1,"description":"CentOS 5.1 (32-bit)"}, {"id":8,"oscategoryid":1,"description":"CentOS 5.1 (64-bit)"}, {"id":9,"oscategoryid":1,"description":"CentOS 5.2 (32-bit)"}, {"id":10,"oscategoryid":1,"description":"CentOS 5.2 (64-bit)"}, {"id":11,"oscategoryid":1,"description":"CentOS 5.3 (32-bit)"}, {"id":12,"oscategoryid":1,"description":"CentOS 5.3 (64-bit)"}, {"id":13,"oscategoryid":1,"description":"CentOS 5.4 (32-bit)"}, {"id":14,"oscategoryid":1,"description":"CentOS 5.4 (64-bit)"}, {"id":111,"oscategoryid":1,"description":"CentOS 5.5 (32-bit)"}, {"id":112,"oscategoryid":1,"description":"CentOS 5.5 (64-bit)"}, {"id":73,"oscategoryid":2,"description":"Debian GNU/Linux 4(32-bit)"}, {"id":74,"oscategoryid":2,"description":"Debian GNU/Linux 4(64-bit)"}, {"id":72,"oscategoryid":2,"description":"Debian GNU/Linux 5(64-bit)"}, {"id":15,"oscategoryid":2,"description":"Debian GNU/Linux 5.0 (32-bit)"}, {"id":132,"oscategoryid":2,"description":"Debian GNU/Linux 6(32-bit)"}, {"id":133,"oscategoryid":2,"description":"Debian GNU/Linux 6(64-bit)"}, {"id":102,"oscategoryid":6,"description":"DOS"}, {"id":118,"oscategoryid":4,"description":"Fedora 10"}, {"id":117,"oscategoryid":4,"description":"Fedora 11"}, {"id":116,"oscategoryid":4,"description":"Fedora 12"}, {"id":115,"oscategoryid":4,"description":"Fedora 13"}, {"id":120,"oscategoryid":4,"description":"Fedora 8"}, {"id":119,"oscategoryid":4,"description":"Fedora 9"}, {"id":83,"oscategoryid":9,"description":"FreeBSD (32-bit)"}, {"id":84,"oscategoryid":9,"description":"FreeBSD (64-bit)"}, {"id":92,"oscategoryid":6,"description":"Microsoft Small Bussiness Server 2003"}, {"id":78,"oscategoryid":8,"description":"Novell Netware 5.1"}, {"id":77,"oscategoryid":8,"description":"Novell Netware 6.x"}, {"id":68,"oscategoryid":7,"description":"Open Enterprise Server"}, {"id":16,"oscategoryid":3,"description":"Oracle Enterprise Linux 5.0 (32-bit)"}, {"id":17,"oscategoryid":3,"description":"Oracle Enterprise Linux 5.0 (64-bit)"}, {"id":18,"oscategoryid":3,"description":"Oracle Enterprise Linux 5.1 (32-bit)"}, {"id":19,"oscategoryid":3,"description":"Oracle Enterprise Linux 5.1 (64-bit)"}, {"id":20,"oscategoryid":3,"description":"Oracle Enterprise Linux 5.2 (32-bit)"}, {"id":21,"oscategoryid":3,"description":"Oracle Enterprise Linux 5.2 (64-bit)"}, {"id":22,"oscategoryid":3,"description":"Oracle Enterprise Linux 5.3 (32-bit)"}, {"id":23,"oscategoryid":3,"description":"Oracle Enterprise Linux 5.3 (64-bit)"}, {"id":24,"oscategoryid":3,"description":"Oracle Enterprise Linux 5.4 (32-bit)"}, {"id":25,"oscategoryid":3,"description":"Oracle Enterprise Linux 5.4 (64-bit)"}, {"id":134,"oscategoryid":3,"description":"Oracle Enterprise Linux 5.5 (32-bit)"}, {"id":135,"oscategoryid":3,"description":"Oracle Enterprise Linux 5.5 (64-bit)"}, {"id":104,"oscategoryid":7,"description":"OS/2"}, {"id":60,"oscategoryid":7,"description":"Other (32-bit)"}, {"id":103,"oscategoryid":7,"description":"Other (64-bit)"}, {"id":75,"oscategoryid":7,"description":"Other 2.6x Linux (32-bit)"}, {"id":76,"oscategoryid":7,"description":"Other 2.6x Linux (64-bit)"}, {"id":98,"oscategoryid":7,"description":"Other Linux (32-bit)"}, {"id":99,"oscategoryid":7,"description":"Other Linux (64-bit)"}, {"id":59,"oscategoryid":10,"description":"Other Ubuntu (32-bit)"}, {"id":100,"oscategoryid":10,"description":"Other Ubuntu (64-bit)"}, {"id":131,"oscategoryid":10,"description":"Red Hat Enterprise Linux 2"}, {"id":66,"oscategoryid":4,"description":"Red Hat Enterprise Linux 3(32-bit)"}, {"id":67,"oscategoryid":4,"description":"Red Hat Enterprise Linux 3(64-bit)"}, {"id":106,"oscategoryid":4,"description":"Red Hat Enterprise Linux 4(64-bit)"}, {"id":26,"oscategoryid":4,"description":"Red Hat Enterprise Linux 4.5 (32-bit)"}, {"id":27,"oscategoryid":4,"description":"Red Hat Enterprise Linux 4.6 (32-bit)"}, {"id":28,"oscategoryid":4,"description":"Red Hat Enterprise Linux 4.7 (32-bit)"}, {"id":29,"oscategoryid":4,"description":"Red Hat Enterprise Linux 4.8 (32-bit)"}, {"id":30,"oscategoryid":4,"description":"Red Hat Enterprise Linux 5.0 (32-bit)"}, {"id":31,"oscategoryid":4,"description":"Red Hat Enterprise Linux 5.0 (64-bit)"}, {"id":32,"oscategoryid":4,"description":"Red Hat Enterprise Linux 5.1 (32-bit)"}, {"id":33,"oscategoryid":4,"description":"Red Hat Enterprise Linux 5.1 (64-bit)"}, {"id":34,"oscategoryid":4,"description":"Red Hat Enterprise Linux 5.2 (32-bit)"}, {"id":35,"oscategoryid":4,"description":"Red Hat Enterprise Linux 5.2 (64-bit)"}, {"id":36,"oscategoryid":4,"description":"Red Hat Enterprise Linux 5.3 (32-bit)"}, {"id":37,"oscategoryid":4,"description":"Red Hat Enterprise Linux 5.3 (64-bit)"}, {"id":38,"oscategoryid":4,"description":"Red Hat Enterprise Linux 5.4 (32-bit)"}, {"id":39,"oscategoryid":4,"description":"Red Hat Enterprise Linux 5.4 (64-bit)"}, {"id":113,"oscategoryid":4,"description":"Red Hat Enterprise Linux 5.5 (32-bit)"}, {"id":114,"oscategoryid":4,"description":"Red Hat Enterprise Linux 5.5 (64-bit)"}, {"id":136,"oscategoryid":4,"description":"Red Hat Enterprise Linux 6.0 (32-bit)"}, {"id":137,"oscategoryid":4,"description":"Red Hat Enterprise Linux 6.0 (64-bit)"}, {"id":85,"oscategoryid":9,"description":"SCO OpenServer 5"}, {"id":86,"oscategoryid":9,"description":"SCO UnixWare 7"}, {"id":79,"oscategoryid":9,"description":"Sun Solaris 10(32-bit)"}, {"id":80,"oscategoryid":9,"description":"Sun Solaris 10(64-bit)"}, {"id":82,"oscategoryid":9,"description":"Sun Solaris 8(Experimental)"}, {"id":81,"oscategoryid":9,"description":"Sun Solaris 9(Experimental)"}, {"id":109,"oscategoryid":5,"description":"SUSE Linux Enterprise 10(32-bit)"}, {"id":110,"oscategoryid":5,"description":"SUSE Linux Enterprise 10(64-bit)"}, {"id":96,"oscategoryid":5,"description":"SUSE Linux Enterprise 8(32-bit)"}, {"id":97,"oscategoryid":5,"description":"SUSE Linux Enterprise 8(64-bit)"}, {"id":107,"oscategoryid":5,"description":"SUSE Linux Enterprise 9(32-bit)"}, {"id":108,"oscategoryid":5,"description":"SUSE Linux Enterprise 9(64-bit)"}, {"id":41,"oscategoryid":5,"description":"SUSE Linux Enterprise Server 10 SP1 (32-bit)"}, {"id":42,"oscategoryid":5,"description":"SUSE Linux Enterprise Server 10 SP1 (64-bit)"}, {"id":43,"oscategoryid":5,"description":"SUSE Linux Enterprise Server 10 SP2 (32-bit)"}, {"id":44,"oscategoryid":5,"description":"SUSE Linux Enterprise Server 10 SP2 (64-bit)"}, {"id":45,"oscategoryid":5,"description":"SUSE Linux Enterprise Server 10 SP3 (64-bit)"}, {"id":46,"oscategoryid":5,"description":"SUSE Linux Enterprise Server 11 (32-bit)"}, {"id":47,"oscategoryid":5,"description":"SUSE Linux Enterprise Server 11 (64-bit)"}, {"id":40,"oscategoryid":5,"description":"SUSE Linux Enterprise Server 9 SP4 (32-bit)"}, {"id":121,"oscategoryid":10,"description":"Ubuntu 10.04 (32-bit)"}, {"id":126,"oscategoryid":10,"description":"Ubuntu 10.04 (64-bit)"}, {"id":125,"oscategoryid":10,"description":"Ubuntu 8.04 (32-bit)"}, {"id":130,"oscategoryid":10,"description":"Ubuntu 8.04 (64-bit)"}, {"id":124,"oscategoryid":10,"description":"Ubuntu 8.10 (32-bit)"}, {"id":129,"oscategoryid":10,"description":"Ubuntu 8.10 (64-bit)"}, {"id":123,"oscategoryid":10,"description":"Ubuntu 9.04 (32-bit)"}, {"id":128,"oscategoryid":10,"description":"Ubuntu 9.04 (64-bit)"}, {"id":122,"oscategoryid":10,"description":"Ubuntu 9.10 (32-bit)"}, {"id":127,"oscategoryid":10,"description":"Ubuntu 9.10 (64-bit)"}, {"id":95,"oscategoryid":6,"description":"Windows 2000 Advanced Server"}, {"id":105,"oscategoryid":6,"description":"Windows 2000 Professional"}, {"id":61,"oscategoryid":6,"description":"Windows 2000 Server"}, {"id":55,"oscategoryid":6,"description":"Windows 2000 Server SP4 (32-bit)"}, {"id":65,"oscategoryid":6,"description":"Windows 3.1"}, {"id":48,"oscategoryid":6,"description":"Windows 7 (32-bit)"}, {"id":49,"oscategoryid":6,"description":"Windows 7 (64-bit)"}, {"id":63,"oscategoryid":6,"description":"Windows 95"}, {"id":62,"oscategoryid":6,"description":"Windows 98"}, {"id":64,"oscategoryid":6,"description":"Windows NT 4"}, {"id":87,"oscategoryid":6,"description":"Windows Server 2003 DataCenter Edition(32-bit)"}, {"id":88,"oscategoryid":6,"description":"Windows Server 2003 DataCenter Edition(64-bit)"}, {"id":50,"oscategoryid":6,"description":"Windows Server 2003 Enterprise Edition(32-bit)"}, {"id":51,"oscategoryid":6,"description":"Windows Server 2003 Enterprise Edition(64-bit)"}, {"id":89,"oscategoryid":6,"description":"Windows Server 2003 Standard Edition(32-bit)"}, {"id":90,"oscategoryid":6,"description":"Windows Server 2003 Standard Edition(64-bit)"}, {"id":91,"oscategoryid":6,"description":"Windows Server 2003 Web Edition"}, {"id":52,"oscategoryid":6,"description":"Windows Server 2008 (32-bit)"}, {"id":53,"oscategoryid":6,"description":"Windows Server 2008 (64-bit)"}, {"id":54,"oscategoryid":6,"description":"Windows Server 2008 R2 (64-bit)"}, {"id":56,"oscategoryid":6,"description":"Windows Vista (32-bit)"}, {"id":101,"oscategoryid":6,"description":"Windows Vista (64-bit)"}, {"id":93,"oscategoryid":6,"description":"Windows XP (32-bit)"}, {"id":94,"oscategoryid":6,"description":"Windows XP (64-bit)"}, {"id":57,"oscategoryid":6,"description":"Windows XP SP2 (32-bit)"}, {"id":58,"oscategoryid":6,"description":"Windows XP SP3 (32-bit)"} ] } }
\ No newline at end of file
diff --git a/sandbox-apis/cloudwatch/pom.xml b/sandbox-apis/cloudwatch/pom.xml
index 68c47d5f40..a2b05b7aa9 100644
--- a/sandbox-apis/cloudwatch/pom.xml
+++ b/sandbox-apis/cloudwatch/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>cloudwatch</artifactId>
     <name>jcloud cloudwatch api</name>
     <description>jclouds components to access an implementation of CloudWatch</description>
+    <packaging>bundle</packaging>
 
     <properties>
         <test.cloudwatch.endpoint>https://monitoring.us-east-1.amazonaws.com</test.cloudwatch.endpoint>
@@ -112,6 +113,21 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>    
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.cloudwatch.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
 
diff --git a/sandbox-apis/elb/pom.xml b/sandbox-apis/elb/pom.xml
index 8dc3b49bcf..5b0b380060 100644
--- a/sandbox-apis/elb/pom.xml
+++ b/sandbox-apis/elb/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>elb</artifactId>
     <name>jcloud elb api</name>
     <description>jclouds components to access an implementation of Elastic Load Balancer</description>
+    <packaging>bundle</packaging>
 
     <properties>
         <test.elb.zone>us-east-1a</test.elb.zone>
@@ -165,6 +166,22 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>    
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.elb.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 
 </project>
 
diff --git a/sandbox-apis/libvirt/pom.xml b/sandbox-apis/libvirt/pom.xml
index 722d4f0541..43b9a625ea 100644
--- a/sandbox-apis/libvirt/pom.xml
+++ b/sandbox-apis/libvirt/pom.xml
@@ -31,6 +31,8 @@
     <groupId>org.jclouds.api</groupId>
     <artifactId>libvirt</artifactId>
     <name>jclouds example components for a libvirt provider</name>
+    <packaging>bundle</packaging>
+
     <properties>
         <!-- when instances are hung, open a ticket and add here -->
         <jclouds.compute.blacklist.nodes>trmkrun-ccc,test.trmk-924</jclouds.compute.blacklist.nodes>
@@ -153,4 +155,20 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>    
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.libvirt.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
diff --git a/sandbox-apis/libvirt/src/main/java/org/jclouds/libvirt/compute/LibvirtComputeService.java b/sandbox-apis/libvirt/src/main/java/org/jclouds/libvirt/compute/LibvirtComputeService.java
index 9f255bb54d..1ea47243f6 100644
--- a/sandbox-apis/libvirt/src/main/java/org/jclouds/libvirt/compute/LibvirtComputeService.java
+++ b/sandbox-apis/libvirt/src/main/java/org/jclouds/libvirt/compute/LibvirtComputeService.java
@@ -31,23 +31,26 @@ import javax.inject.Singleton;
 import org.jclouds.Constants;
 import org.jclouds.collect.Memoized;
 import org.jclouds.compute.ComputeServiceContext;
+import org.jclouds.compute.callables.RunScriptOnNode;
 import org.jclouds.compute.domain.Hardware;
 import org.jclouds.compute.domain.Image;
 import org.jclouds.compute.domain.NodeMetadata;
 import org.jclouds.compute.domain.TemplateBuilder;
 import org.jclouds.compute.internal.BaseComputeService;
+import org.jclouds.compute.internal.PersistNodeCredentials;
 import org.jclouds.compute.options.TemplateOptions;
 import org.jclouds.compute.reference.ComputeServiceConstants.Timeouts;
+import org.jclouds.compute.strategy.CreateNodesInGroupThenAddToSet;
 import org.jclouds.compute.strategy.DestroyNodeStrategy;
 import org.jclouds.compute.strategy.GetNodeMetadataStrategy;
 import org.jclouds.compute.strategy.InitializeRunScriptOnNodeOrPlaceInBadMap;
 import org.jclouds.compute.strategy.ListNodesStrategy;
 import org.jclouds.compute.strategy.RebootNodeStrategy;
 import org.jclouds.compute.strategy.ResumeNodeStrategy;
-import org.jclouds.compute.strategy.CreateNodesInGroupThenAddToSet;
 import org.jclouds.compute.strategy.SuspendNodeStrategy;
 import org.jclouds.domain.Credentials;
 import org.jclouds.domain.Location;
+import org.jclouds.scriptbuilder.functions.InitAdminAccess;
 import org.libvirt.Connect;
 import org.libvirt.StorageVol;
 import org.xml.sax.InputSource;
@@ -72,22 +75,23 @@ public class LibvirtComputeService extends BaseComputeService {
             @Memoized Supplier<Set<? extends Image>> images,
             @Memoized Supplier<Set<? extends Hardware>> hardwareProfiles,
             @Memoized Supplier<Set<? extends Location>> locations, ListNodesStrategy listNodesStrategy,
-            GetNodeMetadataStrategy getNodeMetadataStrategy, CreateNodesInGroupThenAddToSet runNodesAndAddToSetStrategy,
-            RebootNodeStrategy rebootNodeStrategy, DestroyNodeStrategy destroyNodeStrategy,
-            ResumeNodeStrategy resumeNodeStrategy, SuspendNodeStrategy suspendNodeStrategy,
-            Provider<TemplateBuilder> templateBuilderProvider, Provider<TemplateOptions> templateOptionsProvider,
+            GetNodeMetadataStrategy getNodeMetadataStrategy,
+            CreateNodesInGroupThenAddToSet runNodesAndAddToSetStrategy, RebootNodeStrategy rebootNodeStrategy,
+            DestroyNodeStrategy destroyNodeStrategy, ResumeNodeStrategy resumeNodeStrategy,
+            SuspendNodeStrategy suspendNodeStrategy, Provider<TemplateBuilder> templateBuilderProvider,
+            Provider<TemplateOptions> templateOptionsProvider,
             @Named("NODE_RUNNING") Predicate<NodeMetadata> nodeRunning,
             @Named("NODE_TERMINATED") Predicate<NodeMetadata> nodeTerminated,
             @Named("NODE_SUSPENDED") Predicate<NodeMetadata> nodeSuspended,
-            InitializeRunScriptOnNodeOrPlaceInBadMap.Factory initScriptRunnerFactory, Timeouts timeouts,
-            @Named(Constants.PROPERTY_USER_THREADS) ExecutorService executor, Connect client) {
+            InitializeRunScriptOnNodeOrPlaceInBadMap.Factory initScriptRunnerFactory, InitAdminAccess initAdminAccess,
+            RunScriptOnNode.Factory runScriptOnNodeFactory, PersistNodeCredentials persistNodeCredentials,
+            Timeouts timeouts, @Named(Constants.PROPERTY_USER_THREADS) ExecutorService executor, Connect client) {
       super(context, credentialStore, images, hardwareProfiles, locations, listNodesStrategy, getNodeMetadataStrategy,
                runNodesAndAddToSetStrategy, rebootNodeStrategy, destroyNodeStrategy, resumeNodeStrategy,
                suspendNodeStrategy, templateBuilderProvider, templateOptionsProvider, nodeRunning, nodeTerminated,
-               nodeSuspended, initScriptRunnerFactory, timeouts, executor);
-
+               nodeSuspended, initScriptRunnerFactory, initAdminAccess, runScriptOnNodeFactory, persistNodeCredentials,
+               timeouts, executor);
       this.client = client;
-
    }
 
    @Override
diff --git a/sandbox-apis/libvirt/src/test/java/org/jclouds/libvirt/compute/LibvirtComputeServiceLiveTest.java b/sandbox-apis/libvirt/src/test/java/org/jclouds/libvirt/compute/LibvirtComputeServiceLiveTest.java
index f97bf8840c..5fe6d54f71 100644
--- a/sandbox-apis/libvirt/src/test/java/org/jclouds/libvirt/compute/LibvirtComputeServiceLiveTest.java
+++ b/sandbox-apis/libvirt/src/test/java/org/jclouds/libvirt/compute/LibvirtComputeServiceLiveTest.java
@@ -42,7 +42,7 @@ public class LibvirtComputeServiceLiveTest extends BaseComputeServiceLiveTest {
    }
 
    @Override
-   protected Properties getRestProperties() {
+   protected Properties setupRestProperties() {
       Properties restProperties = new Properties();
       restProperties.setProperty("libvirt.contextbuilder", LibvirtComputeServiceContextBuilder.class.getName());
       restProperties.setProperty("libvirt.propertiesbuilder", LibvirtPropertiesBuilder.class.getName());
diff --git a/sandbox-apis/nirvanix/pom.xml b/sandbox-apis/nirvanix/pom.xml
index 6c7a8bda5d..ac5549c642 100644
--- a/sandbox-apis/nirvanix/pom.xml
+++ b/sandbox-apis/nirvanix/pom.xml
@@ -32,6 +32,7 @@
     <artifactId>nirvanix</artifactId>
     <name>jclouds nirvanix storage delivery network core</name>
     <description>jclouds Core components to access nirvanix nirvanix</description>
+    <packaging>bundle</packaging>
 
     <!-- bootstrapping: need to fetch the project POM -->
     <repositories>
@@ -131,5 +132,20 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>    
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.nirvanix.sdn.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
     
 </project>
diff --git a/sandbox-apis/nirvanix/src/test/java/org/jclouds/nirvanix/sdn/SDNAsyncClientTest.java b/sandbox-apis/nirvanix/src/test/java/org/jclouds/nirvanix/sdn/SDNAsyncClientTest.java
index 3575c69c00..8a2978db30 100644
--- a/sandbox-apis/nirvanix/src/test/java/org/jclouds/nirvanix/sdn/SDNAsyncClientTest.java
+++ b/sandbox-apis/nirvanix/src/test/java/org/jclouds/nirvanix/sdn/SDNAsyncClientTest.java
@@ -176,7 +176,6 @@ public class SDNAsyncClientTest extends RestClientTest<SDNAsyncClient> {
          bind(String.class).annotatedWith(SessionToken.class).toInstance("sessiontoken");
          bind(String.class).annotatedWith(Names.named(SDNConstants.PROPERTY_SDN_APPKEY)).toInstance("appKey");
          bind(String.class).annotatedWith(Names.named(SDNConstants.PROPERTY_SDN_APPNAME)).toInstance("appname");
-
          bind(String.class).annotatedWith(Names.named(SDNConstants.PROPERTY_SDN_USERNAME)).toInstance("username");
       }
 
diff --git a/sandbox-apis/nirvanix/src/test/java/org/jclouds/nirvanix/sdn/filters/AddSessionTokenToRequestTest.java b/sandbox-apis/nirvanix/src/test/java/org/jclouds/nirvanix/sdn/filters/AddSessionTokenToRequestTest.java
index 5b460a6a86..894d34e8fa 100755
--- a/sandbox-apis/nirvanix/src/test/java/org/jclouds/nirvanix/sdn/filters/AddSessionTokenToRequestTest.java
+++ b/sandbox-apis/nirvanix/src/test/java/org/jclouds/nirvanix/sdn/filters/AddSessionTokenToRequestTest.java
@@ -20,41 +20,37 @@ package org.jclouds.nirvanix.sdn.filters;
 
 import static org.testng.Assert.assertEquals;
 
+import java.io.IOException;
 import java.lang.reflect.Method;
 import java.net.URI;
 import java.util.Properties;
 
 import javax.ws.rs.POST;
 
-import org.jclouds.concurrent.MoreExecutors;
-import org.jclouds.concurrent.config.ExecutorServiceModule;
-import org.jclouds.date.DateService;
 import org.jclouds.http.HttpRequest;
-import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule;
-import org.jclouds.logging.Logger;
-import org.jclouds.logging.Logger.LoggerFactory;
-import org.jclouds.nirvanix.sdn.SDNPropertiesBuilder;
+import org.jclouds.http.RequiresHttp;
+import org.jclouds.nirvanix.sdn.SDNAsyncClient;
+import org.jclouds.nirvanix.sdn.SDNClient;
 import org.jclouds.nirvanix.sdn.SessionToken;
+import org.jclouds.nirvanix.sdn.config.SDNRestClientModule;
+import org.jclouds.nirvanix.sdn.reference.SDNConstants;
+import org.jclouds.rest.ConfiguresRestClient;
+import org.jclouds.rest.RestClientTest;
+import org.jclouds.rest.RestContextFactory;
+import org.jclouds.rest.RestContextSpec;
 import org.jclouds.rest.annotations.EndpointParam;
-import org.jclouds.rest.config.RestModule;
 import org.jclouds.rest.internal.RestAnnotationProcessor;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
-import com.google.inject.AbstractModule;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
 import com.google.inject.Key;
-import com.google.inject.Provides;
+import com.google.inject.Module;
 import com.google.inject.TypeLiteral;
 import com.google.inject.name.Names;
 
-@Test(groups = "unit", testName = "sdn.AddSessionTokenToRequestTest")
-public class AddSessionTokenToRequestTest {
-
-   private Injector injector;
-   private AddSessionTokenToRequest filter;
+@Test(groups = "unit", testName = "AddSessionTokenToRequestTest")
+public class AddSessionTokenToRequestTest extends RestClientTest<SDNAsyncClient> {
 
    private static interface TestService {
       @POST
@@ -65,15 +61,15 @@ public class AddSessionTokenToRequestTest {
    public Object[][] dataProvider() throws SecurityException, NoSuchMethodException {
 
       RestAnnotationProcessor<TestService> factory = injector.getInstance(Key
-            .get(new TypeLiteral<RestAnnotationProcessor<TestService>>() {
-            }));
+               .get(new TypeLiteral<RestAnnotationProcessor<TestService>>() {
+               }));
 
       Method method = TestService.class.getMethod("foo", URI.class);
       return new Object[][] { { factory.createRequest(method, new Object[] { URI.create("https://host:443") }) },
-            { factory.createRequest(method, new Object[] { URI.create("https://host/path") }) },
-            { factory.createRequest(method, new Object[] { URI.create("https://host/?query") })
+               { factory.createRequest(method, new Object[] { URI.create("https://host/path") }) },
+               { factory.createRequest(method, new Object[] { URI.create("https://host/?query") })
 
-            } };
+               } };
    }
 
    @Test(dataProvider = "dataProvider")
@@ -82,7 +78,7 @@ public class AddSessionTokenToRequestTest {
       String query = request.getEndpoint().getQuery();
       request = filter.filter(request);
       assertEquals(request.getEndpoint().getQuery(), query == null ? "sessionToken=" + token : query + "&sessionToken="
-            + token);
+               + token);
    }
 
    @Test
@@ -93,34 +89,44 @@ public class AddSessionTokenToRequestTest {
       assert token.equals(filter.getSessionToken());
    }
 
-   /**
-    * before class, as we need to ensure that the filter is threadsafe.
-    * 
-    */
+   @Override
+   protected void checkFilters(HttpRequest request) {
+   }
+
+   private AddSessionTokenToRequest filter;
+
    @BeforeClass
-   protected void createFilter() {
-      injector = Guice.createInjector(new RestModule(), new ExecutorServiceModule(MoreExecutors.sameThreadExecutor(),
-            MoreExecutors.sameThreadExecutor()), new JavaUrlHttpCommandExecutorServiceModule(), new AbstractModule() {
-
-         protected void configure() {
-            bind(DateService.class);
-            Names.bindProperties(this.binder(),
-                  new SDNPropertiesBuilder(new Properties()).credentials("appkey/appname/username", "password").build());
-            bind(Logger.LoggerFactory.class).toInstance(new LoggerFactory() {
-               public Logger getLogger(String category) {
-                  return Logger.NULL;
-               }
-            });
-         }
-
-         @SuppressWarnings("unused")
-         @SessionToken
-         @Provides
-         String authTokenProvider() {
-            return System.currentTimeMillis() + "";
-         }
-      });
+   @Override
+   protected void setupFactory() throws IOException {
+      super.setupFactory();
       filter = injector.getInstance(AddSessionTokenToRequest.class);
    }
 
+   @Override
+   protected TypeLiteral<RestAnnotationProcessor<SDNAsyncClient>> createTypeLiteral() {
+      return new TypeLiteral<RestAnnotationProcessor<SDNAsyncClient>>() {
+      };
+   }
+
+   protected Module createModule() {
+      return new TestSDNRestClientModule();
+   }
+
+   @RequiresHttp
+   @ConfiguresRestClient
+   static class TestSDNRestClientModule extends SDNRestClientModule {
+      @Override
+      public void configure() {
+         bind(String.class).annotatedWith(SessionToken.class).toInstance("sessiontoken");
+         bind(String.class).annotatedWith(Names.named(SDNConstants.PROPERTY_SDN_APPKEY)).toInstance("appKey");
+         bind(String.class).annotatedWith(Names.named(SDNConstants.PROPERTY_SDN_APPNAME)).toInstance("appname");
+         bind(String.class).annotatedWith(Names.named(SDNConstants.PROPERTY_SDN_USERNAME)).toInstance("username");
+      }
+
+   }
+
+   @Override
+   public RestContextSpec<SDNClient, SDNAsyncClient> createContextSpec() {
+      return new RestContextFactory().createContextSpec("sdn", "user", "password", new Properties());
+   }
 }
\ No newline at end of file
diff --git a/sandbox-apis/nirvanix/src/test/java/org/jclouds/nirvanix/sdn/filters/InsertUserContextIntoPathTest.java b/sandbox-apis/nirvanix/src/test/java/org/jclouds/nirvanix/sdn/filters/InsertUserContextIntoPathTest.java
index f44bc4c163..745e32aa59 100644
--- a/sandbox-apis/nirvanix/src/test/java/org/jclouds/nirvanix/sdn/filters/InsertUserContextIntoPathTest.java
+++ b/sandbox-apis/nirvanix/src/test/java/org/jclouds/nirvanix/sdn/filters/InsertUserContextIntoPathTest.java
@@ -18,99 +18,113 @@
  */
 package org.jclouds.nirvanix.sdn.filters;
 
-import static org.easymock.EasyMock.expect;
-import static org.easymock.classextension.EasyMock.createMock;
-import static org.easymock.classextension.EasyMock.replay;
 import static org.testng.Assert.assertEquals;
 
+import java.io.IOException;
 import java.lang.reflect.Method;
 import java.net.URI;
 import java.util.Properties;
 
 import javax.ws.rs.POST;
 
-import org.jclouds.concurrent.MoreExecutors;
-import org.jclouds.concurrent.config.ExecutorServiceModule;
 import org.jclouds.http.HttpRequest;
-import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule;
-import org.jclouds.logging.Logger;
-import org.jclouds.logging.Logger.LoggerFactory;
-import org.jclouds.nirvanix.sdn.SDNPropertiesBuilder;
-import org.jclouds.nirvanix.sdn.config.SDNAuthRestClientModule;
+import org.jclouds.http.RequiresHttp;
+import org.jclouds.nirvanix.sdn.SDNAsyncClient;
+import org.jclouds.nirvanix.sdn.SDNClient;
+import org.jclouds.nirvanix.sdn.SessionToken;
+import org.jclouds.nirvanix.sdn.config.SDNRestClientModule;
+import org.jclouds.nirvanix.sdn.reference.SDNConstants;
+import org.jclouds.rest.ConfiguresRestClient;
+import org.jclouds.rest.RestClientTest;
+import org.jclouds.rest.RestContextFactory;
+import org.jclouds.rest.RestContextSpec;
 import org.jclouds.rest.annotations.EndpointParam;
-import org.jclouds.rest.config.RestModule;
 import org.jclouds.rest.internal.RestAnnotationProcessor;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import com.google.inject.AbstractModule;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-import com.google.inject.Key;
+import com.google.common.base.Throwables;
+import com.google.inject.Module;
 import com.google.inject.TypeLiteral;
 import com.google.inject.name.Names;
 
-@Test(groups = "unit", sequential = true, testName = "sdn.InsertUserContextIntoPathTest")
+@Test(groups = "unit", singleThreaded = true, testName = "sdn.InsertUserContextIntoPathTest")
 // sequential as easymock isn't threadsafe
-public class InsertUserContextIntoPathTest {
+public class InsertUserContextIntoPathTest extends RestClientTest<TestService> {
 
-   private Injector injector;
-   private InsertUserContextIntoPath filter;
-   private RestAnnotationProcessor<TestService> factory;
    private Method method;
 
-   private static interface TestService {
-      @POST
-         public void foo(@EndpointParam URI endpoint);
-   }
-
    public void testRequestInvalid() {
-      HttpRequest request = factory.createRequest(method, URI.create("https://host/path"));
+      HttpRequest request = processor.createRequest(method, URI.create("https://host/path"));
       request = filter.filter(request);
       request = filter.filter(request);
-      assertEquals(request.getEndpoint().getPath(), "/token/appname/username/path");
+      assertEquals(request.getEndpoint().getPath(), "/sessiontoken/appname/username/path");
       assertEquals(request.getEndpoint().getHost(), "host");
    }
 
    public void testRequestNoSession() {
-      HttpRequest request = factory.createRequest(method, URI.create("https://host/path"));
+      HttpRequest request = processor.createRequest(method, URI.create("https://host/path"));
       request = filter.filter(request);
-      assertEquals(request.getEndpoint().getPath(), "/token/appname/username/path");
+      assertEquals(request.getEndpoint().getPath(), "/sessiontoken/appname/username/path");
       assertEquals(request.getEndpoint().getHost(), "host");
    }
 
    public void testRequestAlreadyHasSession() {
-      HttpRequest request = factory.createRequest(method, URI.create("https://host/token/appname/username/path"));
+      HttpRequest request = processor.createRequest(method, URI.create("https://host/sessiontoken/appname/username/path"));
       request = filter.filter(request);
-      assertEquals(request.getEndpoint().getPath(), "/token/appname/username/path");
+      assertEquals(request.getEndpoint().getPath(), "/sessiontoken/appname/username/path");
       assertEquals(request.getEndpoint().getHost(), "host");
    }
 
+   private InsertUserContextIntoPath filter;
+
    @BeforeClass
-   protected void createFilter() throws SecurityException, NoSuchMethodException {
-      injector = Guice.createInjector(new RestModule(), new ExecutorServiceModule(MoreExecutors.sameThreadExecutor(),
-            MoreExecutors.sameThreadExecutor()), new JavaUrlHttpCommandExecutorServiceModule(), new AbstractModule() {
-
-         protected void configure() {
-            install(new SDNAuthRestClientModule());
-            bind(Logger.LoggerFactory.class).toInstance(new LoggerFactory() {
-               public Logger getLogger(String category) {
-                  return Logger.NULL;
-               }
-            });
-            AddSessionTokenToRequest sessionManager = createMock(AddSessionTokenToRequest.class);
-            expect(sessionManager.getSessionToken()).andReturn("token").anyTimes();
-            replay(sessionManager);
-            bind(AddSessionTokenToRequest.class).toInstance(sessionManager);
-            Names.bindProperties(this.binder(),
-                  new SDNPropertiesBuilder(new Properties()).credentials("appkey/appname/username", "password").build());
-         }
-
-      });
+   @Override
+   protected void setupFactory() throws IOException {
+      super.setupFactory();
       filter = injector.getInstance(InsertUserContextIntoPath.class);
-      factory = injector.getInstance(Key.get(new TypeLiteral<RestAnnotationProcessor<TestService>>() {
-      }));
-      method = TestService.class.getMethod("foo", URI.class);
+      try {
+         method = TestService.class.getMethod("foo", URI.class);
+      } catch (Exception e) {
+        Throwables.propagate(e);
+      }
    }
 
-}
\ No newline at end of file
+   @Override
+   protected TypeLiteral<RestAnnotationProcessor<TestService>> createTypeLiteral() {
+      return new TypeLiteral<RestAnnotationProcessor<TestService>>() {
+      };
+   }
+
+   protected Module createModule() {
+      return new TestSDNRestClientModule();
+   }
+
+   @RequiresHttp
+   @ConfiguresRestClient
+   static class TestSDNRestClientModule extends SDNRestClientModule {
+      @Override
+      public void configure() {
+         bind(String.class).annotatedWith(SessionToken.class).toInstance("sessiontoken");
+         bind(String.class).annotatedWith(Names.named(SDNConstants.PROPERTY_SDN_APPKEY)).toInstance("appKey");
+         bind(String.class).annotatedWith(Names.named(SDNConstants.PROPERTY_SDN_APPNAME)).toInstance("appname");
+         bind(String.class).annotatedWith(Names.named(SDNConstants.PROPERTY_SDN_USERNAME)).toInstance("username");
+      }
+
+   }
+
+   @Override
+   public RestContextSpec<SDNClient, SDNAsyncClient> createContextSpec() {
+      return new RestContextFactory().createContextSpec("sdn", "user", "password", new Properties());
+   }
+
+   @Override
+   protected void checkFilters(HttpRequest request) {
+      
+   }
+}
+
+interface TestService {
+   @POST
+   public void foo(@EndpointParam URI endpoint);
+}
diff --git a/sandbox-apis/pcs/pom.xml b/sandbox-apis/pcs/pom.xml
index afb6454e57..2ef6344198 100644
--- a/sandbox-apis/pcs/pom.xml
+++ b/sandbox-apis/pcs/pom.xml
@@ -32,6 +32,8 @@
     <artifactId>pcs</artifactId>
     <name>jclouds mezeo cloud storage platform core</name>
     <description>jclouds Core components to access mezeo pcs2</description>
+    <packaging>bundle</packaging>
+
     <!-- bootstrapping: need to fetch the project POM -->
     <repositories>
         <repository>
@@ -130,5 +132,20 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>    
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.mezeo.pcs.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
     
 </project>
diff --git a/sandbox-apis/simpledb/pom.xml b/sandbox-apis/simpledb/pom.xml
index 289c574bab..088e01feb2 100644
--- a/sandbox-apis/simpledb/pom.xml
+++ b/sandbox-apis/simpledb/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>simpledb</artifactId>
     <name>jcloud simpledb api</name>
     <description>jclouds components to access an implementation of Simple DB</description>
+    <packaging>bundle</packaging>
 
     <properties>
         <test.simpledb.endpoint>https://sdb.amazonaws.com</test.simpledb.endpoint>
@@ -105,6 +106,21 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>    
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.simpledb.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
 
diff --git a/sandbox-apis/sqs/pom.xml b/sandbox-apis/sqs/pom.xml
index b57ee13723..d05dd450b5 100644
--- a/sandbox-apis/sqs/pom.xml
+++ b/sandbox-apis/sqs/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>sqs</artifactId>
     <name>jcloud sqs api</name>
     <description>jclouds components to access an implementation of Simple Queue Service</description>
+    <packaging>bundle</packaging>
 
     <properties>
         <test.sqs.endpoint>https://sqs.us-east-1.amazonaws.com</test.sqs.endpoint>
@@ -105,6 +106,20 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>    
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.sqs.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
-
diff --git a/sandbox-drivers/asynchttpclient/pom.xml b/sandbox-drivers/asynchttpclient/pom.xml
index 9b52fedd79..ad1349d179 100644
--- a/sandbox-drivers/asynchttpclient/pom.xml
+++ b/sandbox-drivers/asynchttpclient/pom.xml
@@ -2,7 +2,7 @@
     <!--
 
 
-        Copyright (C) 2010 Cloud Conscious, LLC.
+        Copyright (C) 2011 Cloud Conscious, LLC.
         <info@cloudconscious.com>
 
         ====================================================================
@@ -31,8 +31,8 @@
     <groupId>org.jclouds.driver</groupId>
     <artifactId>jclouds-asynchttpclient</artifactId>
     <name>jclouds Ning Http Client</name>
-    <packaging>jar</packaging>
     <description>Ning Http client</description>
+    <packaging>bundle</packaging>
 
     <!-- bootstrapping: need to fetch the project POM -->
     <repositories>
@@ -70,4 +70,20 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>    
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration> 
+                    <instructions>      
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.http.ning.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>     
+                </configuration>
+            </plugin>   
+        </plugins>
+    </build>
+
 </project>
diff --git a/sandbox-providers/aws-elb/pom.xml b/sandbox-providers/aws-elb/pom.xml
index 38209a0ded..3cd74042f0 100644
--- a/sandbox-providers/aws-elb/pom.xml
+++ b/sandbox-providers/aws-elb/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>aws-elb</artifactId>
     <name>jclouds Amazon Elastic Load Balancer provider</name>
     <description>Elastic Load Balancer implementation targeted to Amazon Web Services</description>
+    <packaging>bundle</packaging>
 
     <properties>
         <test.aws-elb.endpoint>https://elasticloadbalancing.us-east-1.amazonaws.com</test.aws-elb.endpoint>
@@ -168,6 +169,20 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.aws.elb.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
-
diff --git a/sandbox-providers/aws-elb/src/main/java/org/jclouds/aws/elb/AWSELBProviderMetadata.java b/sandbox-providers/aws-elb/src/main/java/org/jclouds/aws/elb/AWSELBProviderMetadata.java
new file mode 100644
index 0000000000..3a674c8195
--- /dev/null
+++ b/sandbox-providers/aws-elb/src/main/java/org/jclouds/aws/elb/AWSELBProviderMetadata.java
@@ -0,0 +1,108 @@
+/**
+ *
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.aws.elb;
+
+import java.net.URI;
+import java.util.Set;
+
+import org.jclouds.providers.BaseProviderMetadata;
+import org.jclouds.providers.ProviderMetadata;
+
+import com.google.common.collect.ImmutableSet;
+
+/**
+ * Implementation of @ link org.jclouds.types.ProviderMetadata} for Amazon's Elastic Load Balancing
+ * provider.
+ * 
+ * @author Adrian Cole
+ */
+public class AWSELBProviderMetadata extends BaseProviderMetadata {
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public String getId() {
+      return "aws-elb";
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public String getType() {
+      return ProviderMetadata.LOADBALANCER_TYPE;
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public String getName() {
+      return "Amazon Elastic Load Balancing";
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public String getIdentityName() {
+      return "Access Key ID";
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public String getCredentialName() {
+      return "Secret Access Key";
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public URI getHomepage() {
+      return URI.create("http://aws.amazon.com/elasticloadbalancing");
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public URI getConsole() {
+      return URI.create("https://console.aws.amazon.com/ec2/home");
+   }
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public URI getApiDocumentation() {
+      return URI.create("http://docs.amazonwebservices.com/ElasticLoadBalancing/latest/APIReference");
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public Set<String> getLinkedServices() {
+      return ImmutableSet.of("aws-s3", "aws-ec2", "aws-elb", "aws-simpledb");
+   }
+
+}
\ No newline at end of file
diff --git a/sandbox-providers/aws-elb/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/sandbox-providers/aws-elb/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
new file mode 100644
index 0000000000..6b88bf79db
--- /dev/null
+++ b/sandbox-providers/aws-elb/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
@@ -0,0 +1 @@
+org.jclouds.aws.elb.AWSELBProviderMetadata
diff --git a/sandbox-providers/aws-elb/src/test/java/org/jclouds/aws/elb/ProvidersInPropertiesTest.java b/sandbox-providers/aws-elb/src/test/java/org/jclouds/aws/elb/AWSELBProviderTest.java
similarity index 67%
rename from sandbox-providers/aws-elb/src/test/java/org/jclouds/aws/elb/ProvidersInPropertiesTest.java
rename to sandbox-providers/aws-elb/src/test/java/org/jclouds/aws/elb/AWSELBProviderTest.java
index 41ed1fb94d..bf31bc94cd 100644
--- a/sandbox-providers/aws-elb/src/test/java/org/jclouds/aws/elb/ProvidersInPropertiesTest.java
+++ b/sandbox-providers/aws-elb/src/test/java/org/jclouds/aws/elb/AWSELBProviderTest.java
@@ -18,23 +18,19 @@
  */
 package org.jclouds.aws.elb;
 
-import org.jclouds.rest.Providers;
+import org.jclouds.providers.BaseProviderMetadataTest;
+import org.jclouds.providers.ProviderMetadata;
 import org.testng.annotations.Test;
 
-import com.google.common.collect.Iterables;
-
 /**
+ * The AWSELBProviderTest tests the org.jclouds.providers.AWSELBProvider class.
  * 
  * @author Adrian Cole
- * 
  */
-@Test(groups = "unit")
-public class ProvidersInPropertiesTest {
-   
-   @Test
-   public void testSupportedProviders() {
-      Iterable<String> providers = Providers.getSupportedProviders();
-      assert Iterables.contains(providers, "aws-elb") : providers;
-   }
+@Test(groups = "unit", testName = "AWSELBProviderTest")
+public class AWSELBProviderTest extends BaseProviderMetadataTest {
 
-}
+   public AWSELBProviderTest() {
+      super(new AWSELBProviderMetadata(), ProviderMetadata.LOADBALANCER_TYPE);
+   }
+}
\ No newline at end of file
diff --git a/sandbox-providers/aws-simpledb/pom.xml b/sandbox-providers/aws-simpledb/pom.xml
index 005aa13bb3..b3b91898c5 100644
--- a/sandbox-providers/aws-simpledb/pom.xml
+++ b/sandbox-providers/aws-simpledb/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>aws-simpledb</artifactId>
     <name>jclouds Amazon SimpleDB provider</name>
     <description>SimpleDB implementation targeted to Amazon Web Services</description>
+    <packaging>bundle</packaging>
 
     <properties>
         <test.aws-simpledb.endpoint>https://sdb.amazonaws.com</test.aws-simpledb.endpoint>
@@ -119,6 +120,21 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.aws.simpledb.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
 
diff --git a/sandbox-providers/aws-simpledb/src/main/java/org/jclouds/aws/simpledb/AWSSimpleDBProviderMetadata.java b/sandbox-providers/aws-simpledb/src/main/java/org/jclouds/aws/simpledb/AWSSimpleDBProviderMetadata.java
new file mode 100644
index 0000000000..105c3f8f8a
--- /dev/null
+++ b/sandbox-providers/aws-simpledb/src/main/java/org/jclouds/aws/simpledb/AWSSimpleDBProviderMetadata.java
@@ -0,0 +1,108 @@
+/**
+ *
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.aws.simpledb;
+
+import java.net.URI;
+import java.util.Set;
+
+import org.jclouds.providers.BaseProviderMetadata;
+import org.jclouds.providers.ProviderMetadata;
+
+import com.google.common.collect.ImmutableSet;
+
+/**
+ * Implementation of @ link org.jclouds.types.ProviderMetadata} for Amazon's SimpleDB provider.
+ * 
+ * @author Adrian Cole
+ */
+public class AWSSimpleDBProviderMetadata extends BaseProviderMetadata {
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public String getId() {
+      return "aws-simpledb";
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public String getType() {
+      return ProviderMetadata.TABLE_TYPE;
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public String getName() {
+      return "Amazon SimpleDB";
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public String getIdentityName() {
+      return "Access Key ID";
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public String getCredentialName() {
+      return "Secret Access Key";
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public URI getHomepage() {
+      return URI.create("http://aws.amazon.com/simpledb");
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public URI getConsole() {
+      return null;
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public URI getApiDocumentation() {
+      return URI.create("http://docs.amazonwebservices.com/AmazonSimpleDB/latest/DeveloperGuide");
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public Set<String> getLinkedServices() {
+      return ImmutableSet.of("aws-s3", "aws-ec2", "aws-elb", "aws-simpledb");
+   }
+
+}
\ No newline at end of file
diff --git a/sandbox-providers/aws-simpledb/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/sandbox-providers/aws-simpledb/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
new file mode 100644
index 0000000000..2e3fd4f328
--- /dev/null
+++ b/sandbox-providers/aws-simpledb/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
@@ -0,0 +1 @@
+org.jclouds.aws.simpledb.AWSSimpleDBProviderMetadata
diff --git a/core/src/main/java/com/google/gson/JcloudsGsonPackageAccessor.java b/sandbox-providers/aws-simpledb/src/test/java/org/jclouds/aws/simpledb/AWSSimpleDBProviderTest.java
similarity index 61%
rename from core/src/main/java/com/google/gson/JcloudsGsonPackageAccessor.java
rename to sandbox-providers/aws-simpledb/src/test/java/org/jclouds/aws/simpledb/AWSSimpleDBProviderTest.java
index b7fd52655a..69969c47cc 100644
--- a/core/src/main/java/com/google/gson/JcloudsGsonPackageAccessor.java
+++ b/sandbox-providers/aws-simpledb/src/test/java/org/jclouds/aws/simpledb/AWSSimpleDBProviderTest.java
@@ -16,17 +16,21 @@
  * limitations under the License.
  * ====================================================================
  */
-package com.google.gson;
+package org.jclouds.aws.simpledb;
+
+import org.jclouds.providers.BaseProviderMetadataTest;
+import org.jclouds.providers.ProviderMetadata;
+import org.testng.annotations.Test;
 
 /**
- * handles the limitation in gson 1.6 where
- * {@link GsonBuilder#registerTypeHierarchyAdapter(Class, Object)} is package private.
+ * The AWSSimpleDBProviderTest tests the org.jclouds.providers.AWSSimpleDBProvider class.
  * 
- * @see <a href="http://code.google.com/p/google-gson/issues/detail?id=271" >gson issue 271</a>
  * @author Adrian Cole
  */
-public class JcloudsGsonPackageAccessor {
-   public static GsonBuilder registerTypeHierarchyAdapter(GsonBuilder builder, Class<?> baseType, Object typeAdapter) {
-      return builder.registerTypeHierarchyAdapter(baseType, typeAdapter);
+@Test(groups = "unit", testName = "AWSSimpleDBProviderTest")
+public class AWSSimpleDBProviderTest extends BaseProviderMetadataTest {
+
+   public AWSSimpleDBProviderTest() {
+      super(new AWSSimpleDBProviderMetadata(), ProviderMetadata.TABLE_TYPE);
    }
-}
+}
\ No newline at end of file
diff --git a/sandbox-providers/azurequeue/pom.xml b/sandbox-providers/azurequeue/pom.xml
index 27d7dd6285..beeacf0e25 100644
--- a/sandbox-providers/azurequeue/pom.xml
+++ b/sandbox-providers/azurequeue/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>azurequeue</artifactId>
     <name>jcloud azurequeue provider</name>
     <description>jclouds components to access Azure Queue Service</description>
+    <packaging>bundle</packaging>
 
     <properties>
         <test.azurequeue.endpoint>https://{identity}.queue.core.windows.net</test.azurequeue.endpoint>
@@ -112,6 +113,20 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.azurequeue.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
-
diff --git a/sandbox-providers/boxdotnet/pom.xml b/sandbox-providers/boxdotnet/pom.xml
index f1a1d26664..433628602f 100644
--- a/sandbox-providers/boxdotnet/pom.xml
+++ b/sandbox-providers/boxdotnet/pom.xml
@@ -37,6 +37,8 @@
     <artifactId>boxdotnet</artifactId>
     <name>jclouds BoxDotNet core</name>
     <description>jclouds components to access BoxDotNet</description>
+    <packaging>bundle</packaging>
+
     <!-- bootstrapping: need to fetch the project POM -->
     <repositories>
         <repository>
@@ -126,4 +128,19 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.boxdotnet.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/sandbox-providers/ibmdev/pom.xml b/sandbox-providers/ibm-smartcloud/pom.xml
similarity index 71%
rename from sandbox-providers/ibmdev/pom.xml
rename to sandbox-providers/ibm-smartcloud/pom.xml
index f5148ed4b4..1938d8d2e3 100644
--- a/sandbox-providers/ibmdev/pom.xml
+++ b/sandbox-providers/ibm-smartcloud/pom.xml
@@ -34,9 +34,11 @@
         <relativePath>../../project/pom.xml</relativePath>
     </parent>
     <groupId>org.jclouds.provider</groupId>
-    <artifactId>ibmdev</artifactId>
-    <name>jclouds IBMDeveloperCloud core</name>
-    <description>jclouds components to access IBMDeveloperCloud</description>
+    <artifactId>ibm-smartcloud</artifactId>
+    <name>jclouds IBM SmartCloud core</name>
+    <description>jclouds components to access IBM SmartCloud</description>
+    <packaging>bundle</packaging>
+
     <!-- bootstrapping: need to fetch the project POM -->
     <repositories>
         <repository>
@@ -52,10 +54,10 @@
     </repositories>
 
     <properties>
-        <test.ibmdev.endpoint>https://www-147.ibm.com/computecloud/enterprise/api/rest</test.ibmdev.endpoint>
-        <test.ibmdev.apiversion>20100331</test.ibmdev.apiversion>
-        <test.ibmdev.identity>FIXME</test.ibmdev.identity>
-        <test.ibmdev.credential>FIXME</test.ibmdev.credential>
+        <test.ibm-smartcloud.endpoint>https://www-147.ibm.com/computecloud/enterprise/api/rest</test.ibm-smartcloud.endpoint>
+        <test.ibm-smartcloud.apiversion>20100331</test.ibm-smartcloud.apiversion>
+        <test.ibm-smartcloud.identity>FIXME</test.ibm-smartcloud.identity>
+        <test.ibm-smartcloud.credential>FIXME</test.ibm-smartcloud.credential>
     </properties>
     <dependencies>
         <dependency>
@@ -82,12 +84,6 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>        
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.16</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.jclouds.driver</groupId>
             <artifactId>jclouds-log4j</artifactId>
@@ -100,11 +96,6 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.jcraft</groupId>
-            <artifactId>jsch</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
     <profiles>
         <profile>
@@ -124,20 +115,20 @@
                                 <configuration>
                                     <systemProperties>
                                         <property>
-                                            <name>test.ibmdev.endpoint</name>
-                                            <value>${test.ibmdev.endpoint}</value>
+                                            <name>test.ibm-smartcloud.endpoint</name>
+                                            <value>${test.ibm-smartcloud.endpoint}</value>
                                         </property>
                                         <property>
-                                            <name>test.ibmdev.apiversion</name>
-                                            <value>${test.ibmdev.apiversion}</value>
+                                            <name>test.ibm-smartcloud.apiversion</name>
+                                            <value>${test.ibm-smartcloud.apiversion}</value>
                                         </property>
                                         <property>
-                                            <name>test.ibmdev.identity</name>
-                                            <value>${test.ibmdev.identity}</value>
+                                            <name>test.ibm-smartcloud.identity</name>
+                                            <value>${test.ibm-smartcloud.identity}</value>
                                         </property>
                                         <property>
-                                            <name>test.ibmdev.credential</name>
-                                            <value>${test.ibmdev.credential}</value>
+                                            <name>test.ibm-smartcloud.credential</name>
+                                            <value>${test.ibm-smartcloud.credential}</value>
                                         </property>
                                     </systemProperties>
                                 </configuration>
@@ -149,4 +140,20 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.ibm.smartcloud.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudAsyncClient.java b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/IBMSmartCloudAsyncClient.java
similarity index 52%
rename from sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudAsyncClient.java
rename to sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/IBMSmartCloudAsyncClient.java
index 88e7037c9e..ff3d98314c 100644
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudAsyncClient.java
+++ b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/IBMSmartCloudAsyncClient.java
@@ -16,9 +16,8 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.ibmdev;
+package org.jclouds.ibm.smartcloud;
 
-import java.net.URI;
 import java.util.Date;
 import java.util.Set;
 
@@ -33,36 +32,23 @@ import javax.ws.rs.PathParam;
 import javax.ws.rs.core.MediaType;
 
 import org.jclouds.http.filters.BasicAuthentication;
-import org.jclouds.ibmdev.domain.Address;
-import org.jclouds.ibmdev.domain.Image;
-import org.jclouds.ibmdev.domain.Instance;
-import org.jclouds.ibmdev.domain.Key;
-import org.jclouds.ibmdev.domain.Location;
-import org.jclouds.ibmdev.domain.Offering;
-import org.jclouds.ibmdev.domain.StorageOffering;
-import org.jclouds.ibmdev.domain.Volume;
-import org.jclouds.ibmdev.functions.GetFirstInstanceInList;
-import org.jclouds.ibmdev.functions.ParseAddressFromJson;
-import org.jclouds.ibmdev.functions.ParseAddressesFromJson;
-import org.jclouds.ibmdev.functions.ParseExpirationTimeFromJson;
-import org.jclouds.ibmdev.functions.ParseImageFromJson;
-import org.jclouds.ibmdev.functions.ParseImagesFromJson;
-import org.jclouds.ibmdev.functions.ParseInstanceFromJson;
-import org.jclouds.ibmdev.functions.ParseInstancesFromJson;
-import org.jclouds.ibmdev.functions.ParseKeysFromJson;
-import org.jclouds.ibmdev.functions.ParseLongFromDate;
-import org.jclouds.ibmdev.functions.ParseVolumeFromJson;
-import org.jclouds.ibmdev.functions.ParseVolumesFromJson;
-import org.jclouds.ibmdev.options.CreateInstanceOptions;
-import org.jclouds.ibmdev.options.RestartInstanceOptions;
-import org.jclouds.ibmdev.xml.LocationHandler;
-import org.jclouds.ibmdev.xml.LocationsHandler;
-import org.jclouds.rest.annotations.EndpointParam;
+import org.jclouds.ibm.smartcloud.domain.Address;
+import org.jclouds.ibm.smartcloud.domain.Image;
+import org.jclouds.ibm.smartcloud.domain.Instance;
+import org.jclouds.ibm.smartcloud.domain.Key;
+import org.jclouds.ibm.smartcloud.domain.Location;
+import org.jclouds.ibm.smartcloud.domain.Offering;
+import org.jclouds.ibm.smartcloud.domain.StorageOffering;
+import org.jclouds.ibm.smartcloud.domain.Volume;
+import org.jclouds.ibm.smartcloud.functions.ParseLongFromDate;
+import org.jclouds.ibm.smartcloud.options.CreateInstanceOptions;
+import org.jclouds.ibm.smartcloud.options.RestartInstanceOptions;
+import org.jclouds.ibm.smartcloud.xml.LocationHandler;
+import org.jclouds.ibm.smartcloud.xml.LocationsHandler;
 import org.jclouds.rest.annotations.ExceptionParser;
 import org.jclouds.rest.annotations.FormParams;
 import org.jclouds.rest.annotations.ParamParser;
 import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.ResponseParser;
 import org.jclouds.rest.annotations.SkipEncoding;
 import org.jclouds.rest.annotations.Unwrap;
 import org.jclouds.rest.annotations.XMLResponseParser;
@@ -73,305 +59,300 @@ import org.jclouds.rest.functions.ReturnVoidOnNotFoundOr404;
 import com.google.common.util.concurrent.ListenableFuture;
 
 /**
- * Provides asynchronous access to IBMDeveloperCloud via their REST API.
+ * Provides asynchronous access to IBMSmartCloud via their REST API.
  * <p/>
  * 
- * @see IBMDeveloperCloudClient
+ * @see IBMSmartCloudClient
  * @see <a href="http://www-180.ibm.com/cloud/enterprise/beta/support" />
  * @author Adrian Cole
  */
 @RequestFilters(BasicAuthentication.class)
 @SkipEncoding( { '{', '}' })
-public interface IBMDeveloperCloudAsyncClient {
+public interface IBMSmartCloudAsyncClient {
    public static final String VERSION = "20100331";
 
    /**
-    * @see IBMDeveloperCloudClient#listImages()
+    * @see IBMSmartCloudClient#listImages()
     */
    @GET
-   @Path(IBMDeveloperCloudAsyncClient.VERSION + "/offerings/image")
+   @Path(IBMSmartCloudAsyncClient.VERSION + "/offerings/image")
    @Consumes(MediaType.APPLICATION_JSON)
-   @ResponseParser(ParseImagesFromJson.class)
+   @Unwrap
    @ExceptionParser(ReturnEmptySetOnNotFoundOr404.class)
    ListenableFuture<Set<? extends Image>> listImages();
 
    /**
-    * @see IBMDeveloperCloudClient#getImage(long)
+    * @see IBMSmartCloudClient#getImage(long)
     */
    @GET
    @ExceptionParser(ReturnNullOnNotFoundOr404.class)
-   @Path(IBMDeveloperCloudAsyncClient.VERSION + "/offerings/image/{imageId}")
+   @Path(IBMSmartCloudAsyncClient.VERSION + "/offerings/image/{imageId}")
    @Consumes(MediaType.APPLICATION_JSON)
-   @ResponseParser(ParseImageFromJson.class)
    ListenableFuture<Image> getImage(@PathParam("imageId") String id);
 
    /**
-    * @see IBMDeveloperCloudClient#deleteImage
+    * @see IBMSmartCloudClient#getManifestOfImage
+    */
+   @GET
+   @Path(IBMSmartCloudAsyncClient.VERSION + "/offerings/image/{imageId}/manifest")
+   @ExceptionParser(ReturnNullOnNotFoundOr404.class)
+   @Consumes(MediaType.TEXT_XML)
+   ListenableFuture<String> getManifestOfImage(@PathParam("imageId") String id);
+
+   /**
+    * @see IBMSmartCloudClient#deleteImage
     */
    @DELETE
-   @Path(IBMDeveloperCloudAsyncClient.VERSION + "/offerings/image/{imageId}")
+   @Path(IBMSmartCloudAsyncClient.VERSION + "/offerings/image/{imageId}")
    @ExceptionParser(ReturnVoidOnNotFoundOr404.class)
    ListenableFuture<Void> deleteImage(@PathParam("imageId") String id);
 
    /**
-    * @see IBMDeveloperCloudClient#setImageVisibility(long, Image.Visibility)
+    * @see IBMSmartCloudClient#setImageVisibility(long, Image.Visibility)
     */
    @PUT
    @ExceptionParser(ReturnNullOnNotFoundOr404.class)
-   @Path(IBMDeveloperCloudAsyncClient.VERSION + "/offerings/image/{imageId}")
+   @Path(IBMSmartCloudAsyncClient.VERSION + "/offerings/image/{imageId}")
    @Consumes(MediaType.APPLICATION_JSON)
-   @ResponseParser(ParseImageFromJson.class)
    ListenableFuture<Image> setImageVisibility(@PathParam("imageId") String id,
-         @FormParam("visibility") Image.Visibility visibility);
+            @FormParam("visibility") Image.Visibility visibility);
 
    /**
-    * @see IBMDeveloperCloudClient#listInstancesFromRequest(long)
+    * @see IBMSmartCloudClient#listInstancesFromRequest(long)
     */
    @GET
-   @Path(IBMDeveloperCloudAsyncClient.VERSION + "/requests/{requestId}")
+   @Path(IBMSmartCloudAsyncClient.VERSION + "/requests/{requestId}")
+   @Unwrap
    @ExceptionParser(ReturnEmptySetOnNotFoundOr404.class)
    @Consumes(MediaType.APPLICATION_JSON)
-   @ResponseParser(ParseInstancesFromJson.class)
    ListenableFuture<Set<? extends Instance>> listInstancesFromRequest(@PathParam("requestId") String requestId);
 
    /**
-    * @see IBMDeveloperCloudClient#listInstances()
+    * @see IBMSmartCloudClient#listInstances()
     */
    @GET
-   @Path(IBMDeveloperCloudAsyncClient.VERSION + "/instances")
+   @Path(IBMSmartCloudAsyncClient.VERSION + "/instances")
    @Consumes(MediaType.APPLICATION_JSON)
-   @ResponseParser(ParseInstancesFromJson.class)
+   @Unwrap
    @ExceptionParser(ReturnEmptySetOnNotFoundOr404.class)
    ListenableFuture<Set<? extends Instance>> listInstances();
 
    /**
-    * @see IBMDeveloperCloudClient#getInstance(long)
+    * @see IBMSmartCloudClient#getInstance(long)
     */
    @GET
    @ExceptionParser(ReturnNullOnNotFoundOr404.class)
-   @Path(IBMDeveloperCloudAsyncClient.VERSION + "/instances/{instanceId}")
+   @Path(IBMSmartCloudAsyncClient.VERSION + "/instances/{instanceId}")
    @Consumes(MediaType.APPLICATION_JSON)
-   @ResponseParser(ParseInstanceFromJson.class)
    ListenableFuture<Instance> getInstance(@PathParam("instanceId") String id);
 
    /**
     * 
-    * @see IBMDeveloperCloudClient#extendReservationForInstance(long,Date)
+    * @see IBMSmartCloudClient#extendReservationForInstance(long,Date)
     */
    @PUT
-   @Path(IBMDeveloperCloudAsyncClient.VERSION + "/instances/{instanceId}")
+   @Path(IBMSmartCloudAsyncClient.VERSION + "/instances/{instanceId}")
    @Consumes(MediaType.APPLICATION_JSON)
-   @ResponseParser(ParseExpirationTimeFromJson.class)
+   @Unwrap
    ListenableFuture<Date> extendReservationForInstance(@PathParam("instanceId") String id,
-         @FormParam("expirationTime") @ParamParser(ParseLongFromDate.class) Date expirationTime);
+            @FormParam("expirationTime") @ParamParser(ParseLongFromDate.class) Date expirationTime);
 
    /**
-    * @see IBMDeveloperCloudClient#restartInstance
+    * @see IBMSmartCloudClient#restartInstance
     */
    @PUT
-   @Path(IBMDeveloperCloudAsyncClient.VERSION + "/instances/{instanceId}")
+   @Path(IBMSmartCloudAsyncClient.VERSION + "/instances/{instanceId}")
    @FormParams(keys = "state", values = "restart")
    ListenableFuture<Void> restartInstance(@PathParam("instanceId") String id, RestartInstanceOptions... options);
 
    /**
-    * @see IBMDeveloperCloudClient#saveInstanceToImage
+    * @see IBMSmartCloudClient#saveInstanceToImage
     */
    @PUT
-   @Path(IBMDeveloperCloudAsyncClient.VERSION + "/instances/{instanceId}")
+   @Path(IBMSmartCloudAsyncClient.VERSION + "/instances/{instanceId}")
    @Consumes(MediaType.APPLICATION_JSON)
    @FormParams(keys = "state", values = "save")
-   @ResponseParser(ParseImageFromJson.class)
    ListenableFuture<Image> saveInstanceToImage(@PathParam("instanceId") String id,
-         @FormParam("name") String toImageName, @FormParam("description") String toImageDescription);
+            @FormParam("name") String toImageName, @FormParam("description") String toImageDescription);
 
    /**
-    * @see IBMDeveloperCloudClient#createInstanceInLocation
+    * @see IBMSmartCloudClient#createInstanceInLocation
     */
    @POST
-   @Path(IBMDeveloperCloudAsyncClient.VERSION + "/instances")
+   @Path(IBMSmartCloudAsyncClient.VERSION + "/instances")
    @Consumes(MediaType.APPLICATION_JSON)
-   @ResponseParser(GetFirstInstanceInList.class)
+   @Unwrap(depth = 2, edgeCollection = Set.class)
    ListenableFuture<Instance> createInstanceInLocation(@FormParam("location") String location,
-         @FormParam("name") String name, @FormParam("imageID") String imageID,
-         @FormParam("instanceType") String instanceType, CreateInstanceOptions... options);
+            @FormParam("name") String name, @FormParam("imageID") String imageID,
+            @FormParam("instanceType") String instanceType, CreateInstanceOptions... options);
 
    /**
-    * @see IBMDeveloperCloudClient#deleteInstance
+    * @see IBMSmartCloudClient#deleteInstance
     */
    @DELETE
-   @Path(IBMDeveloperCloudAsyncClient.VERSION + "/instances/{instanceId}")
+   @Path(IBMSmartCloudAsyncClient.VERSION + "/instances/{instanceId}")
    @ExceptionParser(ReturnVoidOnNotFoundOr404.class)
    ListenableFuture<Void> deleteInstance(@PathParam("instanceId") String id);
 
    /**
-    * @see IBMDeveloperCloudClient#listKeys()
+    * @see IBMSmartCloudClient#listKeys()
     */
    @GET
-   @Path(IBMDeveloperCloudAsyncClient.VERSION + "/keys")
+   @Path(IBMSmartCloudAsyncClient.VERSION + "/keys")
    @Consumes(MediaType.APPLICATION_JSON)
-   @ResponseParser(ParseKeysFromJson.class)
+   @Unwrap
    @ExceptionParser(ReturnEmptySetOnNotFoundOr404.class)
    ListenableFuture<Set<? extends Key>> listKeys();
 
    /**
-    * @see IBMDeveloperCloudClient#generateKeyPair(String)
+    * @see IBMSmartCloudClient#generateKeyPair(String)
     */
    @POST
-   @Path(IBMDeveloperCloudAsyncClient.VERSION + "/keys")
+   @Path(IBMSmartCloudAsyncClient.VERSION + "/keys")
    @Consumes(MediaType.APPLICATION_JSON)
    ListenableFuture<Key> generateKeyPair(@FormParam("name") String name);
 
    /**
-    * @see IBMDeveloperCloudClient#addPublicKey(String, String)
+    * @see IBMSmartCloudClient#addPublicKey(String, String)
     */
    @POST
-   @Path(IBMDeveloperCloudAsyncClient.VERSION + "/keys")
+   @Path(IBMSmartCloudAsyncClient.VERSION + "/keys")
    ListenableFuture<Void> addPublicKey(@FormParam("name") String name, @FormParam("publicKey") String publicKey);
 
    /**
-    * @see IBMDeveloperCloudClient#updatePublicKey(String, String)
+    * @see IBMSmartCloudClient#updatePublicKey(String, String)
     */
    @PUT
-   @Path(IBMDeveloperCloudAsyncClient.VERSION + "/keys/{keyName}")
+   @Path(IBMSmartCloudAsyncClient.VERSION + "/keys/{keyName}")
    ListenableFuture<Void> updatePublicKey(@PathParam("keyName") String name, @FormParam("publicKey") String publicKey);
 
    /**
-    * @see IBMDeveloperCloudClient#setDefaultStatusOfKey(String, boolean)
+    * @see IBMSmartCloudClient#setDefaultStatusOfKey(String, boolean)
     */
    @PUT
-   @Path(IBMDeveloperCloudAsyncClient.VERSION + "/keys/{keyName}")
+   @Path(IBMSmartCloudAsyncClient.VERSION + "/keys/{keyName}")
    ListenableFuture<Void> setDefaultStatusOfKey(@PathParam("keyName") String name,
-         @FormParam("default") boolean isDefault);
+            @FormParam("default") boolean isDefault);
 
    /**
-    * @see IBMDeveloperCloudClient#getKey(String)
+    * @see IBMSmartCloudClient#getKey(String)
     */
    @GET
    @ExceptionParser(ReturnNullOnNotFoundOr404.class)
-   @Path(IBMDeveloperCloudAsyncClient.VERSION + "/keys/{keyName}")
+   @Path(IBMSmartCloudAsyncClient.VERSION + "/keys/{keyName}")
    @Consumes(MediaType.APPLICATION_JSON)
    ListenableFuture<Key> getKey(@PathParam("keyName") String name);
 
    /**
-    * @see IBMDeveloperCloudClient#deleteKey
+    * @see IBMSmartCloudClient#deleteKey
     */
    @DELETE
-   @Path(IBMDeveloperCloudAsyncClient.VERSION + "/keys/{keyName}")
+   @Path(IBMSmartCloudAsyncClient.VERSION + "/keys/{keyName}")
    @ExceptionParser(ReturnVoidOnNotFoundOr404.class)
    ListenableFuture<Void> deleteKey(@PathParam("keyName") String name);
 
    /**
-    * @see IBMDeveloperCloudClient#listStorageOfferings()
+    * @see IBMSmartCloudClient#listStorageOfferings()
     */
    @GET
-   @Path(IBMDeveloperCloudAsyncClient.VERSION + "/offerings/storage")
+   @Path(IBMSmartCloudAsyncClient.VERSION + "/offerings/storage")
    @Unwrap
    @Consumes(MediaType.APPLICATION_JSON)
    @ExceptionParser(ReturnEmptySetOnNotFoundOr404.class)
    ListenableFuture<Set<? extends StorageOffering>> listStorageOfferings();
 
    /**
-    * @see IBMDeveloperCloudClient#listVolumes()
+    * @see IBMSmartCloudClient#listVolumes()
     */
    @GET
-   @Path(IBMDeveloperCloudAsyncClient.VERSION + "/storage")
-   @ResponseParser(ParseVolumesFromJson.class)
+   @Path(IBMSmartCloudAsyncClient.VERSION + "/storage")
+   @Unwrap
    @Consumes(MediaType.APPLICATION_JSON)
    @ExceptionParser(ReturnEmptySetOnNotFoundOr404.class)
    ListenableFuture<Set<? extends Volume>> listVolumes();
 
    /**
-    * @see IBMDeveloperCloudClient#createVolumeInLocation
+    * @see IBMSmartCloudClient#createVolumeInLocation
     */
    @POST
-   @Path(IBMDeveloperCloudAsyncClient.VERSION + "/storage")
+   @Path(IBMSmartCloudAsyncClient.VERSION + "/storage")
    @Consumes(MediaType.APPLICATION_JSON)
-   @ResponseParser(ParseVolumeFromJson.class)
    ListenableFuture<Volume> createVolumeInLocation(@FormParam("location") String location,
-         @FormParam("name") String name, @FormParam("format") String format, @FormParam("size") String size,
-         @FormParam("offeringID") String offeringID);
+            @FormParam("name") String name, @FormParam("format") String format, @FormParam("size") String size,
+            @FormParam("offeringID") String offeringID);
 
    /**
-    * @see IBMDeveloperCloudClient#getVolume(long)
+    * @see IBMSmartCloudClient#getVolume(long)
     */
    @GET
    @ExceptionParser(ReturnNullOnNotFoundOr404.class)
-   @Path(IBMDeveloperCloudAsyncClient.VERSION + "/storage/{volumeId}")
+   @Path(IBMSmartCloudAsyncClient.VERSION + "/storage/{volumeId}")
    @Consumes(MediaType.APPLICATION_JSON)
-   @ResponseParser(ParseVolumeFromJson.class)
    ListenableFuture<Volume> getVolume(@PathParam("volumeId") String id);
 
    /**
-    * @see IBMDeveloperCloudClient#deleteVolume
+    * @see IBMSmartCloudClient#deleteVolume
     */
    @DELETE
-   @Path(IBMDeveloperCloudAsyncClient.VERSION + "/storage/{volumeId}")
+   @Path(IBMSmartCloudAsyncClient.VERSION + "/storage/{volumeId}")
    @ExceptionParser(ReturnVoidOnNotFoundOr404.class)
    ListenableFuture<Void> deleteVolume(@PathParam("volumeId") String id);
 
    /**
-    * @see IBMDeveloperCloudClient#listLocations()
+    * @see IBMSmartCloudClient#listLocations()
     */
    @GET
-   @Path(IBMDeveloperCloudAsyncClient.VERSION + "/locations")
+   @Path(IBMSmartCloudAsyncClient.VERSION + "/locations")
    @Consumes(MediaType.TEXT_XML)
    @XMLResponseParser(LocationsHandler.class)
    @ExceptionParser(ReturnEmptySetOnNotFoundOr404.class)
    ListenableFuture<Set<? extends Location>> listLocations();
 
    /**
-    * @see IBMDeveloperCloudClient#getLocation
+    * @see IBMSmartCloudClient#getLocation
     */
    @GET
    @ExceptionParser(ReturnNullOnNotFoundOr404.class)
-   @Path(IBMDeveloperCloudAsyncClient.VERSION + "/locations/{locationId}")
+   @Path(IBMSmartCloudAsyncClient.VERSION + "/locations/{locationId}")
    @Consumes(MediaType.TEXT_XML)
    @XMLResponseParser(LocationHandler.class)
    ListenableFuture<Location> getLocation(@PathParam("locationId") String id);
 
    /**
-    * @see IBMDeveloperCloudClient#listAddressOfferings()
+    * @see IBMSmartCloudClient#listAddressOfferings()
     */
    @GET
-   @Path(IBMDeveloperCloudAsyncClient.VERSION + "/offerings/address")
+   @Path(IBMSmartCloudAsyncClient.VERSION + "/offerings/address")
    @Unwrap
    @Consumes(MediaType.APPLICATION_JSON)
    @ExceptionParser(ReturnEmptySetOnNotFoundOr404.class)
    ListenableFuture<Set<? extends Offering>> listAddressOfferings();
 
    /**
-    * @see IBMDeveloperCloudClient#listAddresses()
+    * @see IBMSmartCloudClient#listAddresses()
     */
    @GET
-   @Path(IBMDeveloperCloudAsyncClient.VERSION + "/addresses")
+   @Path(IBMSmartCloudAsyncClient.VERSION + "/addresses")
    @Consumes(MediaType.APPLICATION_JSON)
-   @ResponseParser(ParseAddressesFromJson.class)
+   @Unwrap
    @ExceptionParser(ReturnEmptySetOnNotFoundOr404.class)
    ListenableFuture<Set<? extends Address>> listAddresses();
 
    /**
-    * @see IBMDeveloperCloudClient#allocateAddressInLocation
+    * @see IBMSmartCloudClient#allocateAddressInLocation
     */
    @POST
-   @Path(IBMDeveloperCloudAsyncClient.VERSION + "/addresses")
+   @Path(IBMSmartCloudAsyncClient.VERSION + "/addresses")
    @Consumes(MediaType.APPLICATION_JSON)
-   @ResponseParser(ParseAddressFromJson.class)
    ListenableFuture<Address> allocateAddressInLocation(@FormParam("location") String locationId,
-         @FormParam("offeringID") String offeringID);
+            @FormParam("offeringID") String offeringID);
 
    /**
-    * @see IBMDeveloperCloudClient#releaseAddress
+    * @see IBMSmartCloudClient#releaseAddress
     */
    @DELETE
-   @Path(IBMDeveloperCloudAsyncClient.VERSION + "/addresses/{addressId}")
+   @Path(IBMSmartCloudAsyncClient.VERSION + "/addresses/{addressId}")
    @ExceptionParser(ReturnVoidOnNotFoundOr404.class)
    ListenableFuture<Void> releaseAddress(@PathParam("addressId") String id);
 
-   /**
-    * @see IBMDeveloperCloudClient#getManifest
-    */
-   @GET
-   @ExceptionParser(ReturnNullOnNotFoundOr404.class)
-   @Consumes(MediaType.TEXT_XML)
-   ListenableFuture<String> getManifest(@EndpointParam URI manifest);
-}
\ No newline at end of file
+}
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudClient.java b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/IBMSmartCloudClient.java
similarity index 95%
rename from sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudClient.java
rename to sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/IBMSmartCloudClient.java
index 175c57ea89..5cf987755f 100644
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudClient.java
+++ b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/IBMSmartCloudClient.java
@@ -16,37 +16,36 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.ibmdev;
+package org.jclouds.ibm.smartcloud;
 
-import java.net.URI;
 import java.util.Date;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 import org.jclouds.concurrent.Timeout;
-import org.jclouds.ibmdev.domain.Address;
-import org.jclouds.ibmdev.domain.Image;
-import org.jclouds.ibmdev.domain.Instance;
-import org.jclouds.ibmdev.domain.Key;
-import org.jclouds.ibmdev.domain.Location;
-import org.jclouds.ibmdev.domain.Offering;
-import org.jclouds.ibmdev.domain.StorageOffering;
-import org.jclouds.ibmdev.domain.Volume;
-import org.jclouds.ibmdev.options.CreateInstanceOptions;
-import org.jclouds.ibmdev.options.RestartInstanceOptions;
+import org.jclouds.ibm.smartcloud.domain.Address;
+import org.jclouds.ibm.smartcloud.domain.Image;
+import org.jclouds.ibm.smartcloud.domain.Instance;
+import org.jclouds.ibm.smartcloud.domain.Key;
+import org.jclouds.ibm.smartcloud.domain.Location;
+import org.jclouds.ibm.smartcloud.domain.Offering;
+import org.jclouds.ibm.smartcloud.domain.StorageOffering;
+import org.jclouds.ibm.smartcloud.domain.Volume;
+import org.jclouds.ibm.smartcloud.options.CreateInstanceOptions;
+import org.jclouds.ibm.smartcloud.options.RestartInstanceOptions;
 import org.jclouds.rest.AuthorizationException;
 import org.jclouds.rest.ResourceNotFoundException;
 
 /**
- * Provides synchronous access to IBMDeveloperCloud.
+ * Provides synchronous access to IBMSmartCloud.
  * <p/>
  * 
- * @see IBMDeveloperCloudAsyncClient
+ * @see IBMSmartCloudAsyncClient
  * @see <a href="http://www-180.ibm.com/cloud/enterprise/beta/support" />
  * @author Adrian Cole
  */
 @Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
-public interface IBMDeveloperCloudClient {
+public interface IBMSmartCloudClient {
    /**
     * 
     * @return the list of Images available to be provisioned on the IBM
@@ -74,6 +73,8 @@ public interface IBMDeveloperCloudClient {
     *            operation
     */
    void deleteImage(String id);
+   
+   String getManifestOfImage(String id);
 
    /**
     * If set to {@code Image.Visibility#PUBLIC}, makes the Image identified by
@@ -463,6 +464,5 @@ public interface IBMDeveloperCloudClient {
     */
    void releaseAddress(String id);
 
-   String getManifest(URI manifest);
 
 }
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudContextBuilder.java b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/IBMSmartCloudContextBuilder.java
similarity index 64%
rename from sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudContextBuilder.java
rename to sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/IBMSmartCloudContextBuilder.java
index 8aacf70d38..40d48c8650 100644
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudContextBuilder.java
+++ b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/IBMSmartCloudContextBuilder.java
@@ -16,34 +16,34 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.ibmdev;
+package org.jclouds.ibm.smartcloud;
 
 import java.util.List;
 import java.util.Properties;
 
 import org.jclouds.compute.ComputeServiceContextBuilder;
-import org.jclouds.ibmdev.compute.config.IBMDeveloperCloudComputeServiceContextModule;
-import org.jclouds.ibmdev.config.IBMDeveloperCloudRestClientModule;
+import org.jclouds.ibm.smartcloud.compute.config.IBMSmartCloudComputeServiceContextModule;
+import org.jclouds.ibm.smartcloud.config.IBMSmartCloudRestClientModule;
 
 import com.google.inject.Module;
 
 /**
  * @author Adrian Cole
  */
-public class IBMDeveloperCloudContextBuilder extends
-         ComputeServiceContextBuilder<IBMDeveloperCloudClient, IBMDeveloperCloudAsyncClient> {
+public class IBMSmartCloudContextBuilder extends
+         ComputeServiceContextBuilder<IBMSmartCloudClient, IBMSmartCloudAsyncClient> {
 
-   public IBMDeveloperCloudContextBuilder(Properties props) {
-      super(IBMDeveloperCloudClient.class, IBMDeveloperCloudAsyncClient.class, props);
+   public IBMSmartCloudContextBuilder(Properties props) {
+      super(IBMSmartCloudClient.class, IBMSmartCloudAsyncClient.class, props);
    }
 
    protected void addClientModule(List<Module> modules) {
-      modules.add(new IBMDeveloperCloudRestClientModule());
+      modules.add(new IBMSmartCloudRestClientModule());
    }
 
    @Override
    protected void addContextModule(List<Module> modules) {
-      modules.add(new IBMDeveloperCloudComputeServiceContextModule());
+      modules.add(new IBMSmartCloudComputeServiceContextModule());
    }
 
 }
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudPropertiesBuilder.java b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/IBMSmartCloudPropertiesBuilder.java
similarity index 75%
rename from sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudPropertiesBuilder.java
rename to sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/IBMSmartCloudPropertiesBuilder.java
index 5e2d126d54..6029970854 100644
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudPropertiesBuilder.java
+++ b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/IBMSmartCloudPropertiesBuilder.java
@@ -16,11 +16,12 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.ibmdev;
+package org.jclouds.ibm.smartcloud;
 
 import static org.jclouds.Constants.PROPERTY_API_VERSION;
 import static org.jclouds.Constants.PROPERTY_ENDPOINT;
 import static org.jclouds.Constants.PROPERTY_ISO3166_CODES;
+import static org.jclouds.Constants.PROPERTY_SESSION_INTERVAL;
 import static org.jclouds.compute.reference.ComputeServiceConstants.PROPERTY_TIMEOUT_NODE_RUNNING;
 import static org.jclouds.location.reference.LocationConstants.ISO3166_CODES;
 import static org.jclouds.location.reference.LocationConstants.PROPERTY_ZONE;
@@ -31,27 +32,30 @@ import java.util.Properties;
 import org.jclouds.PropertiesBuilder;
 
 /**
- * Builds properties used in IBMDeveloperCloud Clients
+ * Builds properties used in IBMSmartCloud Clients
  * 
  * @author Adrian Cole
  */
-public class IBMDeveloperCloudPropertiesBuilder extends PropertiesBuilder {
+public class IBMSmartCloudPropertiesBuilder extends PropertiesBuilder {
    @Override
    protected Properties defaultProperties() {
       Properties properties = super.defaultProperties();
-      properties.setProperty(PROPERTY_ZONES, "41,61,82,101");
-      properties.setProperty(PROPERTY_ISO3166_CODES, "US-NC,DE-BW,US-CO,CA-ON");
+      properties.setProperty(PROPERTY_ZONES, "41,61,82,101,121,141");
+      properties.setProperty(PROPERTY_ISO3166_CODES, "US-NC,DE-BW,US-CO,CA-ON,JP-12,SG");
       properties.setProperty(PROPERTY_ZONE + ".41." + ISO3166_CODES, "US-NC");
       properties.setProperty(PROPERTY_ZONE + ".61." + ISO3166_CODES, "DE-BW");
       properties.setProperty(PROPERTY_ZONE + ".82." + ISO3166_CODES, "US-CO");
       properties.setProperty(PROPERTY_ZONE + ".101." + ISO3166_CODES, "CA-ON");
-      properties.setProperty(PROPERTY_API_VERSION, IBMDeveloperCloudAsyncClient.VERSION);
+      properties.setProperty(PROPERTY_ZONE + ".121." + ISO3166_CODES, "JP-12");
+      properties.setProperty(PROPERTY_ZONE + ".141." + ISO3166_CODES, "SG");
+      properties.setProperty(PROPERTY_API_VERSION, IBMSmartCloudAsyncClient.VERSION);
       properties.setProperty(PROPERTY_ENDPOINT, "https://www-147.ibm.com/computecloud/enterprise/api/rest");
       properties.setProperty(PROPERTY_TIMEOUT_NODE_RUNNING, (15 * 60 * 1000) + "");
+      properties.setProperty(PROPERTY_SESSION_INTERVAL, 60 * 5 + "");
       return properties;
    }
 
-   public IBMDeveloperCloudPropertiesBuilder(Properties properties) {
+   public IBMSmartCloudPropertiesBuilder(Properties properties) {
       super(properties);
    }
 
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/config/IBMDeveloperCloudBindComputeStrategiesByClass.java b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/compute/config/IBMSmartCloudBindComputeStrategiesByClass.java
similarity index 67%
rename from sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/config/IBMDeveloperCloudBindComputeStrategiesByClass.java
rename to sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/compute/config/IBMSmartCloudBindComputeStrategiesByClass.java
index 08dbb6f9f4..2b203e2669 100644
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/config/IBMDeveloperCloudBindComputeStrategiesByClass.java
+++ b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/compute/config/IBMSmartCloudBindComputeStrategiesByClass.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.ibmdev.compute.config;
+package org.jclouds.ibm.smartcloud.compute.config;
 
 import org.jclouds.compute.config.BindComputeStrategiesByClass;
 import org.jclouds.compute.strategy.CreateNodeWithGroupEncodedIntoName;
@@ -26,50 +26,50 @@ import org.jclouds.compute.strategy.ListNodesStrategy;
 import org.jclouds.compute.strategy.RebootNodeStrategy;
 import org.jclouds.compute.strategy.ResumeNodeStrategy;
 import org.jclouds.compute.strategy.SuspendNodeStrategy;
-import org.jclouds.ibmdev.compute.strategy.IBMDeveloperCloudCreateNodeWithGroupEncodedIntoName;
-import org.jclouds.ibmdev.compute.strategy.IBMDeveloperCloudDestroyNodeStrategy;
-import org.jclouds.ibmdev.compute.strategy.IBMDeveloperCloudGetNodeMetadataStrategy;
-import org.jclouds.ibmdev.compute.strategy.IBMDeveloperCloudLifeCycleStrategy;
-import org.jclouds.ibmdev.compute.strategy.IBMDeveloperCloudListNodesStrategy;
+import org.jclouds.ibm.smartcloud.compute.strategy.IBMSmartCloudCreateNodeWithGroupEncodedIntoName;
+import org.jclouds.ibm.smartcloud.compute.strategy.IBMSmartCloudDestroyNodeStrategy;
+import org.jclouds.ibm.smartcloud.compute.strategy.IBMSmartCloudGetNodeMetadataStrategy;
+import org.jclouds.ibm.smartcloud.compute.strategy.IBMSmartCloudLifeCycleStrategy;
+import org.jclouds.ibm.smartcloud.compute.strategy.IBMSmartCloudListNodesStrategy;
 
 /**
  * @author Adrian Cole
  */
-public class IBMDeveloperCloudBindComputeStrategiesByClass extends BindComputeStrategiesByClass {
+public class IBMSmartCloudBindComputeStrategiesByClass extends BindComputeStrategiesByClass {
 
    @Override
    protected Class<? extends CreateNodeWithGroupEncodedIntoName> defineAddNodeWithTagStrategy() {
-      return IBMDeveloperCloudCreateNodeWithGroupEncodedIntoName.class;
+      return IBMSmartCloudCreateNodeWithGroupEncodedIntoName.class;
    }
 
    @Override
    protected Class<? extends DestroyNodeStrategy> defineDestroyNodeStrategy() {
-      return IBMDeveloperCloudDestroyNodeStrategy.class;
+      return IBMSmartCloudDestroyNodeStrategy.class;
    }
 
    @Override
    protected Class<? extends GetNodeMetadataStrategy> defineGetNodeMetadataStrategy() {
-      return IBMDeveloperCloudGetNodeMetadataStrategy.class;
+      return IBMSmartCloudGetNodeMetadataStrategy.class;
    }
 
    @Override
    protected Class<? extends ListNodesStrategy> defineListNodesStrategy() {
-      return IBMDeveloperCloudListNodesStrategy.class;
+      return IBMSmartCloudListNodesStrategy.class;
    }
 
    @Override
    protected Class<? extends RebootNodeStrategy> defineRebootNodeStrategy() {
-      return IBMDeveloperCloudLifeCycleStrategy.class;
+      return IBMSmartCloudLifeCycleStrategy.class;
    }
 
    @Override
    protected Class<? extends ResumeNodeStrategy> defineStartNodeStrategy() {
-      return IBMDeveloperCloudLifeCycleStrategy.class;
+      return IBMSmartCloudLifeCycleStrategy.class;
    }
 
    @Override
    protected Class<? extends SuspendNodeStrategy> defineStopNodeStrategy() {
-      return IBMDeveloperCloudLifeCycleStrategy.class;
+      return IBMSmartCloudLifeCycleStrategy.class;
    }
 
-}
\ No newline at end of file
+}
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/config/IBMDeveloperCloudBindComputeSuppliersByClass.java b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/compute/config/IBMSmartCloudBindComputeSuppliersByClass.java
similarity index 71%
rename from sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/config/IBMDeveloperCloudBindComputeSuppliersByClass.java
rename to sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/compute/config/IBMSmartCloudBindComputeSuppliersByClass.java
index 21549d4a45..5bc0b7b5f4 100644
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/config/IBMDeveloperCloudBindComputeSuppliersByClass.java
+++ b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/compute/config/IBMSmartCloudBindComputeSuppliersByClass.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.ibmdev.compute.config;
+package org.jclouds.ibm.smartcloud.compute.config;
 
 import java.util.Set;
 
@@ -24,27 +24,27 @@ import org.jclouds.compute.config.BindComputeSuppliersByClass;
 import org.jclouds.compute.domain.Hardware;
 import org.jclouds.compute.domain.Image;
 import org.jclouds.domain.Location;
-import org.jclouds.ibmdev.compute.suppliers.IBMDeveloperCloudHardwareSupplier;
-import org.jclouds.ibmdev.compute.suppliers.IBMDeveloperCloudImageSupplier;
-import org.jclouds.ibmdev.compute.suppliers.IBMDeveloperCloudLocationSupplier;
+import org.jclouds.ibm.smartcloud.compute.suppliers.IBMSmartCloudHardwareSupplier;
+import org.jclouds.ibm.smartcloud.compute.suppliers.IBMSmartCloudImageSupplier;
+import org.jclouds.ibm.smartcloud.compute.suppliers.IBMSmartCloudLocationSupplier;
 
 import com.google.common.base.Supplier;
 /**
  * @author Adrian Cole
  */
-public class IBMDeveloperCloudBindComputeSuppliersByClass extends BindComputeSuppliersByClass {
+public class IBMSmartCloudBindComputeSuppliersByClass extends BindComputeSuppliersByClass {
    @Override
    protected Class<? extends Supplier<Set<? extends Hardware>>> defineHardwareSupplier() {
-      return IBMDeveloperCloudHardwareSupplier.class;
+      return IBMSmartCloudHardwareSupplier.class;
    }
 
    @Override
    protected Class<? extends Supplier<Set<? extends Image>>> defineImageSupplier() {
-      return IBMDeveloperCloudImageSupplier.class;
+      return IBMSmartCloudImageSupplier.class;
    }
 
    @Override
    protected Class<? extends Supplier<Set<? extends Location>>> defineLocationSupplier() {
-      return IBMDeveloperCloudLocationSupplier.class;
+      return IBMSmartCloudLocationSupplier.class;
    }
-}
\ No newline at end of file
+}
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/config/IBMDeveloperCloudComputeServiceContextModule.java b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/compute/config/IBMSmartCloudComputeServiceContextModule.java
similarity index 69%
rename from sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/config/IBMDeveloperCloudComputeServiceContextModule.java
rename to sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/compute/config/IBMSmartCloudComputeServiceContextModule.java
index 0b2b57a45f..ca3f7c7f85 100644
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/config/IBMDeveloperCloudComputeServiceContextModule.java
+++ b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/compute/config/IBMSmartCloudComputeServiceContextModule.java
@@ -16,9 +16,7 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.ibmdev.compute.config;
-
-import static org.jclouds.compute.domain.OsFamily.SUSE;
+package org.jclouds.ibm.smartcloud.compute.config;
 
 import org.jclouds.compute.config.BaseComputeServiceContextModule;
 import org.jclouds.compute.domain.TemplateBuilder;
@@ -27,26 +25,26 @@ import org.jclouds.compute.internal.BaseComputeService;
 import com.google.inject.Injector;
 
 /**
- * Configures the {@link IBMDeveloperCloudComputeServiceContext}; requires
+ * Configures the {@link IBMSmartCloudComputeServiceContext}; requires
  * {@link BaseComputeService} bound.
  * 
  * @author Adrian Cole
  */
-public class IBMDeveloperCloudComputeServiceContextModule extends BaseComputeServiceContextModule {
+public class IBMSmartCloudComputeServiceContextModule extends BaseComputeServiceContextModule {
 
    @Override
    protected void configure() {
-      install(new IBMDeveloperCloudComputeServiceDependenciesModule());
-      install(new IBMDeveloperCloudBindComputeStrategiesByClass());
-      install(new IBMDeveloperCloudBindComputeSuppliersByClass());
+      install(new IBMSmartCloudComputeServiceDependenciesModule());
+      install(new IBMSmartCloudBindComputeStrategiesByClass());
+      install(new IBMSmartCloudBindComputeSuppliersByClass());
       super.configure();
    }
 
    /**
-    * tested known configuration
+    * cheapest image in most available datacenter
     */
    @Override
    protected TemplateBuilder provideTemplate(Injector injector, TemplateBuilder template) {
-      return template.osFamily(SUSE);
+      return template.imageNameMatches("^SUSE Linux Enterprise Server 11 SP1 for x86.*").locationId("101");
    }
 }
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/config/IBMDeveloperCloudComputeServiceDependenciesModule.java b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/compute/config/IBMSmartCloudComputeServiceDependenciesModule.java
similarity index 66%
rename from sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/config/IBMDeveloperCloudComputeServiceDependenciesModule.java
rename to sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/compute/config/IBMSmartCloudComputeServiceDependenciesModule.java
index 820101fd5d..1cefc18d46 100644
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/config/IBMDeveloperCloudComputeServiceDependenciesModule.java
+++ b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/compute/config/IBMSmartCloudComputeServiceDependenciesModule.java
@@ -16,8 +16,9 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.ibmdev.compute.config;
+package org.jclouds.ibm.smartcloud.compute.config;
 
+import java.security.SecureRandom;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -28,15 +29,20 @@ import org.jclouds.compute.ComputeServiceContext;
 import org.jclouds.compute.domain.NodeMetadata;
 import org.jclouds.compute.domain.NodeState;
 import org.jclouds.compute.internal.ComputeServiceContextImpl;
-import org.jclouds.ibmdev.IBMDeveloperCloudAsyncClient;
-import org.jclouds.ibmdev.IBMDeveloperCloudClient;
-import org.jclouds.ibmdev.compute.functions.InstanceToNodeMetadata;
-import org.jclouds.ibmdev.domain.Instance;
+import org.jclouds.compute.options.TemplateOptions;
+import org.jclouds.compute.strategy.impl.CreateNodesWithGroupEncodedIntoNameThenAddToSet;
+import org.jclouds.ibm.smartcloud.IBMSmartCloudAsyncClient;
+import org.jclouds.ibm.smartcloud.IBMSmartCloudClient;
+import org.jclouds.ibm.smartcloud.compute.functions.InstanceToNodeMetadata;
+import org.jclouds.ibm.smartcloud.compute.options.IBMSmartCloudTemplateOptions;
+import org.jclouds.ibm.smartcloud.compute.strategy.CreateKeyCreateNodesWithGroupEncodedIntoNameThenAddToSet;
+import org.jclouds.ibm.smartcloud.domain.Instance;
 import org.jclouds.rest.RestContext;
 import org.jclouds.rest.internal.RestContextImpl;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Function;
+import com.google.common.base.Supplier;
 import com.google.common.collect.ImmutableMap;
 import com.google.inject.AbstractModule;
 import com.google.inject.Provides;
@@ -46,18 +52,35 @@ import com.google.inject.TypeLiteral;
 /**
  * @author Adrian Cole
  */
-public class IBMDeveloperCloudComputeServiceDependenciesModule extends AbstractModule {
+public class IBMSmartCloudComputeServiceDependenciesModule extends AbstractModule {
 
    @Override
    protected void configure() {
+      bind(TemplateOptions.class).to(IBMSmartCloudTemplateOptions.class);
       bind(new TypeLiteral<Function<Instance, NodeMetadata>>() {
       }).to(InstanceToNodeMetadata.class);
       bind(new TypeLiteral<ComputeServiceContext>() {
-      }).to(new TypeLiteral<ComputeServiceContextImpl<IBMDeveloperCloudClient, IBMDeveloperCloudAsyncClient>>() {
+      }).to(new TypeLiteral<ComputeServiceContextImpl<IBMSmartCloudClient, IBMSmartCloudAsyncClient>>() {
       }).in(Scopes.SINGLETON);
-      bind(new TypeLiteral<RestContext<IBMDeveloperCloudClient, IBMDeveloperCloudAsyncClient>>() {
-      }).to(new TypeLiteral<RestContextImpl<IBMDeveloperCloudClient, IBMDeveloperCloudAsyncClient>>() {
+      bind(new TypeLiteral<RestContext<IBMSmartCloudClient, IBMSmartCloudAsyncClient>>() {
+      }).to(new TypeLiteral<RestContextImpl<IBMSmartCloudClient, IBMSmartCloudAsyncClient>>() {
       }).in(Scopes.SINGLETON);
+      bind(CreateNodesWithGroupEncodedIntoNameThenAddToSet.class).to(
+               CreateKeyCreateNodesWithGroupEncodedIntoNameThenAddToSet.class);
+   }
+
+   @Provides
+   @Singleton
+   Supplier<String> provideSuffix() {
+      return new Supplier<String>() {
+         final SecureRandom random = new SecureRandom();
+
+         @Override
+         public String get() {
+            return random.nextInt(100) + "";
+         }
+      };
+
    }
 
    @Provides
@@ -88,4 +111,4 @@ public class IBMDeveloperCloudComputeServiceDependenciesModule extends AbstractM
    Map<Instance.Status, NodeState> provideServerToNodeState() {
       return instanceStatusToNodeState;
    }
-}
\ No newline at end of file
+}
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/functions/InstanceToNodeMetadata.java b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/compute/functions/InstanceToNodeMetadata.java
similarity index 55%
rename from sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/functions/InstanceToNodeMetadata.java
rename to sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/compute/functions/InstanceToNodeMetadata.java
index df4c99fe01..6c8aa538ac 100644
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/functions/InstanceToNodeMetadata.java
+++ b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/compute/functions/InstanceToNodeMetadata.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.ibmdev.compute.functions;
+package org.jclouds.ibm.smartcloud.compute.functions;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static org.jclouds.compute.util.ComputeServiceUtils.parseGroupFromName;
@@ -35,14 +35,17 @@ import org.jclouds.compute.domain.NodeMetadataBuilder;
 import org.jclouds.compute.domain.NodeState;
 import org.jclouds.domain.Credentials;
 import org.jclouds.domain.Location;
-import org.jclouds.ibmdev.domain.Instance;
+import org.jclouds.ibm.smartcloud.domain.IP;
+import org.jclouds.ibm.smartcloud.domain.Instance;
 import org.jclouds.logging.Logger;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Function;
+import com.google.common.base.Predicates;
 import com.google.common.base.Supplier;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
 
 /**
  * @author Adrian Cole
@@ -52,19 +55,19 @@ public class InstanceToNodeMetadata implements Function<Instance, NodeMetadata>
 
    @VisibleForTesting
    public static final Map<Instance.Status, NodeState> instanceStatusToNodeState = ImmutableMap
-         .<Instance.Status, NodeState> builder().put(Instance.Status.ACTIVE, NodeState.RUNNING)//
-         .put(Instance.Status.STOPPED, NodeState.SUSPENDED)//
-         .put(Instance.Status.REMOVED, NodeState.TERMINATED)//
-         .put(Instance.Status.DEPROVISIONING, NodeState.PENDING)//
-         .put(Instance.Status.FAILED, NodeState.ERROR)//
-         .put(Instance.Status.NEW, NodeState.PENDING)//
-         .put(Instance.Status.PROVISIONING, NodeState.PENDING)//
-         .put(Instance.Status.REJECTED, NodeState.ERROR)//
-         .put(Instance.Status.RESTARTING, NodeState.PENDING)//
-         .put(Instance.Status.STARTING, NodeState.PENDING)//
-         .put(Instance.Status.STOPPING, NodeState.PENDING)//
-         .put(Instance.Status.DEPROVISION_PENDING, NodeState.PENDING)//
-         .put(Instance.Status.UNKNOWN, NodeState.UNRECOGNIZED).build();
+            .<Instance.Status, NodeState> builder().put(Instance.Status.ACTIVE, NodeState.RUNNING)//
+            .put(Instance.Status.STOPPED, NodeState.SUSPENDED)//
+            .put(Instance.Status.REMOVED, NodeState.TERMINATED)//
+            .put(Instance.Status.DEPROVISIONING, NodeState.PENDING)//
+            .put(Instance.Status.FAILED, NodeState.ERROR)//
+            .put(Instance.Status.NEW, NodeState.PENDING)//
+            .put(Instance.Status.PROVISIONING, NodeState.PENDING)//
+            .put(Instance.Status.REJECTED, NodeState.ERROR)//
+            .put(Instance.Status.RESTARTING, NodeState.PENDING)//
+            .put(Instance.Status.STARTING, NodeState.PENDING)//
+            .put(Instance.Status.STOPPING, NodeState.PENDING)//
+            .put(Instance.Status.DEPROVISION_PENDING, NodeState.PENDING)//
+            .put(Instance.Status.UNKNOWN, NodeState.UNRECOGNIZED).build();
    @Resource
    protected Logger logger = Logger.NULL;
    private final Map<Instance.Status, NodeState> instanceStateToNodeState;
@@ -74,25 +77,36 @@ public class InstanceToNodeMetadata implements Function<Instance, NodeMetadata>
 
    @Inject
    InstanceToNodeMetadata(Map<Instance.Status, NodeState> instanceStateToNodeState,
-         Supplier<Map<String, ? extends Image>> images, @Named("CREDENTIALS") Map<String, String> credentialsMap,
-         Supplier<Map<String, ? extends Location>> locations) {
+            Supplier<Map<String, ? extends Image>> images, @Named("CREDENTIALS") Map<String, String> credentialsMap,
+            Supplier<Map<String, ? extends Location>> locations) {
       this.instanceStateToNodeState = checkNotNull(instanceStateToNodeState, "instanceStateToNodeState");
       this.images = checkNotNull(images, "images");
       this.credentialsMap = checkNotNull(credentialsMap, "credentialsMap");
       this.locations = checkNotNull(locations, "locations");
    }
 
+   private static Function<IP, String> ipFromIP = new Function<IP, String>() {
+
+      @Override
+      public String apply(IP arg0) {
+         return arg0 != null ? arg0.getIP() : null;
+      }
+
+   };
+
    @Override
    public NodeMetadata apply(Instance from) {
-      //TODO hardware
+      // TODO hardware
       String group = parseGroupFromName(from.getName());
-      Set<String> ipSet = from.getIp() != null ? ImmutableSet.of(from.getIp()) : ImmutableSet.<String> of();
+      String ip = ipFromIP.apply(from.getPrimaryIP());
+      Set<String> ipSet = ip != null ? ImmutableSet.of(ip) : ImmutableSet.<String> of();
       Image image = images.get().get(from.getImageId());
-      String key = group != null ? credentialsMap.get(group) : null;
-      return new NodeMetadataBuilder().ids(from.getId() + "").name(from.getName())
-            .location(locations.get().get(image.getLocation())).group(group).imageId(from.getImageId())
-            .state(instanceStateToNodeState.get(from.getStatus()))
-            .operatingSystem(image != null ? image.getOperatingSystem() : null).publicAddresses(ipSet)
-            .credentials(new Credentials(image.getDefaultCredentials().identity, key)).build();
+      String key = credentialsMap.get(from.getKeyName());
+      return new NodeMetadataBuilder().ids(from.getId() + "").name(from.getName()).location(
+               locations.get().get(image.getLocation())).group(group).imageId(from.getImageId()).state(
+               instanceStateToNodeState.get(from.getStatus())).operatingSystem(
+               image != null ? image.getOperatingSystem() : null).publicAddresses(ipSet).privateAddresses(
+               Iterables.filter(Iterables.transform(from.getSecondaryIPs(), ipFromIP), Predicates.notNull()))
+               .credentials(new Credentials(image.getDefaultCredentials().identity, key)).build();
    }
-}
\ No newline at end of file
+}
diff --git a/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/compute/options/IBMSmartCloudTemplateOptions.java b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/compute/options/IBMSmartCloudTemplateOptions.java
new file mode 100644
index 0000000000..efdc88f0fa
--- /dev/null
+++ b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/compute/options/IBMSmartCloudTemplateOptions.java
@@ -0,0 +1,366 @@
+/**
+ *
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.ibm.smartcloud.compute.options;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkState;
+
+import java.util.Arrays;
+
+import org.jclouds.compute.options.TemplateOptions;
+import org.jclouds.domain.Credentials;
+import org.jclouds.ibm.smartcloud.options.CreateInstanceOptions;
+import org.jclouds.io.Payload;
+import org.jclouds.scriptbuilder.domain.Statement;
+import org.jclouds.util.Preconditions2;
+
+/**
+ * Contains options supported in the {@code ComputeService#runNode} operation on the
+ * "ibm.smartcloud" provider. <h2>
+ * Usage</h2> The recommended way to instantiate a IBMSmartCloudTemplateOptions object is to
+ * statically import IBMSmartCloudTemplateOptions.* and invoke a static creation method followed by
+ * an instance mutator (if needed):
+ * <p/>
+ * <code>
+ * import static org.jclouds.ibm.smartcloud.compute.options.IBMSmartCloudTemplateOptions.Builder.*;
+ * <p/>
+ * ComputeService client = // get connection
+ * templateBuilder.options(inboundPorts(22, 80, 8080, 443));
+ * Set<? extends NodeMetadata> set = client.runNodesWithTag(tag, 2, templateBuilder.build());
+ * <code>
+ * 
+ * @author Adrian Cole
+ */
+public class IBMSmartCloudTemplateOptions extends TemplateOptions implements Cloneable {
+   @Override
+   public IBMSmartCloudTemplateOptions clone() {
+      IBMSmartCloudTemplateOptions options = new IBMSmartCloudTemplateOptions();
+      copyTo(options);
+      return options;
+   }
+
+   @Override
+   public void copyTo(TemplateOptions to) {
+      super.copyTo(to);
+      if (to instanceof IBMSmartCloudTemplateOptions) {
+         IBMSmartCloudTemplateOptions eTo = IBMSmartCloudTemplateOptions.class.cast(to);
+         if (getKeyPair() != null)
+            eTo.keyPair(getKeyPair());
+         if (!shouldAutomaticallyCreateKeyPair())
+            eTo.noKeyPair();
+         if (!isMiniEphemeral)
+            eTo.isMiniEphemeral(false);
+      }
+   }
+
+   private String keyPair = null;
+   private boolean noKeyPair;
+   private boolean isMiniEphemeral = true;
+
+   public static final IBMSmartCloudTemplateOptions NONE = new IBMSmartCloudTemplateOptions();
+
+   /**
+    * @see CreateInstanceOptions#isMiniEphemeral
+    */
+   public IBMSmartCloudTemplateOptions isMiniEphemeral(boolean isMiniEphemeral) {
+      this.isMiniEphemeral = isMiniEphemeral;
+      return this;
+   }
+
+   /**
+    * Specifies the keypair used to run instances with
+    */
+   public IBMSmartCloudTemplateOptions keyPair(String keyPair) {
+      checkNotNull(keyPair, "use noKeyPair option to request boot without a keypair");
+      checkState(!noKeyPair, "you cannot specify both options keyPair and noKeyPair");
+      Preconditions2.checkNotEmpty(keyPair, "keypair must be non-empty");
+      this.keyPair = keyPair;
+      return this;
+   }
+
+   /**
+    * Do not use a keypair on instances
+    */
+   public IBMSmartCloudTemplateOptions noKeyPair() {
+      checkState(keyPair == null, "you cannot specify both options keyPair and noKeyPair");
+      this.noKeyPair = true;
+      return this;
+   }
+
+   public static class Builder {
+
+      /**
+       * @see IBMSmartCloudTemplateOptions#isMiniEphemeral
+       */
+      public static IBMSmartCloudTemplateOptions isMiniEphemeral(boolean isMiniEphemeral) {
+         IBMSmartCloudTemplateOptions options = new IBMSmartCloudTemplateOptions();
+         return options.isMiniEphemeral(isMiniEphemeral);
+      }
+
+      /**
+       * @see IBMSmartCloudTemplateOptions#keyPair
+       */
+      public static IBMSmartCloudTemplateOptions keyPair(String keyPair) {
+         IBMSmartCloudTemplateOptions options = new IBMSmartCloudTemplateOptions();
+         return IBMSmartCloudTemplateOptions.class.cast(options.keyPair(keyPair));
+      }
+
+      /**
+       * @see IBMSmartCloudTemplateOptions#noKeyPair
+       */
+      public static IBMSmartCloudTemplateOptions noKeyPair() {
+         IBMSmartCloudTemplateOptions options = new IBMSmartCloudTemplateOptions();
+         return IBMSmartCloudTemplateOptions.class.cast(options.noKeyPair());
+      }
+
+
+      // methods that only facilitate returning the correct object type
+      /**
+       * @see TemplateOptions#inboundPorts
+       */
+      public static IBMSmartCloudTemplateOptions inboundPorts(int... ports) {
+         IBMSmartCloudTemplateOptions options = new IBMSmartCloudTemplateOptions();
+         return IBMSmartCloudTemplateOptions.class.cast(options.inboundPorts(ports));
+      }
+
+      /**
+       * @see TemplateOptions#port
+       */
+      public static IBMSmartCloudTemplateOptions blockOnPort(int port, int seconds) {
+         IBMSmartCloudTemplateOptions options = new IBMSmartCloudTemplateOptions();
+         return IBMSmartCloudTemplateOptions.class.cast(options.blockOnPort(port, seconds));
+      }
+
+      /**
+       * @see TemplateOptions#runScript
+       */
+      public static IBMSmartCloudTemplateOptions runScript(byte[] script) {
+         IBMSmartCloudTemplateOptions options = new IBMSmartCloudTemplateOptions();
+         return IBMSmartCloudTemplateOptions.class.cast(options.runScript(script));
+      }
+
+      /**
+       * @see TemplateOptions#installPrivateKey
+       */
+      public static IBMSmartCloudTemplateOptions installPrivateKey(String rsaKey) {
+         IBMSmartCloudTemplateOptions options = new IBMSmartCloudTemplateOptions();
+         return IBMSmartCloudTemplateOptions.class.cast(options.installPrivateKey(rsaKey));
+      }
+
+      /**
+       * @see TemplateOptions#authorizePublicKey
+       */
+      public static IBMSmartCloudTemplateOptions authorizePublicKey(String rsaKey) {
+         IBMSmartCloudTemplateOptions options = new IBMSmartCloudTemplateOptions();
+         return IBMSmartCloudTemplateOptions.class.cast(options.authorizePublicKey(rsaKey));
+      }
+
+      /**
+       * @see TemplateOptions#withDetails
+       */
+      public static IBMSmartCloudTemplateOptions withDetails() {
+         IBMSmartCloudTemplateOptions options = new IBMSmartCloudTemplateOptions();
+         return IBMSmartCloudTemplateOptions.class.cast(options.withMetadata());
+      }
+
+   }
+
+   // methods that only facilitate returning the correct object type
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public IBMSmartCloudTemplateOptions blockOnPort(int port, int seconds) {
+      return IBMSmartCloudTemplateOptions.class.cast(super.blockOnPort(port, seconds));
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public IBMSmartCloudTemplateOptions inboundPorts(int... ports) {
+      return IBMSmartCloudTemplateOptions.class.cast(super.inboundPorts(ports));
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public IBMSmartCloudTemplateOptions authorizePublicKey(String publicKey) {
+      return IBMSmartCloudTemplateOptions.class.cast(super.authorizePublicKey(publicKey));
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   @Deprecated
+   public IBMSmartCloudTemplateOptions authorizePublicKey(Payload publicKey) {
+      return IBMSmartCloudTemplateOptions.class.cast(super.authorizePublicKey(publicKey));
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public IBMSmartCloudTemplateOptions installPrivateKey(String privateKey) {
+      return IBMSmartCloudTemplateOptions.class.cast(super.installPrivateKey(privateKey));
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   @Deprecated
+   public IBMSmartCloudTemplateOptions installPrivateKey(Payload privateKey) {
+      return IBMSmartCloudTemplateOptions.class.cast(super.installPrivateKey(privateKey));
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public IBMSmartCloudTemplateOptions runScript(Payload script) {
+      return IBMSmartCloudTemplateOptions.class.cast(super.runScript(script));
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   @Deprecated
+   public IBMSmartCloudTemplateOptions runScript(byte[] script) {
+      return IBMSmartCloudTemplateOptions.class.cast(super.runScript(script));
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public IBMSmartCloudTemplateOptions withMetadata() {
+      return IBMSmartCloudTemplateOptions.class.cast(super.withMetadata());
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public IBMSmartCloudTemplateOptions blockUntilRunning(boolean blockUntilRunning) {
+      return IBMSmartCloudTemplateOptions.class.cast(super.blockUntilRunning(blockUntilRunning));
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public IBMSmartCloudTemplateOptions dontAuthorizePublicKey() {
+      return IBMSmartCloudTemplateOptions.class.cast(super.dontAuthorizePublicKey());
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public IBMSmartCloudTemplateOptions nameTask(String name) {
+      return IBMSmartCloudTemplateOptions.class.cast(super.nameTask(name));
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public IBMSmartCloudTemplateOptions runAsRoot(boolean runAsRoot) {
+      return IBMSmartCloudTemplateOptions.class.cast(super.runAsRoot(runAsRoot));
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public IBMSmartCloudTemplateOptions runScript(Statement script) {
+      return IBMSmartCloudTemplateOptions.class.cast(super.runScript(script));
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public IBMSmartCloudTemplateOptions overrideCredentialsWith(Credentials overridingCredentials) {
+      return IBMSmartCloudTemplateOptions.class.cast(super.overrideCredentialsWith(overridingCredentials));
+   }
+
+   /**
+    * @return keyPair to use when running the instance or null, to generate a keypair.
+    */
+   public String getKeyPair() {
+      return keyPair;
+   }
+
+   /**
+    * @return true (default) if we are supposed to use a keypair
+    */
+   public boolean shouldAutomaticallyCreateKeyPair() {
+      return !noKeyPair;
+   }
+
+   /**
+    * @see CreateInstanceOptions#isMiniEphemeral
+    */
+   public boolean isMiniEphemeral() {
+      return isMiniEphemeral;
+   }
+
+   @Override
+   public int hashCode() {
+      final int prime = 31;
+      int result = super.hashCode();
+      result = prime * result + ((keyPair == null) ? 0 : keyPair.hashCode());
+      result = prime * result + (noKeyPair ? 1231 : 1237);
+      return result;
+   }
+
+   @Override
+   public boolean equals(Object obj) {
+      if (this == obj)
+         return true;
+      if (!super.equals(obj))
+         return false;
+      if (getClass() != obj.getClass())
+         return false;
+      IBMSmartCloudTemplateOptions other = (IBMSmartCloudTemplateOptions) obj;
+      if (keyPair == null) {
+         if (other.keyPair != null)
+            return false;
+      } else if (!keyPair.equals(other.keyPair))
+         return false;
+      if (noKeyPair != other.noKeyPair)
+         return false;
+      return true;
+   }
+
+   @Override
+   public String toString() {
+      return "[keyPair=" + keyPair + ", noKeyPair=" + noKeyPair + ", isMiniEphemeral=" + isMiniEphemeral
+               + ", inboundPorts=" + Arrays.toString(inboundPorts) + ", privateKey=" + (privateKey != null)
+               + ", publicKey=" + (publicKey != null) + ", runScript=" + (script != null) + ", port:seconds=" + port
+               + ":" + seconds + ", metadata/details: " + includeMetadata + "]";
+   }
+
+}
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/CreateKeyCreateNodesWithGroupEncodedIntoNameThenAddToSet.java b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/compute/strategy/CreateKeyCreateNodesWithGroupEncodedIntoNameThenAddToSet.java
similarity index 62%
rename from sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/CreateKeyCreateNodesWithGroupEncodedIntoNameThenAddToSet.java
rename to sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/compute/strategy/CreateKeyCreateNodesWithGroupEncodedIntoNameThenAddToSet.java
index bb519a4656..0c1bed6b0a 100644
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/CreateKeyCreateNodesWithGroupEncodedIntoNameThenAddToSet.java
+++ b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/compute/strategy/CreateKeyCreateNodesWithGroupEncodedIntoNameThenAddToSet.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.ibmdev.compute.strategy;
+package org.jclouds.ibm.smartcloud.compute.strategy;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -25,6 +25,7 @@ import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 
+import javax.annotation.Resource;
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Singleton;
@@ -33,21 +34,34 @@ import org.jclouds.Constants;
 import org.jclouds.compute.config.CustomizationResponse;
 import org.jclouds.compute.domain.NodeMetadata;
 import org.jclouds.compute.domain.Template;
+import org.jclouds.compute.reference.ComputeServiceConstants;
 import org.jclouds.compute.strategy.CreateNodeWithGroupEncodedIntoName;
 import org.jclouds.compute.strategy.CustomizeNodeAndAddToGoodMapOrPutExceptionIntoBadMap;
 import org.jclouds.compute.strategy.ListNodesStrategy;
 import org.jclouds.compute.strategy.impl.CreateNodesWithGroupEncodedIntoNameThenAddToSet;
-import org.jclouds.ibmdev.IBMDeveloperCloudClient;
+import org.jclouds.ibm.smartcloud.IBMSmartCloudClient;
+import org.jclouds.ibm.smartcloud.compute.options.IBMSmartCloudTemplateOptions;
+import org.jclouds.ibm.smartcloud.domain.Key;
+import org.jclouds.logging.Logger;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Supplier;
 import com.google.common.collect.Multimap;
 
 /**
  * @author Adrian Cole
  */
 @Singleton
-public class CreateKeyCreateNodesWithGroupEncodedIntoNameThenAddToSet extends CreateNodesWithGroupEncodedIntoNameThenAddToSet {
-   private final IBMDeveloperCloudClient client;
+public class CreateKeyCreateNodesWithGroupEncodedIntoNameThenAddToSet extends
+         CreateNodesWithGroupEncodedIntoNameThenAddToSet {
+
+   @Resource
+   @Named(ComputeServiceConstants.COMPUTE_LOGGER)
+   protected Logger logger = Logger.NULL;
+
+   private final IBMSmartCloudClient client;
    private final Map<String, String> credentialsMap;
+   private final Supplier<String> randomSuffix;
 
    @Inject
    protected CreateKeyCreateNodesWithGroupEncodedIntoNameThenAddToSet(
@@ -56,29 +70,45 @@ public class CreateKeyCreateNodesWithGroupEncodedIntoNameThenAddToSet extends Cr
             @Named("NAMING_CONVENTION") String nodeNamingConvention,
             @Named(Constants.PROPERTY_USER_THREADS) ExecutorService executor,
             CustomizeNodeAndAddToGoodMapOrPutExceptionIntoBadMap.Factory customizeNodeAndAddToGoodMapOrPutExceptionIntoBadMapFactory,
-            IBMDeveloperCloudClient client, @Named("CREDENTIALS") Map<String, String> credentialsMap) {
+            IBMSmartCloudClient client, @Named("CREDENTIALS") Map<String, String> credentialsMap,
+            Supplier<String> randomSuffix) {
       super(addNodeWithTagStrategy, listNodesStrategy, nodeNamingConvention, executor,
                customizeNodeAndAddToGoodMapOrPutExceptionIntoBadMapFactory);
       this.client = checkNotNull(client, "client");
       this.credentialsMap = checkNotNull(credentialsMap, "credentialsMap");
+      this.randomSuffix = checkNotNull(randomSuffix, "randomSuffix");
    }
 
    @Override
    public Map<?, Future<Void>> execute(String group, int count, Template template, Set<NodeMetadata> goodNodes,
             Map<NodeMetadata, Exception> badNodes, Multimap<NodeMetadata, CustomizationResponse> customizationResponses) {
-      String keyAsText = template.getOptions().getPublicKey();
-      if (keyAsText != null) {
-         template.getOptions().dontAuthorizePublicKey();
-         try {
-            client.addPublicKey(group, keyAsText);
-         } catch (IllegalStateException e) {
-            // must not have been found
-            client.updatePublicKey(group, keyAsText);
-         }
-      } else {
-         credentialsMap.put(group, client.generateKeyPair(group).getKeyMaterial());
+      IBMSmartCloudTemplateOptions options = template.getOptions().as(IBMSmartCloudTemplateOptions.class);
+      if (options.shouldAutomaticallyCreateKeyPair() && options.getKeyPair() == null) {
+         Key key = createNewKey(group);
+         options.keyPair(key.getName());
+         credentialsMap.put(key.getName(), key.getKeyMaterial());
       }
       return super.execute(group, count, template, goodNodes, badNodes, customizationResponses);
    }
 
-}
\ No newline at end of file
+   @VisibleForTesting
+   Key createNewKey(String group) {
+      checkNotNull(group, "group");
+      logger.debug(">> creating key group(%s)", group);
+      Key key = null;
+      while (key == null) {
+         try {
+            key = client.generateKeyPair(getNextName(group));
+            logger.debug("<< created key(%s)", key.getName());
+         } catch (IllegalStateException e) {
+
+         }
+      }
+      return key;
+   }
+
+   private String getNextName(String group) {
+      return String.format("jclouds#%s#%s", group, randomSuffix.get());
+   }
+
+}
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudCreateNodeWithGroupEncodedIntoName.java b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/compute/strategy/IBMSmartCloudCreateNodeWithGroupEncodedIntoName.java
similarity index 58%
rename from sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudCreateNodeWithGroupEncodedIntoName.java
rename to sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/compute/strategy/IBMSmartCloudCreateNodeWithGroupEncodedIntoName.java
index e91dbec78e..6e2f4ded91 100644
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudCreateNodeWithGroupEncodedIntoName.java
+++ b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/compute/strategy/IBMSmartCloudCreateNodeWithGroupEncodedIntoName.java
@@ -16,10 +16,10 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.ibmdev.compute.strategy;
+package org.jclouds.ibm.smartcloud.compute.strategy;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import static org.jclouds.ibmdev.options.CreateInstanceOptions.Builder.authorizePublicKey;
+import static org.jclouds.ibm.smartcloud.options.CreateInstanceOptions.Builder.authorizePublicKey;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
@@ -27,8 +27,10 @@ import javax.inject.Singleton;
 import org.jclouds.compute.domain.NodeMetadata;
 import org.jclouds.compute.domain.Template;
 import org.jclouds.compute.strategy.CreateNodeWithGroupEncodedIntoName;
-import org.jclouds.ibmdev.IBMDeveloperCloudClient;
-import org.jclouds.ibmdev.domain.Instance;
+import org.jclouds.ibm.smartcloud.IBMSmartCloudClient;
+import org.jclouds.ibm.smartcloud.compute.options.IBMSmartCloudTemplateOptions;
+import org.jclouds.ibm.smartcloud.domain.Instance;
+import org.jclouds.ibm.smartcloud.options.CreateInstanceOptions;
 
 import com.google.common.base.Function;
 
@@ -36,22 +38,25 @@ import com.google.common.base.Function;
  * @author Adrian Cole
  */
 @Singleton
-public class IBMDeveloperCloudCreateNodeWithGroupEncodedIntoName implements CreateNodeWithGroupEncodedIntoName {
+public class IBMSmartCloudCreateNodeWithGroupEncodedIntoName implements CreateNodeWithGroupEncodedIntoName {
 
-   private final IBMDeveloperCloudClient client;
+   private final IBMSmartCloudClient client;
    private final Function<Instance, NodeMetadata> instanceToNodeMetadata;
 
    @Inject
-   protected IBMDeveloperCloudCreateNodeWithGroupEncodedIntoName(IBMDeveloperCloudClient client,
-         Function<Instance, NodeMetadata> instanceToNodeMetadata) {
+   protected IBMSmartCloudCreateNodeWithGroupEncodedIntoName(IBMSmartCloudClient client,
+            Function<Instance, NodeMetadata> instanceToNodeMetadata) {
       this.client = checkNotNull(client, "client");
       this.instanceToNodeMetadata = checkNotNull(instanceToNodeMetadata, "instanceToNodeMetadata");
    }
 
    @Override
    public NodeMetadata createNodeWithGroupEncodedIntoName(String group, String name, Template template) {
+      IBMSmartCloudTemplateOptions templateOptions = template.getOptions().as(IBMSmartCloudTemplateOptions.class);
+      CreateInstanceOptions options = authorizePublicKey(templateOptions.getKeyPair()).isMiniEphemeral(
+               IBMSmartCloudTemplateOptions.class.cast(template.getOptions()).isMiniEphemeral());
       Instance instance = client.createInstanceInLocation(template.getLocation().getId(), name, template.getImage()
-            .getProviderId(), template.getHardware().getProviderId(), authorizePublicKey(group));
-      return instanceToNodeMetadata.apply(client.getInstance(instance.getId()));
+               .getProviderId(), template.getHardware().getProviderId(), options);
+      return instanceToNodeMetadata.apply(instance);
    }
-}
\ No newline at end of file
+}
diff --git a/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/compute/strategy/IBMSmartCloudDestroyNodeStrategy.java b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/compute/strategy/IBMSmartCloudDestroyNodeStrategy.java
new file mode 100644
index 0000000000..ecbf7cd5b3
--- /dev/null
+++ b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/compute/strategy/IBMSmartCloudDestroyNodeStrategy.java
@@ -0,0 +1,74 @@
+/**
+ *
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.ibm.smartcloud.compute.strategy;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import java.util.concurrent.TimeUnit;
+
+import javax.annotation.Resource;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+import org.jclouds.compute.domain.NodeMetadata;
+import org.jclouds.compute.reference.ComputeServiceConstants;
+import org.jclouds.compute.strategy.DestroyNodeStrategy;
+import org.jclouds.compute.strategy.GetNodeMetadataStrategy;
+import org.jclouds.ibm.smartcloud.IBMSmartCloudClient;
+import org.jclouds.ibm.smartcloud.domain.Instance;
+import org.jclouds.ibm.smartcloud.predicates.InstanceActiveOrFailed;
+import org.jclouds.logging.Logger;
+import org.jclouds.predicates.RetryablePredicate;
+
+/**
+ * @author Adrian Cole
+ */
+@Singleton
+public class IBMSmartCloudDestroyNodeStrategy implements DestroyNodeStrategy {
+   @Resource
+   @Named(ComputeServiceConstants.COMPUTE_LOGGER)
+   protected Logger logger = Logger.NULL;
+
+   private final IBMSmartCloudClient client;
+   private final GetNodeMetadataStrategy getNode;
+
+   @Inject
+   protected IBMSmartCloudDestroyNodeStrategy(IBMSmartCloudClient client, GetNodeMetadataStrategy getNode) {
+      this.client = checkNotNull(client, "client");
+      this.getNode = checkNotNull(getNode, "getNode");
+   }
+
+   @Override
+   public NodeMetadata destroyNode(String id) {
+      Instance instance = client.getInstance(id);
+      if (instance != null && instance.getStatus() != Instance.Status.DEPROVISIONING
+               && instance.getStatus() != Instance.Status.DEPROVISION_PENDING) {
+         // often it takes 8 minutes to finish provisioning a suse host
+         int timeout = (instance.getStatus() == Instance.Status.NEW || instance.getStatus() == Instance.Status.PROVISIONING) ? 600
+                  : 30;
+         logger.debug(">> awaiting up to %s seconds for instance %s to be ready for delete", timeout, id);
+         boolean ready = new RetryablePredicate<Instance>(new InstanceActiveOrFailed(client), timeout, 2,
+                  TimeUnit.SECONDS).apply(instance);
+         logger.debug(">> instance state is %sready, deleting", ready ? "" : "not ", id);
+         client.deleteInstance(instance.getId());
+      }
+      return instance != null ? getNode.getNode(id) : null;
+   }
+}
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudGetNodeMetadataStrategy.java b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/compute/strategy/IBMSmartCloudGetNodeMetadataStrategy.java
similarity index 80%
rename from sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudGetNodeMetadataStrategy.java
rename to sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/compute/strategy/IBMSmartCloudGetNodeMetadataStrategy.java
index deef13a493..4702f0bf62 100644
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudGetNodeMetadataStrategy.java
+++ b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/compute/strategy/IBMSmartCloudGetNodeMetadataStrategy.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.ibmdev.compute.strategy;
+package org.jclouds.ibm.smartcloud.compute.strategy;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -25,8 +25,8 @@ import javax.inject.Singleton;
 
 import org.jclouds.compute.domain.NodeMetadata;
 import org.jclouds.compute.strategy.GetNodeMetadataStrategy;
-import org.jclouds.ibmdev.IBMDeveloperCloudClient;
-import org.jclouds.ibmdev.domain.Instance;
+import org.jclouds.ibm.smartcloud.IBMSmartCloudClient;
+import org.jclouds.ibm.smartcloud.domain.Instance;
 
 import com.google.common.base.Function;
 
@@ -34,12 +34,12 @@ import com.google.common.base.Function;
  * @author Adrian Cole
  */
 @Singleton
-public class IBMDeveloperCloudGetNodeMetadataStrategy implements GetNodeMetadataStrategy {
-   private final IBMDeveloperCloudClient client;
+public class IBMSmartCloudGetNodeMetadataStrategy implements GetNodeMetadataStrategy {
+   private final IBMSmartCloudClient client;
    private final Function<Instance, NodeMetadata> instanceToNodeMetadata;
 
    @Inject
-   protected IBMDeveloperCloudGetNodeMetadataStrategy(IBMDeveloperCloudClient client,
+   protected IBMSmartCloudGetNodeMetadataStrategy(IBMSmartCloudClient client,
             Function<Instance, NodeMetadata> instanceToNodeMetadata) {
       this.client = client;
       this.instanceToNodeMetadata = instanceToNodeMetadata;
@@ -50,4 +50,4 @@ public class IBMDeveloperCloudGetNodeMetadataStrategy implements GetNodeMetadata
       Instance instance = client.getInstance(checkNotNull(id, "id"));
       return instance == null ? null : instanceToNodeMetadata.apply(instance);
    }
-}
\ No newline at end of file
+}
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudLifeCycleStrategy.java b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/compute/strategy/IBMSmartCloudLifeCycleStrategy.java
similarity index 82%
rename from sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudLifeCycleStrategy.java
rename to sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/compute/strategy/IBMSmartCloudLifeCycleStrategy.java
index f226421f69..032a854edd 100644
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudLifeCycleStrategy.java
+++ b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/compute/strategy/IBMSmartCloudLifeCycleStrategy.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.ibmdev.compute.strategy;
+package org.jclouds.ibm.smartcloud.compute.strategy;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -28,19 +28,19 @@ import org.jclouds.compute.strategy.GetNodeMetadataStrategy;
 import org.jclouds.compute.strategy.RebootNodeStrategy;
 import org.jclouds.compute.strategy.ResumeNodeStrategy;
 import org.jclouds.compute.strategy.SuspendNodeStrategy;
-import org.jclouds.ibmdev.IBMDeveloperCloudClient;
+import org.jclouds.ibm.smartcloud.IBMSmartCloudClient;
 
 /**
  * @author Adrian Cole
  */
 @Singleton
-public class IBMDeveloperCloudLifeCycleStrategy implements RebootNodeStrategy, SuspendNodeStrategy, ResumeNodeStrategy {
+public class IBMSmartCloudLifeCycleStrategy implements RebootNodeStrategy, SuspendNodeStrategy, ResumeNodeStrategy {
 
-   private final IBMDeveloperCloudClient client;
+   private final IBMSmartCloudClient client;
    private final GetNodeMetadataStrategy getNode;
 
    @Inject
-   protected IBMDeveloperCloudLifeCycleStrategy(IBMDeveloperCloudClient client, GetNodeMetadataStrategy getNode) {
+   protected IBMSmartCloudLifeCycleStrategy(IBMSmartCloudClient client, GetNodeMetadataStrategy getNode) {
       this.client = checkNotNull(client, "client");
       this.getNode = checkNotNull(getNode, "getNode");
    }
@@ -60,4 +60,4 @@ public class IBMDeveloperCloudLifeCycleStrategy implements RebootNodeStrategy, S
    public NodeMetadata resumeNode(String id) {
       throw new UnsupportedOperationException("resume not supported");
    }
-}
\ No newline at end of file
+}
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudListNodesStrategy.java b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/compute/strategy/IBMSmartCloudListNodesStrategy.java
similarity index 83%
rename from sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudListNodesStrategy.java
rename to sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/compute/strategy/IBMSmartCloudListNodesStrategy.java
index 92c03579c9..671c57682b 100644
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudListNodesStrategy.java
+++ b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/compute/strategy/IBMSmartCloudListNodesStrategy.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.ibmdev.compute.strategy;
+package org.jclouds.ibm.smartcloud.compute.strategy;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
@@ -25,8 +25,8 @@ import org.jclouds.compute.domain.ComputeMetadata;
 import org.jclouds.compute.domain.NodeMetadata;
 import org.jclouds.compute.predicates.NodePredicates;
 import org.jclouds.compute.strategy.ListNodesStrategy;
-import org.jclouds.ibmdev.IBMDeveloperCloudClient;
-import org.jclouds.ibmdev.domain.Instance;
+import org.jclouds.ibm.smartcloud.IBMSmartCloudClient;
+import org.jclouds.ibm.smartcloud.domain.Instance;
 
 import com.google.common.base.Function;
 import com.google.common.base.Predicate;
@@ -36,12 +36,12 @@ import com.google.common.collect.Iterables;
  * @author Adrian Cole
  */
 @Singleton
-public class IBMDeveloperCloudListNodesStrategy implements ListNodesStrategy {
-   private final IBMDeveloperCloudClient client;
+public class IBMSmartCloudListNodesStrategy implements ListNodesStrategy {
+   private final IBMSmartCloudClient client;
    private final Function<Instance, NodeMetadata> instanceToNodeMetadata;
 
    @Inject
-   protected IBMDeveloperCloudListNodesStrategy(IBMDeveloperCloudClient client,
+   protected IBMSmartCloudListNodesStrategy(IBMSmartCloudClient client,
          Function<Instance, NodeMetadata> instanceToNodeMetadata) {
       this.client = client;
       this.instanceToNodeMetadata = instanceToNodeMetadata;
@@ -56,4 +56,4 @@ public class IBMDeveloperCloudListNodesStrategy implements ListNodesStrategy {
    public Iterable<? extends NodeMetadata> listDetailsOnNodesMatching(Predicate<ComputeMetadata> filter) {
       return Iterables.filter(Iterables.transform(client.listInstances(), instanceToNodeMetadata), filter);
    }
-}
\ No newline at end of file
+}
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/suppliers/IBMDeveloperCloudHardwareSupplier.java b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/compute/suppliers/IBMSmartCloudHardwareSupplier.java
similarity index 80%
rename from sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/suppliers/IBMDeveloperCloudHardwareSupplier.java
rename to sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/compute/suppliers/IBMSmartCloudHardwareSupplier.java
index 03da2b7c14..82f489509c 100644
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/suppliers/IBMDeveloperCloudHardwareSupplier.java
+++ b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/compute/suppliers/IBMSmartCloudHardwareSupplier.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.ibmdev.compute.suppliers;
+package org.jclouds.ibm.smartcloud.compute.suppliers;
 
 import java.util.Map;
 import java.util.Set;
@@ -31,10 +31,11 @@ import org.jclouds.compute.domain.HardwareBuilder;
 import org.jclouds.compute.domain.Processor;
 import org.jclouds.compute.domain.Volume;
 import org.jclouds.compute.domain.internal.VolumeImpl;
+import org.jclouds.compute.predicates.ImagePredicates;
 import org.jclouds.compute.reference.ComputeServiceConstants;
 import org.jclouds.domain.Location;
-import org.jclouds.ibmdev.IBMDeveloperCloudClient;
-import org.jclouds.ibmdev.domain.InstanceType;
+import org.jclouds.ibm.smartcloud.IBMSmartCloudClient;
+import org.jclouds.ibm.smartcloud.domain.InstanceType;
 import org.jclouds.logging.Logger;
 
 import com.google.common.base.Supplier;
@@ -45,16 +46,16 @@ import com.google.common.collect.Sets;
  * @author Adrian Cole
  */
 @Singleton
-public class IBMDeveloperCloudHardwareSupplier implements Supplier<Set<? extends Hardware>> {
+public class IBMSmartCloudHardwareSupplier implements Supplier<Set<? extends Hardware>> {
 
    @Resource
    @Named(ComputeServiceConstants.COMPUTE_LOGGER)
    protected Logger logger = Logger.NULL;
-   private final IBMDeveloperCloudClient sync;
+   private final IBMSmartCloudClient sync;
    private final Supplier<Map<String, ? extends Location>> locations;
 
    @Inject
-   IBMDeveloperCloudHardwareSupplier(IBMDeveloperCloudClient sync, Supplier<Map<String, ? extends Location>> locations) {
+   IBMSmartCloudHardwareSupplier(IBMSmartCloudClient sync, Supplier<Map<String, ? extends Location>> locations) {
       this.sync = sync;
       this.locations = locations;
    }
@@ -63,16 +64,17 @@ public class IBMDeveloperCloudHardwareSupplier implements Supplier<Set<? extends
    public Set<? extends Hardware> get() {
       final Set<Hardware> hardware = Sets.newHashSet();
       logger.debug(">> providing hardware");
-      for (org.jclouds.ibmdev.domain.Image image : sync.listImages()) {
+      for (org.jclouds.ibm.smartcloud.domain.Image image : sync.listImages()) {
          for (InstanceType instanceType : image.getSupportedInstanceTypes()) {
             hardware.add(new HardwareBuilder()
                   .id(image.getId() + "/" + instanceType.getId())
-                  .providerId(image.getId())
+                  .providerId(instanceType.getId())
                   .name(instanceType.getLabel())
                   .location(locations.get().get(image.getLocation()))
                   .uri(image.getManifest())
                   .processors(ImmutableList.of(new Processor((instanceType.getPrice().getRate() * 100), 1.0)))
                   .ram((int) instanceType.getPrice().getRate() * 1024)
+                  .supportsImage(ImagePredicates.idEquals(image.getId()))
                   .volumes(
                         ImmutableList.<Volume> of(new VolumeImpl((float) (instanceType.getPrice().getRate() * 100d),
                               true, true))).build());
@@ -82,4 +84,4 @@ public class IBMDeveloperCloudHardwareSupplier implements Supplier<Set<? extends
       logger.debug("<< hardware(%d)", hardware.size());
       return hardware;
    }
-}
\ No newline at end of file
+}
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/suppliers/IBMDeveloperCloudImageSupplier.java b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/compute/suppliers/IBMSmartCloudImageSupplier.java
similarity index 53%
rename from sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/suppliers/IBMDeveloperCloudImageSupplier.java
rename to sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/compute/suppliers/IBMSmartCloudImageSupplier.java
index 9fe4d5d7b7..7bedfcf483 100644
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/suppliers/IBMDeveloperCloudImageSupplier.java
+++ b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/compute/suppliers/IBMSmartCloudImageSupplier.java
@@ -16,7 +16,9 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.ibmdev.compute.suppliers;
+package org.jclouds.ibm.smartcloud.compute.suppliers;
+
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.Map;
 import java.util.Set;
@@ -28,32 +30,34 @@ import javax.inject.Singleton;
 
 import org.jclouds.compute.domain.Image;
 import org.jclouds.compute.domain.ImageBuilder;
-import org.jclouds.compute.domain.OperatingSystemBuilder;
+import org.jclouds.compute.domain.OperatingSystem;
 import org.jclouds.compute.domain.OsFamily;
 import org.jclouds.compute.reference.ComputeServiceConstants;
 import org.jclouds.domain.Credentials;
 import org.jclouds.domain.Location;
-import org.jclouds.ibmdev.IBMDeveloperCloudClient;
+import org.jclouds.ibm.smartcloud.IBMSmartCloudClient;
+import org.jclouds.ibm.smartcloud.domain.Image.Architecture;
 import org.jclouds.logging.Logger;
 
+import com.google.common.base.Splitter;
 import com.google.common.base.Supplier;
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Sets;
 
 /**
  * @author Adrian Cole
  */
 @Singleton
-public class IBMDeveloperCloudImageSupplier implements Supplier<Set<? extends Image>> {
+public class IBMSmartCloudImageSupplier implements Supplier<Set<? extends Image>> {
 
    @Resource
    @Named(ComputeServiceConstants.COMPUTE_LOGGER)
    protected Logger logger = Logger.NULL;
-   private final IBMDeveloperCloudClient sync;
+   private final IBMSmartCloudClient sync;
    private final Supplier<Map<String, ? extends Location>> locations;
 
    @Inject
-   IBMDeveloperCloudImageSupplier(final IBMDeveloperCloudClient sync,
-         Supplier<Map<String, ? extends Location>> locations) {
+   IBMSmartCloudImageSupplier(final IBMSmartCloudClient sync, Supplier<Map<String, ? extends Location>> locations) {
       this.sync = sync;
       this.locations = locations;
    }
@@ -63,24 +67,34 @@ public class IBMDeveloperCloudImageSupplier implements Supplier<Set<? extends Im
       final Set<Image> images = Sets.newHashSet();
       logger.debug(">> providing images");
 
-      for (org.jclouds.ibmdev.domain.Image image : sync.listImages()) {
-         // TODO parse correct OS
+      for (org.jclouds.ibm.smartcloud.domain.Image image : sync.listImages()) {
+
+         OperatingSystem.Builder osBuilder = OperatingSystem.builder();
+         Iterable<String> osVersion = Splitter.on('/').split(checkNotNull(image.getPlatform(), "platform"));
+         osBuilder.version(Iterables.get(osVersion, 1));
+         osBuilder.name(image.getPlatform());
+         osBuilder.description(image.getPlatform());
+         if ("Red Hat Enterprise Linux".equals(Iterables.get(osVersion, 0)))
+            osBuilder.family(OsFamily.RHEL);
+         else if ("SUSE Linux Enterprise Server".equals(Iterables.get(osVersion, 0)))
+            osBuilder.family(OsFamily.SUSE);
+         else if ("Windows".equals(Iterables.get(osVersion, 0)))
+            osBuilder.family(OsFamily.WINDOWS);
+         else
+            osBuilder.family(OsFamily.UNRECOGNIZED);
+         osBuilder.arch(image.getArchitecture().toString());
+         osBuilder.is64Bit(image.getArchitecture() == Architecture.X86_64);
+
          // TODO manifest fails to parse due to encoding issues in the path
          // TODO get correct default credentials
          // http://www-180.ibm.com/cloud/enterprise/beta/ram/community/_rlvid.jsp.faces?_rap=pc_DiscussionForum.doDiscussionTopic&_rvip=/community/discussionForum.jsp&guid={DA689AEE-783C-6FE7-6F9F-DFEE9763F806}&v=1&submission=false&fid=1068&tid=1527
-         images.add(new ImageBuilder()
-               .ids(image.getId())
-               .name(image.getName())
-               .location(locations.get().get(image.getLocation()))
-               .operatingSystem(
-                     new OperatingSystemBuilder()
-                           .family((image.getPlatform().indexOf("Red Hat") != -1) ? OsFamily.RHEL : OsFamily.SUSE)
-                           .arch(image.getPlatform()).is64Bit(image.getPlatform().indexOf("32") == -1).build())
-               .description(image.getName()).version(image.getCreatedTime().getTime() + "")
-               .defaultCredentials(new Credentials("idcuser", null)).build());
+         images.add(new ImageBuilder().ids(image.getId()).name(image.getName()).location(
+                  locations.get().get(image.getLocation())).operatingSystem(osBuilder.build()).description(
+                  image.getName()).version(image.getCreatedTime().getTime() + "").defaultCredentials(
+                  new Credentials("idcuser", null)).build());
       }
 
       logger.debug("<< images(%d)", images.size());
       return images;
    }
-}
\ No newline at end of file
+}
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/suppliers/IBMDeveloperCloudLocationSupplier.java b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/compute/suppliers/IBMSmartCloudLocationSupplier.java
similarity index 64%
rename from sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/suppliers/IBMDeveloperCloudLocationSupplier.java
rename to sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/compute/suppliers/IBMSmartCloudLocationSupplier.java
index 69f9399915..0e5b8723d9 100644
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/suppliers/IBMDeveloperCloudLocationSupplier.java
+++ b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/compute/suppliers/IBMSmartCloudLocationSupplier.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.ibmdev.compute.suppliers;
+package org.jclouds.ibm.smartcloud.compute.suppliers;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -30,7 +30,8 @@ import javax.inject.Singleton;
 import org.jclouds.domain.Location;
 import org.jclouds.domain.LocationBuilder;
 import org.jclouds.domain.LocationScope;
-import org.jclouds.ibmdev.IBMDeveloperCloudClient;
+import org.jclouds.ibm.smartcloud.IBMSmartCloudClient;
+import org.jclouds.ibm.smartcloud.domain.Location.State;
 import org.jclouds.location.Iso3166;
 import org.jclouds.location.Provider;
 import org.jclouds.location.suppliers.JustProvider;
@@ -44,14 +45,14 @@ import com.google.common.collect.ImmutableSet.Builder;
  * @author Adrian Cole
  */
 @Singleton
-public class IBMDeveloperCloudLocationSupplier extends JustProvider {
+public class IBMSmartCloudLocationSupplier extends JustProvider {
 
-   private final IBMDeveloperCloudClient sync;
+   private final IBMSmartCloudClient sync;
    private final Map<String, Set<String>> isoCodesById;
 
    @Inject
-   IBMDeveloperCloudLocationSupplier(@Iso3166 Set<String> isoCodes, @Provider String providerName,
-            @Provider URI endpoint, IBMDeveloperCloudClient sync, @Iso3166 Map<String, Set<String>> isoCodesById) {
+   IBMSmartCloudLocationSupplier(@Iso3166 Set<String> isoCodes, @Provider String providerName, @Provider URI endpoint,
+            IBMSmartCloudClient sync, @Iso3166 Map<String, Set<String>> isoCodesById) {
       super(isoCodes, providerName, endpoint);
       this.sync = checkNotNull(sync, "sync");
       this.isoCodesById = checkNotNull(isoCodesById, "isoCodesById");
@@ -60,17 +61,19 @@ public class IBMDeveloperCloudLocationSupplier extends JustProvider {
    @Override
    public Set<? extends Location> get() {
       Builder<Location> locations = ImmutableSet.builder();
-      Set<? extends org.jclouds.ibmdev.domain.Location> list = sync.listLocations();
+      Set<? extends org.jclouds.ibm.smartcloud.domain.Location> list = sync.listLocations();
       Location provider = Iterables.getOnlyElement(super.get());
       if (list.size() == 0)
          locations.add(provider);
       else
-         for (org.jclouds.ibmdev.domain.Location from : list) {
-            LocationBuilder builder = new LocationBuilder().scope(LocationScope.ZONE).id(from.getId() + "")
-                     .description(from.getName()).parent(provider);
-            if (isoCodesById.containsKey(from.getId() + ""))
-               builder.iso3166Codes(isoCodesById.get(from.getId() + ""));
-            locations.add(builder.build());
+         for (org.jclouds.ibm.smartcloud.domain.Location from : list) {
+            if (from.getState() != State.OFFLINE) {
+               LocationBuilder builder = new LocationBuilder().scope(LocationScope.ZONE).id(from.getId() + "")
+                        .description(from.getName()).parent(provider);
+               if (isoCodesById.containsKey(from.getId() + ""))
+                  builder.iso3166Codes(isoCodesById.get(from.getId() + ""));
+               locations.add(builder.build());
+            }
          }
       return locations.build();
    }
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/config/IBMDeveloperCloudParserModule.java b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/config/IBMSmartCloudParserModule.java
similarity index 95%
rename from sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/config/IBMDeveloperCloudParserModule.java
rename to sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/config/IBMSmartCloudParserModule.java
index 5d2ba65356..7c44578f22 100644
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/config/IBMDeveloperCloudParserModule.java
+++ b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/config/IBMSmartCloudParserModule.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.ibmdev.config;
+package org.jclouds.ibm.smartcloud.config;
 
 import java.lang.reflect.Type;
 import java.net.URI;
@@ -41,7 +41,7 @@ import com.google.inject.Provides;
  * 
  * @author Adrian Cole
  */
-public class IBMDeveloperCloudParserModule extends AbstractModule {
+public class IBMSmartCloudParserModule extends AbstractModule {
    @Singleton
    public static class CurlyBraceCapableURIAdapter implements JsonDeserializer<URI> {
       @Override
@@ -63,4 +63,4 @@ public class IBMDeveloperCloudParserModule extends AbstractModule {
    protected void configure() {
       bind(DateAdapter.class).to(LongDateAdapter.class);
    }
-}
\ No newline at end of file
+}
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/config/IBMDeveloperCloudRestClientModule.java b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/config/IBMSmartCloudRestClientModule.java
similarity index 67%
rename from sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/config/IBMDeveloperCloudRestClientModule.java
rename to sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/config/IBMSmartCloudRestClientModule.java
index c36136aff4..4fb6cb49b4 100644
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/config/IBMDeveloperCloudRestClientModule.java
+++ b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/config/IBMSmartCloudRestClientModule.java
@@ -16,46 +16,46 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.ibmdev.config;
+package org.jclouds.ibm.smartcloud.config;
 
 import org.jclouds.http.HttpErrorHandler;
 import org.jclouds.http.RequiresHttp;
 import org.jclouds.http.annotation.ClientError;
 import org.jclouds.http.annotation.Redirection;
 import org.jclouds.http.annotation.ServerError;
-import org.jclouds.ibmdev.IBMDeveloperCloudAsyncClient;
-import org.jclouds.ibmdev.IBMDeveloperCloudClient;
-import org.jclouds.ibmdev.handlers.IBMDeveloperCloudErrorHandler;
+import org.jclouds.ibm.smartcloud.IBMSmartCloudAsyncClient;
+import org.jclouds.ibm.smartcloud.IBMSmartCloudClient;
+import org.jclouds.ibm.smartcloud.handlers.IBMSmartCloudErrorHandler;
 import org.jclouds.rest.ConfiguresRestClient;
 import org.jclouds.rest.config.RestClientModule;
 
 /**
- * Configures the IBMDeveloperCloud connection.
+ * Configures the IBMSmartCloud connection.
  * 
  * @author Adrian Cole
  */
 @RequiresHttp
 @ConfiguresRestClient
-public class IBMDeveloperCloudRestClientModule extends
-         RestClientModule<IBMDeveloperCloudClient, IBMDeveloperCloudAsyncClient> {
+public class IBMSmartCloudRestClientModule extends
+         RestClientModule<IBMSmartCloudClient, IBMSmartCloudAsyncClient> {
 
-   public IBMDeveloperCloudRestClientModule() {
-      super(IBMDeveloperCloudClient.class, IBMDeveloperCloudAsyncClient.class);
+   public IBMSmartCloudRestClientModule() {
+      super(IBMSmartCloudClient.class, IBMSmartCloudAsyncClient.class);
    }
 
    @Override
    protected void bindErrorHandlers() {
       bind(HttpErrorHandler.class).annotatedWith(Redirection.class).to(
-               IBMDeveloperCloudErrorHandler.class);
+               IBMSmartCloudErrorHandler.class);
       bind(HttpErrorHandler.class).annotatedWith(ClientError.class).to(
-               IBMDeveloperCloudErrorHandler.class);
+               IBMSmartCloudErrorHandler.class);
       bind(HttpErrorHandler.class).annotatedWith(ServerError.class).to(
-               IBMDeveloperCloudErrorHandler.class);
+               IBMSmartCloudErrorHandler.class);
    }
 
    @Override
    protected void configure() {
-      install(new IBMDeveloperCloudParserModule());
+      install(new IBMSmartCloudParserModule());
       super.configure();
    }
-}
\ No newline at end of file
+}
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Address.java b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/domain/Address.java
similarity index 76%
rename from sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Address.java
rename to sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/domain/Address.java
index 5e6121c4ec..755683b3cc 100644
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Address.java
+++ b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/domain/Address.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.ibmdev.domain;
+package org.jclouds.ibm.smartcloud.domain;
 
 import javax.annotation.Nullable;
 
@@ -26,30 +26,30 @@ import javax.annotation.Nullable;
  * 
  * @author Adrian Cole
  */
-public class Address {
+public class Address implements Comparable<Address> {
 
    public static enum State {
       NEW, ALLOCATING, FREE, ATTACHED, RELEASING, RELEASED, FAILED, RELEASE_PENDING;
       public static State fromValue(int v) {
          switch (v) {
-         case 0:
-            return NEW;
-         case 1:
-            return ALLOCATING;
-         case 2:
-            return FREE;
-         case 3:
-            return ATTACHED;
-         case 4:
-            return RELEASING;
-         case 5:
-            return RELEASED;
-         case 6:
-            return FAILED;
-         case 7:
-            return RELEASE_PENDING;
-         default:
-            throw new IllegalArgumentException("invalid state:" + v);
+            case 0:
+               return NEW;
+            case 1:
+               return ALLOCATING;
+            case 2:
+               return FREE;
+            case 3:
+               return ATTACHED;
+            case 4:
+               return RELEASING;
+            case 5:
+               return RELEASED;
+            case 6:
+               return FAILED;
+            case 7:
+               return RELEASE_PENDING;
+            default:
+               throw new IllegalArgumentException("invalid state:" + v);
          }
       }
    }
@@ -69,7 +69,7 @@ public class Address {
       this.instanceId = instanceId;
    }
 
-   public Address() {
+   Address() {
 
    }
 
@@ -77,42 +77,22 @@ public class Address {
       return State.fromValue(state);
    }
 
-   public void setState(int state) {
-      this.state = state;
-   }
-
    public String getLocation() {
       return location;
    }
 
-   public void setLocation(String location) {
-      this.location = location;
-   }
-
-   public String getIp() {
-      return ip;
-   }
-
-   public void setIp(String ip) {
-      this.ip = ip;
+   public String getIP() {
+      return "".equals(ip.trim()) ? null : ip.trim();
    }
 
    public String getId() {
       return id;
    }
 
-   public void setId(String id) {
-      this.id = id;
-   }
-
    public String getInstanceId() {
       return instanceId;
    }
 
-   public void setInstanceId(String instanceId) {
-      this.instanceId = instanceId;
-   }
-
    @Override
    public int hashCode() {
       final int prime = 31;
@@ -159,7 +139,11 @@ public class Address {
    @Override
    public String toString() {
       return "[id=" + id + ", ip=" + ip + ", location=" + location + ", state=" + getState() + ", instanceId="
-            + instanceId + "]";
+               + instanceId + "]";
    }
 
-}
\ No newline at end of file
+   @Override
+   public int compareTo(Address arg0) {
+      return id.compareTo(arg0.getId());
+   }
+}
diff --git a/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/domain/IP.java b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/domain/IP.java
new file mode 100644
index 0000000000..9f790f896f
--- /dev/null
+++ b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/domain/IP.java
@@ -0,0 +1,127 @@
+/**
+ *
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.ibm.smartcloud.domain;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.google.common.annotations.Beta;
+
+/**
+ * 
+ * 
+ * @author Adrian Cole
+ */
+public class IP {
+   public static Builder builder() {
+      return new Builder();
+   }
+
+   public static class Builder {
+      private String ip;
+      private String hostname;
+      private int type;
+
+      public Builder ip(String ip) {
+         this.ip = ip;
+         return this;
+      }
+
+      public Builder hostname(String hostname) {
+         this.hostname = hostname;
+         return this;
+      }
+
+      public Builder type(int type) {
+         this.type = type;
+         return this;
+      }
+
+      public IP build() {
+         return new IP(ip, hostname, type);
+      }
+   }
+
+   private String ip;
+   private String hostname;
+   @Beta
+   private int type;
+
+   IP() {
+
+   }
+
+   public IP(String ip, String hostname, int type) {
+      this.ip = checkNotNull(ip, "ip");
+      this.hostname = checkNotNull(hostname, "hostname");
+      this.type = type;
+   }
+
+   // TODO custom parser to do this once
+   public String getHostname() {
+      return "".equals(hostname.trim()) ? null : hostname.trim();
+   }
+
+   public String getIP() {
+      return "".equals(ip.trim()) ? null : ip.trim();
+   }
+
+   public int getType() {
+      return type;
+   }
+
+   @Override
+   public int hashCode() {
+      final int prime = 31;
+      int result = 1;
+      result = prime * result + ((hostname == null) ? 0 : hostname.hashCode());
+      result = prime * result + ((ip == null) ? 0 : ip.hashCode());
+      result = prime * result + type;
+      return result;
+   }
+
+   @Override
+   public boolean equals(Object obj) {
+      if (this == obj)
+         return true;
+      if (obj == null)
+         return false;
+      if (getClass() != obj.getClass())
+         return false;
+      IP other = (IP) obj;
+      if (hostname == null) {
+         if (other.hostname != null)
+            return false;
+      } else if (!hostname.equals(other.hostname))
+         return false;
+      if (ip == null) {
+         if (other.ip != null)
+            return false;
+      } else if (!ip.equals(other.ip))
+         return false;
+      if (type != other.type)
+         return false;
+      return true;
+   }
+
+   @Override
+   public String toString() {
+      return String.format("[hostname=%s, ip=%s, type=%s]", hostname, ip, type);
+   }
+
+}
diff --git a/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/domain/Image.java b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/domain/Image.java
new file mode 100644
index 0000000000..d3b85db9bb
--- /dev/null
+++ b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/domain/Image.java
@@ -0,0 +1,221 @@
+/**
+ *
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.ibm.smartcloud.domain;
+
+import java.net.URI;
+import java.util.Date;
+import java.util.Set;
+import java.util.SortedSet;
+
+import com.google.common.collect.ImmutableSortedSet;
+import com.google.common.collect.Sets;
+
+/**
+ * 
+ * The current state of the image.
+ * 
+ * @author Adrian Cole
+ */
+public class Image implements Comparable<Image> {
+
+   public static enum State {
+      NEW, AVAILABLE, UNAVAILABLE, DELETED, CAPTURING, UNRECOGNIZED;
+      public static State fromValue(String v) {
+         switch (Integer.parseInt(v)) {
+            case 0:
+               return NEW;
+            case 1:
+               return AVAILABLE;
+            case 2:
+               return UNAVAILABLE;
+            case 3:
+               return DELETED;
+            case 4:
+               return CAPTURING;
+            default:
+               return UNRECOGNIZED;
+         }
+      }
+   }
+
+   public static enum Visibility {
+
+      PUBLIC,
+
+      SHARED,
+
+      PRIVATE;
+   }
+
+   public static enum Architecture {
+      I386, X86_64, UNRECOGNIZED;
+      public String value() {
+         return name().toLowerCase();
+      }
+
+      public static Architecture fromValue(String v) {
+         try {
+            return valueOf(v.toUpperCase());
+         } catch (IllegalArgumentException e) {
+            return UNRECOGNIZED;
+         }
+      }
+   }
+
+   private String name;
+
+   private URI manifest;
+   private State state;
+   private Visibility visibility;
+   private String owner;
+   private String platform;
+   private Architecture architecture;
+   private Date createdTime;
+   private String location;
+   // for testing to be the same order each time
+   private SortedSet<InstanceType> supportedInstanceTypes = Sets.newTreeSet();
+   private SortedSet<String> productCodes = Sets.newTreeSet();
+   private URI documentation;
+   private String id;
+   private String description;
+
+   Image() {
+
+   }
+
+   public Image(String name, URI manifest, State state, Visibility visibility, String owner, String platform,
+            Architecture architecture, Date createdTime, String location, Set<InstanceType> supportedInstanceTypes,
+            Set<String> productCodes, URI documentation, String id, String description) {
+      this.name = name;
+      this.manifest = manifest;
+      this.state = state;
+      this.visibility = visibility;
+      this.owner = owner;
+      this.platform = platform;
+      this.architecture = architecture;
+      this.createdTime = createdTime;
+      this.location = location;
+      this.supportedInstanceTypes = ImmutableSortedSet.copyOf(supportedInstanceTypes);
+      this.productCodes = ImmutableSortedSet.copyOf(productCodes);
+      this.documentation = documentation;
+      this.id = id;
+      this.description = description;
+   }
+
+   @Override
+   public int hashCode() {
+      final int prime = 31;
+      int result = 1;
+      result = prime * result + ((id == null) ? 0 : id.hashCode());
+      result = prime * result + ((location == null) ? 0 : location.hashCode());
+      return result;
+   }
+
+   @Override
+   public boolean equals(Object obj) {
+      if (this == obj)
+         return true;
+      if (obj == null)
+         return false;
+      if (getClass() != obj.getClass())
+         return false;
+      Image other = (Image) obj;
+      if (id == null) {
+         if (other.id != null)
+            return false;
+      } else if (!id.equals(other.id))
+         return false;
+      if (location == null) {
+         if (other.location != null)
+            return false;
+      } else if (!location.equals(other.location))
+         return false;
+      return true;
+   }
+
+   @Override
+   public String toString() {
+      return String
+               .format(
+                        "[id=%s, name=%s, architecture=%s, createdTime=%s, description=%s, documentation=%s, location=%s, manifest=%s, owner=%s, platform=%s, productCodes=%s, state=%s, supportedInstanceTypes=%s, visibility=%s]",
+                        id, name, architecture, createdTime, description, documentation, location, manifest, owner,
+                        platform, productCodes, state, supportedInstanceTypes, visibility);
+   }
+
+   public String getName() {
+      return name;
+   }
+
+   public URI getManifest() {
+      return manifest;
+   }
+
+   public State getState() {
+      return state;
+   }
+
+   public Visibility getVisibility() {
+      return visibility;
+   }
+
+   public String getOwner() {
+      return owner;
+   }
+
+   public String getPlatform() {
+      return platform;
+   }
+
+   public Architecture getArchitecture() {
+      return architecture;
+   }
+
+   public Date getCreatedTime() {
+      return createdTime;
+   }
+
+   public String getLocation() {
+      return location;
+   }
+
+   public Set<InstanceType> getSupportedInstanceTypes() {
+      return supportedInstanceTypes;
+   }
+
+   public Set<String> getProductCodes() {
+      return productCodes;
+   }
+
+   public URI getDocumentation() {
+      return documentation;
+   }
+
+   public String getId() {
+      return id;
+   }
+
+   public String getDescription() {
+      return description;
+   }
+
+   @Override
+   public int compareTo(Image arg0) {
+      return id.compareTo(arg0.getId());
+   }
+}
diff --git a/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/domain/Instance.java b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/domain/Instance.java
new file mode 100644
index 0000000000..466888e23d
--- /dev/null
+++ b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/domain/Instance.java
@@ -0,0 +1,449 @@
+/**
+ *
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.ibm.smartcloud.domain;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import java.util.Date;
+import java.util.Set;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Sets;
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * 
+ * The current state of the instance.
+ * 
+ * @author Adrian Cole
+ */
+public class Instance implements Comparable<Instance> {
+   public static Builder builder() {
+      return new Builder();
+   }
+
+   public static class Builder {
+      private Date launchTime;
+      private Set<Software> software = Sets.newLinkedHashSet();
+      private IP primaryIP;
+      private Set<IP> secondaryIPs = Sets.newLinkedHashSet();
+      private String requestId;
+      private String keyName;
+      private String name;
+      private String instanceType;
+      private Status status;
+      private String owner;
+      private String location;
+      private String imageId;
+      private Set<String> productCodes = Sets.newLinkedHashSet();
+      private String requestName;
+      private String id;
+      private Date expirationTime;
+      private Vlan vlan;
+      private int diskSize;
+
+      private boolean rootOnly;
+      private String antiCollocationInstance;
+
+      public Builder launchTime(Date launchTime) {
+         this.launchTime = launchTime;
+         return this;
+      }
+
+      public Builder software(Iterable<Software> software) {
+         this.software = ImmutableSet.<Software> copyOf(checkNotNull(software, "software"));
+         return this;
+      }
+
+      public Builder primaryIP(IP primaryIP) {
+         this.primaryIP = primaryIP;
+         return this;
+      }
+
+      public Builder secondaryIPs(Iterable<IP> secondaryIPs) {
+         this.secondaryIPs = ImmutableSet.<IP> copyOf(checkNotNull(secondaryIPs, "secondaryIPs"));
+         return this;
+      }
+
+      public Builder requestId(String requestId) {
+         this.requestId = requestId;
+         return this;
+      }
+
+      public Builder keyName(String keyName) {
+         this.keyName = keyName;
+         return this;
+      }
+
+      public Builder name(String name) {
+         this.name = name;
+         return this;
+      }
+
+      public Builder instanceType(String instanceType) {
+         this.instanceType = instanceType;
+         return this;
+      }
+
+      public Builder status(Status status) {
+         this.status = status;
+         return this;
+      }
+
+      public Builder owner(String owner) {
+         this.owner = owner;
+         return this;
+      }
+
+      public Builder location(String location) {
+         this.location = location;
+         return this;
+      }
+
+      public Builder imageId(String imageId) {
+         this.imageId = imageId;
+         return this;
+      }
+
+      public Builder productCodes(Iterable<String> productCodes) {
+         this.productCodes = ImmutableSet.<String> copyOf(checkNotNull(productCodes, "productCodes"));
+         return this;
+      }
+
+      public Builder requestName(String requestName) {
+         this.requestName = requestName;
+         return this;
+      }
+
+      public Builder id(String id) {
+         this.id = id;
+         return this;
+      }
+
+      public Builder expirationTime(Date expirationTime) {
+         this.expirationTime = expirationTime;
+         return this;
+      }
+
+      public Builder vlan(Vlan vlan) {
+         this.vlan = vlan;
+         return this;
+      }
+
+      public Builder diskSize(int diskSize) {
+         this.diskSize = diskSize;
+         return this;
+      }
+
+      public Builder rootOnly(boolean rootOnly) {
+         this.rootOnly = rootOnly;
+         return this;
+      }
+
+      public Builder antiCollocationInstance(String antiCollocationInstance) {
+         this.antiCollocationInstance = antiCollocationInstance;
+         return this;
+      }
+
+      public Instance build() {
+         return new Instance(launchTime, software, primaryIP, secondaryIPs, requestId, keyName, name, instanceType,
+                  status, owner, location, imageId, productCodes, requestName, id, expirationTime, vlan, diskSize,
+                  rootOnly, antiCollocationInstance);
+      }
+   }
+
+   public static enum Status {
+      NEW, PROVISIONING, FAILED, REMOVED, REJECTED, ACTIVE, UNKNOWN, DEPROVISIONING, RESTARTING, STARTING, STOPPING, STOPPED, DEPROVISION_PENDING, UNRECOGNIZED;
+
+      public static Status fromValue(String v) {
+         switch (Integer.parseInt(v)) {
+            case 0:
+               return NEW;
+            case 1:
+               return PROVISIONING;
+            case 2:
+               return FAILED;
+            case 3:
+               return REMOVED;
+            case 4:
+               return REJECTED;
+            case 5:
+               return ACTIVE;
+            case 6:
+               return UNKNOWN;
+            case 7:
+               return DEPROVISIONING;
+            case 8:
+               return RESTARTING;
+            case 9:
+               return STARTING;
+            case 10:
+               return STOPPING;
+            case 11:
+               return STOPPED;
+            case 12:
+               return DEPROVISION_PENDING;
+            default:
+               return UNRECOGNIZED;
+         }
+      }
+   }
+
+   public static class Software {
+      private String version;
+      private String type;
+      private String name;
+
+      public Software(String name, String type, String version) {
+         this.version = version;
+         this.type = type;
+         this.name = name;
+      }
+
+      public Software() {
+
+      }
+
+      @Override
+      public int hashCode() {
+         final int prime = 31;
+         int result = 1;
+         result = prime * result + ((name == null) ? 0 : name.hashCode());
+         result = prime * result + ((type == null) ? 0 : type.hashCode());
+         result = prime * result + ((version == null) ? 0 : version.hashCode());
+         return result;
+      }
+
+      @Override
+      public boolean equals(Object obj) {
+         if (this == obj)
+            return true;
+         if (obj == null)
+            return false;
+         if (getClass() != obj.getClass())
+            return false;
+         Software other = (Software) obj;
+         if (name == null) {
+            if (other.name != null)
+               return false;
+         } else if (!name.equals(other.name))
+            return false;
+         if (type == null) {
+            if (other.type != null)
+               return false;
+         } else if (!type.equals(other.type))
+            return false;
+         if (version == null) {
+            if (other.version != null)
+               return false;
+         } else if (!version.equals(other.version))
+            return false;
+         return true;
+      }
+
+      public String getVersion() {
+         return version;
+      }
+
+      public String getType() {
+         return type;
+      }
+
+      public String getName() {
+         return name;
+      }
+
+      @Override
+      public String toString() {
+         return "[name=" + name + ", type=" + type + ", version=" + version + "]";
+      }
+   }
+
+   private Date launchTime;
+   private Set<Software> software = Sets.newLinkedHashSet();
+   private IP primaryIP;
+   @SerializedName("secondaryIP")
+   private Set<IP> secondaryIPs = Sets.newLinkedHashSet();
+   private String requestId;
+   private String keyName;
+   private String name;
+   private String instanceType;
+   private Status status;
+   private String owner;
+   private String location;
+   private String imageId;
+   private Set<String> productCodes = Sets.newLinkedHashSet();
+   private String requestName;
+   private String id;
+   private Date expirationTime;
+   private Vlan vlan;
+   private int diskSize;
+   @SerializedName("root-only")
+   private boolean rootOnly;
+   private String antiCollocationInstance;
+
+   Instance() {
+   }
+
+   public Instance(Date launchTime, Iterable<Software> software, IP primaryIP, Iterable<IP> secondaryIPs,
+            String requestId, String keyName, String name, String instanceType, Status status, String owner,
+            String location, String imageId, Iterable<String> productCodes, String requestName, String id,
+            Date expirationTime, Vlan vlan, int diskSize, boolean rootOnly, String antiCollocationInstance) {
+      this.launchTime = launchTime;
+      this.software = ImmutableSet.copyOf(software);
+      this.primaryIP = primaryIP;
+      this.secondaryIPs = ImmutableSet.copyOf(secondaryIPs);
+      this.requestId = requestId;
+      this.keyName = keyName;
+      this.name = name;
+      this.instanceType = instanceType;
+      this.status = status;
+      this.owner = owner;
+      this.location = location;
+      this.imageId = imageId;
+      this.productCodes = ImmutableSet.copyOf(productCodes);
+      this.requestName = requestName;
+      this.id = id;
+      this.expirationTime = expirationTime;
+      this.vlan = vlan;
+      this.diskSize = diskSize;
+      this.rootOnly = rootOnly;
+      this.antiCollocationInstance = antiCollocationInstance;
+   }
+
+   public Date getLaunchTime() {
+      return launchTime;
+   }
+
+   public Set<Software> getSoftware() {
+      return software;
+   }
+
+   public IP getPrimaryIP() {
+      return primaryIP;
+   }
+
+   public Set<IP> getSecondaryIPs() {
+      return secondaryIPs;
+   }
+
+   public String getRequestId() {
+      return requestId;
+   }
+
+   public String getKeyName() {
+      return keyName;
+   }
+
+   public String getName() {
+      return name;
+   }
+
+   public String getInstanceType() {
+      return instanceType;
+   }
+
+   public Status getStatus() {
+      return status;
+   }
+
+   public String getOwner() {
+      return owner;
+   }
+
+   public String getLocation() {
+      return location;
+   }
+
+   public String getImageId() {
+      return imageId;
+   }
+
+   public Set<String> getProductCodes() {
+      return productCodes;
+   }
+
+   public String getRequestName() {
+      return requestName;
+   }
+
+   public String getId() {
+      return id;
+   }
+
+   public Date getExpirationTime() {
+      return expirationTime;
+   }
+
+   public Vlan getVlan() {
+      return vlan;
+   }
+
+   public int getDiskSize() {
+      return diskSize;
+   }
+
+   public boolean isRootOnly() {
+      return rootOnly;
+   }
+
+   public String getAntiCollocationInstance() {
+      return antiCollocationInstance;
+   }
+
+   @Override
+   public int hashCode() {
+      final int prime = 31;
+      int result = 1;
+      result = prime * result + ((id == null) ? 0 : id.hashCode());
+      return result;
+   }
+
+   @Override
+   public boolean equals(Object obj) {
+      if (this == obj)
+         return true;
+      if (obj == null)
+         return false;
+      if (getClass() != obj.getClass())
+         return false;
+      Instance other = (Instance) obj;
+      if (id == null) {
+         if (other.id != null)
+            return false;
+      } else if (!id.equals(other.id))
+         return false;
+      return true;
+   }
+
+   @Override
+   public String toString() {
+      return String
+               .format(
+                        "[id=%s, instanceType=%s, owner=%s, name=%s, location=%s, status=%s, imageId=%s, primaryIP=%s, secondaryIPs=%s, diskSize=%s, keyName=%s, launchTime=%s, rootOnly=%s, vlan=%s, software=%s, expirationTime=%s, antiCollocationInstance=%s, requestId=%s, requestName=%s, productCodes=%s]",
+                        id, instanceType, owner, name, location, status, imageId, primaryIP, secondaryIPs, diskSize,
+                        keyName, launchTime, rootOnly, vlan, software, expirationTime, antiCollocationInstance,
+                        requestId, requestName, productCodes);
+   }
+
+   @Override
+   public int compareTo(Instance arg0) {
+      return id.compareTo(arg0.getId());
+   }
+}
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/InstanceType.java b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/domain/InstanceType.java
similarity index 98%
rename from sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/InstanceType.java
rename to sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/domain/InstanceType.java
index 5066755565..63e505dc5d 100644
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/InstanceType.java
+++ b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/domain/InstanceType.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.ibmdev.domain;
+package org.jclouds.ibm.smartcloud.domain;
 
 import com.google.common.collect.ComparisonChain;
 
@@ -100,4 +100,4 @@ public class InstanceType implements Comparable<InstanceType> {
    public int compareTo(InstanceType o) {
       return ComparisonChain.start().compare(this.getPrice().getRate(), o.getPrice().getRate()).result();
    }
-}
\ No newline at end of file
+}
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Key.java b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/domain/Key.java
similarity index 95%
rename from sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Key.java
rename to sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/domain/Key.java
index 930fc06d3b..cf274e31ae 100644
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Key.java
+++ b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/domain/Key.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.ibmdev.domain;
+package org.jclouds.ibm.smartcloud.domain;
 
 import java.util.Date;
 import java.util.Set;
@@ -31,7 +31,7 @@ import com.google.gson.annotations.SerializedName;
  * 
  * @author Adrian Cole
  */
-public class Key {
+public class Key implements Comparable<Key> {
    @SerializedName("default")
    private boolean isDefault;
    private Set<String> instanceIds = Sets.newLinkedHashSet();
@@ -144,4 +144,8 @@ public class Key {
       this.instanceIds = instanceIds;
    }
 
-}
\ No newline at end of file
+   @Override
+   public int compareTo(Key arg0) {
+      return name.compareTo(arg0.name);
+   }
+}
diff --git a/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/domain/Location.java b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/domain/Location.java
new file mode 100644
index 0000000000..34f2ae4d7f
Binary files /dev/null and b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/domain/Location.java differ
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Offering.java b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/domain/Offering.java
similarity index 91%
rename from sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Offering.java
rename to sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/domain/Offering.java
index a7a286ac80..29bddcf464 100644
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Offering.java
+++ b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/domain/Offering.java
@@ -16,21 +16,20 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.ibmdev.domain;
+package org.jclouds.ibm.smartcloud.domain;
 
 /**
  * 
  * 
  * @author Adrian Cole
  */
-public class Offering {
+public class Offering implements Comparable<Offering> {
 
    protected String location;
    protected Price price;
    protected String id;
 
-   public Offering() {
-      super();
+   Offering() {
    }
 
    public String getLocation() {
@@ -87,4 +86,8 @@ public class Offering {
       return "[id=" + id + ", location=" + location + ", price=" + price + "]";
    }
 
-}
\ No newline at end of file
+   @Override
+   public int compareTo(Offering arg0) {
+      return id.compareTo(arg0.id);
+   }
+}
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Price.java b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/domain/Price.java
similarity index 98%
rename from sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Price.java
rename to sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/domain/Price.java
index 69e27ce2d5..4dc6272a73 100644
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Price.java
+++ b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/domain/Price.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.ibmdev.domain;
+package org.jclouds.ibm.smartcloud.domain;
 
 import java.util.Date;
 
@@ -129,4 +129,4 @@ public class Price {
       return "[countryCode=" + countryCode + ", currencyCode=" + currencyCode + ", effectiveDate=" + effectiveDate
             + ", pricePerQuantity=" + pricePerQuantity + ", rate=" + rate + ", unitOfMeasure=" + unitOfMeasure + "]";
    }
-}
\ No newline at end of file
+}
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/StorageOffering.java b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/domain/StorageOffering.java
similarity index 98%
rename from sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/StorageOffering.java
rename to sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/domain/StorageOffering.java
index 3d22d42e1d..cf2e11c891 100644
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/StorageOffering.java
+++ b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/domain/StorageOffering.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.ibmdev.domain;
+package org.jclouds.ibm.smartcloud.domain;
 
 import java.util.Set;
 
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Location.java b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/domain/Vlan.java
similarity index 58%
rename from sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Location.java
rename to sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/domain/Vlan.java
index 1b65d03f60..52d2c9135e 100644
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Location.java
+++ b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/domain/Vlan.java
@@ -16,61 +16,74 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.ibmdev.domain;
+package org.jclouds.ibm.smartcloud.domain;
 
-import java.util.Map;
-
-import com.google.common.collect.Maps;
 
 /**
  * 
- * The current state of a location (datacenter)
  * 
  * @author Adrian Cole
  */
-public class Location {
+public class Vlan {
+   public static Builder builder() {
+      return new Builder();
+   }
 
-   private final String id;
-   private final String name;
-   private final String description;
-   private final String location;
-   private final Map<String, Map<String, String>> capabilities = Maps.newLinkedHashMap();
+   public static class Builder {
+      private String id;
+      private String name;
+      private String location;
 
-   public Location(String id, String name, String description, String location,
-            Map<String, Map<String, String>> capabilities) {
-      this.id = id;
-      this.name = name;
-      this.description = description;
+      public Builder id(String id) {
+         this.id = id;
+         return this;
+      }
+
+      public Builder name(String name) {
+         this.name = name;
+         return this;
+      }
+
+      public Builder location(String location) {
+         this.location = location;
+         return this;
+      }
+
+      public Vlan build() {
+         return new Vlan(location, name, id);
+      }
+   }
+
+   private String location;
+   private String name;
+   private String id;
+
+   Vlan() {
+
+   }
+
+   public Vlan(String location, String name, String id) {
       this.location = location;
-      this.capabilities.putAll(capabilities);
-   }
-
-   public String getId() {
-      return id;
-   }
-
-   public String getName() {
-      return name;
-   }
-
-   public String getDescription() {
-      return description;
+      this.name = name;
+      this.id = id;
    }
 
    public String getLocation() {
       return location;
    }
 
-   public Map<String, Map<String, String>> getCapabilities() {
-      return capabilities;
+   public String getName() {
+      return name;
+   }
+
+   public String getId() {
+      return id;
    }
 
    @Override
    public int hashCode() {
       final int prime = 31;
       int result = 1;
-      result = prime * result + ((capabilities == null) ? 0 : capabilities.hashCode());
-      result = prime * result + ((description == null) ? 0 : description.hashCode());
       result = prime * result + ((id == null) ? 0 : id.hashCode());
       result = prime * result + ((location == null) ? 0 : location.hashCode());
       result = prime * result + ((name == null) ? 0 : name.hashCode());
@@ -85,17 +98,7 @@ public class Location {
          return false;
       if (getClass() != obj.getClass())
          return false;
-      Location other = (Location) obj;
-      if (capabilities == null) {
-         if (other.capabilities != null)
-            return false;
-      } else if (!capabilities.equals(other.capabilities))
-         return false;
-      if (description == null) {
-         if (other.description != null)
-            return false;
-      } else if (!description.equals(other.description))
-         return false;
+      Vlan other = (Vlan) obj;
       if (id == null) {
          if (other.id != null)
             return false;
@@ -116,8 +119,7 @@ public class Location {
 
    @Override
    public String toString() {
-      return "Location [id=" + id + ", name=" + name + ", description=" + description
-               + ", location=" + location + ", capabilities=" + capabilities + "]";
+      return "[id=" + id + ", location=" + location + ", name=" + name + "]";
    }
 
-}
\ No newline at end of file
+}
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Volume.java b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/domain/Volume.java
similarity index 97%
rename from sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Volume.java
rename to sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/domain/Volume.java
index 89c9bed788..d89307d7e6 100644
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Volume.java
+++ b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/domain/Volume.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.ibmdev.domain;
+package org.jclouds.ibm.smartcloud.domain;
 
 import java.util.Date;
 import java.util.Set;
@@ -30,7 +30,7 @@ import com.google.common.collect.Sets;
  * 
  * @author Adrian Cole
  */
-public class Volume {
+public class Volume  implements Comparable<Volume> {
 
    public static enum State {
       NEW, CREATING, DELETING, DELETED, UNMOUNTED, MOUNTED, FAILED;
@@ -243,4 +243,8 @@ public class Volume {
                + productCodes + "]";
    }
 
-}
\ No newline at end of file
+   @Override
+   public int compareTo(Volume arg0) {
+      return id.compareTo(arg0.getId());
+   }
+}
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseLongFromDate.java b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/functions/ParseLongFromDate.java
similarity index 96%
rename from sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseLongFromDate.java
rename to sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/functions/ParseLongFromDate.java
index 89ec282595..c75265f82c 100644
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseLongFromDate.java
+++ b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/functions/ParseLongFromDate.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.ibmdev.functions;
+package org.jclouds.ibm.smartcloud.functions;
 
 import static com.google.common.base.Preconditions.checkArgument;
 
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/handlers/IBMDeveloperCloudErrorHandler.java b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/handlers/IBMSmartCloudErrorHandler.java
similarity index 96%
rename from sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/handlers/IBMDeveloperCloudErrorHandler.java
rename to sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/handlers/IBMSmartCloudErrorHandler.java
index 0052ce4e13..6bc4c5679a 100644
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/handlers/IBMDeveloperCloudErrorHandler.java
+++ b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/handlers/IBMSmartCloudErrorHandler.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.ibmdev.handlers;
+package org.jclouds.ibm.smartcloud.handlers;
 
 import static org.jclouds.http.HttpUtils.releasePayload;
 
@@ -41,7 +41,7 @@ import org.jclouds.util.Strings2;
  * 
  */
 @Singleton
-public class IBMDeveloperCloudErrorHandler implements HttpErrorHandler {
+public class IBMSmartCloudErrorHandler implements HttpErrorHandler {
    @Resource
    protected Logger logger = Logger.NULL;
 
@@ -88,4 +88,4 @@ public class IBMDeveloperCloudErrorHandler implements HttpErrorHandler {
          return null;
       return Strings2.toStringAndClose(response.getPayload().getInput());
    }
-}
\ No newline at end of file
+}
diff --git a/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/options/CreateInstanceOptions.java b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/options/CreateInstanceOptions.java
new file mode 100644
index 0000000000..bc16576d18
--- /dev/null
+++ b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/options/CreateInstanceOptions.java
@@ -0,0 +1,207 @@
+/**
+ *
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.ibm.smartcloud.options;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.jclouds.http.options.BaseHttpRequestOptions;
+
+import com.google.common.collect.ImmutableSet;
+
+/**
+ * 
+ * 
+ * @author Adrian Cole
+ * 
+ */
+public class CreateInstanceOptions extends BaseHttpRequestOptions {
+
+   public CreateInstanceOptions() {
+      super();
+      formParameters.put("publicKey", "DEFAULT");
+   }
+
+   /**
+    * 
+    * @param id
+    *           The ID of a storage volume to associate with this instance
+    * @param mountPoint
+    *           The mount point in which to mount the attached storage volume
+    */
+   public CreateInstanceOptions mountVolume(String id, String mountPoint) {
+      checkNotNull(id, "volume id");
+      checkNotNull(mountPoint, "mountPoint");
+      formParameters.replaceValues("volumeID", ImmutableSet.of(id));
+      String mountParam = String.format("oss.storage.id.0.mnt", id);
+      formParameters.replaceValues(mountParam, ImmutableSet.of(mountPoint));
+      return this;
+   }
+
+   /**
+    * 
+    * @param publicKeyName
+    *           The public key to use for accessing the created instancee
+    */
+   public CreateInstanceOptions authorizePublicKey(String publicKeyName) {
+      checkNotNull(publicKeyName, "publicKeyName");
+      formParameters.replaceValues("publicKey", ImmutableSet.of(publicKeyName));
+      return this;
+   }
+
+   /**
+    * 
+    * @param configurationData
+    *           extra configuration to pass to the instance
+    */
+   public CreateInstanceOptions configurationData(Map<String, String> configurationData) {
+      checkNotNull(configurationData, "configurationData");
+      for (Entry<String, String> entry : configurationData.entrySet()) {
+         formParameters.replaceValues(entry.getKey(), ImmutableSet.of(entry.getValue()));
+      }
+      return this;
+   }
+
+   /**
+    * 
+    * @param ip
+    *           The ID of a static IP address to associate with this instance
+    */
+   public CreateInstanceOptions staticIP(String ip) {
+      checkNotNull(ip, "ip");
+      formParameters.replaceValues("ip", ImmutableSet.of(ip));
+      return this;
+   }
+
+   /**
+    * 
+    * @param id
+    *           The ID of a Vlan offering to associate with this instance.
+    */
+   public CreateInstanceOptions vlanID(String id) {
+      checkNotNull(id, "id");
+      formParameters.replaceValues("vlanID", ImmutableSet.of(id));
+      return this;
+   }
+
+   /**
+    * 
+    * @param ip
+    *           The ID of a static IP address to associate with this instance as secondary IP.
+    */
+   public CreateInstanceOptions secondaryIP(String ip) {
+      checkNotNull(ip, "ip");
+      formParameters.replaceValues("secondaryIP", ImmutableSet.of(ip));
+      return this;
+   }
+
+   /**
+    * 
+    * @param id
+    *           The ID of an existing anti-collocated instance.
+    */
+   public CreateInstanceOptions antiCollocationInstance(String id) {
+      checkNotNull(id, "id");
+      formParameters.replaceValues("antiCollocationInstance", ImmutableSet.of(id));
+      return this;
+   }
+
+   /**
+    * Whether or not the instance should be provisioned with the root segment only. Compared to
+    * standard server size, this option will provide less storage but same memory and CPU, and thus
+    * provision the instance faster.
+    * 
+    * @param isMiniEphemeral
+    *           true if root only provision, False: normal provision
+    */
+   public CreateInstanceOptions isMiniEphemeral(boolean isMiniEphemeral) {
+      formParameters.replaceValues("isMiniEphemeral", ImmutableSet.of(isMiniEphemeral + ""));
+      return this;
+   }
+
+   public static class Builder {
+
+      /**
+       * @see CreateInstanceOptions#configurationData
+       */
+      public static CreateInstanceOptions configurationData(Map<String, String> configurationData) {
+         CreateInstanceOptions options = new CreateInstanceOptions();
+         return options.configurationData(configurationData);
+      }
+
+      /**
+       * @see CreateInstanceOptions#mountVolume
+       */
+      public static CreateInstanceOptions mountVolume(String id, String mountPoint) {
+         CreateInstanceOptions options = new CreateInstanceOptions();
+         return options.mountVolume(id, mountPoint);
+      }
+
+      /**
+       * @see CreateInstanceOptions#staticIP
+       */
+      public static CreateInstanceOptions staticIP(String ip) {
+         CreateInstanceOptions options = new CreateInstanceOptions();
+         return options.staticIP(ip);
+      }
+
+      /**
+       * @see CreateInstanceOptions#secondaryIP
+       */
+      public static CreateInstanceOptions secondaryIP(String ip) {
+         CreateInstanceOptions options = new CreateInstanceOptions();
+         return options.secondaryIP(ip);
+      }
+
+      /**
+       * @see CreateInstanceOptions#vlanID
+       */
+      public static CreateInstanceOptions vlanID(String id) {
+         CreateInstanceOptions options = new CreateInstanceOptions();
+         return options.vlanID(id);
+      }
+
+      /**
+       * @see CreateInstanceOptions#antiCollocationInstance
+       */
+      public static CreateInstanceOptions antiCollocationInstance(String id) {
+         CreateInstanceOptions options = new CreateInstanceOptions();
+         return options.antiCollocationInstance(id);
+      }
+
+      /**
+       * @see CreateInstanceOptions#isMiniEphemeral
+       */
+      public static CreateInstanceOptions isMiniEphemeral(boolean isMiniEphemeral) {
+         CreateInstanceOptions options = new CreateInstanceOptions();
+         return options.isMiniEphemeral(isMiniEphemeral);
+      }
+
+      /**
+       * @see CreateInstanceOptions#authorizePublicKey
+       */
+      public static CreateInstanceOptions authorizePublicKey(String publicKeyName) {
+         CreateInstanceOptions options = new CreateInstanceOptions();
+         return options.authorizePublicKey(publicKeyName);
+      }
+   }
+
+}
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/options/RestartInstanceOptions.java b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/options/RestartInstanceOptions.java
similarity index 97%
rename from sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/options/RestartInstanceOptions.java
rename to sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/options/RestartInstanceOptions.java
index 4a415277d3..64bbd2da74 100644
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/options/RestartInstanceOptions.java
+++ b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/options/RestartInstanceOptions.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.ibmdev.options;
+package org.jclouds.ibm.smartcloud.options;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/AddressFree.java b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/predicates/AddressFree.java
similarity index 88%
rename from sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/AddressFree.java
rename to sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/predicates/AddressFree.java
index 9aa086342d..c8c7864f56 100644
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/AddressFree.java
+++ b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/predicates/AddressFree.java
@@ -16,15 +16,15 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.ibmdev.predicates;
+package org.jclouds.ibm.smartcloud.predicates;
 
 import java.util.NoSuchElementException;
 
 import javax.annotation.Resource;
 import javax.inject.Singleton;
 
-import org.jclouds.ibmdev.IBMDeveloperCloudClient;
-import org.jclouds.ibmdev.domain.Address;
+import org.jclouds.ibm.smartcloud.IBMSmartCloudClient;
+import org.jclouds.ibm.smartcloud.domain.Address;
 import org.jclouds.logging.Logger;
 
 import com.google.common.base.Predicate;
@@ -38,13 +38,13 @@ import com.google.inject.Inject;
 @Singleton
 public class AddressFree implements Predicate<Address> {
 
-   private final IBMDeveloperCloudClient client;
+   private final IBMSmartCloudClient client;
 
    @Resource
    protected Logger logger = Logger.NULL;
 
    @Inject
-   public AddressFree(IBMDeveloperCloudClient client) {
+   public AddressFree(IBMSmartCloudClient client) {
       this.client = client;
    }
 
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/InstanceActive.java b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/predicates/InstanceActive.java
similarity index 88%
rename from sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/InstanceActive.java
rename to sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/predicates/InstanceActive.java
index c1f73cc933..2755039b55 100644
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/InstanceActive.java
+++ b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/predicates/InstanceActive.java
@@ -16,13 +16,13 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.ibmdev.predicates;
+package org.jclouds.ibm.smartcloud.predicates;
 
 import javax.annotation.Resource;
 import javax.inject.Singleton;
 
-import org.jclouds.ibmdev.IBMDeveloperCloudClient;
-import org.jclouds.ibmdev.domain.Instance;
+import org.jclouds.ibm.smartcloud.IBMSmartCloudClient;
+import org.jclouds.ibm.smartcloud.domain.Instance;
 import org.jclouds.logging.Logger;
 
 import com.google.common.base.Predicate;
@@ -36,13 +36,13 @@ import com.google.inject.Inject;
 @Singleton
 public class InstanceActive implements Predicate<Instance> {
 
-   private final IBMDeveloperCloudClient client;
+   private final IBMSmartCloudClient client;
 
    @Resource
    protected Logger logger = Logger.NULL;
 
    @Inject
-   public InstanceActive(IBMDeveloperCloudClient client) {
+   public InstanceActive(IBMSmartCloudClient client) {
       this.client = client;
    }
 
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/InstanceActiveOrFailed.java b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/predicates/InstanceActiveOrFailed.java
similarity index 86%
rename from sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/InstanceActiveOrFailed.java
rename to sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/predicates/InstanceActiveOrFailed.java
index f5eaa6ece0..7a822622df 100644
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/InstanceActiveOrFailed.java
+++ b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/predicates/InstanceActiveOrFailed.java
@@ -16,13 +16,13 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.ibmdev.predicates;
+package org.jclouds.ibm.smartcloud.predicates;
 
 import javax.annotation.Resource;
 import javax.inject.Singleton;
 
-import org.jclouds.ibmdev.IBMDeveloperCloudClient;
-import org.jclouds.ibmdev.domain.Instance;
+import org.jclouds.ibm.smartcloud.IBMSmartCloudClient;
+import org.jclouds.ibm.smartcloud.domain.Instance;
 import org.jclouds.logging.Logger;
 
 import com.google.common.base.Predicate;
@@ -35,13 +35,13 @@ import com.google.inject.Inject;
 @Singleton
 public class InstanceActiveOrFailed implements Predicate<Instance> {
 
-   private final IBMDeveloperCloudClient client;
+   private final IBMSmartCloudClient client;
 
    @Resource
    protected Logger logger = Logger.NULL;
 
    @Inject
-   public InstanceActiveOrFailed(IBMDeveloperCloudClient client) {
+   public InstanceActiveOrFailed(IBMSmartCloudClient client) {
       this.client = client;
    }
 
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/InstanceRemovedOrNotFound.java b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/predicates/InstanceRemovedOrNotFound.java
similarity index 85%
rename from sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/InstanceRemovedOrNotFound.java
rename to sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/predicates/InstanceRemovedOrNotFound.java
index 70c96322f9..35c8c06c15 100644
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/InstanceRemovedOrNotFound.java
+++ b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/predicates/InstanceRemovedOrNotFound.java
@@ -16,13 +16,13 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.ibmdev.predicates;
+package org.jclouds.ibm.smartcloud.predicates;
 
 import javax.annotation.Resource;
 import javax.inject.Singleton;
 
-import org.jclouds.ibmdev.IBMDeveloperCloudClient;
-import org.jclouds.ibmdev.domain.Instance;
+import org.jclouds.ibm.smartcloud.IBMSmartCloudClient;
+import org.jclouds.ibm.smartcloud.domain.Instance;
 import org.jclouds.logging.Logger;
 
 import com.google.common.base.Predicate;
@@ -36,13 +36,13 @@ import com.google.inject.Inject;
 @Singleton
 public class InstanceRemovedOrNotFound implements Predicate<Instance> {
 
-   private final IBMDeveloperCloudClient client;
+   private final IBMSmartCloudClient client;
 
    @Resource
    protected Logger logger = Logger.NULL;
 
    @Inject
-   public InstanceRemovedOrNotFound(IBMDeveloperCloudClient client) {
+   public InstanceRemovedOrNotFound(IBMSmartCloudClient client) {
       this.client = client;
    }
 
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/VolumeUnmounted.java b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/predicates/VolumeUnmounted.java
similarity index 86%
rename from sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/VolumeUnmounted.java
rename to sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/predicates/VolumeUnmounted.java
index d0d90425fe..98c63afc77 100644
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/VolumeUnmounted.java
+++ b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/predicates/VolumeUnmounted.java
@@ -16,13 +16,13 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.ibmdev.predicates;
+package org.jclouds.ibm.smartcloud.predicates;
 
 import javax.annotation.Resource;
 import javax.inject.Singleton;
 
-import org.jclouds.ibmdev.IBMDeveloperCloudClient;
-import org.jclouds.ibmdev.domain.Volume;
+import org.jclouds.ibm.smartcloud.IBMSmartCloudClient;
+import org.jclouds.ibm.smartcloud.domain.Volume;
 import org.jclouds.logging.Logger;
 
 import com.google.common.base.Predicate;
@@ -35,13 +35,13 @@ import com.google.inject.Inject;
 @Singleton
 public class VolumeUnmounted implements Predicate<Volume> {
 
-   private final IBMDeveloperCloudClient client;
+   private final IBMSmartCloudClient client;
 
    @Resource
    protected Logger logger = Logger.NULL;
 
    @Inject
-   public VolumeUnmounted(IBMDeveloperCloudClient client) {
+   public VolumeUnmounted(IBMSmartCloudClient client) {
       this.client = client;
    }
 
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/reference/IBMDeveloperCloudConstants.java b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/reference/Capabilities.java
similarity index 81%
rename from sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/reference/IBMDeveloperCloudConstants.java
rename to sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/reference/Capabilities.java
index 2637b3ed7c..3b982af110 100644
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/reference/IBMDeveloperCloudConstants.java
+++ b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/reference/Capabilities.java
@@ -16,17 +16,18 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.ibmdev.reference;
+package org.jclouds.ibm.smartcloud.reference;
 
 /**
- * Configuration properties and constants used in IBMDeveloperCloud connections.
+ * Configuration properties and constants used in IBMSmartCloud connections.
  * 
  * @author Adrian Cole
  */
-public interface IBMDeveloperCloudConstants {
+public interface Capabilities {
    public static final String CAPABILITY_CAPACITY = "oss.storage.capacity";
    public static final String CAPABILITY_FORMAT = "oss.storage.format";
    public static final String CAPABILITY_I386 = "oss.instance.spec.i386";
    public static final String CAPABILITY_x86_64 = "oss.instance.spec.x86_64";
+   public static final String CAPABILITY_AVAILABILITYAREA =  "oss.storage.availabilityarea";
 
 }
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/xml/LocationHandler.java b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/xml/LocationHandler.java
similarity index 88%
rename from sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/xml/LocationHandler.java
rename to sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/xml/LocationHandler.java
index 77a779a17d..056d717336 100644
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/xml/LocationHandler.java
+++ b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/xml/LocationHandler.java
@@ -16,15 +16,13 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.ibmdev.xml;
+package org.jclouds.ibm.smartcloud.xml;
 
 import java.util.Map;
 
-import javax.annotation.Resource;
-
 import org.jclouds.http.functions.ParseSax;
-import org.jclouds.ibmdev.domain.Location;
-import org.jclouds.logging.Logger;
+import org.jclouds.ibm.smartcloud.domain.Location;
+import org.jclouds.ibm.smartcloud.domain.Location.State;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
@@ -44,18 +42,16 @@ public class LocationHandler extends ParseSax.HandlerWithResult<Location> {
    private String capabilityName;
    private String capabilityKey;
 
-   @Resource
-   protected Logger logger = Logger.NULL;
-
    private Location loc;
 
+   private State state;
+
    public Location getResult() {
       return loc;
    }
 
    @Override
-   public void startElement(String uri, String localName, String qName, Attributes attributes)
-            throws SAXException {
+   public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
       if (qName.equalsIgnoreCase("Capability")) {
          capabilityName = attributes.getValue(attributes.getIndex("id"));
          capabilities.put(capabilityName, Maps.<String, String> newLinkedHashMap());
@@ -74,15 +70,18 @@ public class LocationHandler extends ParseSax.HandlerWithResult<Location> {
          description = currentText.toString().trim();
          if (description.equals(""))
             description = null;
+      } else if (qName.equalsIgnoreCase("State")) {
+         state = State.fromValue(Integer.parseInt(currentText.toString().trim()));
       } else if (qName.equalsIgnoreCase("Value")) {
          capabilities.get(capabilityName).put(capabilityKey, currentText.toString().trim());
       } else if (qName.equalsIgnoreCase("Location")) {
          if (currentText.toString().trim().equals("")) {
-            this.loc = new Location(id, name, description, location, capabilities);
+            this.loc = new Location(id, name, description, location, state, capabilities);
             id = null;
             name = null;
             description = null;
             location = null;
+            state = null;
             capabilities = Maps.newLinkedHashMap();
             capabilityKey = null;
             capabilityName = null;
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/xml/LocationsHandler.java b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/xml/LocationsHandler.java
similarity index 89%
rename from sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/xml/LocationsHandler.java
rename to sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/xml/LocationsHandler.java
index 101a5f4857..fa3b412036 100644
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/xml/LocationsHandler.java
+++ b/sandbox-providers/ibm-smartcloud/src/main/java/org/jclouds/ibm/smartcloud/xml/LocationsHandler.java
@@ -16,14 +16,14 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.ibmdev.xml;
+package org.jclouds.ibm.smartcloud.xml;
 
 import java.util.Set;
 
 import javax.inject.Inject;
 
 import org.jclouds.http.functions.ParseSax;
-import org.jclouds.ibmdev.domain.Location;
+import org.jclouds.ibm.smartcloud.domain.Location;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
@@ -35,7 +35,7 @@ import com.google.common.collect.Sets;
 public class LocationsHandler extends ParseSax.HandlerWithResult<Set<? extends Location>> {
    private StringBuilder currentText = new StringBuilder();
 
-   private Set<Location> tasks = Sets.newLinkedHashSet();
+   private Set<Location> locations = Sets.newLinkedHashSet();
    private final LocationHandler locationHandler;
 
    @Inject
@@ -44,7 +44,7 @@ public class LocationsHandler extends ParseSax.HandlerWithResult<Set<? extends L
    }
 
    public Set<? extends Location> getResult() {
-      return tasks;
+      return locations;
    }
 
    @Override
@@ -57,7 +57,7 @@ public class LocationsHandler extends ParseSax.HandlerWithResult<Set<? extends L
    public void endElement(String uri, String localName, String qName) throws SAXException {
       locationHandler.endElement(uri, localName, qName);
       if (qName.equals("Location") && currentText.toString().trim().equals("")) {
-         this.tasks.add(locationHandler.getResult());
+         this.locations.add(locationHandler.getResult());
       }
       currentText = new StringBuilder();
    }
diff --git a/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/BaseIBMSmartCloudClientLiveTest.java b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/BaseIBMSmartCloudClientLiveTest.java
new file mode 100644
index 0000000000..b4f8408bc4
--- /dev/null
+++ b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/BaseIBMSmartCloudClientLiveTest.java
@@ -0,0 +1,91 @@
+/**
+ *
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.ibm.smartcloud;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.Map;
+import java.util.Properties;
+
+import org.jclouds.Constants;
+import org.jclouds.compute.ComputeTestUtils;
+import org.jclouds.logging.log4j.config.Log4JLoggingModule;
+import org.jclouds.rest.RestContext;
+import org.jclouds.rest.RestContextFactory;
+import org.jclouds.ssh.jsch.config.JschSshClientModule;
+import org.testng.annotations.BeforeGroups;
+import org.testng.annotations.Test;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.inject.Module;
+
+/**
+ * 
+ * @author Adrian Cole
+ */
+@Test(groups = "live", singleThreaded = true, testName = "BaseIBMSmartCloudClientLiveTest")
+public abstract class BaseIBMSmartCloudClientLiveTest {
+
+   protected RestContext<IBMSmartCloudClient, IBMSmartCloudAsyncClient> context;
+   protected String provider = "ibm-smartcloud";
+   protected String identity;
+   protected String credential;
+   protected String endpoint;
+   protected String apiversion;
+
+   protected IBMSmartCloudClient connection;
+
+   protected Map<String, String> keyPair;
+
+   protected void setupCredentials() {
+      identity = checkNotNull(System.getProperty("test." + provider + ".identity"), "test." + provider
+               + ".identity must be set.  ex. apiKey");
+      credential = checkNotNull(System.getProperty("test." + provider + ".credential"), "test." + provider
+               + ".credential must be set.  ex. secretKey");
+      endpoint = System.getProperty("test." + provider + ".endpoint");
+      apiversion = System.getProperty("test." + provider + ".apiversion");
+   }
+
+   protected Properties setupProperties() {
+      Properties overrides = new Properties();
+      overrides.setProperty(Constants.PROPERTY_TRUST_ALL_CERTS, "true");
+      overrides.setProperty(Constants.PROPERTY_RELAX_HOSTNAME, "true");
+      overrides.setProperty(provider + ".identity", identity);
+      overrides.setProperty(provider + ".credential", credential);
+      if (endpoint != null)
+         overrides.setProperty(provider + ".endpoint", endpoint);
+      if (apiversion != null)
+         overrides.setProperty(provider + ".apiversion", apiversion);
+      return overrides;
+   }
+
+   @BeforeGroups(groups = "live")
+   public void setupClient() throws FileNotFoundException, IOException {
+      setupCredentials();
+      Properties overrides = setupProperties();
+      context = new RestContextFactory().createContext(provider, ImmutableSet.<Module> of(new Log4JLoggingModule(),
+               new JschSshClientModule()), overrides);
+
+      connection = context.getApi();
+      keyPair = ComputeTestUtils.setupKeyPair();
+   }
+
+}
diff --git a/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/IBMDeveloperCloudAsyncClientTest.java b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/IBMSmartCloudAsyncClientTest.java
similarity index 66%
rename from sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/IBMDeveloperCloudAsyncClientTest.java
rename to sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/IBMSmartCloudAsyncClientTest.java
index 6f6fdd2f1f..9ed9119436 100644
--- a/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/IBMDeveloperCloudAsyncClientTest.java
+++ b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/IBMSmartCloudAsyncClientTest.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.ibmdev;
+package org.jclouds.ibm.smartcloud;
 
 import static org.testng.Assert.assertEquals;
 
@@ -31,22 +31,12 @@ import org.jclouds.http.functions.ParseJson;
 import org.jclouds.http.functions.ParseSax;
 import org.jclouds.http.functions.ReleasePayloadAndReturn;
 import org.jclouds.http.functions.UnwrapOnlyJsonValue;
-import org.jclouds.ibmdev.domain.Image;
-import org.jclouds.ibmdev.functions.GetFirstInstanceInList;
-import org.jclouds.ibmdev.functions.ParseAddressFromJson;
-import org.jclouds.ibmdev.functions.ParseAddressesFromJson;
-import org.jclouds.ibmdev.functions.ParseExpirationTimeFromJson;
-import org.jclouds.ibmdev.functions.ParseImageFromJson;
-import org.jclouds.ibmdev.functions.ParseImagesFromJson;
-import org.jclouds.ibmdev.functions.ParseInstanceFromJson;
-import org.jclouds.ibmdev.functions.ParseInstancesFromJson;
-import org.jclouds.ibmdev.functions.ParseKeysFromJson;
-import org.jclouds.ibmdev.functions.ParseVolumeFromJson;
-import org.jclouds.ibmdev.functions.ParseVolumesFromJson;
-import org.jclouds.ibmdev.options.CreateInstanceOptions;
-import org.jclouds.ibmdev.options.RestartInstanceOptions;
-import org.jclouds.ibmdev.xml.LocationHandler;
-import org.jclouds.ibmdev.xml.LocationsHandler;
+import org.jclouds.http.functions.UnwrapOnlyJsonValueInSet;
+import org.jclouds.ibm.smartcloud.domain.Image;
+import org.jclouds.ibm.smartcloud.options.CreateInstanceOptions;
+import org.jclouds.ibm.smartcloud.options.RestartInstanceOptions;
+import org.jclouds.ibm.smartcloud.xml.LocationHandler;
+import org.jclouds.ibm.smartcloud.xml.LocationsHandler;
 import org.jclouds.rest.RestClientTest;
 import org.jclouds.rest.RestContextFactory;
 import org.jclouds.rest.RestContextSpec;
@@ -61,19 +51,19 @@ import com.google.common.collect.Iterables;
 import com.google.inject.TypeLiteral;
 
 /**
- * Tests annotation parsing of {@code IBMDeveloperCloudAsyncClient}
+ * Tests annotation parsing of {@code IBMSmartCloudAsyncClient}
  * 
  * @author Adrian Cole
  */
-@Test(groups = "unit", testName = "ibmdevelopercloud.IBMDeveloperCloudAsyncClientTest")
-public class IBMDeveloperCloudAsyncClientTest extends RestClientTest<IBMDeveloperCloudAsyncClient> {
+@Test(groups = "unit", testName = "IBMSmartCloudAsyncClientTest")
+public class IBMSmartCloudAsyncClientTest extends RestClientTest<IBMSmartCloudAsyncClient> {
 
    public void testListImages() throws SecurityException, NoSuchMethodException, IOException {
-      Method method = IBMDeveloperCloudAsyncClient.class.getMethod("listImages");
+      Method method = IBMSmartCloudAsyncClient.class.getMethod("listImages");
       HttpRequest httpRequest = processor.createRequest(method);
 
       assertRequestLineEquals(httpRequest,
-            "GET https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/offerings/image HTTP/1.1");
+               "GET https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/offerings/image HTTP/1.1");
       assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
       assertPayloadEquals(httpRequest, null, null, false);
 
@@ -82,14 +72,15 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest<IBMDevelope
       httpRequest = Iterables.getOnlyElement(httpRequest.getFilters()).filter(httpRequest);
 
       assertRequestLineEquals(httpRequest,
-            "GET https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/offerings/image HTTP/1.1");
+               "GET https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/offerings/image HTTP/1.1");
       // for example, using basic authentication, we should get "only one"
       // header
       assertNonPayloadHeadersEqual(httpRequest,
-            "Accept: application/json\nAuthorization: Basic aWRlbnRpdHk6Y3JlZGVudGlhbA==\n");
+               "Accept: application/json\nAuthorization: Basic aWRlbnRpdHk6Y3JlZGVudGlhbA==\n");
       assertPayloadEquals(httpRequest, null, null, false);
 
-      assertResponseParserClassEquals(method, httpRequest, ParseImagesFromJson.class);
+      assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
+
       assertSaxResponseParserClassEquals(method, null);
       assertExceptionParserClassEquals(method, ReturnEmptySetOnNotFoundOr404.class);
 
@@ -98,15 +89,16 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest<IBMDevelope
    }
 
    public void testGetImage() throws SecurityException, NoSuchMethodException, IOException {
-      Method method = IBMDeveloperCloudAsyncClient.class.getMethod("getImage", String.class);
+      Method method = IBMSmartCloudAsyncClient.class.getMethod("getImage", String.class);
       HttpRequest httpRequest = processor.createRequest(method, "1");
 
       assertRequestLineEquals(httpRequest,
-            "GET https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/offerings/image/1 HTTP/1.1");
+               "GET https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/offerings/image/1 HTTP/1.1");
       assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
       assertPayloadEquals(httpRequest, null, null, false);
 
-      assertResponseParserClassEquals(method, httpRequest, ParseImageFromJson.class);
+      assertResponseParserClassEquals(method, httpRequest, ParseJson.class);
+
       assertSaxResponseParserClassEquals(method, null);
       assertExceptionParserClassEquals(method, ReturnNullOnNotFoundOr404.class);
 
@@ -115,11 +107,11 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest<IBMDevelope
    }
 
    public void testDeleteImage() throws SecurityException, NoSuchMethodException, IOException {
-      Method method = IBMDeveloperCloudAsyncClient.class.getMethod("deleteImage", String.class);
+      Method method = IBMSmartCloudAsyncClient.class.getMethod("deleteImage", String.class);
       HttpRequest httpRequest = processor.createRequest(method, "1");
 
       assertRequestLineEquals(httpRequest,
-            "DELETE https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/offerings/image/1 HTTP/1.1");
+               "DELETE https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/offerings/image/1 HTTP/1.1");
       assertNonPayloadHeadersEqual(httpRequest, "");
       assertPayloadEquals(httpRequest, null, null, false);
 
@@ -132,17 +124,17 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest<IBMDevelope
    }
 
    public void testSetImageVisibility() throws SecurityException, NoSuchMethodException, IOException {
-      Method method = IBMDeveloperCloudAsyncClient.class.getMethod("setImageVisibility", String.class,
-            Image.Visibility.class);
-      HttpRequest httpRequest = processor.createRequest(method, "1",
-            Image.Visibility.PUBLIC);
+      Method method = IBMSmartCloudAsyncClient.class.getMethod("setImageVisibility", String.class,
+               Image.Visibility.class);
+      HttpRequest httpRequest = processor.createRequest(method, "1", Image.Visibility.PUBLIC);
 
       assertRequestLineEquals(httpRequest,
-            "PUT https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/offerings/image/1 HTTP/1.1");
+               "PUT https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/offerings/image/1 HTTP/1.1");
       assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
       assertPayloadEquals(httpRequest, "visibility=PUBLIC", "application/x-www-form-urlencoded", false);
 
-      assertResponseParserClassEquals(method, httpRequest, ParseImageFromJson.class);
+      assertResponseParserClassEquals(method, httpRequest, ParseJson.class);
+
       assertSaxResponseParserClassEquals(method, null);
       assertExceptionParserClassEquals(method, ReturnNullOnNotFoundOr404.class);
 
@@ -151,15 +143,16 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest<IBMDevelope
    }
 
    public void testListInstances() throws SecurityException, NoSuchMethodException, IOException {
-      Method method = IBMDeveloperCloudAsyncClient.class.getMethod("listInstances");
+      Method method = IBMSmartCloudAsyncClient.class.getMethod("listInstances");
       HttpRequest httpRequest = processor.createRequest(method);
 
       assertRequestLineEquals(httpRequest,
-            "GET https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/instances HTTP/1.1");
+               "GET https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/instances HTTP/1.1");
       assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
       assertPayloadEquals(httpRequest, null, null, false);
 
-      assertResponseParserClassEquals(method, httpRequest, ParseInstancesFromJson.class);
+      assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
+
       assertSaxResponseParserClassEquals(method, null);
       assertExceptionParserClassEquals(method, ReturnEmptySetOnNotFoundOr404.class);
 
@@ -168,15 +161,16 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest<IBMDevelope
    }
 
    public void testListInstancesFromRequest() throws SecurityException, NoSuchMethodException, IOException {
-      Method method = IBMDeveloperCloudAsyncClient.class.getMethod("listInstancesFromRequest", String.class);
+      Method method = IBMSmartCloudAsyncClient.class.getMethod("listInstancesFromRequest", String.class);
       HttpRequest httpRequest = processor.createRequest(method, "1");
 
       assertRequestLineEquals(httpRequest,
-            "GET https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/requests/1 HTTP/1.1");
+               "GET https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/requests/1 HTTP/1.1");
       assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
       assertPayloadEquals(httpRequest, null, null, false);
 
-      assertResponseParserClassEquals(method, httpRequest, ParseInstancesFromJson.class);
+      assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
+
       assertSaxResponseParserClassEquals(method, null);
       assertExceptionParserClassEquals(method, ReturnEmptySetOnNotFoundOr404.class);
 
@@ -185,15 +179,16 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest<IBMDevelope
    }
 
    public void testGetInstance() throws SecurityException, NoSuchMethodException, IOException {
-      Method method = IBMDeveloperCloudAsyncClient.class.getMethod("getInstance", String.class);
+      Method method = IBMSmartCloudAsyncClient.class.getMethod("getInstance", String.class);
       HttpRequest httpRequest = processor.createRequest(method, "1");
 
       assertRequestLineEquals(httpRequest,
-            "GET https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/instances/1 HTTP/1.1");
+               "GET https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/instances/1 HTTP/1.1");
       assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
       assertPayloadEquals(httpRequest, null, null, false);
 
-      assertResponseParserClassEquals(method, httpRequest, ParseInstanceFromJson.class);
+      assertResponseParserClassEquals(method, httpRequest, ParseJson.class);
+
       assertSaxResponseParserClassEquals(method, null);
       assertExceptionParserClassEquals(method, ReturnNullOnNotFoundOr404.class);
 
@@ -202,17 +197,17 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest<IBMDevelope
    }
 
    public void testExtendReservationForInstance() throws SecurityException, NoSuchMethodException, IOException {
-      Method method = IBMDeveloperCloudAsyncClient.class.getMethod("extendReservationForInstance", String.class,
-            Date.class);
-      HttpRequest httpRequest = processor.createRequest(method, "1", new Date(
-            123215235l));
+      Method method = IBMSmartCloudAsyncClient.class
+               .getMethod("extendReservationForInstance", String.class, Date.class);
+      HttpRequest httpRequest = processor.createRequest(method, "1", new Date(123215235l));
 
       assertRequestLineEquals(httpRequest,
-            "PUT https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/instances/1 HTTP/1.1");
+               "PUT https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/instances/1 HTTP/1.1");
       assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
       assertPayloadEquals(httpRequest, "expirationTime=123215235", "application/x-www-form-urlencoded", false);
 
-      assertResponseParserClassEquals(method, httpRequest, ParseExpirationTimeFromJson.class);
+      assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
+
       assertSaxResponseParserClassEquals(method, null);
       assertExceptionParserClassEquals(method, null);
 
@@ -220,12 +215,12 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest<IBMDevelope
    }
 
    public void testRestartInstance() throws SecurityException, NoSuchMethodException, IOException {
-      Method method = IBMDeveloperCloudAsyncClient.class.getMethod("restartInstance", String.class,
-            RestartInstanceOptions[].class);
+      Method method = IBMSmartCloudAsyncClient.class.getMethod("restartInstance", String.class,
+               RestartInstanceOptions[].class);
       HttpRequest httpRequest = processor.createRequest(method, "1");
 
       assertRequestLineEquals(httpRequest,
-            "PUT https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/instances/1 HTTP/1.1");
+               "PUT https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/instances/1 HTTP/1.1");
       assertNonPayloadHeadersEqual(httpRequest, "");
       assertPayloadEquals(httpRequest, "state=restart", "application/x-www-form-urlencoded", false);
 
@@ -237,13 +232,13 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest<IBMDevelope
    }
 
    public void testRestartInstanceNewKey() throws SecurityException, NoSuchMethodException, IOException {
-      Method method = IBMDeveloperCloudAsyncClient.class.getMethod("restartInstance", String.class,
-            RestartInstanceOptions[].class);
-      HttpRequest httpRequest = processor.createRequest(method, "1",
-            new RestartInstanceOptions().authorizePublicKey("keyName"));
+      Method method = IBMSmartCloudAsyncClient.class.getMethod("restartInstance", String.class,
+               RestartInstanceOptions[].class);
+      HttpRequest httpRequest = processor.createRequest(method, "1", new RestartInstanceOptions()
+               .authorizePublicKey("keyName"));
 
       assertRequestLineEquals(httpRequest,
-            "PUT https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/instances/1 HTTP/1.1");
+               "PUT https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/instances/1 HTTP/1.1");
       assertNonPayloadHeadersEqual(httpRequest, "");
       assertPayloadEquals(httpRequest, "state=restart&keyName=keyName", "application/x-www-form-urlencoded", false);
 
@@ -255,18 +250,18 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest<IBMDevelope
    }
 
    public void testSaveInstanceToImage() throws SecurityException, NoSuchMethodException, IOException {
-      Method method = IBMDeveloperCloudAsyncClient.class.getMethod("saveInstanceToImage", String.class, String.class,
-            String.class);
-      HttpRequest httpRequest = processor.createRequest(method, "1",
-            "imageName", "imageDescription");
+      Method method = IBMSmartCloudAsyncClient.class.getMethod("saveInstanceToImage", String.class, String.class,
+               String.class);
+      HttpRequest httpRequest = processor.createRequest(method, "1", "imageName", "imageDescription");
 
       assertRequestLineEquals(httpRequest,
-            "PUT https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/instances/1 HTTP/1.1");
+               "PUT https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/instances/1 HTTP/1.1");
       assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
       assertPayloadEquals(httpRequest, "state=save&description=imageDescription&name=imageName",
-            "application/x-www-form-urlencoded", false);
+               "application/x-www-form-urlencoded", false);
+
+      assertResponseParserClassEquals(method, httpRequest, ParseJson.class);
 
-      assertResponseParserClassEquals(method, httpRequest, ParseImageFromJson.class);
       assertSaxResponseParserClassEquals(method, null);
       assertExceptionParserClassEquals(method, null);
 
@@ -274,11 +269,11 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest<IBMDevelope
    }
 
    public void testDeleteInstance() throws SecurityException, NoSuchMethodException, IOException {
-      Method method = IBMDeveloperCloudAsyncClient.class.getMethod("deleteInstance", String.class);
+      Method method = IBMSmartCloudAsyncClient.class.getMethod("deleteInstance", String.class);
       HttpRequest httpRequest = processor.createRequest(method, "1");
 
       assertRequestLineEquals(httpRequest,
-            "DELETE https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/instances/1 HTTP/1.1");
+               "DELETE https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/instances/1 HTTP/1.1");
       assertNonPayloadHeadersEqual(httpRequest, "");
       assertPayloadEquals(httpRequest, null, null, false);
 
@@ -291,15 +286,16 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest<IBMDevelope
    }
 
    public void testListKeys() throws SecurityException, NoSuchMethodException, IOException {
-      Method method = IBMDeveloperCloudAsyncClient.class.getMethod("listKeys");
+      Method method = IBMSmartCloudAsyncClient.class.getMethod("listKeys");
       HttpRequest httpRequest = processor.createRequest(method);
 
       assertRequestLineEquals(httpRequest,
-            "GET https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/keys HTTP/1.1");
+               "GET https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/keys HTTP/1.1");
       assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
       assertPayloadEquals(httpRequest, null, null, false);
 
-      assertResponseParserClassEquals(method, httpRequest, ParseKeysFromJson.class);
+      assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
+
       assertSaxResponseParserClassEquals(method, null);
       assertExceptionParserClassEquals(method, ReturnEmptySetOnNotFoundOr404.class);
 
@@ -308,11 +304,11 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest<IBMDevelope
    }
 
    public void testGetKey() throws SecurityException, NoSuchMethodException, IOException {
-      Method method = IBMDeveloperCloudAsyncClient.class.getMethod("getKey", String.class);
+      Method method = IBMSmartCloudAsyncClient.class.getMethod("getKey", String.class);
       HttpRequest httpRequest = processor.createRequest(method, "1");
 
       assertRequestLineEquals(httpRequest,
-            "GET https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/keys/1 HTTP/1.1");
+               "GET https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/keys/1 HTTP/1.1");
       assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
       assertPayloadEquals(httpRequest, null, null, false);
 
@@ -325,11 +321,11 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest<IBMDevelope
    }
 
    public void testGenerateKeyPair() throws SecurityException, NoSuchMethodException, IOException {
-      Method method = IBMDeveloperCloudAsyncClient.class.getMethod("generateKeyPair", String.class);
+      Method method = IBMSmartCloudAsyncClient.class.getMethod("generateKeyPair", String.class);
       HttpRequest httpRequest = processor.createRequest(method, "key");
 
       assertRequestLineEquals(httpRequest,
-            "POST https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/keys HTTP/1.1");
+               "POST https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/keys HTTP/1.1");
       assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
       assertPayloadEquals(httpRequest, "name=key", "application/x-www-form-urlencoded", false);
 
@@ -342,12 +338,11 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest<IBMDevelope
    }
 
    public void testAddPublicKey() throws SecurityException, NoSuchMethodException, IOException {
-      Method method = IBMDeveloperCloudAsyncClient.class.getMethod("addPublicKey", String.class, String.class);
-      HttpRequest httpRequest = processor.createRequest(method, "key",
-            "publicbits");
+      Method method = IBMSmartCloudAsyncClient.class.getMethod("addPublicKey", String.class, String.class);
+      HttpRequest httpRequest = processor.createRequest(method, "key", "publicbits");
 
       assertRequestLineEquals(httpRequest,
-            "POST https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/keys HTTP/1.1");
+               "POST https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/keys HTTP/1.1");
       assertNonPayloadHeadersEqual(httpRequest, "");
       assertPayloadEquals(httpRequest, "name=key&publicKey=publicbits", "application/x-www-form-urlencoded", false);
 
@@ -360,12 +355,11 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest<IBMDevelope
    }
 
    public void testUpdatePublicKey() throws SecurityException, NoSuchMethodException, IOException {
-      Method method = IBMDeveloperCloudAsyncClient.class.getMethod("updatePublicKey", String.class, String.class);
-      HttpRequest httpRequest = processor.createRequest(method, "key",
-            "publicbits");
+      Method method = IBMSmartCloudAsyncClient.class.getMethod("updatePublicKey", String.class, String.class);
+      HttpRequest httpRequest = processor.createRequest(method, "key", "publicbits");
 
       assertRequestLineEquals(httpRequest,
-            "PUT https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/keys/key HTTP/1.1");
+               "PUT https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/keys/key HTTP/1.1");
       assertNonPayloadHeadersEqual(httpRequest, "");
       assertPayloadEquals(httpRequest, "publicKey=publicbits", "application/x-www-form-urlencoded", false);
 
@@ -378,12 +372,11 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest<IBMDevelope
    }
 
    public void testSetDefaultStatusOfKey() throws SecurityException, NoSuchMethodException, IOException {
-      Method method = IBMDeveloperCloudAsyncClient.class
-            .getMethod("setDefaultStatusOfKey", String.class, boolean.class);
+      Method method = IBMSmartCloudAsyncClient.class.getMethod("setDefaultStatusOfKey", String.class, boolean.class);
       HttpRequest httpRequest = processor.createRequest(method, "key", true);
 
       assertRequestLineEquals(httpRequest,
-            "PUT https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/keys/key HTTP/1.1");
+               "PUT https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/keys/key HTTP/1.1");
       assertNonPayloadHeadersEqual(httpRequest, "");
       assertPayloadEquals(httpRequest, "default=true", "application/x-www-form-urlencoded", false);
 
@@ -396,11 +389,11 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest<IBMDevelope
    }
 
    public void testDeleteKey() throws SecurityException, NoSuchMethodException, IOException {
-      Method method = IBMDeveloperCloudAsyncClient.class.getMethod("deleteKey", String.class);
+      Method method = IBMSmartCloudAsyncClient.class.getMethod("deleteKey", String.class);
       HttpRequest httpRequest = processor.createRequest(method, "1");
 
       assertRequestLineEquals(httpRequest,
-            "DELETE https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/keys/1 HTTP/1.1");
+               "DELETE https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/keys/1 HTTP/1.1");
       assertNonPayloadHeadersEqual(httpRequest, "");
       assertPayloadEquals(httpRequest, null, null, false);
 
@@ -413,15 +406,16 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest<IBMDevelope
    }
 
    public void testListVolumes() throws SecurityException, NoSuchMethodException, IOException {
-      Method method = IBMDeveloperCloudAsyncClient.class.getMethod("listVolumes");
+      Method method = IBMSmartCloudAsyncClient.class.getMethod("listVolumes");
       HttpRequest httpRequest = processor.createRequest(method);
 
       assertRequestLineEquals(httpRequest,
-            "GET https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/storage HTTP/1.1");
+               "GET https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/storage HTTP/1.1");
       assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
       assertPayloadEquals(httpRequest, null, null, false);
 
-      assertResponseParserClassEquals(method, httpRequest, ParseVolumesFromJson.class);
+      assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
+
       assertSaxResponseParserClassEquals(method, null);
       assertExceptionParserClassEquals(method, ReturnEmptySetOnNotFoundOr404.class);
 
@@ -430,15 +424,16 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest<IBMDevelope
    }
 
    public void testGetVolume() throws SecurityException, NoSuchMethodException, IOException {
-      Method method = IBMDeveloperCloudAsyncClient.class.getMethod("getVolume", String.class);
+      Method method = IBMSmartCloudAsyncClient.class.getMethod("getVolume", String.class);
       HttpRequest httpRequest = processor.createRequest(method, "1");
 
       assertRequestLineEquals(httpRequest,
-            "GET https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/storage/1 HTTP/1.1");
+               "GET https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/storage/1 HTTP/1.1");
       assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
       assertPayloadEquals(httpRequest, null, null, false);
 
-      assertResponseParserClassEquals(method, httpRequest, ParseVolumeFromJson.class);
+      assertResponseParserClassEquals(method, httpRequest, ParseJson.class);
+
       assertSaxResponseParserClassEquals(method, null);
       assertExceptionParserClassEquals(method, ReturnNullOnNotFoundOr404.class);
 
@@ -447,18 +442,17 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest<IBMDevelope
    }
 
    public void testCreateVolumeInLocation() throws SecurityException, NoSuchMethodException, IOException {
-      Method method = IBMDeveloperCloudAsyncClient.class.getMethod("createVolumeInLocation", String.class,
-            String.class, String.class, String.class, String.class);
-      HttpRequest httpRequest = processor.createRequest(method, "location",
-            "name", "format", "size", "offering");
+      Method method = IBMSmartCloudAsyncClient.class.getMethod("createVolumeInLocation", String.class, String.class,
+               String.class, String.class, String.class);
+      HttpRequest httpRequest = processor.createRequest(method, "location", "name", "format", "size", "offering");
 
       assertRequestLineEquals(httpRequest,
-            "POST https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/storage HTTP/1.1");
+               "POST https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/storage HTTP/1.1");
       assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
       assertPayloadEquals(httpRequest, "location=location&format=format&name=name&size=size&offeringID=offering",
-            "application/x-www-form-urlencoded", false);
+               "application/x-www-form-urlencoded", false);
 
-      assertResponseParserClassEquals(method, httpRequest, ParseVolumeFromJson.class);
+      assertResponseParserClassEquals(method, httpRequest, ParseJson.class);
       assertSaxResponseParserClassEquals(method, null);
       assertExceptionParserClassEquals(method, null);
 
@@ -467,17 +461,17 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest<IBMDevelope
    }
 
    public void testCreateInstanceInLocation() throws SecurityException, NoSuchMethodException, IOException {
-      Method method = IBMDeveloperCloudAsyncClient.class.getMethod("createInstanceInLocation", String.class,
-            String.class, String.class, String.class, CreateInstanceOptions[].class);
-      HttpRequest httpRequest = processor.createRequest(method, "1", "name",
-            "22", "instanceType");
+      Method method = IBMSmartCloudAsyncClient.class.getMethod("createInstanceInLocation", String.class, String.class,
+               String.class, String.class, CreateInstanceOptions[].class);
+      HttpRequest httpRequest = processor.createRequest(method, "1", "name", "22", "instanceType");
 
       assertRequestLineEquals(httpRequest,
-            "POST https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/instances HTTP/1.1");
+               "POST https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/instances HTTP/1.1");
       assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
       assertPayloadEquals(httpRequest, "location=1&imageID=22&name=name&instanceType=instanceType",
-            "application/x-www-form-urlencoded", false);
-      assertResponseParserClassEquals(method, httpRequest, GetFirstInstanceInList.class);
+               "application/x-www-form-urlencoded", false);
+
+      assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValueInSet.class);
       assertSaxResponseParserClassEquals(method, null);
       assertExceptionParserClassEquals(method, null);
 
@@ -486,23 +480,23 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest<IBMDevelope
    }
 
    public void testCreateInstanceInLocationWithOptions() throws SecurityException, NoSuchMethodException, IOException {
-      Method method = IBMDeveloperCloudAsyncClient.class.getMethod("createInstanceInLocation", String.class,
-            String.class, String.class, String.class, CreateInstanceOptions[].class);
-      HttpRequest httpRequest = processor.createRequest(method, "location",
-            "name", "22", "instanceType", new CreateInstanceOptions().attachIp("1").authorizePublicKey("MOO")
-                  .mountVolume("2", "/mnt").configurationData(
-                        ImmutableMap.of("insight_admin_password", "myPassword1", "db2_admin_password", "myPassword2",
-                              "report_user_password", "myPassword3")));
+      Method method = IBMSmartCloudAsyncClient.class.getMethod("createInstanceInLocation", String.class, String.class,
+               String.class, String.class, CreateInstanceOptions[].class);
+      HttpRequest httpRequest = processor.createRequest(method, "location", "name", "22", "instanceType",
+               new CreateInstanceOptions().staticIP("1").authorizePublicKey("MOO").mountVolume("2", "/mnt")
+                        .configurationData(
+                                 ImmutableMap.of("insight_admin_password", "myPassword1", "db2_admin_password",
+                                          "myPassword2", "report_user_password", "myPassword3")));
 
       assertRequestLineEquals(httpRequest,
-            "POST https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/instances HTTP/1.1");
+               "POST https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/instances HTTP/1.1");
       assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
       assertPayloadEquals(
-            httpRequest,
-            "location=location&imageID=22&name=name&instanceType=instanceType&ip=1&publicKey=MOO&volumeID=2&oss.storage.id.0.mnt=%2Fmnt&insight_admin_password=myPassword1&db2_admin_password=myPassword2&report_user_password=myPassword3",
-            "application/x-www-form-urlencoded", false);
+               httpRequest,
+               "location=location&imageID=22&name=name&instanceType=instanceType&ip=1&publicKey=MOO&volumeID=2&oss.storage.id.0.mnt=%2Fmnt&insight_admin_password=myPassword1&db2_admin_password=myPassword2&report_user_password=myPassword3",
+               "application/x-www-form-urlencoded", false);
 
-      assertResponseParserClassEquals(method, httpRequest, GetFirstInstanceInList.class);
+      assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValueInSet.class);
       assertSaxResponseParserClassEquals(method, null);
       assertExceptionParserClassEquals(method, null);
 
@@ -511,11 +505,11 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest<IBMDevelope
    }
 
    public void testDeleteVolume() throws SecurityException, NoSuchMethodException, IOException {
-      Method method = IBMDeveloperCloudAsyncClient.class.getMethod("deleteVolume", String.class);
+      Method method = IBMSmartCloudAsyncClient.class.getMethod("deleteVolume", String.class);
       HttpRequest httpRequest = processor.createRequest(method, "1");
 
       assertRequestLineEquals(httpRequest,
-            "DELETE https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/storage/1 HTTP/1.1");
+               "DELETE https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/storage/1 HTTP/1.1");
       assertNonPayloadHeadersEqual(httpRequest, "");
       assertPayloadEquals(httpRequest, null, null, false);
 
@@ -528,11 +522,11 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest<IBMDevelope
    }
 
    public void testListLocations() throws SecurityException, NoSuchMethodException, IOException {
-      Method method = IBMDeveloperCloudAsyncClient.class.getMethod("listLocations");
+      Method method = IBMSmartCloudAsyncClient.class.getMethod("listLocations");
       HttpRequest httpRequest = processor.createRequest(method);
 
       assertRequestLineEquals(httpRequest,
-            "GET https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/locations HTTP/1.1");
+               "GET https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/locations HTTP/1.1");
       assertNonPayloadHeadersEqual(httpRequest, "Accept: text/xml\n");
       assertPayloadEquals(httpRequest, null, null, false);
 
@@ -545,11 +539,11 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest<IBMDevelope
    }
 
    public void testGetLocation() throws SecurityException, NoSuchMethodException, IOException {
-      Method method = IBMDeveloperCloudAsyncClient.class.getMethod("getLocation", String.class);
+      Method method = IBMSmartCloudAsyncClient.class.getMethod("getLocation", String.class);
       HttpRequest httpRequest = processor.createRequest(method, "1");
 
       assertRequestLineEquals(httpRequest,
-            "GET https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/locations/1 HTTP/1.1");
+               "GET https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/locations/1 HTTP/1.1");
       assertNonPayloadHeadersEqual(httpRequest, "Accept: text/xml\n");
       assertPayloadEquals(httpRequest, null, null, false);
 
@@ -562,15 +556,16 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest<IBMDevelope
    }
 
    public void testListAddresses() throws SecurityException, NoSuchMethodException, IOException {
-      Method method = IBMDeveloperCloudAsyncClient.class.getMethod("listAddresses");
+      Method method = IBMSmartCloudAsyncClient.class.getMethod("listAddresses");
       HttpRequest httpRequest = processor.createRequest(method);
 
       assertRequestLineEquals(httpRequest,
-            "GET https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/addresses HTTP/1.1");
+               "GET https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/addresses HTTP/1.1");
       assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
       assertPayloadEquals(httpRequest, null, null, false);
 
-      assertResponseParserClassEquals(method, httpRequest, ParseAddressesFromJson.class);
+      assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
+
       assertSaxResponseParserClassEquals(method, null);
       assertExceptionParserClassEquals(method, ReturnEmptySetOnNotFoundOr404.class);
 
@@ -579,16 +574,15 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest<IBMDevelope
    }
 
    public void testAllocateAddressInLocation() throws SecurityException, NoSuchMethodException, IOException {
-      Method method = IBMDeveloperCloudAsyncClient.class.getMethod("allocateAddressInLocation", String.class,
-            String.class);
+      Method method = IBMSmartCloudAsyncClient.class.getMethod("allocateAddressInLocation", String.class, String.class);
       HttpRequest httpRequest = processor.createRequest(method, "1", "offering");
 
       assertRequestLineEquals(httpRequest,
-            "POST https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/addresses HTTP/1.1");
+               "POST https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/addresses HTTP/1.1");
       assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
       assertPayloadEquals(httpRequest, "location=1&offeringID=offering", "application/x-www-form-urlencoded", false);
 
-      assertResponseParserClassEquals(method, httpRequest, ParseAddressFromJson.class);
+      assertResponseParserClassEquals(method, httpRequest, ParseJson.class);
       assertSaxResponseParserClassEquals(method, null);
       assertExceptionParserClassEquals(method, null);
 
@@ -597,11 +591,11 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest<IBMDevelope
    }
 
    public void testReleaseAddress() throws SecurityException, NoSuchMethodException, IOException {
-      Method method = IBMDeveloperCloudAsyncClient.class.getMethod("releaseAddress", String.class);
+      Method method = IBMSmartCloudAsyncClient.class.getMethod("releaseAddress", String.class);
       HttpRequest httpRequest = processor.createRequest(method, "1");
 
       assertRequestLineEquals(httpRequest,
-            "DELETE https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/addresses/1 HTTP/1.1");
+               "DELETE https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/addresses/1 HTTP/1.1");
       assertNonPayloadHeadersEqual(httpRequest, "");
       assertPayloadEquals(httpRequest, null, null, false);
 
@@ -614,11 +608,11 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest<IBMDevelope
    }
 
    public void testListStorageOfferings() throws SecurityException, NoSuchMethodException, IOException {
-      Method method = IBMDeveloperCloudAsyncClient.class.getMethod("listStorageOfferings");
+      Method method = IBMSmartCloudAsyncClient.class.getMethod("listStorageOfferings");
       HttpRequest httpRequest = processor.createRequest(method);
 
       assertRequestLineEquals(httpRequest,
-            "GET https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/offerings/storage HTTP/1.1");
+               "GET https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/offerings/storage HTTP/1.1");
       assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
       assertPayloadEquals(httpRequest, null, null, false);
 
@@ -630,11 +624,11 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest<IBMDevelope
    }
 
    public void testListAddressOfferings() throws SecurityException, NoSuchMethodException, IOException {
-      Method method = IBMDeveloperCloudAsyncClient.class.getMethod("listAddressOfferings");
+      Method method = IBMSmartCloudAsyncClient.class.getMethod("listAddressOfferings");
       HttpRequest httpRequest = processor.createRequest(method);
 
       assertRequestLineEquals(httpRequest,
-            "GET https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/offerings/address HTTP/1.1");
+               "GET https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/offerings/address HTTP/1.1");
       assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
       assertPayloadEquals(httpRequest, null, null, false);
 
@@ -652,13 +646,13 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest<IBMDevelope
    }
 
    @Override
-   protected TypeLiteral<RestAnnotationProcessor<IBMDeveloperCloudAsyncClient>> createTypeLiteral() {
-      return new TypeLiteral<RestAnnotationProcessor<IBMDeveloperCloudAsyncClient>>() {
+   protected TypeLiteral<RestAnnotationProcessor<IBMSmartCloudAsyncClient>> createTypeLiteral() {
+      return new TypeLiteral<RestAnnotationProcessor<IBMSmartCloudAsyncClient>>() {
       };
    }
 
    @Override
-   public RestContextSpec<IBMDeveloperCloudClient, IBMDeveloperCloudAsyncClient> createContextSpec() {
-      return new RestContextFactory().createContextSpec("ibmdev", "identity", "credential", new Properties());
+   public RestContextSpec<IBMSmartCloudClient, IBMSmartCloudAsyncClient> createContextSpec() {
+      return new RestContextFactory().createContextSpec("ibm-smartcloud", "identity", "credential", new Properties());
    }
 }
diff --git a/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/IBMDeveloperCloudClientLiveTest.java b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/IBMSmartCloudClientLiveTest.java
similarity index 63%
rename from sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/IBMDeveloperCloudClientLiveTest.java
rename to sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/IBMSmartCloudClientLiveTest.java
index db4d93570d..7b93274586 100644
--- a/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/IBMDeveloperCloudClientLiveTest.java
+++ b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/IBMSmartCloudClientLiveTest.java
@@ -16,21 +16,17 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.ibmdev;
+package org.jclouds.ibm.smartcloud;
 
-import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.collect.Iterables.filter;
-import static org.jclouds.ibmdev.options.CreateInstanceOptions.Builder.attachIp;
-import static org.jclouds.ibmdev.options.CreateInstanceOptions.Builder.authorizePublicKey;
+import static org.jclouds.ibm.smartcloud.options.CreateInstanceOptions.Builder.authorizePublicKey;
+import static org.jclouds.ibm.smartcloud.options.CreateInstanceOptions.Builder.secondaryIP;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertTrue;
 
-import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.NoSuchElementException;
-import java.util.Properties;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
@@ -38,55 +34,47 @@ import org.jclouds.compute.domain.ExecResponse;
 import org.jclouds.domain.Credentials;
 import org.jclouds.http.HttpResponseException;
 import org.jclouds.http.handlers.BackoffLimitedRetryHandler;
-import org.jclouds.ibmdev.domain.Address;
-import org.jclouds.ibmdev.domain.Image;
-import org.jclouds.ibmdev.domain.Instance;
-import org.jclouds.ibmdev.domain.InstanceType;
-import org.jclouds.ibmdev.domain.Key;
-import org.jclouds.ibmdev.domain.Location;
-import org.jclouds.ibmdev.domain.Offering;
-import org.jclouds.ibmdev.domain.StorageOffering;
-import org.jclouds.ibmdev.domain.Volume;
-import org.jclouds.ibmdev.domain.Instance.Software;
-import org.jclouds.ibmdev.domain.StorageOffering.Format;
-import org.jclouds.ibmdev.predicates.AddressFree;
-import org.jclouds.ibmdev.predicates.InstanceActive;
-import org.jclouds.ibmdev.predicates.InstanceActiveOrFailed;
-import org.jclouds.ibmdev.predicates.InstanceRemovedOrNotFound;
-import org.jclouds.ibmdev.predicates.VolumeUnmounted;
-import org.jclouds.logging.log4j.config.Log4JLoggingModule;
+import org.jclouds.ibm.smartcloud.domain.Address;
+import org.jclouds.ibm.smartcloud.domain.Image;
+import org.jclouds.ibm.smartcloud.domain.Instance;
+import org.jclouds.ibm.smartcloud.domain.InstanceType;
+import org.jclouds.ibm.smartcloud.domain.Key;
+import org.jclouds.ibm.smartcloud.domain.Location;
+import org.jclouds.ibm.smartcloud.domain.Offering;
+import org.jclouds.ibm.smartcloud.domain.StorageOffering;
+import org.jclouds.ibm.smartcloud.domain.Volume;
+import org.jclouds.ibm.smartcloud.domain.Instance.Software;
+import org.jclouds.ibm.smartcloud.domain.StorageOffering.Format;
+import org.jclouds.ibm.smartcloud.predicates.AddressFree;
+import org.jclouds.ibm.smartcloud.predicates.InstanceActive;
+import org.jclouds.ibm.smartcloud.predicates.InstanceActiveOrFailed;
+import org.jclouds.ibm.smartcloud.predicates.InstanceRemovedOrNotFound;
+import org.jclouds.ibm.smartcloud.predicates.VolumeUnmounted;
 import org.jclouds.net.IPSocket;
 import org.jclouds.predicates.InetSocketAddressConnect;
 import org.jclouds.predicates.RetryablePredicate;
-import org.jclouds.rest.RestContext;
-import org.jclouds.rest.RestContextFactory;
 import org.jclouds.ssh.SshClient;
 import org.jclouds.ssh.SshException;
 import org.jclouds.ssh.jsch.JschSshClient;
 import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeGroups;
 import org.testng.annotations.Test;
 
-import com.google.common.base.Charsets;
 import com.google.common.base.Predicate;
 import com.google.common.collect.ComparisonChain;
-import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Ordering;
 import com.google.common.collect.Sets;
-import com.google.common.io.Files;
-import com.google.inject.Module;
 
 /**
- * Tests behavior of {@code IBMDeveloperCloudClient}
+ * Tests behavior of {@code IBMSmartCloudClient}
  * 
  * @author Adrian Cole
  */
-@Test(groups = "live", testName = "ibmdevelopercloud.IBMDeveloperCloudClientLiveTest")
-public class IBMDeveloperCloudClientLiveTest {
-   private static final String OS = "Red Hat Enterprise Linux";
-   private static final String VERSION = "5.4";
+@Test(groups = "live", singleThreaded = true, testName = "IBMSmartCloudClientLiveTest")
+public class IBMSmartCloudClientLiveTest extends BaseIBMSmartCloudClientLiveTest {
+   private static final String OS = "SUSE Linux Enterprise Server";
+   private static final String VERSION = "11 SP1";
 
    private static final String PLATFORM = OS + "/" + VERSION;
 
@@ -94,143 +82,43 @@ public class IBMDeveloperCloudClientLiveTest {
 
    private static String FORMAT = "EXT3";
 
-   private IBMDeveloperCloudClient connection;
    private Location location;
    private Address ip;
-   private ImmutableMap<String, String> keyPair;
    private Key key;
    private Volume volume;
-   private String identity;
+
    private Instance instance2;
    private Instance instance;
-   private RestContext<IBMDeveloperCloudClient, IBMDeveloperCloudAsyncClient> context;
    private InstanceType instanceType;
    private Image image;
 
    private StorageOffering cheapestStorage;
 
-   private static final String TAG = System.getProperty("user.name");
-
-   @BeforeGroups(groups = { "live" })
-   public void setupClient() {
-
-      String endpoint = System.getProperty("jclouds.test.endpoint");
-      identity = checkNotNull(System.getProperty("jclouds.test.identity"), "jclouds.test.identity");
-      String credential = checkNotNull(System.getProperty("jclouds.test.credential"), "jclouds.test.credential");
-
-      Properties props = new Properties();
-      if (endpoint != null)
-         props.setProperty("ibmdev.endpoint", endpoint);
-      context = new RestContextFactory().createContext("ibmdev", identity, credential, ImmutableSet
-            .<Module> of(new Log4JLoggingModule()), props);
-
-      connection = context.getApi();
-      for (Instance instance : connection.listInstances()) {
-         try {
-            connection.deleteInstance(instance.getId());
-         } catch (Exception e) {
-
-         }
-      }
-   }
-
-   @Test
-   public void testListImages() throws Exception {
-      Set<? extends Image> response = connection.listImages();
-      assertNotNull(response);
-   }
-
-   @Test
-   public void testGetImage() throws Exception {
-      Set<? extends Image> response = connection.listImages();
-      assertNotNull(response);
-      if (response.size() > 0) {
-         Image image = Iterables.get(response, 0);
-         assertEquals(connection.getImage(image.getId()).getId(), image.getId());
-      }
-   }
-
-   @Test
-   public void testListInstances() throws Exception {
-      Set<? extends Instance> response = connection.listInstances();
-      assertNotNull(response);
-   }
-
-   @Test
-   public void testListInstancesFromRequestReturnsEmptySet() throws Exception {
-      Set<? extends Instance> response = connection.listInstancesFromRequest(Long.MAX_VALUE + "");
-      assertEquals(response.size(), 0);
-   }
-
-   @Test
-   public void testGetInstance() throws Exception {
-      Set<? extends Instance> response = connection.listInstances();
-      assertNotNull(response);
-      if (response.size() > 0) {
-         Instance instance = Iterables.get(response, 0);
-         assertEquals(connection.getInstance(instance.getId()).getId(), instance.getId());
-      }
-   }
-
-   @Test
-   public void testListKeys() throws Exception {
-      Set<? extends Key> response = connection.listKeys();
-      assertNotNull(response);
-   }
-
-   @Test
-   public void testGetKey() throws Exception {
-      Set<? extends Key> response = connection.listKeys();
-      assertNotNull(response);
-      if (response.size() > 0) {
-         Key key = Iterables.get(response, 0);
-         assertEquals(connection.getKey(key.getName()).getName(), key.getName());
-      }
-   }
-
-   @Test
-   public void testListVolumes() throws Exception {
-      Set<? extends Volume> response = connection.listVolumes();
-      assertNotNull(response);
-   }
-
-   @Test
-   public void testGetVolume() throws Exception {
-      Set<? extends Volume> response = connection.listVolumes();
-      assertNotNull(response);
-      if (response.size() > 0) {
-         Volume image = Iterables.get(response, 0);
-         assertEquals(connection.getVolume(image.getId()).getId(), image.getId());
-      }
-   }
-
-   @Test
-   public void testListLocations() throws Exception {
-      Set<? extends Location> response = connection.listLocations();
-      assertNotNull(response);
-   }
+   private static final String GROUP = System.getProperty("user.name");
 
    @Test
    public void testGetLocation() throws Exception {
       Set<? extends Location> response = connection.listLocations();
       assertNotNull(response);
       if (response.size() > 0) {
-         location = Iterables.get(response, 0);
+         location = Iterables.find(response, new Predicate<Location>() {
+
+            @Override
+            public boolean apply(Location arg0) {
+               // ontario is the least used
+               return "101".equals(arg0.getId());
+            }
+
+         });
          assertEquals(connection.getLocation(location.getId()).getId(), location.getId());
       }
    }
 
-   @Test
-   public void testListAddresss() throws Exception {
-      Set<? extends Address> response = connection.listAddresses();
-      assertNotNull(response);
-   }
-
    @Test(dependsOnMethods = "testGetLocation")
    public void testAddPublicKey() throws Exception {
       try {
-         connection.addPublicKey(TAG, keyPair.get("public"));
-         key = connection.getKey(TAG);
+         connection.addPublicKey(GROUP, keyPair.get("public"));
+         key = connection.getKey(GROUP);
          try {
             assert key.getInstanceIds().equals(ImmutableSet.<String> of()) : key;
          } catch (AssertionError e) {
@@ -239,8 +127,8 @@ public class IBMDeveloperCloudClientLiveTest {
          }
       } catch (IllegalStateException e) {
          // must have been found
-         connection.updatePublicKey(TAG, keyPair.get("public"));
-         key = connection.getKey(TAG);
+         connection.updatePublicKey(GROUP, keyPair.get("public"));
+         key = connection.getKey(GROUP);
          for (String instanceId : key.getInstanceIds()) {
             Instance instance = connection.getInstance(instanceId);
             if (instance.getStatus() == Instance.Status.FAILED || instance.getStatus() == Instance.Status.ACTIVE) {
@@ -248,7 +136,7 @@ public class IBMDeveloperCloudClientLiveTest {
             }
          }
       }
-      assertEquals(key.getName(), TAG);
+      assertEquals(key.getName(), GROUP);
       assert keyPair.get("public").indexOf(key.getKeyMaterial()) > 0;
       assertNotNull(key.getLastModifiedTime());
    }
@@ -267,7 +155,7 @@ public class IBMDeveloperCloudClientLiveTest {
       try {
          ip = connection.allocateAddressInLocation(location.getId(), offering.getId());
          System.out.println(ip);
-         assertEquals(ip.getIp(), null);
+         assertEquals(ip.getIP(), null);
          // wait up to 30 seconds for this to become "free"
          new RetryablePredicate<Address>(new AddressFree(connection), 30, 2, TimeUnit.SECONDS).apply(ip);
          refreshIpAndReturnAllAddresses();
@@ -304,19 +192,19 @@ public class IBMDeveloperCloudClientLiveTest {
       }.reverse();
 
       Iterable<? extends StorageOffering> storageOfferingsThatAreInOurLocationAndCorrectFormat = filter(connection
-            .listStorageOfferings(), new Predicate<StorageOffering>() {
+               .listStorageOfferings(), new Predicate<StorageOffering>() {
          @Override
          public boolean apply(StorageOffering arg0) {
 
             return arg0.getLocation().equals(location.getId())
-                  && Iterables.any(arg0.getFormats(), new Predicate<StorageOffering.Format>() {
+                     && Iterables.any(arg0.getFormats(), new Predicate<StorageOffering.Format>() {
 
-                     @Override
-                     public boolean apply(Format arg0) {
-                        return arg0.getId().equals(FORMAT);
-                     }
+                        @Override
+                        public boolean apply(Format arg0) {
+                           return arg0.getId().equals(FORMAT);
+                        }
 
-                  });
+                     });
          }
       });
       cheapestStorage = cheapestOrdering.max(storageOfferingsThatAreInOurLocationAndCorrectFormat);
@@ -326,8 +214,8 @@ public class IBMDeveloperCloudClientLiveTest {
    @Test(dependsOnMethods = "testResolveVolumeOffering")
    public void testCreateVolume() throws Exception {
       try {
-         volume = connection.createVolumeInLocation(location.getId(), TAG, FORMAT, cheapestStorage.getName(),
-               cheapestStorage.getId());
+         volume = connection.createVolumeInLocation(location.getId(), GROUP, FORMAT, cheapestStorage.getName(),
+                  cheapestStorage.getId());
          // wait up to 5 minutes for this to become "unmounted"
          assert new RetryablePredicate<Volume>(new VolumeUnmounted(connection), 300, 5, TimeUnit.SECONDS).apply(volume);
       } catch (IllegalStateException e) {
@@ -344,7 +232,7 @@ public class IBMDeveloperCloudClientLiveTest {
 
                });
             } catch (NoSuchElementException ex) {
-               killInstance(TAG + 1);
+               killInstance(GROUP + 1);
             }
          } else {
             throw e;
@@ -372,13 +260,13 @@ public class IBMDeveloperCloudClientLiveTest {
    @Test(dependsOnMethods = "testGetLocation")
    public void resolveImageAndInstanceType() throws Exception {
       Iterable<? extends Image> imagesThatAreInOurLocationAndNotBYOL = filter(connection.listImages(),
-            new Predicate<Image>() {
-               @Override
-               public boolean apply(Image arg0) {
-                  return arg0.getLocation().equals(location.getId()) && arg0.getPlatform().equals(PLATFORM)
-                        && !arg0.getName().contains("BYOL") && !arg0.getName().contains("PAYG");
-               }
-            });
+               new Predicate<Image>() {
+                  @Override
+                  public boolean apply(Image arg0) {
+                     return arg0.getLocation().equals(location.getId()) && arg0.getPlatform().equals(PLATFORM)
+                              && arg0.getName().startsWith(OS);
+                  }
+               });
 
       Ordering<InstanceType> cheapestOrdering = new Ordering<InstanceType>() {
          public int compare(InstanceType left, InstanceType right) {
@@ -405,22 +293,21 @@ public class IBMDeveloperCloudClientLiveTest {
 
       });
       System.err.println(image);
-      connection.getManifest(connection.getImage(image.getId()).getManifest());
-      connection.getManifest(connection.getImage(image.getId()).getDocumentation());
+      System.err.println(connection.getManifestOfImage(image.getId()));
    }
 
    @Test(dependsOnMethods = { "testAddPublicKey", "resolveImageAndInstanceType" })
    public void testCreateInstance() throws Exception {
-      killInstance(TAG);
+      killInstance(GROUP);
 
-      instance = connection.createInstanceInLocation(location.getId(), TAG, image.getId(), instanceType.getId(),
-            authorizePublicKey(key.getName()));
+      instance = connection.createInstanceInLocation(location.getId(), GROUP, image.getId(), instanceType.getId(),
+               authorizePublicKey(key.getName()).isMiniEphemeral(true));
 
-      assertBeginState(instance, TAG);
+      assertBeginState(instance, GROUP);
       assertIpHostNullAndStatusNEW(instance);
       blockUntilRunning(instance);
-      instance = assertRunning(instance, TAG);
-      sshAndDf(new IPSocket(instance.getIp(), 22), new Credentials("idcuser", key.getKeyMaterial()));
+      instance = assertRunning(instance, GROUP);
+      sshAndDf(new IPSocket(instance.getPrimaryIP().getIP(), 22), new Credentials("idcuser", key.getKeyMaterial()));
    }
 
    private void killInstance(final String nameToKill) {
@@ -435,16 +322,16 @@ public class IBMDeveloperCloudClientLiveTest {
 
          });
          if (instance.getStatus() != Instance.Status.DEPROVISIONING
-               && instance.getStatus() != Instance.Status.DEPROVISION_PENDING) {
+                  && instance.getStatus() != Instance.Status.DEPROVISION_PENDING) {
             System.out.println("deleting instance: " + instance);
             int timeout = (instance.getStatus() == Instance.Status.NEW || instance.getStatus() == Instance.Status.PROVISIONING) ? 300
-                  : 30;
+                     : 30;
             assert new RetryablePredicate<Instance>(new InstanceActiveOrFailed(connection), timeout, 2,
-                  TimeUnit.SECONDS).apply(instance) : instance;
+                     TimeUnit.SECONDS).apply(instance) : instance;
             connection.deleteInstance(instance.getId());
          }
          assert new RetryablePredicate<Instance>(new InstanceRemovedOrNotFound(connection), 120, 2, TimeUnit.SECONDS)
-               .apply(instance) : instance;
+                  .apply(instance) : instance;
       } catch (NoSuchElementException ex) {
       }
    }
@@ -469,7 +356,7 @@ public class IBMDeveloperCloudClientLiveTest {
    private void blockUntilRunning(Instance instance) {
       long start = System.currentTimeMillis();
       assert new RetryablePredicate<Instance>(new InstanceActive(connection), 15 * 60 * 1000).apply(instance) : connection
-            .getInstance(instance.getId());
+               .getInstance(instance.getId());
 
       System.out.println(((System.currentTimeMillis() - start) / 1000) + " seconds");
    }
@@ -487,7 +374,7 @@ public class IBMDeveloperCloudClientLiveTest {
    }
 
    private void assertConsistent(Instance instance, String name) {
-      assertNotNull(instance.getId());
+      assert (instance.getId() != null) : instance;
       assertEquals(instance.getName(), name);
       assertEquals(instance.getInstanceType(), instanceType.getId());
       assertEquals(instance.getLocation(), location.getId());
@@ -503,31 +390,29 @@ public class IBMDeveloperCloudClientLiveTest {
    }
 
    private void assertIpHostNullAndStatusNEW(Instance instance) {
-      assertEquals(instance.getIp(), null);
-      assertEquals(instance.getHostname(), null);
+      assertEquals(instance.getPrimaryIP(), null);
       assertEquals(instance.getStatus(), Instance.Status.NEW);
    }
 
    private void assertIpHostAndStatusNEW(Instance instance) {
-      assertNotNull(instance.getIp());
-      assertNotNull(instance.getHostname());
+      assertNotNull(instance.getPrimaryIP());
       assertEquals(instance.getStatus(), Instance.Status.NEW);
    }
 
    private void assertIpHostAndStatusACTIVE(Instance instance) {
-      assertNotNull(instance.getIp());
-      assertNotNull(instance.getHostname());
+      assertNotNull(instance.getPrimaryIP());
       assertEquals(instance.getStatus(), Instance.Status.ACTIVE);
    }
 
    @Test(dependsOnMethods = { "testAddPublicKey", "testAllocateIpAddress", "testCreateVolume",
-         "resolveImageAndInstanceType" })
+            "resolveImageAndInstanceType" })
    public void testCreateInstanceWithIpAndVolume() throws Exception {
-      String name = TAG + "1";
+      String name = GROUP + "1";
       killInstance(name);
 
       instance2 = connection.createInstanceInLocation(location.getId(), name, image.getId(), instanceType.getId(),
-            attachIp(ip.getId()).authorizePublicKey(key.getName()).mountVolume(volume.getId(), "/mnt"));
+               secondaryIP(ip.getId()).isMiniEphemeral(true).authorizePublicKey(key.getName()).mountVolume(
+                        volume.getId(), "/mnt"));
 
       assertBeginState(instance2, name);
       assertIpHostAndStatusNEW(instance2);
@@ -539,8 +424,8 @@ public class IBMDeveloperCloudClientLiveTest {
 
       refreshIpAndReturnAllAddresses();
       assertEquals(ip.getInstanceId(), instance2.getId());
-      assertEquals(ip.getIp(), instance2.getIp());
-      sshAndDf(new IPSocket(instance2.getIp(), 22), new Credentials("idcuser", keyPair.get("private")));
+      assertEquals(ip.getIP(), instance2.getPrimaryIP().getIP());
+      sshAndDf(new IPSocket(instance2.getPrimaryIP().getIP(), 22), new Credentials("idcuser", keyPair.get("private")));
    }
 
    private Set<? extends Address> refreshIpAndReturnAllAddresses() {
@@ -609,36 +494,22 @@ public class IBMDeveloperCloudClientLiveTest {
 
    private void _sshAndDf(IPSocket socket, Credentials credentials) {
       RetryablePredicate<IPSocket> socketOpen = new RetryablePredicate<IPSocket>(new InetSocketAddressConnect(), 180,
-            5, TimeUnit.SECONDS);
+               5, TimeUnit.SECONDS);
 
       socketOpen.apply(socket);
 
       SshClient ssh = new JschSshClient(new BackoffLimitedRetryHandler(), socket, 60000, credentials.identity, null,
-            credentials.credential.getBytes());
+               credentials.credential.getBytes());
       try {
          ssh.connect();
          ExecResponse hello = ssh.exec("echo hello");
          assertEquals(hello.getOutput().trim(), "hello");
          ExecResponse exec = ssh.exec("df");
          assertTrue(exec.getOutput().contains("Filesystem"),
-               "The output should've contained filesystem information, but it didn't. Output: " + exec);
+                  "The output should've contained filesystem information, but it didn't. Output: " + exec);
       } finally {
          if (ssh != null)
             ssh.disconnect();
       }
    }
-
-   @BeforeGroups(groups = { "live" })
-   protected void setupKeyPair() throws FileNotFoundException, IOException {
-      String secretKeyFile;
-      try {
-         secretKeyFile = checkNotNull(System.getProperty("jclouds.test.ssh.keyfile"), "jclouds.test.ssh.keyfile");
-      } catch (NullPointerException e) {
-         secretKeyFile = System.getProperty("user.home") + "/.ssh/id_rsa";
-      }
-      String secret = Files.toString(new File(secretKeyFile), Charsets.UTF_8);
-      assert secret.startsWith("-----BEGIN RSA PRIVATE KEY-----") : "invalid key:\n" + secret;
-      keyPair = ImmutableMap.<String, String> of("private", secret, "public", Files.toString(new File(secretKeyFile
-            + ".pub"), Charsets.UTF_8));
-   }
 }
diff --git a/providers/trmk-ecloud/src/test/java/org/jclouds/vcloud/terremark/ProvidersInPropertiesTest.java b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/ProvidersInPropertiesTest.java
similarity index 87%
rename from providers/trmk-ecloud/src/test/java/org/jclouds/vcloud/terremark/ProvidersInPropertiesTest.java
rename to sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/ProvidersInPropertiesTest.java
index fcf9736984..57f77b1503 100644
--- a/providers/trmk-ecloud/src/test/java/org/jclouds/vcloud/terremark/ProvidersInPropertiesTest.java
+++ b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/ProvidersInPropertiesTest.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.vcloud.terremark;
+package org.jclouds.ibm.smartcloud;
 
 import org.jclouds.compute.util.ComputeServiceUtils;
 import org.jclouds.rest.Providers;
@@ -35,15 +35,13 @@ public class ProvidersInPropertiesTest {
    @Test
    public void testSupportedProviders() {
       Iterable<String> providers = Providers.getSupportedProviders();
-      assert Iterables.contains(providers, "trmk-ecloud") : providers;
-
+      assert Iterables.contains(providers, "ibm-smartcloud") : providers;
    }
 
    @Test
    public void testSupportedComputeServiceProviders() {
       Iterable<String> providers = ComputeServiceUtils.getSupportedProviders();
-      assert Iterables.contains(providers, "trmk-ecloud") : providers;
-
+      assert Iterables.contains(providers, "ibm-smartcloud") : providers;
    }
 
 }
diff --git a/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/ReadOnlyIBMSmartCloudClientLiveTest.java b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/ReadOnlyIBMSmartCloudClientLiveTest.java
new file mode 100644
index 0000000000..7ce7e43b02
--- /dev/null
+++ b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/ReadOnlyIBMSmartCloudClientLiveTest.java
@@ -0,0 +1,125 @@
+/**
+ *
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.ibm.smartcloud;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+
+import java.util.Set;
+
+import org.jclouds.ibm.smartcloud.domain.Address;
+import org.jclouds.ibm.smartcloud.domain.Image;
+import org.jclouds.ibm.smartcloud.domain.Instance;
+import org.jclouds.ibm.smartcloud.domain.Key;
+import org.jclouds.ibm.smartcloud.domain.Location;
+import org.jclouds.ibm.smartcloud.domain.Volume;
+import org.testng.annotations.Test;
+
+import com.google.common.collect.Iterables;
+
+/**
+ * Tests behavior of {@code IBMSmartCloudClient}
+ * 
+ * @author Adrian Cole
+ */
+@Test(groups = "live", testName = "ReadOnlyIBMSmartCloudClientLiveTest")
+public class ReadOnlyIBMSmartCloudClientLiveTest extends BaseIBMSmartCloudClientLiveTest {
+
+   @Test
+   public void testListImages() throws Exception {
+      Set<? extends Image> response = connection.listImages();
+      assertNotNull(response);
+   }
+
+   @Test
+   public void testGetImage() throws Exception {
+      Set<? extends Image> response = connection.listImages();
+      assertNotNull(response);
+      if (response.size() > 0) {
+         Image image = Iterables.get(response, 0);
+         assertEquals(connection.getImage(image.getId()).getId(), image.getId());
+      }
+   }
+
+   @Test
+   public void testListInstances() throws Exception {
+      Set<? extends Instance> response = connection.listInstances();
+      assertNotNull(response);
+   }
+
+   @Test
+   public void testListInstancesFromRequestReturnsEmptySet() throws Exception {
+      Set<? extends Instance> response = connection.listInstancesFromRequest(Long.MAX_VALUE + "");
+      assertEquals(response.size(), 0);
+   }
+
+   @Test
+   public void testGetInstance() throws Exception {
+      Set<? extends Instance> response = connection.listInstances();
+      assertNotNull(response);
+      if (response.size() > 0) {
+         Instance instance = Iterables.get(response, 0);
+         assertEquals(connection.getInstance(instance.getId()).getId(), instance.getId());
+      }
+   }
+
+   @Test
+   public void testListKeys() throws Exception {
+      Set<? extends Key> response = connection.listKeys();
+      assertNotNull(response);
+   }
+
+   @Test
+   public void testGetKey() throws Exception {
+      Set<? extends Key> response = connection.listKeys();
+      assertNotNull(response);
+      if (response.size() > 0) {
+         Key key = Iterables.get(response, 0);
+         assertEquals(connection.getKey(key.getName()).getName(), key.getName());
+      }
+   }
+
+   @Test
+   public void testListVolumes() throws Exception {
+      Set<? extends Volume> response = connection.listVolumes();
+      assertNotNull(response);
+   }
+
+   @Test
+   public void testGetVolume() throws Exception {
+      Set<? extends Volume> response = connection.listVolumes();
+      assertNotNull(response);
+      if (response.size() > 0) {
+         Volume image = Iterables.get(response, 0);
+         assertEquals(connection.getVolume(image.getId()).getId(), image.getId());
+      }
+   }
+
+   @Test
+   public void testListLocations() throws Exception {
+      Set<? extends Location> response = connection.listLocations();
+      assertNotNull(response);
+   }
+
+   @Test
+   public void testListAddresss() throws Exception {
+      Set<? extends Address> response = connection.listAddresses();
+      assertNotNull(response);
+   }
+}
diff --git a/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/ProvidersInPropertiesTest.java b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/compute/IBMSmartCloudComputeServiceLiveTest.java
similarity index 57%
rename from sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/ProvidersInPropertiesTest.java
rename to sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/compute/IBMSmartCloudComputeServiceLiveTest.java
index c5225f69ce..fe4e26d1aa 100644
--- a/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/ProvidersInPropertiesTest.java
+++ b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/compute/IBMSmartCloudComputeServiceLiveTest.java
@@ -16,32 +16,27 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.ibmdev;
+package org.jclouds.ibm.smartcloud.compute;
 
-import org.jclouds.compute.util.ComputeServiceUtils;
-import org.jclouds.rest.Providers;
+import org.jclouds.compute.BaseComputeServiceLiveTest;
+import org.jclouds.ssh.jsch.config.JschSshClientModule;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import com.google.common.collect.Iterables;
-
 /**
- * 
  * @author Adrian Cole
- * 
  */
-@Test(groups = "unit")
-public class ProvidersInPropertiesTest {
+@Test(groups = "live", enabled = true, singleThreaded = true, testName = "IBMSmartCloudComputeServiceLiveTest")
+public class IBMSmartCloudComputeServiceLiveTest extends BaseComputeServiceLiveTest {
 
-   @Test
-   public void testSupportedProviders() {
-      Iterable<String> providers = Providers.getSupportedProviders();
-      assert Iterables.contains(providers, "ibmdev") : providers;
+   @BeforeClass
+   @Override
+   public void setServiceDefaults() {
+      provider = "ibm-smartcloud";
    }
 
-   @Test
-   public void testSupportedComputeServiceProviders() {
-      Iterable<String> providers = ComputeServiceUtils.getSupportedProviders();
-      assert Iterables.contains(providers, "ibmdev") : providers;
+   @Override
+   protected JschSshClientModule getSshModule() {
+      return new JschSshClientModule();
    }
-
 }
diff --git a/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/compute/IBMSmartCloudTemplateBuilderLiveTest.java b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/compute/IBMSmartCloudTemplateBuilderLiveTest.java
new file mode 100644
index 0000000000..91fe191a8f
--- /dev/null
+++ b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/compute/IBMSmartCloudTemplateBuilderLiveTest.java
@@ -0,0 +1,83 @@
+/**
+ *
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.ibm.smartcloud.compute;
+
+import static org.testng.Assert.assertEquals;
+
+import java.io.IOException;
+import java.util.Set;
+
+import org.jclouds.compute.BaseTemplateBuilderLiveTest;
+import org.jclouds.compute.domain.OsFamily;
+import org.jclouds.compute.domain.OsFamilyVersion64Bit;
+import org.jclouds.compute.domain.Template;
+import org.testng.annotations.Test;
+
+import com.google.common.base.Predicate;
+import com.google.common.collect.ImmutableSet;
+
+/**
+ * 
+ * @author Adrian Cole
+ */
+@Test(groups = "live", testName = "IBMSmartCloudTemplateBuilderLiveTest")
+public class IBMSmartCloudTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTest {
+
+   public IBMSmartCloudTemplateBuilderLiveTest() {
+      provider = "ibm-smartcloud";
+   }
+
+   @Override
+   protected Predicate<OsFamilyVersion64Bit> defineUnsupportedOperatingSystems() {
+      return new Predicate<OsFamilyVersion64Bit>() {
+
+         @Override
+         public boolean apply(OsFamilyVersion64Bit input) {
+            switch (input.family) {
+               case SUSE:
+                  return !input.version.equals("") && !input.version.equals("11") && !input.version.equals("11 SP1");
+               case RHEL:
+                  return !input.version.equals("") && !input.version.equals("5.4") && !input.version.equals("5.5");
+               case WINDOWS:
+                  return !input.version.equals("") && !(input.version.equals("2008 R2") && input.is64Bit)
+                           && !input.version.equals("2008 R1") && !input.version.equals("2003 R2");
+               default:
+                  return true;
+            }
+         }
+
+      };
+   }
+
+   @Override
+   public void testDefaultTemplateBuilder() throws IOException {
+      Template defaultTemplate = context.getComputeService().templateBuilder().build();
+      assertEquals(defaultTemplate.getLocation().getIso3166Codes(), ImmutableSet.of("CA-ON"));
+      assertEquals(defaultTemplate.getImage().getId(), "20015393");
+      assertEquals(defaultTemplate.getHardware().getId(), "20015393/COP32.1/2048/60");
+      assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "11 SP1");
+      assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), false);
+      assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.SUSE);
+   }
+
+   @Override
+   protected Set<String> getIso3166Codes() {
+      return ImmutableSet.of("US-NC", "DE-BW", "US-CO", "CA-ON", "JP-12", "SG");
+   }
+}
diff --git a/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseExpirationTimeFromJsonTest.java b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/parse/ExtendReservationForInstanceTest.java
similarity index 51%
rename from sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseExpirationTimeFromJsonTest.java
rename to sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/parse/ExtendReservationForInstanceTest.java
index 53318fc04d..75e1c95545 100644
--- a/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseExpirationTimeFromJsonTest.java
+++ b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/parse/ExtendReservationForInstanceTest.java
@@ -16,42 +16,40 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.ibmdev.functions;
+package org.jclouds.ibm.smartcloud.parse;
 
-import static org.testng.Assert.assertEquals;
-
-import java.io.IOException;
 import java.util.Date;
 
-import org.jclouds.http.HttpResponse;
-import org.jclouds.ibmdev.config.IBMDeveloperCloudParserModule;
+import org.jclouds.ibm.smartcloud.config.IBMSmartCloudParserModule;
+import org.jclouds.io.Payload;
 import org.jclouds.io.Payloads;
+import org.jclouds.json.BaseItemParserTest;
 import org.jclouds.json.config.GsonModule;
-import org.testng.annotations.BeforeTest;
+import org.jclouds.rest.annotations.Unwrap;
 import org.testng.annotations.Test;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 
 /**
- * Tests behavior of {@code ParseExpirationTimeFromJson}
  * 
  * @author Adrian Cole
  */
-@Test(groups = "unit", sequential = true, testName = "ibmdev.ParseExpirationTimeFromJsonTest")
-public class ParseExpirationTimeFromJsonTest {
-
-   private ParseExpirationTimeFromJson handler;
-
-   @BeforeTest
-   protected void setUpInjector() throws IOException {
-      Injector injector = Guice.createInjector(new IBMDeveloperCloudParserModule(), new GsonModule());
-      handler = injector.getInstance(ParseExpirationTimeFromJson.class);
+@Test(groups = "unit", testName = "ExtendReservationForInstanceTest")
+public class ExtendReservationForInstanceTest extends BaseItemParserTest<Date> {
+   
+   protected Injector injector() {
+      return Guice.createInjector(new GsonModule(), new IBMSmartCloudParserModule());
    }
 
-   public void test() {
-      Date compare = handler.apply(new HttpResponse(200, "ok", Payloads
-            .newStringPayload("{ \"expirationTime\":1249876800000 }")));
-      assertEquals(compare, new Date(1249876800000l));
+   @Override
+   protected Payload payload() {
+      return Payloads.newStringPayload("{ \"expirationTime\":1249876800000 }");
    }
-}
+
+   @Override
+   @Unwrap
+   public Date expected() {
+      return new Date(1249876800000l);
+   }
+}
\ No newline at end of file
diff --git a/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/compute/config/IBMDeveloperCloudComputeServiceDependenciesModuleTest.java b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/parse/GetAddressTest.java
similarity index 63%
rename from sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/compute/config/IBMDeveloperCloudComputeServiceDependenciesModuleTest.java
rename to sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/parse/GetAddressTest.java
index c8f77ca053..6e3e099e33 100644
--- a/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/compute/config/IBMDeveloperCloudComputeServiceDependenciesModuleTest.java
+++ b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/parse/GetAddressTest.java
@@ -16,22 +16,26 @@
  * limitations under the License.
  * ====================================================================
  */
-package org.jclouds.ibmdev.compute.config;
+package org.jclouds.ibm.smartcloud.parse;
 
-import org.jclouds.ibmdev.domain.Instance;
+import org.jclouds.ibm.smartcloud.domain.Address;
+import org.jclouds.json.BaseItemParserTest;
 import org.testng.annotations.Test;
 
 /**
+ * 
  * @author Adrian Cole
  */
-@Test(groups = "unit", testName = "ibmdev.IBMDeveloperCloudComputeServiceDependenciesModuleTest")
-public class IBMDeveloperCloudComputeServiceDependenciesModuleTest {
+@Test(groups = "unit", testName = "GetAddressTest")
+public class GetAddressTest extends BaseItemParserTest<Address> {
 
-   public void testAllStatusCovered() {
-
-      for (Instance.Status state : Instance.Status.values()) {
-         assert IBMDeveloperCloudComputeServiceDependenciesModule.instanceStatusToNodeState.containsKey(state) : state;
-      }
+   @Override
+   public String resource() {
+      return "/address.json";
+   }
 
+   @Override
+   public Address expected() {
+      return new Address(2, "1", "129.33.196.243", "1217", "1");
    }
 }
diff --git a/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/parse/GetImageTest.java b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/parse/GetImageTest.java
new file mode 100644
index 0000000000..088fed048e
--- /dev/null
+++ b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/parse/GetImageTest.java
@@ -0,0 +1,76 @@
+/**
+ *
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.ibm.smartcloud.parse;
+
+import java.util.Date;
+
+import org.jclouds.http.HttpUtils;
+import org.jclouds.ibm.smartcloud.config.IBMSmartCloudParserModule;
+import org.jclouds.ibm.smartcloud.domain.Image;
+import org.jclouds.ibm.smartcloud.domain.InstanceType;
+import org.jclouds.ibm.smartcloud.domain.Price;
+import org.jclouds.ibm.smartcloud.domain.Image.Visibility;
+import org.jclouds.json.BaseItemParserTest;
+import org.jclouds.json.config.GsonModule;
+import org.testng.annotations.Test;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+
+/**
+ * 
+ * @author Adrian Cole
+ */
+@Test(groups = "unit", testName = "GetImageTest")
+public class GetImageTest extends BaseItemParserTest<Image> {
+
+   protected Injector injector() {
+      return Guice.createInjector(new GsonModule(), new IBMSmartCloudParserModule());
+   }
+
+   @Override
+   public String resource() {
+      return "/image.json";
+   }
+
+   @Override
+   public Image expected() {
+      return new Image(
+               "SUSE Linux Enterprise Server 11 for x86",
+               HttpUtils
+                        .createUri("https://www-147.ibm.com/cloud/enterprise/ram.ws/RAMSecure/artifact/{F006D027-02CC-9D08-D389-6C729D939D44}/1.0/parameters.xml"),
+               Image.State.AVAILABLE,
+               Visibility.PUBLIC,
+               "SYSTEM",
+               "SUSE Linux Enterprise Server/11",
+               Image.Architecture.I386,
+               new Date(1216944000000l),
+               "41",
+               ImmutableSet.<InstanceType> of(new InstanceType("Bronze 32 bit", new Price(0.17, "UHR  ", "897", null,
+                        "USD", 1), "BRZ32.1/2048/175"), new InstanceType("Gold 32 bit", new Price(0.41, "UHR  ", "897",
+                        null, "USD", 1), "GLD32.4/4096/350"), new InstanceType("Silver 32 bit", new Price(0.265,
+                        "UHR  ", "897", null, "USD", 1), "SLV32.2/4096/350")),
+               ImmutableSet.<String> of("ifeE7VOzRG6SGvoDlRPTQw"),
+               HttpUtils
+                        .createUri("https://www-147.ibm.com/cloud/enterprise/ram.ws/RAMSecure/artifact/{F006D027-02CC-9D08-D389-6C729D939D44}/1.0/GettingStarted.html"),
+               "20001150", "SUSE Linux Enterprise Server 11 for x86 Base OS 32-bit with pay for use licensing");
+
+   }
+}
diff --git a/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/parse/GetInstanceTest.java b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/parse/GetInstanceTest.java
new file mode 100644
index 0000000000..94dd474543
--- /dev/null
+++ b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/parse/GetInstanceTest.java
@@ -0,0 +1,61 @@
+/**
+ *
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.ibm.smartcloud.parse;
+
+import java.util.Date;
+
+import org.jclouds.ibm.smartcloud.config.IBMSmartCloudParserModule;
+import org.jclouds.ibm.smartcloud.domain.IP;
+import org.jclouds.ibm.smartcloud.domain.Instance;
+import org.jclouds.ibm.smartcloud.domain.Instance.Software;
+import org.jclouds.ibm.smartcloud.domain.Instance.Status;
+import org.jclouds.json.BaseItemParserTest;
+import org.jclouds.json.config.GsonModule;
+import org.testng.annotations.Test;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+
+/**
+ * 
+ * @author Adrian Cole
+ */
+@Test(groups = "unit", testName = "GetInstanceTest")
+public class GetInstanceTest extends BaseItemParserTest<Instance> {
+
+   protected Injector injector() {
+      return Guice.createInjector(new GsonModule(), new IBMSmartCloudParserModule());
+   }
+
+   @Override
+   public String resource() {
+      return "/instance.json";
+   }
+
+   @Override
+   public Instance expected() {
+      return Instance.builder().launchTime(new Date(1305351683883l)).software(
+               ImmutableSet.of(new Software("SUSE Linux Enterprise Server", "OS", "11 SP1"))).primaryIP(
+               new IP("                ", "                ", 0)).requestId("80890").keyName("adriancole").name(
+               "adriancole").instanceType("COP32.1/2048/60").status(Status.NEW).owner("adrian@cloudconscious.com")
+               .location("101").imageId("20015393").rootOnly(true).requestName("adriancole").id("80590")
+               .expirationTime(new Date(1368423692824l)).diskSize(60).build();
+   }
+}
diff --git a/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/parse/GetKeyTest.java b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/parse/GetKeyTest.java
new file mode 100644
index 0000000000..0ce906cc9b
--- /dev/null
+++ b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/parse/GetKeyTest.java
@@ -0,0 +1,54 @@
+/**
+ *
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.ibm.smartcloud.parse;
+
+import java.util.Date;
+
+import org.jclouds.ibm.smartcloud.config.IBMSmartCloudParserModule;
+import org.jclouds.ibm.smartcloud.domain.Key;
+import org.jclouds.json.BaseItemParserTest;
+import org.jclouds.json.config.GsonModule;
+import org.testng.annotations.Test;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+
+/**
+ * 
+ * @author Adrian Cole
+ */
+@Test(groups = "unit", testName = "GetKeyTest")
+public class GetKeyTest extends BaseItemParserTest<Key> {
+
+   protected Injector injector() {
+      return Guice.createInjector(new GsonModule(), new IBMSmartCloudParserModule());
+   }
+
+   @Override
+   public String resource() {
+      return "/key.json";
+   }
+
+   @Override
+   public Key expected() {
+      return new Key(true, ImmutableSet.<String> of("1"), "AAAB3NzaC1yc2EAAAADAQABAAABAQCqBw7a+...", "DEFAULT",
+               new Date(1260428507510l));
+   }
+}
diff --git a/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/parse/GetVolumeTest.java b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/parse/GetVolumeTest.java
new file mode 100644
index 0000000000..8ea463916a
--- /dev/null
+++ b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/parse/GetVolumeTest.java
@@ -0,0 +1,50 @@
+/**
+ *
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.ibm.smartcloud.parse;
+
+import java.util.Date;
+
+import org.jclouds.ibm.smartcloud.config.IBMSmartCloudParserModule;
+import org.jclouds.ibm.smartcloud.domain.Volume;
+import org.jclouds.json.BaseItemParserTest;
+import org.jclouds.json.config.GsonModule;
+import org.testng.annotations.Test;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+
+@Test(groups = "unit", testName = "GetVolumeTest")
+public class GetVolumeTest extends BaseItemParserTest<Volume> {
+   
+   protected Injector injector() {
+      return Guice.createInjector(new GsonModule(), new IBMSmartCloudParserModule());
+   }
+   
+   @Override
+   public String resource() {
+      return "/volume.json";
+   }
+
+   @Override
+   public Volume expected() {
+      return new Volume("2", 5, 50, "aadelucc@us.ibm.com", new Date(1260469075119l), "1", ImmutableSet.<String> of(),
+               "ext3", "New Storage", "67");
+   }
+}
diff --git a/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/parse/ListAddressesTest.java b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/parse/ListAddressesTest.java
new file mode 100644
index 0000000000..e11a40b31b
--- /dev/null
+++ b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/parse/ListAddressesTest.java
@@ -0,0 +1,48 @@
+/**
+ *
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.ibm.smartcloud.parse;
+
+import java.util.Set;
+
+import org.jclouds.ibm.smartcloud.domain.Address;
+import org.jclouds.json.BaseSetParserTest;
+import org.jclouds.rest.annotations.Unwrap;
+import org.testng.annotations.Test;
+
+import com.google.common.collect.ImmutableSet;
+
+/**
+ * 
+ * @author Adrian Cole
+ */
+@Test(groups = "unit", testName = "ListAddressesTest")
+public class ListAddressesTest extends BaseSetParserTest<Address> {
+
+   @Override
+   public String resource() {
+      return "/addresses.json";
+   }
+   
+   @Override
+   @Unwrap
+   public Set<Address> expected() {
+      return ImmutableSet.of(new Address(2, "1", "129.33.196.243", "1217", "1"), new Address(3, "2", "129.33.196.244",
+               "1218", null));
+   }
+}
diff --git a/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/parse/ListImagesTest.java b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/parse/ListImagesTest.java
new file mode 100644
index 0000000000..ac801adac4
--- /dev/null
+++ b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/parse/ListImagesTest.java
@@ -0,0 +1,80 @@
+/**
+ *
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.ibm.smartcloud.parse;
+
+import java.util.Date;
+import java.util.Set;
+
+import org.jclouds.http.HttpUtils;
+import org.jclouds.ibm.smartcloud.config.IBMSmartCloudParserModule;
+import org.jclouds.ibm.smartcloud.domain.Image;
+import org.jclouds.ibm.smartcloud.domain.InstanceType;
+import org.jclouds.ibm.smartcloud.domain.Price;
+import org.jclouds.ibm.smartcloud.domain.Image.Visibility;
+import org.jclouds.json.BaseSetParserTest;
+import org.jclouds.json.config.GsonModule;
+import org.jclouds.rest.annotations.Unwrap;
+import org.testng.annotations.Test;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+
+/**
+ * 
+ * @author Adrian Cole
+ */
+@Test(groups = "unit", singleThreaded = true, testName = "ListImagesTest")
+public class ListImagesTest extends BaseSetParserTest<Image> {
+
+   protected Injector injector() {
+      return Guice.createInjector(new GsonModule(), new IBMSmartCloudParserModule());
+   }
+
+   @Override
+   public String resource() {
+      return "/images.json";
+   }
+
+   @Override
+   @Unwrap
+   public Set<Image> expected() {
+      return ImmutableSet
+               .of(new Image(
+                        "SUSE Linux Enterprise Server 11 for x86",
+                        HttpUtils
+                                 .createUri("https://www-147.ibm.com/cloud/enterprise/ram.ws/RAMSecure/artifact/{F006D027-02CC-9D08-D389-6C729D939D44}/1.0/parameters.xml"),
+                        Image.State.AVAILABLE,
+                        Visibility.PUBLIC,
+                        "SYSTEM",
+                        "SUSE Linux Enterprise Server/11",
+                        Image.Architecture.X86_64,
+                        new Date(1216944000000l),
+                        "41",
+                        ImmutableSet.<InstanceType> of(new InstanceType("Bronze 32 bit", new Price(0.17, "UHR  ",
+                                 "897", null, "USD", 1), "BRZ32.1/2048/175"), new InstanceType("Gold 32 bit",
+                                 new Price(0.41, "UHR  ", "897", null, "USD", 1), "GLD32.4/4096/350"),
+                                 new InstanceType("Silver 32 bit", new Price(0.265, "UHR  ", "897", null, "USD", 1),
+                                          "SLV32.2/4096/350")),
+                        ImmutableSet.<String> of("ifeE7VOzRG6SGvoDlRPTQw"),
+                        HttpUtils
+                                 .createUri("https://www-147.ibm.com/cloud/enterprise/ram.ws/RAMSecure/artifact/{F006D027-02CC-9D08-D389-6C729D939D44}/1.0/GettingStarted.html"),
+                        "20001150", "SUSE Linux Enterprise Server 11 for x86 Base OS 32-bit with pay for use licensing"));
+   }
+}
diff --git a/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/parse/ListInstancesTest.java b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/parse/ListInstancesTest.java
new file mode 100644
index 0000000000..5c609e9d46
--- /dev/null
+++ b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/parse/ListInstancesTest.java
@@ -0,0 +1,66 @@
+/**
+ *
+ * Copyright (C) 2011 Cloud Conscious) LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License) Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing) software
+ * distributed under the License is distributed on an "AS IS" BASIS)
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND) either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.ibm.smartcloud.parse;
+
+import java.util.Date;
+import java.util.Set;
+
+import org.jclouds.ibm.smartcloud.config.IBMSmartCloudParserModule;
+import org.jclouds.ibm.smartcloud.domain.IP;
+import org.jclouds.ibm.smartcloud.domain.Instance;
+import org.jclouds.ibm.smartcloud.domain.Instance.Software;
+import org.jclouds.ibm.smartcloud.domain.Instance.Status;
+import org.jclouds.json.BaseSetParserTest;
+import org.jclouds.json.config.GsonModule;
+import org.jclouds.rest.annotations.Unwrap;
+import org.testng.annotations.Test;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+
+/**
+ * 
+ * @author Adrian Cole
+ */
+@Test(groups = "unit", testName = "ListInstancesTest")
+public class ListInstancesTest extends BaseSetParserTest<Instance> {
+
+   protected Injector injector() {
+      return Guice.createInjector(new GsonModule(), new IBMSmartCloudParserModule());
+   }
+
+   @Override
+   public String resource() {
+      return "/instances.json";
+   }
+
+   @Override
+   @Unwrap
+   public Set<Instance> expected() {
+
+      return ImmutableSet.of(Instance.builder().launchTime(new Date(1305351683883l)).software(
+               ImmutableSet.of(new Software("SUSE Linux Enterprise Server", "OS", "11 SP1"))).primaryIP(
+               new IP("                ", "                ", 0)).requestId("80890").keyName("adriancole").name("adriancole").instanceType(
+               "COP32.1/2048/60").status(Status.NEW).owner("adrian@cloudconscious.com").location("101").imageId(
+               "20015393").rootOnly(true).requestName("adriancole").id("80590")
+               .expirationTime(new Date(1368423692824l)).diskSize(60).build());
+   }
+
+}
diff --git a/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/parse/ListKeysTest.java b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/parse/ListKeysTest.java
new file mode 100644
index 0000000000..648dc43459
--- /dev/null
+++ b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/parse/ListKeysTest.java
@@ -0,0 +1,58 @@
+/**
+ *
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.ibm.smartcloud.parse;
+
+import java.util.Date;
+import java.util.Set;
+
+import org.jclouds.ibm.smartcloud.config.IBMSmartCloudParserModule;
+import org.jclouds.ibm.smartcloud.domain.Key;
+import org.jclouds.json.BaseSetParserTest;
+import org.jclouds.json.config.GsonModule;
+import org.jclouds.rest.annotations.Unwrap;
+import org.testng.annotations.Test;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+
+/**
+ * 
+ * @author Adrian Cole
+ */
+@Test(groups = "unit", testName = "ListKeyesTest")
+public class ListKeysTest extends BaseSetParserTest<Key> {
+   
+   protected Injector injector() {
+      return Guice.createInjector(new GsonModule(), new IBMSmartCloudParserModule());
+   }
+   
+   @Override
+   public String resource() {
+      return "/keys.json";
+   }
+
+   @Override
+   @Unwrap
+   public Set<Key> expected() {
+      return ImmutableSet.of(new Key(true, ImmutableSet.<String> of("1"), "AAAB3NzaC1yc2EAAAADAQABAAABAQCqBw7a+...",
+               "DEFAULT", new Date(1260428507510l)), new Key(false, ImmutableSet.<String> of(),
+               "AAAB3NzaC1yc2EAAAADAQABAAABAQCqBw7a+", "BEAR", new Date(1260428507511l)));
+   }
+}
diff --git a/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/parse/ListStorageOfferingsTest.java b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/parse/ListStorageOfferingsTest.java
new file mode 100644
index 0000000000..2d1fc2cf1e
--- /dev/null
+++ b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/parse/ListStorageOfferingsTest.java
@@ -0,0 +1,66 @@
+/**
+ *
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.ibm.smartcloud.parse;
+
+import java.util.Date;
+import java.util.Set;
+
+import org.jclouds.ibm.smartcloud.config.IBMSmartCloudParserModule;
+import org.jclouds.ibm.smartcloud.domain.Price;
+import org.jclouds.ibm.smartcloud.domain.StorageOffering;
+import org.jclouds.ibm.smartcloud.domain.StorageOffering.Format;
+import org.jclouds.json.BaseSetParserTest;
+import org.jclouds.json.config.GsonModule;
+import org.jclouds.rest.annotations.Unwrap;
+import org.testng.annotations.Test;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+
+/**
+ * 
+ * @author Adrian Cole
+ */
+@Test(groups = "unit", testName = "ListStorageOfferingsTest")
+public class ListStorageOfferingsTest extends BaseSetParserTest<StorageOffering> {
+
+   protected Injector injector() {
+      return Guice.createInjector(new GsonModule(), new IBMSmartCloudParserModule());
+   }
+
+   @Override
+   public String resource() {
+      return "/storage-offerings.json";
+   }
+
+   @Override
+   @Unwrap
+   public Set<StorageOffering> expected() {
+      return ImmutableSet.of(//
+               new StorageOffering("41", new Price(0.039, "UHR", "897", new Date(1279497600000l), "USD", 1), 256,
+                        "Small", "20001208", ImmutableSet.of(new Format("ext3", "EXT3"))),//
+               new StorageOffering("41", new Price(0.312, "UHR", "897", new Date(1279497600000l), "USD", 1), 2048,
+                        "Large", "20001210", ImmutableSet.of(new Format("ext3", "EXT3"))),//
+               new StorageOffering("41", new Price(0.078, "UHR", "897", new Date(1279497600000l), "USD", 1), 512,
+                        "Medium", "20001209", ImmutableSet.of(new Format("ext3", "EXT3")))//
+               );
+   }
+
+}
diff --git a/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/parse/ListVolumesTest.java b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/parse/ListVolumesTest.java
new file mode 100644
index 0000000000..c3c6e38c09
--- /dev/null
+++ b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/parse/ListVolumesTest.java
@@ -0,0 +1,57 @@
+/**
+ *
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.ibm.smartcloud.parse;
+
+import java.util.Date;
+import java.util.Set;
+
+import org.jclouds.ibm.smartcloud.config.IBMSmartCloudParserModule;
+import org.jclouds.ibm.smartcloud.domain.Volume;
+import org.jclouds.json.BaseSetParserTest;
+import org.jclouds.json.config.GsonModule;
+import org.jclouds.rest.annotations.Unwrap;
+import org.testng.annotations.Test;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+
+/**
+ * 
+ * @author Adrian Cole
+ */
+@Test(groups = "unit", testName = "ListVolumesTest")
+public class ListVolumesTest extends BaseSetParserTest<Volume> {
+   protected Injector injector() {
+      return Guice.createInjector(new GsonModule(), new IBMSmartCloudParserModule());
+   }
+
+   @Override
+   public String resource() {
+      return "/volumes.json";
+   }
+
+   @Override
+   @Unwrap
+   public Set<Volume> expected() {
+      return ImmutableSet.of(new Volume("2", 5, 50, "aadelucc@us.ibm.com", new Date(1260469075119l), "1", ImmutableSet
+               .<String> of(), "ext3", "New Storage", "67"), new Volume(null, 6, 51, "aadelucc@us.ibm.com", new Date(
+               1260469075120l), "2", ImmutableSet.<String> of("abrad"), "ext3", "New Storage1", "68"));
+   }
+}
diff --git a/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/parse/NewInstanceTest.java b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/parse/NewInstanceTest.java
new file mode 100644
index 0000000000..de4094f188
--- /dev/null
+++ b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/parse/NewInstanceTest.java
@@ -0,0 +1,62 @@
+/**
+ *
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.ibm.smartcloud.parse;
+
+import java.util.Date;
+import java.util.Set;
+
+import org.jclouds.ibm.smartcloud.config.IBMSmartCloudParserModule;
+import org.jclouds.ibm.smartcloud.domain.Instance;
+import org.jclouds.ibm.smartcloud.domain.Instance.Software;
+import org.jclouds.ibm.smartcloud.domain.Instance.Status;
+import org.jclouds.json.BaseItemParserTest;
+import org.jclouds.json.config.GsonModule;
+import org.jclouds.rest.annotations.Unwrap;
+import org.testng.annotations.Test;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+
+/**
+ * 
+ * @author Adrian Cole
+ */
+@Test(groups = "unit", testName = "GetInstanceTest")
+public class NewInstanceTest extends BaseItemParserTest<Instance> {
+
+   protected Injector injector() {
+      return Guice.createInjector(new GsonModule(), new IBMSmartCloudParserModule());
+   }
+
+   @Override
+   public String resource() {
+      return "/new_instance.json";
+   }
+
+   @Override
+   @Unwrap(depth = 2, edgeCollection = Set.class)
+   public Instance expected() {
+      return Instance.builder().launchTime(new Date(1305359078796l)).software(
+               ImmutableSet.of(new Software("SUSE Linux Enterprise Server", "OS", "11 SP1"))).requestId("80904")
+               .keyName("adriancole").name("adriancole").instanceType("COP32.1/2048/60").status(Status.NEW).owner(
+                        "adrian@cloudconscious.com").location("101").imageId("20015393").requestName("adriancole").id(
+                        "80604").expirationTime(new Date(1368431087355l)).build();
+   }
+}
diff --git a/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/xml/LocationHandlerTest.java b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/xml/LocationHandlerTest.java
similarity index 55%
rename from sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/xml/LocationHandlerTest.java
rename to sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/xml/LocationHandlerTest.java
index 9516df0d94..002de578e1 100644
Binary files a/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/xml/LocationHandlerTest.java and b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/xml/LocationHandlerTest.java differ
diff --git a/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/xml/LocationsHandlerTest.java b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/xml/LocationsHandlerTest.java
new file mode 100644
index 0000000000..21c08c8a81
Binary files /dev/null and b/sandbox-providers/ibm-smartcloud/src/test/java/org/jclouds/ibm/smartcloud/xml/LocationsHandlerTest.java differ
diff --git a/sandbox-providers/ibmdev/src/test/resources/address.json b/sandbox-providers/ibm-smartcloud/src/test/resources/address.json
similarity index 100%
rename from sandbox-providers/ibmdev/src/test/resources/address.json
rename to sandbox-providers/ibm-smartcloud/src/test/resources/address.json
diff --git a/sandbox-providers/ibmdev/src/test/resources/addresses.json b/sandbox-providers/ibm-smartcloud/src/test/resources/addresses.json
similarity index 100%
rename from sandbox-providers/ibmdev/src/test/resources/addresses.json
rename to sandbox-providers/ibm-smartcloud/src/test/resources/addresses.json
diff --git a/sandbox-providers/ibmdev/src/test/resources/image.json b/sandbox-providers/ibm-smartcloud/src/test/resources/image.json
similarity index 98%
rename from sandbox-providers/ibmdev/src/test/resources/image.json
rename to sandbox-providers/ibm-smartcloud/src/test/resources/image.json
index 884031b5df..7d68ce59fa 100644
--- a/sandbox-providers/ibmdev/src/test/resources/image.json
+++ b/sandbox-providers/ibm-smartcloud/src/test/resources/image.json
@@ -4,6 +4,7 @@
         "state": 1,
         "visibility": "PUBLIC",
         "owner": "SYSTEM",
+        "architecture": "i386",
         "platform": "SUSE Linux Enterprise Server/11",
         "createdTime": 1216944000000,
         "location": "41",
diff --git a/sandbox-providers/ibmdev/src/test/resources/images.json b/sandbox-providers/ibm-smartcloud/src/test/resources/images.json
similarity index 98%
rename from sandbox-providers/ibmdev/src/test/resources/images.json
rename to sandbox-providers/ibm-smartcloud/src/test/resources/images.json
index 2a5ccbfde3..f68f1a69e2 100644
--- a/sandbox-providers/ibmdev/src/test/resources/images.json
+++ b/sandbox-providers/ibm-smartcloud/src/test/resources/images.json
@@ -6,6 +6,7 @@
         "state": 1,
         "visibility": "PUBLIC",
         "owner": "SYSTEM",
+        "architecture": "x86_64",
         "platform": "SUSE Linux Enterprise Server/11",
         "createdTime": 1216944000000,
         "location": "41",
diff --git a/sandbox-providers/ibm-smartcloud/src/test/resources/instance.json b/sandbox-providers/ibm-smartcloud/src/test/resources/instance.json
new file mode 100644
index 0000000000..e453a80894
--- /dev/null
+++ b/sandbox-providers/ibm-smartcloud/src/test/resources/instance.json
@@ -0,0 +1,29 @@
+{
+        "launchTime": 1305351683883,
+        "software": [{
+            "version": "11 SP1",
+            "type": "OS",
+            "name": "SUSE Linux Enterprise Server"
+        }],
+        "primaryIP": {
+            "hostname": "                ",
+            "ip": "                ",
+            "type": 0
+        },
+        "requestId": "80890",
+        "keyName": "adriancole",
+        "name": "adriancole",
+        "instanceType": "COP32.1/2048/60",
+        "status": 0,
+        "owner": "adrian@cloudconscious.com",
+        "location": "101",
+        "imageId": "20015393",
+        "root-only": "true",
+        "productCodes": [],
+        "volumes": [],
+        "requestName": "adriancole",
+        "id": "80590",
+        "secondaryIP": [],
+        "expirationTime": 1368423692824,
+        "diskSize": "60"
+    }
\ No newline at end of file
diff --git a/sandbox-providers/ibm-smartcloud/src/test/resources/instances.json b/sandbox-providers/ibm-smartcloud/src/test/resources/instances.json
new file mode 100644
index 0000000000..c842afee74
--- /dev/null
+++ b/sandbox-providers/ibm-smartcloud/src/test/resources/instances.json
@@ -0,0 +1,31 @@
+{
+    "instances": [{
+        "launchTime": 1305351683883,
+        "software": [{
+            "version": "11 SP1",
+            "type": "OS",
+            "name": "SUSE Linux Enterprise Server"
+        }],
+        "primaryIP": {
+            "hostname": "                ",
+            "ip": "                ",
+            "type": 0
+        },
+        "requestId": "80890",
+        "keyName": "adriancole",
+        "name": "adriancole",
+        "instanceType": "COP32.1/2048/60",
+        "status": 0,
+        "owner": "adrian@cloudconscious.com",
+        "location": "101",
+        "imageId": "20015393",
+        "root-only": "true",
+        "productCodes": [],
+        "volumes": [],
+        "requestName": "adriancole",
+        "id": "80590",
+        "secondaryIP": [],
+        "expirationTime": 1368423692824,
+        "diskSize": "60"
+    }]
+}
diff --git a/sandbox-providers/ibmdev/src/test/resources/key.json b/sandbox-providers/ibm-smartcloud/src/test/resources/key.json
similarity index 100%
rename from sandbox-providers/ibmdev/src/test/resources/key.json
rename to sandbox-providers/ibm-smartcloud/src/test/resources/key.json
diff --git a/sandbox-providers/ibmdev/src/test/resources/keys.json b/sandbox-providers/ibm-smartcloud/src/test/resources/keys.json
similarity index 100%
rename from sandbox-providers/ibmdev/src/test/resources/keys.json
rename to sandbox-providers/ibm-smartcloud/src/test/resources/keys.json
diff --git a/sandbox-providers/ibm-smartcloud/src/test/resources/location.xml b/sandbox-providers/ibm-smartcloud/src/test/resources/location.xml
new file mode 100644
index 0000000000..1e09cd783e
--- /dev/null
+++ b/sandbox-providers/ibm-smartcloud/src/test/resources/location.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<ns2:DescribeLocationsResponse
+    xmlns:ns2="http://www.ibm.com/xmlns/b2b/cloud/api/2010-03-31">
+    <Location>
+        <ID>41</ID>
+        <Name>RTP</Name>
+        <Description>RTP usrdtsa0a1ccxra</Description>
+        <Location>RTP</Location>
+        <Capabilities>
+            <Capability id="oss.storage.format">
+                <Entry key="EXT3">
+                    <Value>ext3</Value>
+                </Entry>
+                <Entry key="RAW">
+                    <Value>raw</Value>
+                </Entry>
+            </Capability>
+            <Capability id="oss.instance.spec.i386" />
+            <Capability id="oss.instance.spec.x86_64" />
+            <Capability id="oss.storage.availabilityarea" />
+        </Capabilities>
+        <State>1</State>
+    </Location>   
+</ns2:DescribeLocationsResponse>
\ No newline at end of file
diff --git a/sandbox-providers/ibm-smartcloud/src/test/resources/locations.xml b/sandbox-providers/ibm-smartcloud/src/test/resources/locations.xml
new file mode 100644
index 0000000000..321329f644
--- /dev/null
+++ b/sandbox-providers/ibm-smartcloud/src/test/resources/locations.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<ns2:DescribeLocationsResponse
+    xmlns:ns2="http://www.ibm.com/xmlns/b2b/cloud/api/2010-03-31">
+    <Location>
+        <ID>41</ID>
+        <Name>RTP</Name>
+        <Description>RTP usrdtsa0a1ccxra</Description>
+        <Location>RTP</Location>
+        <Capabilities>
+            <Capability id="oss.storage.format">
+                <Entry key="EXT3">
+                    <Value>ext3</Value>
+                </Entry>
+                <Entry key="RAW">
+                    <Value>raw</Value>
+                </Entry>
+            </Capability>
+            <Capability id="oss.instance.spec.i386" />
+            <Capability id="oss.instance.spec.x86_64" />
+            <Capability id="oss.storage.availabilityarea" />
+        </Capabilities>
+        <State>1</State>
+    </Location>
+    <Location>
+        <ID>61</ID>
+        <Name>EHN</Name>
+        <Description></Description>
+        <Location>EHN</Location>
+        <Capabilities>
+            <Capability id="oss.storage.format">
+                <Entry key="EXT3">
+                    <Value>ext3</Value>
+                </Entry>
+                <Entry key="RAW">
+                    <Value>raw</Value>
+                </Entry>
+            </Capability>
+            <Capability id="oss.instance.spec.i386" />
+            <Capability id="oss.instance.spec.x86_64" />
+            <Capability id="oss.storage.availabilityarea" />
+        </Capabilities>
+        <State>1</State>
+    </Location>
+    <Location>
+        <ID>82</ID>
+        <Name>us-co-dc1</Name>
+        <Description>BLD main DC</Description>
+        <Location>us-co-dc1</Location>
+        <Capabilities>
+            <Capability id="oss.storage.format">
+                <Entry key="EXT3">
+                    <Value>ext3</Value>
+                </Entry>
+                <Entry key="RAW">
+                    <Value>raw</Value>
+                </Entry>
+            </Capability>
+            <Capability id="oss.instance.spec.i386" />
+            <Capability id="oss.instance.spec.x86_64" />
+            <Capability id="oss.storage.availabilityarea" />
+        </Capabilities>
+        <State>1</State>
+    </Location>
+    <Location>
+        <ID>101</ID>
+        <Name>ca-on-dc1</Name>
+        <Description>Data Center 1 at Ontario, Canada </Description>
+        <Location>ca-on-dc1</Location>
+        <Capabilities>
+            <Capability id="oss.storage.format">
+                <Entry key="EXT3">
+                    <Value>ext3</Value>
+                </Entry>
+                <Entry key="RAW">
+                    <Value>raw</Value>
+                </Entry>
+            </Capability>
+            <Capability id="oss.instance.spec.i386" />
+            <Capability id="oss.instance.spec.x86_64" />
+            <Capability id="oss.storage.availabilityarea" />
+        </Capabilities>
+        <State>1</State>
+    </Location>
+    <Location>
+        <ID>121</ID>
+        <Name>ap-jp-dc1</Name>
+        <Description>Data Center 1 at Makuhari, Japan</Description>
+        <Location>ap-jp-dc1</Location>
+        <Capabilities>
+            <Capability id="oss.storage.format">
+                <Entry key="EXT3">
+                    <Value>ext3</Value>
+                </Entry>
+                <Entry key="RAW">
+                    <Value>raw</Value>
+                </Entry>
+            </Capability>
+            <Capability id="oss.instance.spec.i386" />
+            <Capability id="oss.instance.spec.x86_64" />
+            <Capability id="oss.storage.availabilityarea" />
+        </Capabilities>
+        <State>1</State>
+    </Location>
+    <Location>
+        <ID>141</ID>
+        <Name>ap-sg-dc1</Name>
+        <Description>Data Center 1 at Singapore</Description>
+        <Location>ap-sg-dc1</Location>
+        <Capabilities>
+            <Capability id="oss.storage.format">
+                <Entry key="EXT3">
+                    <Value>ext3</Value>
+                </Entry>
+                <Entry key="RAW">
+                    <Value>raw</Value>
+                </Entry>
+            </Capability>
+            <Capability id="oss.instance.spec.i386" />
+            <Capability id="oss.instance.spec.x86_64" />
+            <Capability id="oss.storage.availabilityarea" />
+        </Capabilities>
+        <State>1</State>
+    </Location>
+</ns2:DescribeLocationsResponse>
\ No newline at end of file
diff --git a/sandbox-providers/ibmdev/src/test/resources/log4j.xml b/sandbox-providers/ibm-smartcloud/src/test/resources/log4j.xml
similarity index 100%
rename from sandbox-providers/ibmdev/src/test/resources/log4j.xml
rename to sandbox-providers/ibm-smartcloud/src/test/resources/log4j.xml
diff --git a/sandbox-providers/ibm-smartcloud/src/test/resources/new_instance.json b/sandbox-providers/ibm-smartcloud/src/test/resources/new_instance.json
new file mode 100644
index 0000000000..4388aa839b
--- /dev/null
+++ b/sandbox-providers/ibm-smartcloud/src/test/resources/new_instance.json
@@ -0,0 +1,24 @@
+{
+    "instances": [{
+        "launchTime": 1305359078796,
+        "software": [{
+            "version": "11 SP1",
+            "type": "OS",
+            "name": "SUSE Linux Enterprise Server"
+        }],
+        "requestId": "80904",
+        "keyName": "adriancole",
+        "name": "adriancole",
+        "instanceType": "COP32.1/2048/60",
+        "status": 0,
+        "owner": "adrian@cloudconscious.com",
+        "location": "101",
+        "imageId": "20015393",
+        "productCodes": [],
+        "volumes": [],
+        "requestName": "adriancole",
+        "id": "80604",
+        "secondaryIP": [],
+        "expirationTime": 1368431087355
+    }]
+}
\ No newline at end of file
diff --git a/sandbox-providers/ibmdev/src/test/resources/storage-offerings.json b/sandbox-providers/ibm-smartcloud/src/test/resources/storage-offerings.json
similarity index 100%
rename from sandbox-providers/ibmdev/src/test/resources/storage-offerings.json
rename to sandbox-providers/ibm-smartcloud/src/test/resources/storage-offerings.json
diff --git a/sandbox-providers/ibmdev/src/test/resources/volume.json b/sandbox-providers/ibm-smartcloud/src/test/resources/volume.json
similarity index 100%
rename from sandbox-providers/ibmdev/src/test/resources/volume.json
rename to sandbox-providers/ibm-smartcloud/src/test/resources/volume.json
diff --git a/sandbox-providers/ibmdev/src/test/resources/volumes.json b/sandbox-providers/ibm-smartcloud/src/test/resources/volumes.json
similarity index 100%
rename from sandbox-providers/ibmdev/src/test/resources/volumes.json
rename to sandbox-providers/ibm-smartcloud/src/test/resources/volumes.json
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/options/IBMDeveloperCloudTemplateOptions.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/options/IBMDeveloperCloudTemplateOptions.java
deleted file mode 100644
index 832342ff3e..0000000000
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/options/IBMDeveloperCloudTemplateOptions.java
+++ /dev/null
@@ -1,283 +0,0 @@
-/**
- *
- * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
- *
- * ====================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
- */
-package org.jclouds.ibmdev.compute.options;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
-
-import java.util.Arrays;
-
-import org.jclouds.compute.options.TemplateOptions;
-import org.jclouds.io.Payload;
-import org.jclouds.util.Preconditions2;
-
-/**
- * Contains options supported in the {@code ComputeService#runNode} operation on the "ibmdev"
- * provider. <h2>
- * Usage</h2> The recommended way to instantiate a IBMDeveloperCloudTemplateOptions object is to
- * statically import IBMDeveloperCloudTemplateOptions.* and invoke a static creation method followed
- * by an instance mutator (if needed):
- * <p/>
- * <code>
- * import static org.jclouds.ibmdev.compute.options.IBMDeveloperCloudTemplateOptions.Builder.*;
- * <p/>
- * ComputeService client = // get connection
- * templateBuilder.options(inboundPorts(22, 80, 8080, 443));
- * Set<? extends NodeMetadata> set = client.runNodesWithTag(tag, 2, templateBuilder.build());
- * <code>
- * 
- * @author Adrian Cole
- */
-public class IBMDeveloperCloudTemplateOptions extends TemplateOptions {
-
-   private String keyPair = null;
-   private boolean noKeyPair;
-
-   public static final IBMDeveloperCloudTemplateOptions NONE = new IBMDeveloperCloudTemplateOptions();
-
-   /**
-    * Specifies the keypair used to run instances with
-    */
-   public IBMDeveloperCloudTemplateOptions keyPair(String keyPair) {
-      checkNotNull(keyPair, "use noKeyPair option to request boot without a keypair");
-      checkState(!noKeyPair, "you cannot specify both options keyPair and noKeyPair");
-      Preconditions2.checkNotEmpty(keyPair, "keypair must be non-empty");
-      this.keyPair = keyPair;
-      return this;
-   }
-
-   /**
-    * Do not use a keypair on instances
-    */
-   public IBMDeveloperCloudTemplateOptions noKeyPair() {
-      checkState(keyPair == null, "you cannot specify both options keyPair and noKeyPair");
-      this.noKeyPair = true;
-      return this;
-   }
-
-   public static class Builder {
-
-      /**
-       * @see IBMDeveloperCloudTemplateOptions#keyPair
-       */
-      public static IBMDeveloperCloudTemplateOptions keyPair(String keyPair) {
-         IBMDeveloperCloudTemplateOptions options = new IBMDeveloperCloudTemplateOptions();
-         return IBMDeveloperCloudTemplateOptions.class.cast(options.keyPair(keyPair));
-      }
-
-      /**
-       * @see IBMDeveloperCloudTemplateOptions#noKeyPair
-       */
-      public static IBMDeveloperCloudTemplateOptions noKeyPair() {
-         IBMDeveloperCloudTemplateOptions options = new IBMDeveloperCloudTemplateOptions();
-         return IBMDeveloperCloudTemplateOptions.class.cast(options.noKeyPair());
-      }
-
-      // methods that only facilitate returning the correct object type
-      /**
-       * @see TemplateOptions#inboundPorts
-       */
-      public static IBMDeveloperCloudTemplateOptions inboundPorts(int... ports) {
-         IBMDeveloperCloudTemplateOptions options = new IBMDeveloperCloudTemplateOptions();
-         return IBMDeveloperCloudTemplateOptions.class.cast(options.inboundPorts(ports));
-      }
-
-      /**
-       * @see TemplateOptions#port
-       */
-      public static IBMDeveloperCloudTemplateOptions blockOnPort(int port, int seconds) {
-         IBMDeveloperCloudTemplateOptions options = new IBMDeveloperCloudTemplateOptions();
-         return IBMDeveloperCloudTemplateOptions.class.cast(options.blockOnPort(port, seconds));
-      }
-
-      /**
-       * @see TemplateOptions#blockUntilRunning
-       */
-      public static IBMDeveloperCloudTemplateOptions blockUntilRunning(boolean blockUntilRunning) {
-         IBMDeveloperCloudTemplateOptions options = new IBMDeveloperCloudTemplateOptions();
-         return IBMDeveloperCloudTemplateOptions.class.cast(options.blockUntilRunning(blockUntilRunning));
-      }
-
-      /**
-       * @see TemplateOptions#runScript
-       */
-      public static IBMDeveloperCloudTemplateOptions runScript(byte[] script) {
-         IBMDeveloperCloudTemplateOptions options = new IBMDeveloperCloudTemplateOptions();
-         return IBMDeveloperCloudTemplateOptions.class.cast(options.runScript(script));
-      }
-
-      /**
-       * @see TemplateOptions#installPrivateKey
-       */
-      public static IBMDeveloperCloudTemplateOptions installPrivateKey(String rsaKey) {
-         IBMDeveloperCloudTemplateOptions options = new IBMDeveloperCloudTemplateOptions();
-         return IBMDeveloperCloudTemplateOptions.class.cast(options.installPrivateKey(rsaKey));
-      }
-
-      /**
-       * @see TemplateOptions#authorizePublicKey
-       */
-      public static IBMDeveloperCloudTemplateOptions authorizePublicKey(String rsaKey) {
-         IBMDeveloperCloudTemplateOptions options = new IBMDeveloperCloudTemplateOptions();
-         return IBMDeveloperCloudTemplateOptions.class.cast(options.authorizePublicKey(rsaKey));
-      }
-
-      /**
-       * @see TemplateOptions#withDetails
-       */
-      public static IBMDeveloperCloudTemplateOptions withDetails() {
-         IBMDeveloperCloudTemplateOptions options = new IBMDeveloperCloudTemplateOptions();
-         return IBMDeveloperCloudTemplateOptions.class.cast(options.withMetadata());
-      }
-
-   }
-
-   // methods that only facilitate returning the correct object type
-
-   /**
-    * @see TemplateOptions#blockOnPort
-    */
-   @Override
-   public IBMDeveloperCloudTemplateOptions blockOnPort(int port, int seconds) {
-      return IBMDeveloperCloudTemplateOptions.class.cast(super.blockOnPort(port, seconds));
-   }
-
-   /**
-    * 
-    * special thing is that we do assume if you are passing groups that you have everything you need
-    * already defined. for example, our option inboundPorts normally creates ingress rules
-    * accordingly but if we notice you've specified securityGroups, we do not mess with rules at all
-    * 
-    * @see TemplateOptions#inboundPorts
-    */
-   @Override
-   public IBMDeveloperCloudTemplateOptions inboundPorts(int... ports) {
-      return IBMDeveloperCloudTemplateOptions.class.cast(super.inboundPorts(ports));
-   }
-
-   /**
-    * @see TemplateOptions#authorizePublicKey(String)
-    */
-   @Override
-   @Deprecated
-   public IBMDeveloperCloudTemplateOptions authorizePublicKey(String publicKey) {
-      return IBMDeveloperCloudTemplateOptions.class.cast(super.authorizePublicKey(publicKey));
-   }
-
-   /**
-    * @see TemplateOptions#authorizePublicKey(Payload)
-    */
-   @Override
-   public IBMDeveloperCloudTemplateOptions authorizePublicKey(Payload publicKey) {
-      return IBMDeveloperCloudTemplateOptions.class.cast(super.authorizePublicKey(publicKey));
-   }
-
-   /**
-    * @see TemplateOptions#installPrivateKey(String)
-    */
-   @Override
-   @Deprecated
-   public IBMDeveloperCloudTemplateOptions installPrivateKey(String privateKey) {
-      return IBMDeveloperCloudTemplateOptions.class.cast(super.installPrivateKey(privateKey));
-   }
-
-   /**
-    * @see TemplateOptions#installPrivateKey(Payload)
-    */
-   @Override
-   public IBMDeveloperCloudTemplateOptions installPrivateKey(Payload privateKey) {
-      return IBMDeveloperCloudTemplateOptions.class.cast(super.installPrivateKey(privateKey));
-   }
-
-   /**
-    * @see TemplateOptions#runScript(Payload)
-    */
-   @Override
-   public IBMDeveloperCloudTemplateOptions runScript(Payload script) {
-      return IBMDeveloperCloudTemplateOptions.class.cast(super.runScript(script));
-   }
-
-   /**
-    * @see TemplateOptions#runScript(byte[])
-    */
-   @Override
-   @Deprecated
-   public IBMDeveloperCloudTemplateOptions runScript(byte[] script) {
-      return IBMDeveloperCloudTemplateOptions.class.cast(super.runScript(script));
-   }
-
-   /**
-    * @see TemplateOptions#withMetadata
-    */
-   @Override
-   public IBMDeveloperCloudTemplateOptions withMetadata() {
-      return IBMDeveloperCloudTemplateOptions.class.cast(super.withMetadata());
-   }
-
-   /**
-    * @return keyPair to use when running the instance or null, to generate a keypair.
-    */
-   public String getKeyPair() {
-      return keyPair;
-   }
-
-   /**
-    * @return true (default) if we are supposed to use a keypair
-    */
-   public boolean shouldAutomaticallyCreateKeyPair() {
-      return !noKeyPair;
-   }
-
-   @Override
-   public int hashCode() {
-      final int prime = 31;
-      int result = super.hashCode();
-      result = prime * result + ((keyPair == null) ? 0 : keyPair.hashCode());
-      result = prime * result + (noKeyPair ? 1231 : 1237);
-      return result;
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (this == obj)
-         return true;
-      if (!super.equals(obj))
-         return false;
-      if (getClass() != obj.getClass())
-         return false;
-      IBMDeveloperCloudTemplateOptions other = (IBMDeveloperCloudTemplateOptions) obj;
-      if (keyPair == null) {
-         if (other.keyPair != null)
-            return false;
-      } else if (!keyPair.equals(other.keyPair))
-         return false;
-      if (noKeyPair != other.noKeyPair)
-         return false;
-      return true;
-   }
-
-   @Override
-   public String toString() {
-      return "IBMDeveloperCloudTemplateOptions [keyPair=" + keyPair + ", noKeyPair=" + noKeyPair + ", inboundPorts="
-               + Arrays.toString(inboundPorts) + ", privateKey=" + (privateKey != null) + ", publicKey="
-               + (publicKey != null) + ", runScript=" + (script != null) + ", port:seconds=" + port + ":" + seconds
-               + ", metadata/details: " + includeMetadata + "]";
-   }
-
-}
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudDestroyNodeStrategy.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudDestroyNodeStrategy.java
deleted file mode 100644
index 93c974929d..0000000000
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/compute/strategy/IBMDeveloperCloudDestroyNodeStrategy.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- *
- * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
- *
- * ====================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
- */
-package org.jclouds.ibmdev.compute.strategy;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jclouds.compute.domain.NodeMetadata;
-import org.jclouds.compute.strategy.DestroyNodeStrategy;
-import org.jclouds.compute.strategy.GetNodeMetadataStrategy;
-import org.jclouds.ibmdev.IBMDeveloperCloudClient;
-
-/**
- * @author Adrian Cole
- */
-@Singleton
-public class IBMDeveloperCloudDestroyNodeStrategy implements DestroyNodeStrategy {
-   private final IBMDeveloperCloudClient client;
-   private final GetNodeMetadataStrategy getNode;
-
-   @Inject
-   protected IBMDeveloperCloudDestroyNodeStrategy(IBMDeveloperCloudClient client, GetNodeMetadataStrategy getNode) {
-      this.client = checkNotNull(client, "client");
-      this.getNode = checkNotNull(getNode, "getNode");
-   }
-
-   @Override
-   public NodeMetadata destroyNode(String id) {
-      client.deleteInstance(id);
-      return getNode.getNode(id);
-   }
-}
\ No newline at end of file
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Image.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Image.java
deleted file mode 100644
index 0475f5d135..0000000000
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Image.java
+++ /dev/null
@@ -1,302 +0,0 @@
-/**
- *
- * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
- *
- * ====================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
- */
-package org.jclouds.ibmdev.domain;
-
-import java.net.URI;
-import java.util.Date;
-import java.util.Set;
-
-import com.google.common.collect.Sets;
-
-/**
- * 
- * The current state of the image.
- * 
- * @author Adrian Cole
- */
-public class Image {
-
-   public static enum State {
-      NEW, AVAILABLE, UNAVAILABLE, DELETED, CAPTURING;
-      public static State fromValue(int v) {
-         switch (v) {
-         case 0:
-            return NEW;
-         case 1:
-            return AVAILABLE;
-         case 2:
-            return UNAVAILABLE;
-         case 3:
-            return DELETED;
-         case 4:
-            return CAPTURING;
-         default:
-            throw new IllegalArgumentException("invalid state:" + v);
-         }
-      }
-   }
-
-   public static enum Visibility {
-
-      PUBLIC,
-
-      SHARED,
-
-      PRIVATE;
-   }
-
-   private String name;
-
-   private URI manifest;
-   private int state;
-   private Visibility visibility;
-   private String owner;
-   private String platform;
-   private Date createdTime;
-   private String location;
-   private Set<InstanceType> supportedInstanceTypes = Sets.newLinkedHashSet();
-   private Set<String> productCodes = Sets.newLinkedHashSet();
-   private URI documentation;
-   private String id;
-   private String description;
-
-   Image() {
-
-   }
-
-   public Image(String name, URI manifest, int state, Visibility visibility, String owner, String platform,
-         Date createdTime, String location, Set<InstanceType> supportedInstanceTypes, Set<String> productCodes,
-         URI documentation, String id, String description) {
-      this.name = name;
-      this.manifest = manifest;
-      this.state = state;
-      this.visibility = visibility;
-      this.owner = owner;
-      this.platform = platform;
-      this.createdTime = createdTime;
-      this.location = location;
-      this.supportedInstanceTypes = supportedInstanceTypes;
-      this.productCodes = productCodes;
-      this.documentation = documentation;
-      this.id = id;
-      this.description = description;
-   }
-
-   public String getName() {
-      return name;
-   }
-
-   public void setName(String name) {
-      this.name = name;
-   }
-
-   public URI getManifest() {
-      return manifest;
-   }
-
-   public void setManifest(URI manifest) {
-      this.manifest = manifest;
-   }
-
-   public State getState() {
-      return State.fromValue(state);
-   }
-
-   public void setState(int state) {
-      this.state = state;
-   }
-
-   public Visibility getVisibility() {
-      return visibility;
-   }
-
-   public void setVisibility(Visibility visibility) {
-      this.visibility = visibility;
-   }
-
-   public String getOwner() {
-      return owner;
-   }
-
-   public void setOwner(String owner) {
-      this.owner = owner;
-   }
-
-   public String getPlatform() {
-      return platform;
-   }
-
-   public void setPlatform(String platform) {
-      this.platform = platform;
-   }
-
-   public Date getCreatedTime() {
-      return createdTime;
-   }
-
-   public void setCreatedTime(Date createdTime) {
-      this.createdTime = createdTime;
-   }
-
-   public String getLocation() {
-      return location;
-   }
-
-   public void setLocation(String location) {
-      this.location = location;
-   }
-
-   public Set<InstanceType> getSupportedInstanceTypes() {
-      return supportedInstanceTypes;
-   }
-
-   public void setSupportedInstanceTypes(Set<InstanceType> supportedInstanceTypes) {
-      this.supportedInstanceTypes = supportedInstanceTypes;
-   }
-
-   public Set<String> getProductCodes() {
-      return productCodes;
-   }
-
-   public void setProductCodes(Set<String> productCodes) {
-      this.productCodes = productCodes;
-   }
-
-   public URI getDocumentation() {
-      return documentation;
-   }
-
-   public void setDocumentation(URI documentation) {
-      this.documentation = documentation;
-   }
-
-   public String getId() {
-      return id;
-   }
-
-   public void setId(String id) {
-      this.id = id;
-   }
-
-   public String getDescription() {
-      return description;
-   }
-
-   public void setDescription(String description) {
-      this.description = description;
-   }
-
-   @Override
-   public int hashCode() {
-      final int prime = 31;
-      int result = 1;
-      result = prime * result + ((createdTime == null) ? 0 : createdTime.hashCode());
-      result = prime * result + ((description == null) ? 0 : description.hashCode());
-      result = prime * result + ((documentation == null) ? 0 : documentation.hashCode());
-      result = prime * result + ((id == null) ? 0 : id.hashCode());
-      result = prime * result + ((location == null) ? 0 : location.hashCode());
-      result = prime * result + ((manifest == null) ? 0 : manifest.hashCode());
-      result = prime * result + ((name == null) ? 0 : name.hashCode());
-      result = prime * result + ((owner == null) ? 0 : owner.hashCode());
-      result = prime * result + ((platform == null) ? 0 : platform.hashCode());
-      result = prime * result + ((productCodes == null) ? 0 : productCodes.hashCode());
-      result = prime * result + ((supportedInstanceTypes == null) ? 0 : supportedInstanceTypes.hashCode());
-      result = prime * result + ((visibility == null) ? 0 : visibility.hashCode());
-      return result;
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (this == obj)
-         return true;
-      if (obj == null)
-         return false;
-      if (getClass() != obj.getClass())
-         return false;
-      Image other = (Image) obj;
-      if (createdTime == null) {
-         if (other.createdTime != null)
-            return false;
-      } else if (!createdTime.equals(other.createdTime))
-         return false;
-      if (description == null) {
-         if (other.description != null)
-            return false;
-      } else if (!description.equals(other.description))
-         return false;
-      if (documentation == null) {
-         if (other.documentation != null)
-            return false;
-      } else if (!documentation.equals(other.documentation))
-         return false;
-      if (id == null) {
-         if (other.id != null)
-            return false;
-      } else if (!id.equals(other.id))
-         return false;
-      if (location == null) {
-         if (other.location != null)
-            return false;
-      } else if (!location.equals(other.location))
-         return false;
-      if (manifest == null) {
-         if (other.manifest != null)
-            return false;
-      } else if (!manifest.equals(other.manifest))
-         return false;
-      if (name == null) {
-         if (other.name != null)
-            return false;
-      } else if (!name.equals(other.name))
-         return false;
-      if (owner == null) {
-         if (other.owner != null)
-            return false;
-      } else if (!owner.equals(other.owner))
-         return false;
-      if (platform == null) {
-         if (other.platform != null)
-            return false;
-      } else if (!platform.equals(other.platform))
-         return false;
-      if (productCodes == null) {
-         if (other.productCodes != null)
-            return false;
-      } else if (!productCodes.equals(other.productCodes))
-         return false;
-      if (supportedInstanceTypes == null) {
-         if (other.supportedInstanceTypes != null)
-            return false;
-      } else if (!supportedInstanceTypes.equals(other.supportedInstanceTypes))
-         return false;
-      if (visibility == null) {
-         if (other.visibility != null)
-            return false;
-      } else if (!visibility.equals(other.visibility))
-         return false;
-      return true;
-   }
-
-   @Override
-   public String toString() {
-      return "Image [id=" + id + ", name=" + name + ", location=" + location + ", manifest=" + manifest + ", platform="
-            + platform + ", state=" + getState() + ", supportedInstanceTypes=" + supportedInstanceTypes
-            + ", visibility=" + visibility + "]";
-   }
-}
\ No newline at end of file
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Instance.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Instance.java
deleted file mode 100644
index 04cdff0b4d..0000000000
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Instance.java
+++ /dev/null
@@ -1,432 +0,0 @@
-/**
- *
- * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
- *
- * ====================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
- */
-package org.jclouds.ibmdev.domain;
-
-import java.util.Date;
-import java.util.Set;
-
-import com.google.common.collect.Sets;
-
-/**
- * 
- * The current state of the instance.
- * 
- * @author Adrian Cole
- */
-public class Instance {
-   public static enum Status {
-      NEW, PROVISIONING, FAILED, REMOVED, REJECTED, ACTIVE, UNKNOWN, DEPROVISIONING, RESTARTING, STARTING, STOPPING, STOPPED, DEPROVISION_PENDING;
-      public static Status fromValue(int v) {
-         switch (v) {
-         case 0:
-            return NEW;
-         case 1:
-            return PROVISIONING;
-         case 2:
-            return FAILED;
-         case 3:
-            return REMOVED;
-         case 4:
-            return REJECTED;
-         case 5:
-            return ACTIVE;
-         case 6:
-            return UNKNOWN;
-         case 7:
-            return DEPROVISIONING;
-         case 8:
-            return RESTARTING;
-         case 9:
-            return STARTING;
-         case 10:
-            return STOPPING;
-         case 11:
-            return STOPPED;
-         case 12:
-            return DEPROVISION_PENDING;
-         default:
-            throw new IllegalArgumentException("invalid state:" + v);
-         }
-      }
-   }
-
-   public static class Software {
-      private String version;
-      private String type;
-      private String name;
-
-      public Software(String name, String type, String version) {
-         this.version = version;
-         this.type = type;
-         this.name = name;
-      }
-
-      public Software() {
-
-      }
-
-      @Override
-      public int hashCode() {
-         final int prime = 31;
-         int result = 1;
-         result = prime * result + ((name == null) ? 0 : name.hashCode());
-         result = prime * result + ((type == null) ? 0 : type.hashCode());
-         result = prime * result + ((version == null) ? 0 : version.hashCode());
-         return result;
-      }
-
-      @Override
-      public boolean equals(Object obj) {
-         if (this == obj)
-            return true;
-         if (obj == null)
-            return false;
-         if (getClass() != obj.getClass())
-            return false;
-         Software other = (Software) obj;
-         if (name == null) {
-            if (other.name != null)
-               return false;
-         } else if (!name.equals(other.name))
-            return false;
-         if (type == null) {
-            if (other.type != null)
-               return false;
-         } else if (!type.equals(other.type))
-            return false;
-         if (version == null) {
-            if (other.version != null)
-               return false;
-         } else if (!version.equals(other.version))
-            return false;
-         return true;
-      }
-
-      public String getVersion() {
-         return version;
-      }
-
-      public void setVersion(String version) {
-         this.version = version;
-      }
-
-      public String getType() {
-         return type;
-      }
-
-      public void setType(String type) {
-         this.type = type;
-      }
-
-      public String getName() {
-         return name;
-      }
-
-      public void setName(String name) {
-         this.name = name;
-      }
-
-      @Override
-      public String toString() {
-         return "Software [name=" + name + ", type=" + type + ", version=" + version + "]";
-      }
-   }
-
-   private Date launchTime;
-   private Set<Software> software = Sets.newLinkedHashSet();
-   private String ip;
-   private String requestId;
-   private String keyName;
-   private String name;
-   private String instanceType;
-   private int status;
-   private String owner;
-   private String hostname;
-   private String location;
-   private String imageId;
-   private Set<String> productCodes;
-   private String requestName;
-   private String id;
-   private Date expirationTime;
-
-   public Instance(Date launchTime, Set<Software> software, String ip, String requestId, String keyName, String name,
-         String instanceType, int status, String owner, String hostname, String location, String imageId,
-         Set<String> productCodes, String requestName, String id, Date expirationTime) {
-      this.launchTime = launchTime;
-      this.software = software;
-      this.ip = ip;
-      this.requestId = requestId;
-      this.keyName = keyName;
-      this.name = name;
-      this.instanceType = instanceType;
-      this.status = status;
-      this.owner = owner;
-      this.hostname = hostname;
-      this.location = location;
-      this.imageId = imageId;
-      this.productCodes = productCodes;
-      this.requestName = requestName;
-      this.id = id;
-      this.expirationTime = expirationTime;
-   }
-
-   public Instance() {
-   }
-
-   public Date getLaunchTime() {
-      return launchTime;
-   }
-
-   public void setLaunchTime(Date launchTime) {
-      this.launchTime = launchTime;
-   }
-
-   public Set<Software> getSoftware() {
-      return software;
-   }
-
-   public void setSoftware(Set<Software> software) {
-      this.software = software;
-   }
-
-   public String getIp() {
-      return ip;
-   }
-
-   public void setIp(String ip) {
-      this.ip = ip;
-   }
-
-   public String getRequestId() {
-      return requestId;
-   }
-
-   public void setRequestId(String requestId) {
-      this.requestId = requestId;
-   }
-
-   public String getKeyName() {
-      return keyName;
-   }
-
-   public void setKeyName(String keyName) {
-      this.keyName = keyName;
-   }
-
-   public String getName() {
-      return name;
-   }
-
-   public void setName(String name) {
-      this.name = name;
-   }
-
-   public String getInstanceType() {
-      return instanceType;
-   }
-
-   public void setInstanceType(String instanceType) {
-      this.instanceType = instanceType;
-   }
-
-   public Status getStatus() {
-      return Status.fromValue(status);
-   }
-
-   public void setStatus(int status) {
-      this.status = status;
-   }
-
-   public String getOwner() {
-      return owner;
-   }
-
-   public void setOwner(String owner) {
-      this.owner = owner;
-   }
-
-   public String getHostname() {
-      return hostname;
-   }
-
-   public void setHostname(String hostname) {
-      this.hostname = hostname;
-   }
-
-   public String getLocation() {
-      return location;
-   }
-
-   public void setLocation(String location) {
-      this.location = location;
-   }
-
-   public String getImageId() {
-      return imageId;
-   }
-
-   public void setImageId(String imageId) {
-      this.imageId = imageId;
-   }
-
-   public Set<String> getProductCodes() {
-      return productCodes;
-   }
-
-   public void setProductCodes(Set<String> productCodes) {
-      this.productCodes = productCodes;
-   }
-
-   public String getRequestName() {
-      return requestName;
-   }
-
-   public void setRequestName(String requestName) {
-      this.requestName = requestName;
-   }
-
-   public String getId() {
-      return id;
-   }
-
-   public void setId(String id) {
-      this.id = id;
-   }
-
-   public Date getExpirationTime() {
-      return expirationTime;
-   }
-
-   public void setExpirationTime(Date expirationTime) {
-      this.expirationTime = expirationTime;
-   }
-
-   @Override
-   public int hashCode() {
-      final int prime = 31;
-      int result = 1;
-      result = prime * result + ((hostname == null) ? 0 : hostname.hashCode());
-      result = prime * result + ((id == null) ? 0 : id.hashCode());
-      result = prime * result + ((imageId == null) ? 0 : imageId.hashCode());
-      result = prime * result + ((instanceType == null) ? 0 : instanceType.hashCode());
-      result = prime * result + ((ip == null) ? 0 : ip.hashCode());
-      result = prime * result + ((keyName == null) ? 0 : keyName.hashCode());
-      result = prime * result + ((launchTime == null) ? 0 : launchTime.hashCode());
-      result = prime * result + ((location == null) ? 0 : location.hashCode());
-      result = prime * result + ((name == null) ? 0 : name.hashCode());
-      result = prime * result + ((owner == null) ? 0 : owner.hashCode());
-      result = prime * result + ((productCodes == null) ? 0 : productCodes.hashCode());
-      result = prime * result + ((requestId == null) ? 0 : requestId.hashCode());
-      result = prime * result + ((requestName == null) ? 0 : requestName.hashCode());
-      result = prime * result + ((software == null) ? 0 : software.hashCode());
-      return result;
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (this == obj)
-         return true;
-      if (obj == null)
-         return false;
-      if (getClass() != obj.getClass())
-         return false;
-      Instance other = (Instance) obj;
-      if (hostname == null) {
-         if (other.hostname != null)
-            return false;
-      } else if (!hostname.equals(other.hostname))
-         return false;
-      if (id == null) {
-         if (other.id != null)
-            return false;
-      } else if (!id.equals(other.id))
-         return false;
-      if (imageId == null) {
-         if (other.imageId != null)
-            return false;
-      } else if (!imageId.equals(other.imageId))
-         return false;
-      if (instanceType == null) {
-         if (other.instanceType != null)
-            return false;
-      } else if (!instanceType.equals(other.instanceType))
-         return false;
-      if (ip == null) {
-         if (other.ip != null)
-            return false;
-      } else if (!ip.equals(other.ip))
-         return false;
-      if (keyName == null) {
-         if (other.keyName != null)
-            return false;
-      } else if (!keyName.equals(other.keyName))
-         return false;
-      if (launchTime == null) {
-         if (other.launchTime != null)
-            return false;
-      } else if (!launchTime.equals(other.launchTime))
-         return false;
-      if (location == null) {
-         if (other.location != null)
-            return false;
-      } else if (!location.equals(other.location))
-         return false;
-      if (name == null) {
-         if (other.name != null)
-            return false;
-      } else if (!name.equals(other.name))
-         return false;
-      if (owner == null) {
-         if (other.owner != null)
-            return false;
-      } else if (!owner.equals(other.owner))
-         return false;
-      if (productCodes == null) {
-         if (other.productCodes != null)
-            return false;
-      } else if (!productCodes.equals(other.productCodes))
-         return false;
-      if (requestId == null) {
-         if (other.requestId != null)
-            return false;
-      } else if (!requestId.equals(other.requestId))
-         return false;
-      if (requestName == null) {
-         if (other.requestName != null)
-            return false;
-      } else if (!requestName.equals(other.requestName))
-         return false;
-      if (software == null) {
-         if (other.software != null)
-            return false;
-      } else if (!software.equals(other.software))
-         return false;
-      return true;
-   }
-
-   @Override
-   public String toString() {
-      return "Instance [id=" + id + ", name=" + name + ", ip=" + ip + ", hostname=" + hostname + ", status="
-            + getStatus() + ", instanceType=" + instanceType + ", location=" + location + ", imageId=" + imageId
-            + ", software=" + software + ", keyName=" + keyName + ", launchTime=" + launchTime + ", expirationTime="
-            + expirationTime + ", owner=" + owner + ", productCodes=" + productCodes + ", requestId=" + requestId
-            + ", requestName=" + requestName + "]";
-   }
-
-}
\ No newline at end of file
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseAddressFromJson.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseAddressFromJson.java
deleted file mode 100644
index 6c709dedb9..0000000000
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseAddressFromJson.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- *
- * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
- *
- * ====================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
- */
-/**
- *
- * Copyright (C) 2009 Cloud Conscious, LLC. <info@cloudconscious.com>
- *
- * ====================================================================
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * ====================================================================
- */
-package org.jclouds.ibmdev.functions;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jclouds.http.HttpResponse;
-import org.jclouds.http.functions.ParseJson;
-import org.jclouds.ibmdev.domain.Address;
-
-import com.google.common.base.Function;
-
-/**
- * @author Adrian Cole
- */
-@Singleton
-public class ParseAddressFromJson implements Function<HttpResponse, Address> {
-
-   private final ParseJson<Address> json;
-
-   @Inject
-   ParseAddressFromJson(ParseJson<Address> json) {
-      this.json = json;
-   }
-
-   @Override
-   public Address apply(HttpResponse arg0) {
-      Address input = json.apply(arg0);
-      ParseUtils.CLEAN_ADDRESS.apply(input);
-      return input;
-   }
-}
\ No newline at end of file
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseAddressesFromJson.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseAddressesFromJson.java
deleted file mode 100644
index de953f57a0..0000000000
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseAddressesFromJson.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- *
- * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
- *
- * ====================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
- */
-package org.jclouds.ibmdev.functions;
-
-import java.util.Set;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jclouds.http.HttpResponse;
-import org.jclouds.http.functions.ParseJson;
-import org.jclouds.ibmdev.domain.Address;
-
-import com.google.common.base.Function;
-import com.google.common.collect.Sets;
-
-/**
- * @author Adrian Cole
- */
-@Singleton
-public class ParseAddressesFromJson implements
-      Function<HttpResponse, Set<? extends Address>> {
-
-   private final ParseJson<AddressListResponse> json;
-
-   @Inject
-   ParseAddressesFromJson(ParseJson<AddressListResponse> json) {
-      this.json = json;
-   }
-
-   private static class AddressListResponse {
-      Set<Address> addresses = Sets.newLinkedHashSet();
-   }
-
-   @Override
-   public Set<? extends Address> apply(HttpResponse arg0) {
-      return ParseUtils.clean(json.apply(arg0).addresses,
-            ParseUtils.CLEAN_ADDRESS);
-   }
-}
\ No newline at end of file
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseExpirationTimeFromJson.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseExpirationTimeFromJson.java
deleted file mode 100644
index e6847f0347..0000000000
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseExpirationTimeFromJson.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- *
- * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
- *
- * ====================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
- */
-package org.jclouds.ibmdev.functions;
-
-import java.util.Date;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jclouds.http.HttpResponse;
-import org.jclouds.http.functions.ParseJson;
-
-import com.google.common.base.Function;
-
-/**
- * @author Adrian Cole
- */
-@Singleton
-public class ParseExpirationTimeFromJson implements
-      Function<HttpResponse, Date> {
-
-   private final ParseJson<ExpirationTimeResponse> json;
-
-   @Inject
-   ParseExpirationTimeFromJson(ParseJson<ExpirationTimeResponse> json) {
-      this.json = json;
-   }
-
-   private static class ExpirationTimeResponse {
-      Date expirationTime;
-   }
-
-   @Override
-   public Date apply(HttpResponse arg0) {
-      return json.apply(arg0).expirationTime;
-   }
-}
\ No newline at end of file
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseImagesFromJson.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseImagesFromJson.java
deleted file mode 100644
index 48264c8908..0000000000
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseImagesFromJson.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- *
- * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
- *
- * ====================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
- */
-package org.jclouds.ibmdev.functions;
-
-import java.util.Set;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jclouds.http.HttpResponse;
-import org.jclouds.http.functions.ParseJson;
-import org.jclouds.ibmdev.domain.Image;
-
-import com.google.common.base.Function;
-import com.google.common.collect.Sets;
-
-/**
- * @author Adrian Cole
- */
-@Singleton
-public class ParseImagesFromJson implements
-      Function<HttpResponse, Set<? extends Image>> {
-
-   private final ParseJson<ImageListResponse> json;
-
-   @Inject
-   ParseImagesFromJson(ParseJson<ImageListResponse> json) {
-      this.json = json;
-   }
-
-   private static class ImageListResponse {
-      Set<Image> images = Sets.newLinkedHashSet();
-   }
-
-   @Override
-   public Set<? extends Image> apply(HttpResponse arg0) {
-      return ParseUtils.clean(json.apply(arg0).images, ParseUtils.CLEAN_IMAGE);
-   }
-}
\ No newline at end of file
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseInstanceFromJson.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseInstanceFromJson.java
deleted file mode 100644
index 41dbb44099..0000000000
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseInstanceFromJson.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- *
- * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
- *
- * ====================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
- */
-package org.jclouds.ibmdev.functions;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jclouds.http.HttpResponse;
-import org.jclouds.http.functions.ParseJson;
-import org.jclouds.ibmdev.domain.Instance;
-
-import com.google.common.base.Function;
-
-/**
- * @author Adrian Cole
- */
-@Singleton
-public class ParseInstanceFromJson implements Function<HttpResponse, Instance> {
-
-   private final ParseJson<Instance> json;
-
-   @Inject
-   ParseInstanceFromJson(ParseJson<Instance> json) {
-      this.json = json;
-   }
-
-   @Override
-   public Instance apply(HttpResponse arg0) {
-      Instance input = json.apply(arg0);
-      ParseUtils.CLEAN_INSTANCE.apply(input);
-      return input;
-   }
-}
\ No newline at end of file
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseInstancesFromJson.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseInstancesFromJson.java
deleted file mode 100644
index c3078bd0d8..0000000000
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseInstancesFromJson.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- *
- * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
- *
- * ====================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
- */
-package org.jclouds.ibmdev.functions;
-
-import java.util.Set;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jclouds.http.HttpResponse;
-import org.jclouds.http.functions.ParseJson;
-import org.jclouds.ibmdev.domain.Instance;
-
-import com.google.common.base.Function;
-import com.google.common.collect.Sets;
-
-/**
- * @author Adrian Cole
- */
-@Singleton
-public class ParseInstancesFromJson implements
-      Function<HttpResponse, Set<? extends Instance>> {
-
-   private final ParseJson<InstanceListResponse> json;
-
-   @Inject
-   ParseInstancesFromJson(ParseJson<InstanceListResponse> json) {
-      this.json = json;
-   }
-
-   private static class InstanceListResponse {
-      Set<Instance> instances = Sets.newLinkedHashSet();
-   }
-
-   @Override
-   public Set<? extends Instance> apply(HttpResponse arg0) {
-      return ParseUtils.clean(json.apply(arg0).instances,
-            ParseUtils.CLEAN_INSTANCE);
-   }
-}
\ No newline at end of file
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseKeysFromJson.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseKeysFromJson.java
deleted file mode 100644
index ca12d18efe..0000000000
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseKeysFromJson.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- *
- * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
- *
- * ====================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
- */
-package org.jclouds.ibmdev.functions;
-
-import java.util.Set;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jclouds.http.HttpResponse;
-import org.jclouds.http.functions.ParseJson;
-import org.jclouds.ibmdev.domain.Key;
-
-import com.google.common.base.Function;
-import com.google.common.collect.Sets;
-
-/**
- * @author Adrian Cole
- */
-@Singleton
-public class ParseKeysFromJson implements
-      Function<HttpResponse, Set<? extends Key>> {
-
-   private final ParseJson<KeyListResponse> json;
-
-   @Inject
-   ParseKeysFromJson(ParseJson<KeyListResponse> json) {
-      this.json = json;
-   }
-
-   private static class KeyListResponse {
-      Set<Key> keys = Sets.newLinkedHashSet();
-   }
-
-   @Override
-   public Set<? extends Key> apply(HttpResponse arg0) {
-      return json.apply(arg0).keys;
-   }
-}
\ No newline at end of file
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseUtils.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseUtils.java
deleted file mode 100644
index 87776d201c..0000000000
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseUtils.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- *
- * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
- *
- * ====================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
- */
-package org.jclouds.ibmdev.functions;
-
-import java.util.Set;
-
-import org.jclouds.ibmdev.domain.Address;
-import org.jclouds.ibmdev.domain.Image;
-import org.jclouds.ibmdev.domain.Instance;
-import org.jclouds.ibmdev.domain.Volume;
-
-import com.google.common.base.Predicate;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Sets;
-
-/**
- * 
- * @author Adrian Cole
- */
-public class ParseUtils {
-
-   public static final Predicate<Address> CLEAN_ADDRESS = new Predicate<Address>() {
-      @Override
-      public boolean apply(Address input) {
-         if ("0".equals(input.getInstanceId()))
-            input.setInstanceId(null);
-         if (input.getIp() != null && "".equals(input.getIp().trim()))
-            input.setIp(null);
-         else if (input.getIp() != null && input.getIp().endsWith(" "))
-            input.setIp(input.getIp().trim());
-         return true;
-      }
-   };
-
-   private static final Set<String> emptyString = ImmutableSet.of("");
-   /**
-    * sometimes the service incorrectly returns an id of "0"
-    * http://www-180.ibm.com/cloud/enterprise/
-    * beta/ram/community/discussionTopic.faces?guid={DA689AEE
-    * -783C-6FE7-6F9F-DFEE9763F806}&v=1&fid=1068&tid=1526
-    */
-   public static final Predicate<Volume> CLEAN_VOLUME = new Predicate<Volume>() {
-      @Override
-      public boolean apply(Volume input) {
-         if ("0".equals(input.getInstanceId()))
-            input.setInstanceId(null);
-         if (emptyString.equals(input.getProductCodes()))
-            input.getProductCodes().clear();
-         return true;
-      }
-   };
-
-   public static final Predicate<Image> CLEAN_IMAGE = new Predicate<Image>() {
-      @Override
-      public boolean apply(Image input) {
-         if (emptyString.equals(input.getProductCodes()))
-            input.getProductCodes().clear();
-         return true;
-      }
-   };
-
-   public static final Predicate<Instance> CLEAN_INSTANCE = new Predicate<Instance>() {
-      @Override
-      public boolean apply(Instance input) {
-         if (emptyString.equals(input.getProductCodes()))
-            input.getProductCodes().clear();
-         if (input.getIp() != null && "".equals(input.getIp().trim()))
-            input.setIp(null);
-         else if (input.getIp() != null && input.getIp().endsWith(" "))
-            input.setIp(input.getIp().trim());
-         if (input.getHostname() != null && "".equals(input.getHostname().trim()))
-            input.setHostname(null);
-         else if (input.getHostname() != null && input.getHostname().endsWith(" "))
-            input.setHostname(input.getHostname().trim());
-         return true;
-      }
-   };
-
-   public static <T> Set<T> clean(Iterable<T> elements, Predicate<T> cleaner) {
-      return Sets.newLinkedHashSet(Iterables.filter(elements, cleaner));
-   }
-}
\ No newline at end of file
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseVolumeFromJson.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseVolumeFromJson.java
deleted file mode 100644
index e7b27d731f..0000000000
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseVolumeFromJson.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- *
- * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
- *
- * ====================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
- */
-package org.jclouds.ibmdev.functions;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jclouds.http.HttpResponse;
-import org.jclouds.http.functions.ParseJson;
-import org.jclouds.ibmdev.domain.Volume;
-
-import com.google.common.base.Function;
-
-/**
- * @author Adrian Cole
- */
-@Singleton
-public class ParseVolumeFromJson implements Function<HttpResponse, Volume> {
-
-   private final ParseJson<Volume> json;
-
-   @Inject
-   ParseVolumeFromJson(ParseJson<Volume> json) {
-      this.json = json;
-   }
-
-   @Override
-   public Volume apply(HttpResponse arg0) {
-      Volume input = json.apply(arg0);
-      ParseUtils.CLEAN_VOLUME.apply(input);
-      return input;
-   }
-}
\ No newline at end of file
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseVolumesFromJson.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseVolumesFromJson.java
deleted file mode 100644
index 2852f9ae2c..0000000000
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseVolumesFromJson.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- *
- * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
- *
- * ====================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
- */
-package org.jclouds.ibmdev.functions;
-
-import java.util.Set;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jclouds.http.HttpResponse;
-import org.jclouds.http.functions.ParseJson;
-import org.jclouds.ibmdev.domain.Volume;
-
-import com.google.common.base.Function;
-import com.google.common.collect.Sets;
-
-/**
- * @author Adrian Cole
- */
-@Singleton
-public class ParseVolumesFromJson implements
-      Function<HttpResponse, Set<? extends Volume>> {
-
-   private final ParseJson<VolumeListResponse> json;
-
-   @Inject
-   ParseVolumesFromJson(ParseJson<VolumeListResponse> json) {
-      this.json = json;
-   }
-
-   private static class VolumeListResponse {
-      Set<Volume> volumes = Sets.newLinkedHashSet();
-   }
-
-   @Override
-   public Set<? extends Volume> apply(HttpResponse arg0) {
-      return ParseUtils
-            .clean(json.apply(arg0).volumes, ParseUtils.CLEAN_VOLUME);
-   }
-}
\ No newline at end of file
diff --git a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/options/CreateInstanceOptions.java b/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/options/CreateInstanceOptions.java
deleted file mode 100644
index cf36910931..0000000000
--- a/sandbox-providers/ibmdev/src/main/java/org/jclouds/ibmdev/options/CreateInstanceOptions.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/**
- *
- * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
- *
- * ====================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
- */
-package org.jclouds.ibmdev.options;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-/**
- * 
- * 
- * @author Adrian Cole
- * 
- */
-public class CreateInstanceOptions extends BaseHttpRequestOptions {
-
-   public CreateInstanceOptions() {
-      super();
-      formParameters.put("publicKey", "DEFAULT");
-   }
-
-   /**
-    * 
-    * @param id
-    *           The ID of a storage volume to associate with this instance
-    * @param mountPoint
-    *           The mount point in which to mount the attached storage volume
-    */
-   public CreateInstanceOptions mountVolume(String id, String mountPoint) {
-      checkNotNull(id, "volume id");
-      checkNotNull(mountPoint, "mountPoint");
-      formParameters.removeAll("volumeID");
-      formParameters.put("volumeID", id + "");
-
-      String mountParam = String.format("oss.storage.id.0.mnt", id);
-      formParameters.removeAll(mountParam);
-      formParameters.put(mountParam, mountPoint);
-      return this;
-   }
-
-   /**
-    * 
-    * @param publicKeyName
-    *           The public key to use for accessing the created instancee
-    */
-   public CreateInstanceOptions authorizePublicKey(String publicKeyName) {
-      checkNotNull(publicKeyName, "publicKeyName");
-      formParameters.removeAll("publicKey");
-      formParameters.put("publicKey", publicKeyName);
-      return this;
-   }
-
-   /**
-    * 
-    * @param configurationData
-    *           extra configuration to pass to the instance
-    */
-   public CreateInstanceOptions configurationData(
-         Map<String, String> configurationData) {
-      checkNotNull(configurationData, "configurationData");
-      for (Entry<String, String> entry : configurationData.entrySet()) {
-         formParameters.removeAll(entry.getKey());
-         formParameters.put(entry.getKey(), entry.getValue());
-      }
-      return this;
-   }
-
-   /**
-    * 
-    * @param id
-    *           The ID of a static IP address to associate with this instance
-    */
-   public CreateInstanceOptions attachIp(String id) {
-      checkNotNull(id, "ip");
-      formParameters.removeAll("ip");
-      formParameters.put("ip", id + "");
-      return this;
-   }
-
-   public static class Builder {
-
-      /**
-       * @see CreateInstanceOptions#configurationData(Map<String, String> )
-       */
-      public static CreateInstanceOptions configurationData(
-            Map<String, String> configurationData) {
-         CreateInstanceOptions options = new CreateInstanceOptions();
-         return options.configurationData(configurationData);
-      }
-
-      /**
-       * @see CreateInstanceOptions#mountVolume(String, String )
-       */
-      public static CreateInstanceOptions mountVolume(String id,
-            String mountPoint) {
-         CreateInstanceOptions options = new CreateInstanceOptions();
-         return options.mountVolume(id, mountPoint);
-      }
-
-      /**
-       * @see CreateInstanceOptions#attachIp(String )
-       */
-      public static CreateInstanceOptions attachIp(String id) {
-         CreateInstanceOptions options = new CreateInstanceOptions();
-         return options.attachIp(id);
-      }
-
-      /**
-       * @see CreateInstanceOptions#authorizePublicKey(String )
-       */
-      public static CreateInstanceOptions authorizePublicKey(
-            String publicKeyName) {
-         CreateInstanceOptions options = new CreateInstanceOptions();
-         return options.authorizePublicKey(publicKeyName);
-      }
-   }
-
-}
diff --git a/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/compute/IBMDeveloperCloudComputeServiceLiveTestDisabled.java b/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/compute/IBMDeveloperCloudComputeServiceLiveTestDisabled.java
deleted file mode 100644
index 50b93de63e..0000000000
--- a/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/compute/IBMDeveloperCloudComputeServiceLiveTestDisabled.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- *
- * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
- *
- * ====================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
- */
-package org.jclouds.ibmdev.compute;
-
-import static org.jclouds.compute.util.ComputeServiceUtils.getCores;
-import static org.testng.Assert.assertEquals;
-
-import org.jclouds.compute.BaseComputeServiceLiveTest;
-import org.jclouds.compute.ComputeServiceContextFactory;
-import org.jclouds.compute.domain.ComputeMetadata;
-import org.jclouds.compute.domain.ComputeType;
-import org.jclouds.compute.domain.OsFamily;
-import org.jclouds.compute.domain.Template;
-import org.jclouds.ibmdev.IBMDeveloperCloudAsyncClient;
-import org.jclouds.ibmdev.IBMDeveloperCloudClient;
-import org.jclouds.rest.RestContext;
-import org.jclouds.ssh.jsch.config.JschSshClientModule;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-/**
- * @author Adrian Cole
- */
-@Test(groups = "live", enabled = true, sequential = true, testName = "ibmdevelopercloud.IBMDeveloperCloudComputeServiceLiveTest")
-public class IBMDeveloperCloudComputeServiceLiveTestDisabled extends BaseComputeServiceLiveTest {
-
-   @BeforeClass
-   @Override
-   public void setServiceDefaults() {
-      provider = "ibmdev";
-   }
-
-   @Test
-   public void testTemplateBuilder() {
-      Template defaultTemplate = client.templateBuilder().build();
-      assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), false);
-      assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.SUSE);
-      assertEquals(defaultTemplate.getLocation().getId(), "1");
-      assertEquals(getCores(defaultTemplate.getHardware()), 2.0d);
-   }
-
-   @Override
-   public void testListNodes() throws Exception {
-      for (ComputeMetadata node : client.listNodes()) {
-         assert node.getProviderId() != null;
-         // assert node.getLocation() != null;
-         assertEquals(node.getType(), ComputeType.NODE);
-      }
-   }
-
-   @Override
-   protected JschSshClientModule getSshModule() {
-      return new JschSshClientModule();
-   }
-
-   public void testAssignability() throws Exception {
-      @SuppressWarnings("unused")
-      RestContext<IBMDeveloperCloudClient, IBMDeveloperCloudAsyncClient> tmContext = new ComputeServiceContextFactory()
-               .createContext(provider, identity, credential).getProviderSpecificContext();
-   }
-
-}
\ No newline at end of file
diff --git a/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/compute/IBMDeveloperCloudTemplateBuilderLiveTest.java b/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/compute/IBMDeveloperCloudTemplateBuilderLiveTest.java
deleted file mode 100644
index f5fdfddae7..0000000000
--- a/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/compute/IBMDeveloperCloudTemplateBuilderLiveTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- *
- * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
- *
- * ====================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
- */
-package org.jclouds.ibmdev.compute;
-
-import java.util.Set;
-
-import org.jclouds.compute.BaseTemplateBuilderLiveTest;
-import org.jclouds.compute.domain.OsFamily;
-import org.jclouds.compute.domain.OsFamilyVersion64Bit;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Predicate;
-import com.google.common.collect.ImmutableSet;
-
-/**
- * 
- * @author Adrian Cole
- */
-@Test(groups = "live", testName = "ibmdev.IBMDeveloperCloudTemplateBuilderLiveTest")
-public class IBMDeveloperCloudTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTest {
-
-   public IBMDeveloperCloudTemplateBuilderLiveTest() {
-      provider = "ibmdev";
-   }
-
-   @Override
-   protected Predicate<OsFamilyVersion64Bit> defineUnsupportedOperatingSystems() {
-      return new Predicate<OsFamilyVersion64Bit>() {
-
-         @Override
-         public boolean apply(OsFamilyVersion64Bit input) {
-            return input.family != OsFamily.RHEL && //
-                     input.family != OsFamily.SUSE && //
-                     input.family != OsFamily.WINDOWS;
-         }
-
-      };
-   }
-
-   @Override
-   protected Set<String> getIso3166Codes() {
-      return ImmutableSet.of("US-NC", "DE-BW", "US-CO", "CA-ON");
-   }
-}
\ No newline at end of file
diff --git a/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseAddressFromJsonTest.java b/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseAddressFromJsonTest.java
deleted file mode 100644
index d994c61e20..0000000000
--- a/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseAddressFromJsonTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- *
- * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
- *
- * ====================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
- */
-package org.jclouds.ibmdev.functions;
-
-import static org.testng.Assert.assertEquals;
-
-import java.io.IOException;
-
-import org.jclouds.http.HttpResponse;
-import org.jclouds.ibmdev.config.IBMDeveloperCloudParserModule;
-import org.jclouds.ibmdev.domain.Address;
-import org.jclouds.io.Payloads;
-import org.jclouds.json.config.GsonModule;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
-/**
- * Tests behavior of {@code ParseAddressFromJson}
- * 
- * @author Adrian Cole
- */
-@Test(groups = "unit", sequential = true, testName = "ibmdev.ParseAddressFromJsonTest")
-public class ParseAddressFromJsonTest {
-
-   private ParseAddressFromJson handler;
-
-   @BeforeTest
-   protected void setUpInjector() throws IOException {
-      Injector injector = Guice.createInjector(new IBMDeveloperCloudParserModule(), new GsonModule());
-      handler = injector.getInstance(ParseAddressFromJson.class);
-   }
-
-   public void test() {
-      Address address = new Address(2, "1", "129.33.196.243", "1217", "1");
-      Address compare = handler.apply(new HttpResponse(200, "ok", Payloads
-            .newInputStreamPayload(ParseAddressFromJsonTest.class.getResourceAsStream("/address.json"))));
-      assertEquals(compare, address);
-   }
-}
diff --git a/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseAddressesFromJsonTest.java b/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseAddressesFromJsonTest.java
deleted file mode 100644
index df564d7d93..0000000000
--- a/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseAddressesFromJsonTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- *
- * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
- *
- * ====================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
- */
-package org.jclouds.ibmdev.functions;
-
-import java.io.IOException;
-import java.util.Set;
-
-import org.jclouds.http.HttpResponse;
-import org.jclouds.ibmdev.config.IBMDeveloperCloudParserModule;
-import org.jclouds.ibmdev.domain.Address;
-import org.jclouds.io.Payloads;
-import org.jclouds.json.config.GsonModule;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
-/**
- * Tests behavior of {@code ParseAddresssFromJson}
- * 
- * @author Adrian Cole
- */
-@Test(groups = "unit", sequential = true, testName = "ibmdev.ParseAddressesFromJsonTest")
-public class ParseAddressesFromJsonTest {
-
-   private ParseAddressesFromJson handler;
-
-   @BeforeTest
-   protected void setUpInjector() throws IOException {
-      Injector injector = Guice.createInjector(new IBMDeveloperCloudParserModule(), new GsonModule());
-      handler = injector.getInstance(ParseAddressesFromJson.class);
-   }
-
-   public void test() {
-      Address address1 = new Address(2, "1", "129.33.196.243", "1217", "1");
-      Address address2 = new Address(3, "2", "129.33.196.244", "1218", null);
-      Set<? extends Address> compare = handler.apply(new HttpResponse(200, "ok", Payloads
-            .newInputStreamPayload(ParseAddressesFromJsonTest.class.getResourceAsStream("/addresses.json"))));
-      assert (compare.contains(address1));
-      assert (compare.contains(address2));
-   }
-}
diff --git a/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseImageFromJsonTest.java b/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseImageFromJsonTest.java
deleted file mode 100644
index 9bd89ea182..0000000000
--- a/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseImageFromJsonTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- *
- * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
- *
- * ====================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
- */
-package org.jclouds.ibmdev.functions;
-
-import static org.testng.Assert.assertEquals;
-
-import java.io.IOException;
-import java.util.Date;
-
-import org.jclouds.http.HttpResponse;
-import org.jclouds.http.HttpUtils;
-import org.jclouds.ibmdev.config.IBMDeveloperCloudParserModule;
-import org.jclouds.ibmdev.domain.Image;
-import org.jclouds.ibmdev.domain.InstanceType;
-import org.jclouds.ibmdev.domain.Price;
-import org.jclouds.ibmdev.domain.Image.Visibility;
-import org.jclouds.io.Payloads;
-import org.jclouds.json.config.GsonModule;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
-/**
- * Tests behavior of {@code ParseImageFromJson}
- * 
- * @author Adrian Cole
- */
-@Test(groups = "unit", sequential = true, testName = "ibmdev.ParseImageFromJsonTest")
-public class ParseImageFromJsonTest {
-
-   private ParseImageFromJson handler;
-
-   @BeforeTest
-   protected void setUpInjector() throws IOException {
-      Injector injector = Guice.createInjector(new IBMDeveloperCloudParserModule(), new GsonModule());
-      handler = injector.getInstance(ParseImageFromJson.class);
-   }
-
-   public void test() {
-
-      Image image = new Image(
-            "SUSE Linux Enterprise Server 11 for x86",
-            HttpUtils
-                  .createUri("https://www-147.ibm.com/cloud/enterprise/ram.ws/RAMSecure/artifact/{F006D027-02CC-9D08-D389-6C729D939D44}/1.0/parameters.xml"),
-            1,
-            Visibility.PUBLIC,
-            "SYSTEM",
-            "SUSE Linux Enterprise Server/11",
-            new Date(1216944000000l),
-            "41",
-            ImmutableSet.<InstanceType> of(new InstanceType("Bronze 32 bit", new Price(0.17, "UHR  ", "897", null,
-                  "USD", 1), "BRZ32.1/2048/175"), new InstanceType("Gold 32 bit", new Price(0.41, "UHR  ", "897", null,
-                  "USD", 1), "GLD32.4/4096/350"), new InstanceType("Silver 32 bit", new Price(0.265, "UHR  ", "897",
-                  null, "USD", 1), "SLV32.2/4096/350")),
-            ImmutableSet.<String> of("ifeE7VOzRG6SGvoDlRPTQw"),
-            HttpUtils
-                  .createUri("https://www-147.ibm.com/cloud/enterprise/ram.ws/RAMSecure/artifact/{F006D027-02CC-9D08-D389-6C729D939D44}/1.0/GettingStarted.html"),
-            "20001150", "SUSE Linux Enterprise Server 11 for x86 Base OS 32-bit with pay for use licensing");
-
-      Image compare = handler.apply(new HttpResponse(200, "ok", Payloads
-            .newInputStreamPayload(ParseImageFromJsonTest.class.getResourceAsStream("/image.json"))));
-      assertEquals(compare, image);
-   }
-}
diff --git a/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseImagesFromJsonTest.java b/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseImagesFromJsonTest.java
deleted file mode 100644
index 98b02d2610..0000000000
--- a/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseImagesFromJsonTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- *
- * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
- *
- * ====================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
- */
-package org.jclouds.ibmdev.functions;
-
-import java.io.IOException;
-import java.util.Date;
-import java.util.Set;
-
-import org.jclouds.http.HttpResponse;
-import org.jclouds.http.HttpUtils;
-import org.jclouds.ibmdev.config.IBMDeveloperCloudParserModule;
-import org.jclouds.ibmdev.domain.Image;
-import org.jclouds.ibmdev.domain.InstanceType;
-import org.jclouds.ibmdev.domain.Price;
-import org.jclouds.ibmdev.domain.Image.Visibility;
-import org.jclouds.io.Payloads;
-import org.jclouds.json.config.GsonModule;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
-/**
- * Tests behavior of {@code ParseImagesFromJson}
- * 
- * @author Adrian Cole
- */
-@Test(groups = "unit", sequential = true, testName = "ibmdev.ParseImagesFromJsonTest")
-public class ParseImagesFromJsonTest {
-
-   private ParseImagesFromJson handler;
-
-   @BeforeTest
-   protected void setUpInjector() throws IOException {
-      Injector injector = Guice.createInjector(new IBMDeveloperCloudParserModule(), new GsonModule());
-      handler = injector.getInstance(ParseImagesFromJson.class);
-   }
-
-   public void test() {
-      Image image1 = new Image(
-            "SUSE Linux Enterprise Server 11 for x86",
-            HttpUtils
-                  .createUri("https://www-147.ibm.com/cloud/enterprise/ram.ws/RAMSecure/artifact/{F006D027-02CC-9D08-D389-6C729D939D44}/1.0/parameters.xml"),
-            1,
-            Visibility.PUBLIC,
-            "SYSTEM",
-            "SUSE Linux Enterprise Server/11",
-            new Date(1216944000000l),
-            "41",
-            ImmutableSet.<InstanceType> of(new InstanceType("Bronze 32 bit", new Price(0.17, "UHR  ", "897", null,
-                  "USD", 1), "BRZ32.1/2048/175"), new InstanceType("Gold 32 bit", new Price(0.41, "UHR  ", "897", null,
-                  "USD", 1), "GLD32.4/4096/350"), new InstanceType("Silver 32 bit", new Price(0.265, "UHR  ", "897",
-                  null, "USD", 1), "SLV32.2/4096/350")),
-            ImmutableSet.<String> of("ifeE7VOzRG6SGvoDlRPTQw"),
-            HttpUtils
-                  .createUri("https://www-147.ibm.com/cloud/enterprise/ram.ws/RAMSecure/artifact/{F006D027-02CC-9D08-D389-6C729D939D44}/1.0/GettingStarted.html"),
-            "20001150", "SUSE Linux Enterprise Server 11 for x86 Base OS 32-bit with pay for use licensing");
-
-      Set<? extends Image> compare = handler.apply(new HttpResponse(200, "ok", Payloads
-            .newInputStreamPayload(ParseImagesFromJsonTest.class.getResourceAsStream("/images.json"))));
-      assert (compare.contains(image1));
-   }
-}
diff --git a/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseInstanceFromJsonTest.java b/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseInstanceFromJsonTest.java
deleted file mode 100644
index d9cd82d3b3..0000000000
--- a/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseInstanceFromJsonTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- *
- * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
- *
- * ====================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
- */
-package org.jclouds.ibmdev.functions;
-
-import static org.testng.Assert.assertEquals;
-
-import java.io.IOException;
-import java.util.Date;
-
-import org.jclouds.http.HttpResponse;
-import org.jclouds.ibmdev.config.IBMDeveloperCloudParserModule;
-import org.jclouds.ibmdev.domain.Instance;
-import org.jclouds.ibmdev.domain.Instance.Software;
-import org.jclouds.io.Payloads;
-import org.jclouds.json.config.GsonModule;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
-/**
- * Tests behavior of {@code ParseInstanceFromJson}
- * 
- * @author Adrian Cole
- */
-@Test(groups = "unit", sequential = true, testName = "ibmdev.ParseInstanceFromJsonTest")
-public class ParseInstanceFromJsonTest {
-
-   private ParseInstanceFromJson handler;
-
-   @BeforeTest
-   protected void setUpInjector() throws IOException {
-      Injector injector = Guice.createInjector(new IBMDeveloperCloudParserModule(), new GsonModule());
-      handler = injector.getInstance(ParseInstanceFromJson.class);
-   }
-
-   public void test() {
-      Instance instance = new Instance(new Date(1260472231726l), ImmutableSet.<Software> of(new Software(
-            "SUSE Linux Enterprise", "OS", "10 SP2")), "129.33.197.78", "7430", "DEFAULT", "ABC", "MEDIUM", 5,
-            "aadelucc@us.ibm.com", "vm723.developer.ihost.com", "1", "3", ImmutableSet.<String> of(), "ABC", "7430",
-            new Date(1263064240837l));
-
-      Instance compare = handler.apply(new HttpResponse(200, "ok", Payloads
-            .newInputStreamPayload(ParseInstanceFromJsonTest.class.getResourceAsStream("/instance.json"))));
-      assertEquals(compare, instance);
-   }
-}
diff --git a/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseInstancesFromJsonTest.java b/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseInstancesFromJsonTest.java
deleted file mode 100644
index 3becaa0878..0000000000
--- a/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseInstancesFromJsonTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- *
- * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
- *
- * ====================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
- */
-package org.jclouds.ibmdev.functions;
-
-import static org.testng.Assert.assertEquals;
-
-import java.io.IOException;
-import java.util.Date;
-import java.util.Set;
-
-import org.jclouds.http.HttpResponse;
-import org.jclouds.ibmdev.config.IBMDeveloperCloudParserModule;
-import org.jclouds.ibmdev.domain.Instance;
-import org.jclouds.ibmdev.domain.Instance.Software;
-import org.jclouds.io.Payloads;
-import org.jclouds.json.config.GsonModule;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
-/**
- * Tests behavior of {@code ParseInstancesFromJson}
- * 
- * @author Adrian Cole
- */
-@Test(groups = "unit", sequential = true, testName = "ibmdev.ParseInstancesFromJsonTest")
-public class ParseInstancesFromJsonTest {
-
-   private ParseInstancesFromJson handler;
-
-   @BeforeTest
-   protected void setUpInjector() throws IOException {
-      Injector injector = Guice.createInjector(new IBMDeveloperCloudParserModule(), new GsonModule());
-      handler = injector.getInstance(ParseInstancesFromJson.class);
-   }
-
-   public void test() {
-      Instance instance1 = new Instance(new Date(1260472231726l), ImmutableSet.of(new Software("SUSE Linux Enterprise",
-            "OS", "10 SP2")), "129.33.197.78", "7430", "DEFAULT", "ABC", "MEDIUM", 5, "aadelucc@us.ibm.com",
-            "vm723.developer.ihost.com", "1", "3", ImmutableSet.<String> of(), "ABC", "7430", new Date(1263064240837l));
-
-      Instance instance2 = new Instance(new Date(1260472231727l), ImmutableSet.of(new Software("SUSE Linux Enterprise",
-            "OS", "10 SP3")), null, "7431", "DEFAULT", "ABC", "MEDIUM", 1, "aadelucc@us.ibm.com", null, "2", "4",
-            ImmutableSet.<String> of(), "ABC", "7431", new Date(1263064240838l));
-
-      Set<? extends Instance> compare = handler.apply(new HttpResponse(200, "ok", Payloads
-            .newInputStreamPayload(ParseInstancesFromJsonTest.class.getResourceAsStream("/instances.json"))));
-      assertEquals(Iterables.get(compare, 1), instance1);
-      assertEquals(Iterables.get(compare, 0), instance2);
-   }
-}
diff --git a/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseKeyFromJsonTest.java b/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseKeyFromJsonTest.java
deleted file mode 100644
index 3f11fd2dfa..0000000000
--- a/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseKeyFromJsonTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- *
- * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
- *
- * ====================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
- */
-package org.jclouds.ibmdev.functions;
-
-import static org.testng.Assert.assertEquals;
-
-import java.io.IOException;
-import java.util.Date;
-
-import org.jclouds.http.HttpResponse;
-import org.jclouds.http.functions.ParseJson;
-import org.jclouds.ibmdev.config.IBMDeveloperCloudParserModule;
-import org.jclouds.ibmdev.domain.Key;
-import org.jclouds.io.Payloads;
-import org.jclouds.json.config.GsonModule;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-import com.google.inject.TypeLiteral;
-
-/**
- * Tests behavior of {@code ParseKeyFromJson}
- * 
- * @author Adrian Cole
- */
-@Test(groups = "unit", sequential = true, testName = "ibmdev.ParseKeyFromJsonTest")
-public class ParseKeyFromJsonTest {
-
-   private ParseJson<Key> handler;
-
-   @BeforeTest
-   protected void setUpInjector() throws IOException {
-      Injector injector = Guice.createInjector(new IBMDeveloperCloudParserModule(), new GsonModule());
-      handler = injector.getInstance(com.google.inject.Key.get(new TypeLiteral<ParseJson<Key>>() {
-      }));
-   }
-
-   public void test() {
-      Key key = new Key(true, ImmutableSet.<String> of("1"), "AAAB3NzaC1yc2EAAAADAQABAAABAQCqBw7a+...", "DEFAULT",
-            new Date(1260428507510l));
-
-      Key compare = handler.apply(new HttpResponse(200, "ok", Payloads.newInputStreamPayload(ParseKeyFromJsonTest.class
-            .getResourceAsStream("/key.json"))));
-      assertEquals(compare, key);
-   }
-}
diff --git a/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseKeysFromJsonTest.java b/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseKeysFromJsonTest.java
deleted file mode 100644
index 5f4ed8b11f..0000000000
--- a/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseKeysFromJsonTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- *
- * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
- *
- * ====================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
- */
-package org.jclouds.ibmdev.functions;
-
-import java.io.IOException;
-import java.util.Date;
-import java.util.Set;
-
-import org.jclouds.http.HttpResponse;
-import org.jclouds.ibmdev.config.IBMDeveloperCloudParserModule;
-import org.jclouds.ibmdev.domain.Key;
-import org.jclouds.io.Payloads;
-import org.jclouds.json.config.GsonModule;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
-/**
- * Tests behavior of {@code ParseKeysFromJson}
- * 
- * @author Adrian Cole
- */
-@Test(groups = "unit", sequential = true, testName = "ibmdev.ParseKeysFromJsonTest")
-public class ParseKeysFromJsonTest {
-
-   private ParseKeysFromJson handler;
-
-   @BeforeTest
-   protected void setUpInjector() throws IOException {
-      Injector injector = Guice.createInjector(new IBMDeveloperCloudParserModule(), new GsonModule());
-      handler = injector.getInstance(ParseKeysFromJson.class);
-   }
-
-   public void test() {
-      Key key1 = new Key(true, ImmutableSet.<String> of("1"), "AAAB3NzaC1yc2EAAAADAQABAAABAQCqBw7a+...", "DEFAULT",
-            new Date(1260428507510l));
-      Key key2 = new Key(false, ImmutableSet.<String> of(), "AAAB3NzaC1yc2EAAAADAQABAAABAQCqBw7a+", "BEAR", new Date(
-            1260428507511l));
-
-      Set<? extends Key> compare = handler.apply(new HttpResponse(200, "ok", Payloads
-            .newInputStreamPayload(ParseKeysFromJsonTest.class.getResourceAsStream("/keys.json"))));
-      assert (compare.contains(key1));
-      assert (compare.contains(key2));
-   }
-}
diff --git a/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseStorageOfferingsFromJsonTest.java b/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseStorageOfferingsFromJsonTest.java
deleted file mode 100644
index 0dc2a4e80f..0000000000
--- a/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseStorageOfferingsFromJsonTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- *
- * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
- *
- * ====================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
- */
-package org.jclouds.ibmdev.functions;
-
-import static org.testng.Assert.assertEquals;
-
-import java.io.IOException;
-import java.util.Date;
-import java.util.Set;
-
-import org.jclouds.http.HttpResponse;
-import org.jclouds.http.functions.UnwrapOnlyJsonValue;
-import org.jclouds.ibmdev.config.IBMDeveloperCloudParserModule;
-import org.jclouds.ibmdev.domain.Price;
-import org.jclouds.ibmdev.domain.StorageOffering;
-import org.jclouds.ibmdev.domain.StorageOffering.Format;
-import org.jclouds.io.Payloads;
-import org.jclouds.json.config.GsonModule;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-import com.google.inject.Key;
-import com.google.inject.TypeLiteral;
-
-/**
- * Tests behavior of {@code ParseStorageOfferingsFromJson}
- * 
- * @author Adrian Cole
- */
-@Test(groups = "unit", sequential = true, testName = "ibmdev.ParseStorageOfferingsFromJsonTest")
-public class ParseStorageOfferingsFromJsonTest {
-   private UnwrapOnlyJsonValue<Set<StorageOffering>> handler;
-
-   @BeforeTest
-   protected void setUpInjector() throws IOException {
-      Injector injector = Guice.createInjector(new IBMDeveloperCloudParserModule(), new GsonModule());
-      handler = injector.getInstance(Key.get(new TypeLiteral<UnwrapOnlyJsonValue<Set<StorageOffering>>>() {
-      }));
-   }
-
-   @Test
-   public void testDeserialize() throws IOException {
-      Set<StorageOffering> compare = ImmutableSet.of(//
-            new StorageOffering("41", new Price(0.039, "UHR", "897", new Date(1279497600000l), "USD", 1), 256, "Small",
-                  "20001208", ImmutableSet.of(new Format("ext3", "EXT3"))),//
-            new StorageOffering("41", new Price(0.312, "UHR", "897", new Date(1279497600000l), "USD", 1), 2048,
-                  "Large", "20001210", ImmutableSet.of(new Format("ext3", "EXT3"))),//
-            new StorageOffering("41", new Price(0.078, "UHR", "897", new Date(1279497600000l), "USD", 1), 512,
-                  "Medium", "20001209", ImmutableSet.of(new Format("ext3", "EXT3")))//
-            );
-
-      Set<StorageOffering> expected = handler.apply(new HttpResponse(200, "ok", Payloads
-            .newPayload(ParseStorageOfferingsFromJsonTest.class.getResourceAsStream("/storage-offerings.json"))));
-
-      assertEquals(compare, expected);
-   }
-
-}
diff --git a/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseVolumeFromJsonTest.java b/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseVolumeFromJsonTest.java
deleted file mode 100644
index b029caa5b5..0000000000
--- a/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseVolumeFromJsonTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- *
- * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
- *
- * ====================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
- */
-package org.jclouds.ibmdev.functions;
-
-import static org.testng.Assert.assertEquals;
-
-import java.io.IOException;
-import java.util.Date;
-
-import org.jclouds.http.HttpResponse;
-import org.jclouds.ibmdev.config.IBMDeveloperCloudParserModule;
-import org.jclouds.ibmdev.domain.Volume;
-import org.jclouds.io.Payloads;
-import org.jclouds.json.config.GsonModule;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
-/**
- * Tests behavior of {@code ParseVolumeFromJson}
- * 
- * @author Adrian Cole
- */
-@Test(groups = "unit", sequential = true, testName = "ibmdev.ParseVolumeFromJsonTest")
-public class ParseVolumeFromJsonTest {
-
-   private ParseVolumeFromJson handler;
-
-   @BeforeTest
-   protected void setUpInjector() throws IOException {
-      Injector injector = Guice.createInjector(new IBMDeveloperCloudParserModule(), new GsonModule());
-      handler = injector.getInstance(ParseVolumeFromJson.class);
-   }
-
-   public void test() {
-
-      Volume volume = new Volume("2", 5, 50, "aadelucc@us.ibm.com", new Date(1260469075119l), "1", ImmutableSet
-            .<String> of(), "ext3", "New Storage", "67");
-
-      Volume compare = handler.apply(new HttpResponse(200, "ok", Payloads
-            .newInputStreamPayload(ParseVolumeFromJsonTest.class.getResourceAsStream("/volume.json"))));
-      assertEquals(compare, volume);
-   }
-}
diff --git a/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseVolumesFromJsonTest.java b/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseVolumesFromJsonTest.java
deleted file mode 100644
index 153b7bc2b8..0000000000
--- a/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseVolumesFromJsonTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- *
- * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
- *
- * ====================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
- */
-package org.jclouds.ibmdev.functions;
-
-import java.io.IOException;
-import java.util.Date;
-import java.util.Set;
-
-import org.jclouds.http.HttpResponse;
-import org.jclouds.ibmdev.config.IBMDeveloperCloudParserModule;
-import org.jclouds.ibmdev.domain.Volume;
-import org.jclouds.io.Payloads;
-import org.jclouds.json.config.GsonModule;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
-/**
- * Tests behavior of {@code ParseVolumesFromJson}
- * 
- * @author Adrian Cole
- */
-@Test(groups = "unit", sequential = true, testName = "ibmdev.ParseVolumesFromJsonTest")
-public class ParseVolumesFromJsonTest {
-
-   private ParseVolumesFromJson handler;
-
-   @BeforeTest
-   protected void setUpInjector() throws IOException {
-      Injector injector = Guice.createInjector(new IBMDeveloperCloudParserModule(), new GsonModule());
-      handler = injector.getInstance(ParseVolumesFromJson.class);
-   }
-
-   public void test() {
-      Volume volume1 = new Volume("2", 5, 50, "aadelucc@us.ibm.com", new Date(1260469075119l), "1", ImmutableSet
-            .<String> of(), "ext3", "New Storage", "67");
-
-      Volume volume2 = new Volume(null, 6, 51, "aadelucc@us.ibm.com", new Date(1260469075120l), "2", ImmutableSet
-            .<String> of("abrad"), "ext3", "New Storage1", "68");
-
-      Set<? extends Volume> compare = handler.apply(new HttpResponse(200, "ok", Payloads
-            .newInputStreamPayload(ParseVolumesFromJsonTest.class.getResourceAsStream("/volumes.json"))));
-      assert (compare.contains(volume1));
-      assert (compare.contains(volume2));
-   }
-}
diff --git a/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/xml/LocationsHandlerTest.java b/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/xml/LocationsHandlerTest.java
deleted file mode 100644
index 9e6eebe7f6..0000000000
--- a/sandbox-providers/ibmdev/src/test/java/org/jclouds/ibmdev/xml/LocationsHandlerTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- *
- * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
- *
- * ====================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ====================================================================
- */
-package org.jclouds.ibmdev.xml;
-
-import static org.testng.Assert.assertEquals;
-
-import java.io.InputStream;
-import java.util.Map;
-import java.util.Set;
-
-import org.jclouds.http.functions.BaseHandlerTest;
-import org.jclouds.ibmdev.domain.Location;
-import org.jclouds.ibmdev.reference.IBMDeveloperCloudConstants;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Tests behavior of {@code LocationsHandler}
- * 
- * @author Adrian Cole
- */
-@Test(groups = "unit", testName = "ibmdev.LocationsHandlerTest")
-public class LocationsHandlerTest extends BaseHandlerTest {
-   public void testLocation() {
-      InputStream is = getClass().getResourceAsStream("/location.xml");
-
-      Set<? extends Location> result = factory.create(injector.getInstance(LocationsHandler.class))
-               .parse(is);
-
-      Map<String, Map<String, String>> capabilites = ImmutableMap.<String, Map<String, String>> of(
-               IBMDeveloperCloudConstants.CAPABILITY_CAPACITY, ImmutableMap.<String, String> of(
-                        "SMALL", "50", "MEDIUM", "100", "LARGE", "200"),
-               IBMDeveloperCloudConstants.CAPABILITY_FORMAT, ImmutableMap.<String, String> of(
-                        "EXT3", "ext3"), IBMDeveloperCloudConstants.CAPABILITY_I386,
-               ImmutableMap.<String, String> of("SMALL", "SMALL", "MEDIUM", "MEDIUM", "LARGE",
-                        "LARGE"), IBMDeveloperCloudConstants.CAPABILITY_x86_64, ImmutableMap
-                        .<String, String> of(
-
-                        ));
-      Location location1 = new Location("1", "US North East: Poughkeepsie, NY", null, "POK",
-               capabilites);
-
-      assertEquals(result, ImmutableSet.of(location1));
-
-   }
-
-   @Test(enabled = false)
-   public void testAllLocations() {
-      InputStream is = getClass().getResourceAsStream("/locations.xml");
-
-      Set<? extends Location> result = factory.create(injector.getInstance(LocationsHandler.class))
-               .parse(is);
-
-      Map<String, Map<String, String>> capabilites = ImmutableMap.<String, Map<String, String>> of(
-               IBMDeveloperCloudConstants.CAPABILITY_CAPACITY, ImmutableMap.<String, String> of(
-                        "SMALL", "50", "MEDIUM", "100", "LARGE", "200"),
-               IBMDeveloperCloudConstants.CAPABILITY_FORMAT, ImmutableMap.<String, String> of(
-                        "EXT3", "ext3"), IBMDeveloperCloudConstants.CAPABILITY_I386,
-               ImmutableMap.<String, String> of("SMALL", "SMALL", "MEDIUM", "MEDIUM", "LARGE",
-                        "LARGE"), IBMDeveloperCloudConstants.CAPABILITY_x86_64, ImmutableMap
-                        .<String, String> of(
-
-                        ));
-      Location location1 = new Location("1", "US North East: Poughkeepsie, NY", null, "POK",
-               capabilites);
-
-      capabilites = ImmutableMap.<String, Map<String, String>> of(
-               IBMDeveloperCloudConstants.CAPABILITY_CAPACITY, ImmutableMap.<String, String> of(
-                        "SMALL", "50", "MEDIUM", "100", "LARGE", "200"),
-               IBMDeveloperCloudConstants.CAPABILITY_FORMAT, ImmutableMap.<String, String> of(
-                        "EXT3", "ext3"), IBMDeveloperCloudConstants.CAPABILITY_I386,
-               ImmutableMap.<String, String> of("SMALL", "SMALL", "MEDIUM", "MEDIUM", "LARGE",
-                        "LARGE"), IBMDeveloperCloudConstants.CAPABILITY_x86_64, ImmutableMap
-                        .<String, String> of(
-
-                        ));
-      Location location2 = new Location("1", "US North East: Poughkeepsie, NY", null, "POK",
-               capabilites);
-
-      assertEquals(result, ImmutableSet.of(location1, location2));
-
-   }
-
-}
diff --git a/sandbox-providers/ibmdev/src/test/resources/instance.json b/sandbox-providers/ibmdev/src/test/resources/instance.json
deleted file mode 100644
index 85ecabf4be..0000000000
--- a/sandbox-providers/ibmdev/src/test/resources/instance.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "launchTime":1260472231726, 
-  "software": 
-     [ 
-       { "version":"10 SP2", "type":"OS", "name":"SUSE Linux Enterprise" } 
-     ], 
-  "ip":"129.33.197.78  ", 
-  "requestId":"7430", 
-  "keyName":"DEFAULT", 
-  "name":"ABC", 
-  "instanceType":"MEDIUM", 
-  "status":5, 
-  "owner":"aadelucc@us.ibm.com", 
-  "hostname":"vm723.developer.ihost.com  ", 
-  "location":"1", 
-  "imageId":"3", 
-  "productCodes":[], 
-  "requestName":"ABC",
-  "id":"7430", 
-  "expirationTime":1263064240837
-}
\ No newline at end of file
diff --git a/sandbox-providers/ibmdev/src/test/resources/instances.json b/sandbox-providers/ibmdev/src/test/resources/instances.json
deleted file mode 100644
index 3300546078..0000000000
--- a/sandbox-providers/ibmdev/src/test/resources/instances.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-"instances":[ 
- {
-  "launchTime":1260472231726, 
-  "software": 
-     [ 
-       { "version":"10 SP2", "type":"OS", "name":"SUSE Linux Enterprise" } 
-     ], 
-  "ip":"129.33.197.78  ", 
-  "requestId":"7430", 
-  "keyName":"DEFAULT", 
-  "name":"ABC", 
-  "instanceType":"MEDIUM", 
-  "status":5, 
-  "owner":"aadelucc@us.ibm.com", 
-  "hostname":"vm723.developer.ihost.com  ", 
-  "location":"1", 
-  "imageId":"3", 
-  "productCodes":[], 
-  "requestName":"ABC",
-  "id":"7430", 
-  "expirationTime":1263064240837
- },
-  {
-  "launchTime":1260472231727, 
-  "software": 
-     [ 
-       { "version":"10 SP3", "type":"OS", "name":"SUSE Linux Enterprise" } 
-     ], 
-  "ip":"         ", 
-  "requestId":"7431", 
-  "keyName":"DEFAULT", 
-  "name":"ABC", 
-  "instanceType":"MEDIUM", 
-  "status":1, 
-  "owner":"aadelucc@us.ibm.com", 
-  "hostname":"        ", 
-  "location":"2", 
-  "imageId":"4", 
-  "productCodes":[], 
-  "requestName":"ABC",
-  "id":"7431", 
-  "expirationTime":1263064240838
- }
-]
-}
\ No newline at end of file
diff --git a/sandbox-providers/ibmdev/src/test/resources/location.xml b/sandbox-providers/ibmdev/src/test/resources/location.xml
deleted file mode 100644
index ffc57fb207..0000000000
--- a/sandbox-providers/ibmdev/src/test/resources/location.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<ns2:DescribeLocationResponse
-    xmlns:ns2="http://www.ibm.com/xmlns/b2b/cloud/api/2009-04-03">
-    <Location>
-        <ID>1</ID>
-        <Name>US North East: Poughkeepsie, NY</Name>
-        <Description></Description>
-        <Location>POK</Location>
-        <Capabilities>
-            <Capability id="oss.storage.capacity">
-                <Entry key="SMALL">
-                    <Value>50</Value>
-                </Entry>
-                <Entry key="MEDIUM">
-                    <Value>100</Value>
-                </Entry>
-                <Entry key="LARGE">
-                    <Value>200</Value>
-                </Entry>
-            </Capability>
-            <Capability id="oss.storage.format">
-                <Entry key="EXT3">
-                    <Value>ext3</Value>
-                </Entry>
-            </Capability>
-            <Capability id="oss.instance.spec.i386">
-                <Entry key="SMALL">
-                    <Value>SMALL</Value>
-                </Entry>
-                <Entry key="MEDIUM">
-                    <Value>MEDIUM</Value>
-                </Entry>
-                <Entry key="LARGE">
-                    <Value>LARGE</Value>
-                </Entry>
-            </Capability>
-            <Capability id="oss.instance.spec.x86_64" />
-        </Capabilities>
-    </Location>
-</ns2:DescribeLocationResponse>
\ No newline at end of file
diff --git a/sandbox-providers/rimuhosting/pom.xml b/sandbox-providers/rimuhosting/pom.xml
index 99a2eb5ba2..234f429f1d 100644
--- a/sandbox-providers/rimuhosting/pom.xml
+++ b/sandbox-providers/rimuhosting/pom.xml
@@ -33,6 +33,7 @@
     <artifactId>rimuhosting</artifactId>
     <name>jclouds RimuHosting provider</name>
     <description>ComputeService implementation of RimuHosting datacenters </description>
+    <packaging>bundle</packaging>
 
     <properties>
         <!-- when instances are hung, open a ticket and add here -->
@@ -127,4 +128,20 @@
             </build>
         </profile>
     </profiles>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.rimuhosting.miro.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/binder/CreateServerOptions.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/binder/CreateServerOptions.java
index 838f101400..0ae1e9c94a 100644
--- a/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/binder/CreateServerOptions.java
+++ b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/binder/CreateServerOptions.java
@@ -24,7 +24,10 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import javax.inject.Inject;
+
 import org.jclouds.http.HttpRequest;
+import org.jclouds.json.Json;
 import org.jclouds.rimuhosting.miro.data.CreateOptions;
 import org.jclouds.rimuhosting.miro.data.NewServerData;
 import org.jclouds.rimuhosting.miro.domain.MetaData;
@@ -33,7 +36,11 @@ import org.jclouds.rimuhosting.miro.domain.MetaData;
  * @author Ivan Meredith
  */
 public class CreateServerOptions extends RimuHostingJsonBinder {
-
+   @Inject
+   public CreateServerOptions(Json jsonBinder) {
+      super(jsonBinder);
+   }
+   
    private String password;
    private List<MetaData> metaData = new ArrayList<MetaData>();
 
diff --git a/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/binder/RimuHostingJsonBinder.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/binder/RimuHostingJsonBinder.java
index 1bf1d54f7e..847336708b 100644
--- a/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/binder/RimuHostingJsonBinder.java
+++ b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/binder/RimuHostingJsonBinder.java
@@ -21,7 +21,10 @@ package org.jclouds.rimuhosting.miro.binder;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.inject.Inject;
+
 import org.jclouds.http.HttpRequest;
+import org.jclouds.json.Json;
 import org.jclouds.rest.binders.BindToJsonPayload;
 
 /**
@@ -32,6 +35,11 @@ import org.jclouds.rest.binders.BindToJsonPayload;
  * @author Ivan Meredith
  */
 public class RimuHostingJsonBinder extends BindToJsonPayload {
+   @Inject
+   public RimuHostingJsonBinder(Json jsonBinder) {
+      super(jsonBinder);
+   }
+
    @Override
    public <R extends HttpRequest> R bindToRequest(R request, Map<String, String> postParams) {
       return bindToRequest(request, (Object) postParams);
diff --git a/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/binder/RimuHostingRebootJsonBinder.java b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/binder/RimuHostingRebootJsonBinder.java
index 750c6e9bdc..e766544f8f 100644
--- a/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/binder/RimuHostingRebootJsonBinder.java
+++ b/sandbox-providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/binder/RimuHostingRebootJsonBinder.java
@@ -20,7 +20,10 @@ package org.jclouds.rimuhosting.miro.binder;
 
 import java.util.Map;
 
+import javax.inject.Inject;
+
 import org.jclouds.http.HttpRequest;
+import org.jclouds.json.Json;
 
 import com.google.common.collect.ImmutableMap;
 
@@ -32,6 +35,11 @@ import com.google.common.collect.ImmutableMap;
  * @author Ivan Meredith
  */
 public class RimuHostingRebootJsonBinder extends RimuHostingJsonBinder {
+   @Inject
+   public RimuHostingRebootJsonBinder(Json jsonBinder) {
+      super(jsonBinder);
+   }
+
    @Override
    public <R extends HttpRequest> R bindToRequest(R request, Map<String, String> postParams) {
       return super.bindToRequest(request, (Object) ImmutableMap.of("running_state", "RESTARTING"));
diff --git a/sandbox-providers/softlayer/pom.xml b/sandbox-providers/softlayer/pom.xml
index 52c3a524e5..2348d8e0b8 100644
--- a/sandbox-providers/softlayer/pom.xml
+++ b/sandbox-providers/softlayer/pom.xml
@@ -37,6 +37,8 @@
     <artifactId>softlayer</artifactId>
     <name>jclouds SoftLayer core</name>
     <description>jclouds components to access SoftLayer</description>
+    <packaging>bundle</packaging>
+
     <!-- bootstrapping: need to fetch the project POM -->
     <repositories>
         <repository>
@@ -126,4 +128,19 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.softlayer.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/sandbox-providers/twitter/pom.xml b/sandbox-providers/twitter/pom.xml
index 38cb426e9f..f826bb00c7 100644
--- a/sandbox-providers/twitter/pom.xml
+++ b/sandbox-providers/twitter/pom.xml
@@ -34,6 +34,7 @@
     <artifactId>twitter</artifactId>
     <name>jclouds twitter core</name>
     <description>jclouds components to access twitter</description>
+    <packaging>bundle</packaging>
     
     <!-- bootstrapping: need to fetch the project POM -->
     <repositories>
@@ -124,4 +125,20 @@
             </build>
         </profile>
     </profiles>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.twitter.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/scriptbuilder/pom.xml b/scriptbuilder/pom.xml
index 42dd34c6ab..925f3bf09e 100644
--- a/scriptbuilder/pom.xml
+++ b/scriptbuilder/pom.xml
@@ -32,6 +32,7 @@
     <artifactId>jclouds-scriptbuilder</artifactId>
     <name>jclouds script builder</name>
     <description>creates scripts that can be used to manage services</description>
+    <packaging>bundle</packaging>
     <properties>
         <jclouds.test.listener></jclouds.test.listener>
     </properties>
@@ -42,4 +43,20 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.scriptbuilder.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/skeletons/standalone-compute/pom.xml b/skeletons/standalone-compute/pom.xml
index ce6b4b0d9e..c172a9e999 100644
--- a/skeletons/standalone-compute/pom.xml
+++ b/skeletons/standalone-compute/pom.xml
@@ -31,6 +31,8 @@
     <groupId>org.jclouds.api</groupId>
     <artifactId>servermanager</artifactId>
     <name>jclouds example components for a standalone compute provider</name>
+    <packaging>bundle</packaging>
+
     <properties>
         <!-- when instances are hung, open a ticket and add here -->
         <jclouds.compute.blacklist-nodes>trmkrun-ccc,test.trmk-924</jclouds.compute.blacklist-nodes>
@@ -122,4 +124,19 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>    
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>org.jclouds.servermanager.*;version="${project.version}"</Export-Package>
+                        <Import-Package>org.jclouds.*;version="${project.version}",*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>