diff --git a/examples/pom.xml b/examples/pom.xml
index 1bddc60435..2e6169cd52 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -27,11 +27,21 @@
 			<artifactId>client-java-proto</artifactId>
 			<version>1.0.0-beta5-SNAPSHOT</version>
 		</dependency>
+		<dependency>
+			<groupId>com.google.code.gson</groupId>
+			<artifactId>gson</artifactId>
+			<version>2.6.2</version>
+		</dependency>
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>22.0</version>
+			<version>21.0</version>
 		</dependency>
+		<dependency>
+   <groupId>io.fabric8</groupId>
+   <artifactId>kubernetes-api</artifactId>
+   <version>2.0.37</version>
+</dependency>
 		<!-- test dependencies -->
 		<dependency>
 			<groupId>junit</groupId>
diff --git a/examples/src/main/java/io/kubernetes/client/examples/WatchExample.java b/examples/src/main/java/io/kubernetes/client/examples/WatchExample.java
index 4b5afab4d0..3a1997b0a1 100644
--- a/examples/src/main/java/io/kubernetes/client/examples/WatchExample.java
+++ b/examples/src/main/java/io/kubernetes/client/examples/WatchExample.java
@@ -12,16 +12,19 @@
 */
 package io.kubernetes.client.examples;
 
-import com.google.gson.reflect.TypeToken;
+import java.io.IOException;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+import com.google.gson.Gson;
+
 import io.kubernetes.client.ApiClient;
 import io.kubernetes.client.ApiException;
 import io.kubernetes.client.Configuration;
 import io.kubernetes.client.apis.CoreV1Api;
-import io.kubernetes.client.models.V1Namespace;
+import io.kubernetes.client.models.V1Node;
+import io.kubernetes.client.models.V1NodeList;
 import io.kubernetes.client.util.Config;
-import io.kubernetes.client.util.Watch;
-import java.io.IOException;
-import java.util.concurrent.TimeUnit;
 
 /** A simple example of how to use Watch API to watch changes in Namespace list. */
 public class WatchExample {
@@ -30,17 +33,34 @@ public static void main(String[] args) throws IOException, ApiException {
     client.getHttpClient().setReadTimeout(60, TimeUnit.SECONDS);
     Configuration.setDefaultApiClient(client);
 
-    CoreV1Api api = new CoreV1Api();
-
-    Watch<V1Namespace> watch =
-        Watch.createWatch(
-            client,
-            api.listNamespaceCall(
-                null, null, null, null, null, 5, null, null, Boolean.TRUE, null, null),
-            new TypeToken<Watch.Response<V1Namespace>>() {}.getType());
+    CoreV1Api api = new CoreV1Api(client);
 
-    for (Watch.Response<V1Namespace> item : watch) {
-      System.out.printf("%s : %s%n", item.type, item.object.getMetadata().getName());
-    }
+//    Watch<V1Namespace> watch =
+//        Watch.createWatch(
+//            client,
+//            api.listNamespaceCall(
+//                null, null, null, null, null, 5, null, null, Boolean.TRUE, null, null),
+//            new TypeToken<Watch.Response<V1Namespace>>() {}.getType());
+//
+//    for (Watch.Response<V1Namespace> item : watch) {
+//      System.out.printf("%s : %s%n", item.type, item.object.getMetadata().getName());
+//    }
+    
+    V1NodeList nodeList = null;
+    try {
+    	nodeList = api.listNode("true", null, null, null, null, null, null, null, null);
+            for (V1Node node : nodeList.getItems()) {
+            	Map<String, String>  map = node.getMetadata().getLabels();
+            	// Map<String, List<String>> deviceMap = new HashMap<>();
+            	System.out.println(new Gson().toJson(map));
+            	for (Map.Entry<String, String> entry : map.entrySet()) {
+            		//if(entry.getKey().indexOf("hostname") > -1 || entry.getKey().indexOf("network-device") > -1) {
+            			//System.out.println(entry.getKey() + " : " + entry.getValue());
+            		//}
+            	}
+            }
+        } catch (Exception e) {
+        	e.printStackTrace();
+        }
   }
 }
diff --git a/kubernetes/src/main/java/io/kubernetes/client/ApiClient.java b/kubernetes/src/main/java/io/kubernetes/client/ApiClient.java
index c6bccd3464..4cba142b91 100644
--- a/kubernetes/src/main/java/io/kubernetes/client/ApiClient.java
+++ b/kubernetes/src/main/java/io/kubernetes/client/ApiClient.java
@@ -52,7 +52,7 @@
 
 public class ApiClient {
 
-    private String basePath = "https://localhost";
+    private String basePath = "https://api.system.svc.31.tess.io";
     private boolean debugging = false;
     private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
     private String tempFolderPath = null;
diff --git a/kubernetes/src/main/java/io/kubernetes/client/custom/SuffixFormatter.java b/kubernetes/src/main/java/io/kubernetes/client/custom/SuffixFormatter.java
index 03671cc9c1..2a219da30d 100644
--- a/kubernetes/src/main/java/io/kubernetes/client/custom/SuffixFormatter.java
+++ b/kubernetes/src/main/java/io/kubernetes/client/custom/SuffixFormatter.java
@@ -34,7 +34,7 @@ public class SuffixFormatter {
 
     private static final Map<BaseExponent, String> decimalToSuffix = new HashMap<BaseExponent, String>() {
         {
-            for (Entry<String, BaseExponent> entry : suffixToDecimal.entrySet()) {
+            for (java.util.Map.Entry<String, BaseExponent> entry : suffixToDecimal.entrySet()) {
                 put(entry.getValue(), entry.getKey());
             }
         }
@@ -42,7 +42,7 @@ public class SuffixFormatter {
 
     private static final Map<BaseExponent, String> binaryToSuffix = new HashMap<BaseExponent, String>() {
         {
-            for (Entry<String, BaseExponent> entry : suffixToBinary.entrySet()) {
+            for (java.util.Map.Entry<String, BaseExponent> entry : suffixToBinary.entrySet()) {
                 put(entry.getValue(), entry.getKey());
             }
         }
diff --git a/util/src/main/java/io/kubernetes/client/util/credentials/AccessTokenAuthentication.java b/util/src/main/java/io/kubernetes/client/util/credentials/AccessTokenAuthentication.java
index 9e309fe176..affd3a57e6 100644
--- a/util/src/main/java/io/kubernetes/client/util/credentials/AccessTokenAuthentication.java
+++ b/util/src/main/java/io/kubernetes/client/util/credentials/AccessTokenAuthentication.java
@@ -1,6 +1,5 @@
 package io.kubernetes.client.util.credentials;
 
-import com.google.common.base.Preconditions;
 import io.kubernetes.client.ApiClient;
 
 /** Uses a Bearer Token to configure {@link ApiClient} authentication to the Kubernetes API. */
@@ -8,7 +7,6 @@ public class AccessTokenAuthentication implements Authentication {
   private String token;
 
   public AccessTokenAuthentication(final String token) {
-    Preconditions.checkNotNull(token, "Access Token cannot be null");
     this.token = token;
   }