diff --git a/ceilometer-java/ceilometer-client/src/main/java/org/openstack/ceilometer/CeilometerClient.java b/ceilometer-java/ceilometer-client/src/main/java/org/openstack/ceilometer/CeilometerClient.java
index 0c820163f..2b542afe1 100644
--- a/ceilometer-java/ceilometer-client/src/main/java/org/openstack/ceilometer/CeilometerClient.java
+++ b/ceilometer-java/ceilometer-client/src/main/java/org/openstack/ceilometer/CeilometerClient.java
@@ -14,7 +14,7 @@ public CeilometerClient(String endpointURL, String token) {
 	public <R> R execute(CeilometerCommand<R> command) {
 		WebTarget endpoint = OpenStack.CLIENT.target(endpointURL);
 		if(token != null) {
-			endpoint.configuration().register(tokenFilter);
+			endpoint.register(tokenFilter);
 		}
 		return command.execute(endpoint);
 	}
diff --git a/glance-client/src/main/java/org/openstack/glance/GlanceClient.java b/glance-client/src/main/java/org/openstack/glance/GlanceClient.java
index f4e76bc1b..7741ef634 100644
--- a/glance-client/src/main/java/org/openstack/glance/GlanceClient.java
+++ b/glance-client/src/main/java/org/openstack/glance/GlanceClient.java
@@ -14,7 +14,7 @@ public GlanceClient(String endpointURL, String token) {
 	public <R> R execute(GlanceCommand<R> command) {
 		WebTarget endpoint = OpenStack.CLIENT.target(endpointURL);
 		if(token != null) {
-			endpoint.configuration().register(tokenFilter);
+			endpoint.register(tokenFilter);
 		}
 		return command.execute(endpoint);
 	}
diff --git a/keystone-client/src/main/java/org/openstack/keystone/KeystoneClient.java b/keystone-client/src/main/java/org/openstack/keystone/KeystoneClient.java
index 482830c89..2a51e98e5 100644
--- a/keystone-client/src/main/java/org/openstack/keystone/KeystoneClient.java
+++ b/keystone-client/src/main/java/org/openstack/keystone/KeystoneClient.java
@@ -18,7 +18,7 @@ public KeystoneClient(String endpointURL) {
 	public <R> R execute(KeystoneCommand<R> command) {
 		WebTarget endpoint = OpenStack.CLIENT.target(endpointURL);
 		if(token != null) {
-			endpoint.configuration().register(tokenFilter);
+			endpoint.register(tokenFilter);
 		}
 		return command.execute(endpoint);
 	}
diff --git a/nova-client/src/main/java/org/openstack/nova/NovaClient.java b/nova-client/src/main/java/org/openstack/nova/NovaClient.java
index e4995465e..a7b38b80e 100644
--- a/nova-client/src/main/java/org/openstack/nova/NovaClient.java
+++ b/nova-client/src/main/java/org/openstack/nova/NovaClient.java
@@ -14,7 +14,7 @@ public NovaClient(String endpointURL, String token) {
 	public <R> R execute(NovaCommand<R> command) {
 		WebTarget endpoint = OpenStack.CLIENT.target(endpointURL);
 		if(token != null) {
-			endpoint.configuration().register(tokenFilter);
+			endpoint.register(tokenFilter);
 		}
 		return command.execute(endpoint);
 	}
diff --git a/openstack-client/src/main/java/org/openstack/OpenStack.java b/openstack-client/src/main/java/org/openstack/OpenStack.java
index 1be02a5bd..7235af0ce 100644
--- a/openstack-client/src/main/java/org/openstack/OpenStack.java
+++ b/openstack-client/src/main/java/org/openstack/OpenStack.java
@@ -59,7 +59,7 @@ private static void initialize() {
 			SSLContext context = null;
             context = SSLContext.getInstance("SSL");
             context.init(null, null, null);
-	        CLIENT.configuration().setProperty(ClientProperties.SSL_CONFIG, new SslConfig(context));
+	        CLIENT.setProperty(ClientProperties.SSL_CONFIG, new SslConfig(context));
 			
 			DEFAULT_MAPPER = new ObjectMapper();
 			
@@ -75,7 +75,7 @@ private static void initialize() {
 			WRAPPED_MAPPER.enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE);
 			WRAPPED_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 			
-			CLIENT.configuration().register(new JacksonFeature()).register(new ContextResolver<ObjectMapper>() {
+			CLIENT.register(new JacksonFeature()).register(new ContextResolver<ObjectMapper>() {
 
 				public ObjectMapper getContext(Class<?> type) {
 					return type.getAnnotation(JsonRootName.class) == null ? DEFAULT_MAPPER : WRAPPED_MAPPER;
@@ -83,7 +83,7 @@ public ObjectMapper getContext(Class<?> type) {
 				
 			});
 			
-			CLIENT.configuration().register(new ClientRequestFilter() {
+			CLIENT.register(new ClientRequestFilter() {
 				
 				public void filter(ClientRequestContext requestContext) throws IOException {
 					requestContext.getHeaders().remove("Content-Language");
@@ -91,7 +91,7 @@ public void filter(ClientRequestContext requestContext) throws IOException {
 				}
 			});
 			
-			CLIENT.configuration().register(new LoggingFilter(Logger.getLogger("openstack"), true));
+			CLIENT.register(new LoggingFilter(Logger.getLogger("openstack"), true));
 		} catch(Exception e) {
 			throw new RuntimeException(e.getMessage(), e);
 		}
diff --git a/openstack-client/src/main/java/org/openstack/common/client/AbstractOpenStackClient.java b/openstack-client/src/main/java/org/openstack/common/client/AbstractOpenStackClient.java
index 5f9bcabd0..62a466f47 100644
--- a/openstack-client/src/main/java/org/openstack/common/client/AbstractOpenStackClient.java
+++ b/openstack-client/src/main/java/org/openstack/common/client/AbstractOpenStackClient.java
@@ -44,7 +44,7 @@ public void setToken(String token) {
 	public OpenStackRequest request(String uri, String... mediaTypes) {
 		WebTarget endpoint = OpenStack.CLIENT.target(endpointURL);
 		if(token != null) {
-			endpoint.configuration().register(tokenFilter);
+			endpoint.register(tokenFilter);
 		}
 		return new OpenStackRequest(endpoint.path(uri).request(mediaTypes));
 	}
diff --git a/openstack-examples/src/main/java/org/openstack/examples/objectstore/SwiftExample.java b/openstack-examples/src/main/java/org/openstack/examples/objectstore/SwiftExample.java
index f3f76033c..919ae4c90 100644
--- a/openstack-examples/src/main/java/org/openstack/examples/objectstore/SwiftExample.java
+++ b/openstack-examples/src/main/java/org/openstack/examples/objectstore/SwiftExample.java
@@ -12,7 +12,6 @@
 import org.openstack.keystone.utils.KeystoneUtils;
 import org.openstack.swift.SwiftClient;
 import org.openstack.swift.api.CreateContainer;
-import org.openstack.swift.api.DeleteContainer;
 import org.openstack.swift.api.ListContainers;
 import org.openstack.swift.api.ListObjects;
 import org.openstack.swift.api.UploadObject;
@@ -48,19 +47,19 @@ public static void main(String[] args) throws Exception {
 			
 			SwiftClient swiftClient = new SwiftClient(KeystoneUtils.findEndpointURL(access.getServiceCatalog(), "object-store", null, "public"), access.getToken().getId());
 		
-			swiftClient.execute(new DeleteContainer("navidad"));
+			//swiftClient.execute(new DeleteContainer("navidad2"));
 			
-			swiftClient.execute(new CreateContainer("navidad"));
+			swiftClient.execute(new CreateContainer("navidad2"));
 			
 			System.out.println(swiftClient.execute(new ListContainers()));
 			
 			ObjectForUpload upload = new ObjectForUpload();
-			upload.setContainer("navidad");
-			upload.setName("example");
+			upload.setContainer("navidad2");
+			upload.setName("example2");
 			upload.setInputStream(new FileInputStream(TEST_FILE));
 			swiftClient.execute(new UploadObject(upload));
 			
-			System.out.println(swiftClient.execute(new ListObjects("navidad", new HashMap<String, String>() {{
+			System.out.println(swiftClient.execute(new ListObjects("navidad2", new HashMap<String, String>() {{
 				put("path", "");
 			}})).get(0).getContentType());
 			
diff --git a/swift-client/src/main/java/org/openstack/swift/SwiftClient.java b/swift-client/src/main/java/org/openstack/swift/SwiftClient.java
index 898243513..8fc6a6861 100644
--- a/swift-client/src/main/java/org/openstack/swift/SwiftClient.java
+++ b/swift-client/src/main/java/org/openstack/swift/SwiftClient.java
@@ -14,7 +14,7 @@ public SwiftClient(String endpointURL, String token) {
 	public <R> R execute(SwiftCommand<R> command) {
 		WebTarget endpoint = OpenStack.CLIENT.target(endpointURL);
 		if(token != null) {
-			endpoint.configuration().register(tokenFilter);
+			endpoint.register(tokenFilter);
 		}
 		return command.execute(endpoint);
 	}