diff --git a/src/main/java/com/lambdaworks/redis/RedisClusterAsyncConnection.java b/src/main/java/com/lambdaworks/redis/RedisClusterAsyncConnection.java
index 5326d2054f..3fe5308ad1 100644
--- a/src/main/java/com/lambdaworks/redis/RedisClusterAsyncConnection.java
+++ b/src/main/java/com/lambdaworks/redis/RedisClusterAsyncConnection.java
@@ -18,7 +18,7 @@
 public interface RedisClusterAsyncConnection<K, V> extends RedisHashesAsyncConnection<K, V>, RedisKeysAsyncConnection<K, V>,
         RedisStringsAsyncConnection<K, V>, RedisListsAsyncConnection<K, V>, RedisSetsAsyncConnection<K, V>,
         RedisSortedSetsAsyncConnection<K, V>, RedisScriptingAsyncConnection<K, V>, RedisServerAsyncConnection<K, V>,
-        RedisHLLAsyncConnection<K, V>, BaseRedisAsyncConnection<K, V> {
+        RedisHLLAsyncConnection<K, V>, RedisGeoAsyncConnection<K, V>, BaseRedisAsyncConnection<K, V> {
 
     /**
      * Set the default timeout for operations.
@@ -126,7 +126,8 @@ public interface RedisClusterAsyncConnection<K, V> extends RedisHashesAsyncConne
      * {@link com.lambdaworks.redis.cluster.models.partitions.ClusterPartitionParser#parse}
      *
      * @param nodeId node id of the master node
-     * @return List&lt;String&gt; array-reply list of slaves. The command returns data in the same format as {@link #clusterNodes()} but one line per slave.
+     * @return List&lt;String&gt; array-reply list of slaves. The command returns data in the same format as
+     *         {@link #clusterNodes()} but one line per slave.
      */
     RedisFuture<List<String>> clusterSlaves(String nodeId);
 
diff --git a/src/main/java/com/lambdaworks/redis/RedisClusterConnection.java b/src/main/java/com/lambdaworks/redis/RedisClusterConnection.java
index c9841ef2d3..35a651495c 100644
--- a/src/main/java/com/lambdaworks/redis/RedisClusterConnection.java
+++ b/src/main/java/com/lambdaworks/redis/RedisClusterConnection.java
@@ -3,8 +3,6 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.api.sync.*;
-
 /**
  * A complete synchronous and thread-safe cluster Redis API with 400+ Methods.
  * 
@@ -17,7 +15,8 @@
 @Deprecated
 public interface RedisClusterConnection<K, V> extends RedisHashesConnection<K, V>, RedisKeysConnection<K, V>,
         RedisStringsConnection<K, V>, RedisListsConnection<K, V>, RedisSetsConnection<K, V>, RedisSortedSetsConnection<K, V>,
-        RedisScriptingConnection<K, V>, RedisServerConnection<K, V>, RedisHLLConnection<K, V>, AutoCloseable {
+        RedisScriptingConnection<K, V>, RedisServerConnection<K, V>, RedisHLLConnection<K, V>, RedisGeoConnection<K, V>,
+        AutoCloseable {
 
     /**
      * Set the default timeout for operations.
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/RedisClusterAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/RedisClusterAsyncCommands.java
index 1ed26944be..f6b4bb19b1 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/RedisClusterAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/RedisClusterAsyncCommands.java
@@ -19,7 +19,8 @@
 public interface RedisClusterAsyncCommands<K, V> extends RedisHashAsyncCommands<K, V>, RedisKeyAsyncCommands<K, V>,
         RedisStringAsyncCommands<K, V>, RedisListAsyncCommands<K, V>, RedisSetAsyncCommands<K, V>,
         RedisSortedSetAsyncCommands<K, V>, RedisScriptingAsyncCommands<K, V>, RedisServerAsyncCommands<K, V>,
-        RedisHLLAsyncCommands<K, V>, BaseRedisAsyncCommands<K, V>, RedisClusterAsyncConnection<K, V> {
+        RedisHLLAsyncCommands<K, V>, RedisGeoAsyncCommands<K, V>, BaseRedisAsyncCommands<K, V>,
+        RedisClusterAsyncConnection<K, V> {
 
     /**
      * Set the default timeout for operations.
@@ -127,7 +128,8 @@ public interface RedisClusterAsyncCommands<K, V> extends RedisHashAsyncCommands<
      * {@link com.lambdaworks.redis.cluster.models.partitions.ClusterPartitionParser#parse}
      *
      * @param nodeId node id of the master node
-     * @return List&lt;String&gt; array-reply list of slaves. The command returns data in the same format as {@link #clusterNodes()} but one line per slave.
+     * @return List&lt;String&gt; array-reply list of slaves. The command returns data in the same format as
+     *         {@link #clusterNodes()} but one line per slave.
      */
     RedisFuture<List<String>> clusterSlaves(String nodeId);
 
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/rx/RedisClusterReactiveCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/rx/RedisClusterReactiveCommands.java
index ee327f6465..072745694b 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/rx/RedisClusterReactiveCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/rx/RedisClusterReactiveCommands.java
@@ -1,22 +1,11 @@
 package com.lambdaworks.redis.cluster.api.rx;
 
-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import com.lambdaworks.redis.RedisFuture;
 import rx.Observable;
 
-import com.lambdaworks.redis.api.rx.BaseRedisReactiveCommands;
-import com.lambdaworks.redis.api.rx.RedisHLLReactiveCommands;
-import com.lambdaworks.redis.api.rx.RedisHashReactiveCommands;
-import com.lambdaworks.redis.api.rx.RedisKeyReactiveCommands;
-import com.lambdaworks.redis.api.rx.RedisListReactiveCommands;
-import com.lambdaworks.redis.api.rx.RedisScriptingReactiveCommands;
-import com.lambdaworks.redis.api.rx.RedisServerReactiveCommands;
-import com.lambdaworks.redis.api.rx.RedisSetReactiveCommands;
-import com.lambdaworks.redis.api.rx.RedisSortedSetReactiveCommands;
-import com.lambdaworks.redis.api.rx.RedisStringReactiveCommands;
+import com.lambdaworks.redis.api.rx.*;
 
 /**
  * A complete reactive and thread-safe cluster Redis API with 400+ Methods.
@@ -29,7 +18,7 @@
 public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCommands<K, V>, RedisKeyReactiveCommands<K, V>,
         RedisStringReactiveCommands<K, V>, RedisListReactiveCommands<K, V>, RedisSetReactiveCommands<K, V>,
         RedisSortedSetReactiveCommands<K, V>, RedisScriptingReactiveCommands<K, V>, RedisServerReactiveCommands<K, V>,
-        RedisHLLReactiveCommands<K, V>, BaseRedisReactiveCommands<K, V> {
+        RedisHLLReactiveCommands<K, V>, RedisGeoReactiveCommands<K, V>, BaseRedisReactiveCommands<K, V> {
 
     /**
      * Set the default timeout for operations.
@@ -137,7 +126,8 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      * {@link com.lambdaworks.redis.cluster.models.partitions.ClusterPartitionParser#parse}
      *
      * @param nodeId node id of the master node
-     * @return List&lt;String&gt; array-reply list of slaves. The command returns data in the same format as {@link #clusterNodes()} but one line per slave.
+     * @return List&lt;String&gt; array-reply list of slaves. The command returns data in the same format as
+     *         {@link #clusterNodes()} but one line per slave.
      */
     Observable<String> clusterSlaves(String nodeId);
 
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/RedisClusterCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/RedisClusterCommands.java
index f0dac5c7cf..0638e26457 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/RedisClusterCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/RedisClusterCommands.java
@@ -4,15 +4,7 @@
 import java.util.concurrent.TimeUnit;
 
 import com.lambdaworks.redis.RedisClusterConnection;
-import com.lambdaworks.redis.api.sync.RedisHLLCommands;
-import com.lambdaworks.redis.api.sync.RedisHashCommands;
-import com.lambdaworks.redis.api.sync.RedisKeyCommands;
-import com.lambdaworks.redis.api.sync.RedisListCommands;
-import com.lambdaworks.redis.api.sync.RedisScriptingCommands;
-import com.lambdaworks.redis.api.sync.RedisServerCommands;
-import com.lambdaworks.redis.api.sync.RedisSetCommands;
-import com.lambdaworks.redis.api.sync.RedisSortedSetCommands;
-import com.lambdaworks.redis.api.sync.RedisStringCommands;
+import com.lambdaworks.redis.api.sync.*;
 
 /**
  * A complete synchronous and thread-safe Redis Cluster API with 400+ Methods.
@@ -24,7 +16,7 @@
  */
 public interface RedisClusterCommands<K, V> extends RedisHashCommands<K, V>, RedisKeyCommands<K, V>, RedisStringCommands<K, V>,
         RedisListCommands<K, V>, RedisSetCommands<K, V>, RedisSortedSetCommands<K, V>, RedisScriptingCommands<K, V>,
-        RedisServerCommands<K, V>, RedisHLLCommands<K, V>, AutoCloseable, RedisClusterConnection<K, V> {
+        RedisServerCommands<K, V>, RedisHLLCommands<K, V>, RedisGeoCommands<K, V>, AutoCloseable, RedisClusterConnection<K, V> {
 
     /**
      * Set the default timeout for operations.