diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionHashAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionHashAsyncCommands.java
index 0b2e2548a9..9b3022d374 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionHashAsyncCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/async/NodeSelectionHashAsyncCommands.java
@@ -119,16 +119,6 @@ public interface NodeSelectionHashAsyncCommands<K, V> {
      */
     AsyncExecutions<Long> hlen(K key);
 
-    /**
-     * Get the string length of the field value in a hash.
-     *
-     * @param key the key
-     * @param field the field type: key
-     * @return Long integer-reply the string length of the {@code field} value, or {@code 0} when {@code field} is not present
-     *         in the hash or {@code key} does not exist at all.
-     */
-    AsyncExecutions<Long> hstrlen(K key, K field);
-
     /**
      * Get the values of all the given hash fields.
      * 
@@ -158,50 +148,6 @@ public interface NodeSelectionHashAsyncCommands<K, V> {
      */
     AsyncExecutions<String> hmset(K key, Map<K, V> map);
 
-    /**
-     * Set the string value of a hash field.
-     * 
-     * @param key the key
-     * @param field the field type: key
-     * @param value the value
-     * @return Boolean integer-reply specifically:
-     * 
-     *         {@literal true} if {@code field} is a new field in the hash and {@code value} was set. {@literal false} if
-     *         {@code field} already exists in the hash and the value was updated.
-     */
-    AsyncExecutions<Boolean> hset(K key, K field, V value);
-
-    /**
-     * Set the value of a hash field, only if the field does not exist.
-     * 
-     * @param key the key
-     * @param field the field type: key
-     * @param value the value
-     * @return Boolean integer-reply specifically:
-     * 
-     *         {@code 1} if {@code field} is a new field in the hash and {@code value} was set. {@code 0} if {@code field}
-     *         already exists in the hash and no operation was performed.
-     */
-    AsyncExecutions<Boolean> hsetnx(K key, K field, V value);
-
-    /**
-     * Get all the values in a hash.
-     * 
-     * @param key the key
-     * @return List&lt;V&gt; array-reply list of values in the hash, or an empty list when {@code key} does not exist.
-     */
-    AsyncExecutions<List<V>> hvals(K key);
-
-    /**
-     * Stream over all the values in a hash.
-     * 
-     * @param channel streaming channel that receives a call for every value
-     * @param key the key
-     * 
-     * @return Long count of the keys.
-     */
-    AsyncExecutions<Long> hvals(ValueStreamingChannel<V> channel, K key);
-
     /**
      * Incrementally iterate hash fields and associated values.
      * 
@@ -277,4 +223,58 @@ public interface NodeSelectionHashAsyncCommands<K, V> {
      * @return StreamScanCursor scan cursor.
      */
     AsyncExecutions<StreamScanCursor> hscan(KeyValueStreamingChannel<K, V> channel, K key, ScanCursor scanCursor);
+
+    /**
+     * Set the string value of a hash field.
+     *
+     * @param key the key
+     * @param field the field type: key
+     * @param value the value
+     * @return Boolean integer-reply specifically:
+     *
+     *         {@literal true} if {@code field} is a new field in the hash and {@code value} was set. {@literal false} if
+     *         {@code field} already exists in the hash and the value was updated.
+     */
+    AsyncExecutions<Boolean> hset(K key, K field, V value);
+
+    /**
+     * Set the value of a hash field, only if the field does not exist.
+     *
+     * @param key the key
+     * @param field the field type: key
+     * @param value the value
+     * @return Boolean integer-reply specifically:
+     *
+     *         {@code 1} if {@code field} is a new field in the hash and {@code value} was set. {@code 0} if {@code field}
+     *         already exists in the hash and no operation was performed.
+     */
+    AsyncExecutions<Boolean> hsetnx(K key, K field, V value);
+
+    /**
+     * Get the string length of the field value in a hash.
+     *
+     * @param key the key
+     * @param field the field type: key
+     * @return Long integer-reply the string length of the {@code field} value, or {@code 0} when {@code field} is not present
+     *         in the hash or {@code key} does not exist at all.
+     */
+    AsyncExecutions<Long> hstrlen(K key, K field);
+
+    /**
+     * Get all the values in a hash.
+     *
+     * @param key the key
+     * @return List&lt;V&gt; array-reply list of values in the hash, or an empty list when {@code key} does not exist.
+     */
+    AsyncExecutions<List<V>> hvals(K key);
+
+    /**
+     * Stream over all the values in a hash.
+     *
+     * @param channel streaming channel that receives a call for every value
+     * @param key the key
+     *
+     * @return Long count of the keys.
+     */
+    AsyncExecutions<Long> hvals(ValueStreamingChannel<V> channel, K key);
 }
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionKeyCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionKeyCommands.java
index 009eeb6353..2a4916c469 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionKeyCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionKeyCommands.java
@@ -22,13 +22,21 @@
 public interface NodeSelectionKeyCommands<K, V> {
 
     /**
-     * Delete a key.
-     * 
-     * @param keys the key
+     * Delete one or more keys.
+     *
+     * @param keys the keys
      * @return Long integer-reply The number of keys that were removed.
      */
     Executions<Long> del(K... keys);
 
+    /**
+     * Unlink one or more keys (non blocking DEL).
+     *
+     * @param keys the keys
+     * @return Long integer-reply The number of keys that were removed.
+     */
+    Executions<Long> unlink(K... keys);
+
     /**
      * Return a serialized version of the value stored at the specified key.
      * 
diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionServerCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionServerCommands.java
index 5438601915..1f434f1663 100644
--- a/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionServerCommands.java
+++ b/src/main/java/com/lambdaworks/redis/cluster/api/sync/NodeSelectionServerCommands.java
@@ -146,6 +146,21 @@ public interface NodeSelectionServerCommands<K, V> {
      */
     Executions<Long> dbsize();
 
+    /**
+     * Crash and recover
+     * @param delay optional delay in milliseconds
+     * @return String simple-string-reply
+     */
+    Executions<String> debugCrashAndRecover(Long delay);
+
+    /**
+     * Get debugging information about the internal hash-table state.
+     *
+     * @param db the database number
+     * @return String simple-string-reply
+     */
+    Executions<String> debugHtstats(int db);
+
     /**
      * Get debugging information about a key.
      * 
@@ -155,12 +170,26 @@ public interface NodeSelectionServerCommands<K, V> {
     Executions<String> debugObject(K key);
 
     /**
-     * Get debugging information about the internal hash-table state.
+     * Save RDB, clear the database and reload RDB.
      *
-     * @param db the database number
+     * @return String simple-string-reply The commands returns OK on success.
+     */
+    Executions<String> debugReload();
+
+    /**
+     * Restart the server gracefully.
+     * @param delay optional delay in milliseconds
      * @return String simple-string-reply
      */
-    Executions<String> debugHtstats(int db);
+    Executions<String> debugRestart(Long delay);
+
+    /**
+     * Get debugging information about the internal SDS length.
+     *
+     * @param key the key
+     * @return String simple-string-reply
+     */
+    Executions<String> debugSdslen(K key);
 
     /**
      * Remove all keys from all databases.
@@ -169,6 +198,13 @@ public interface NodeSelectionServerCommands<K, V> {
      */
     Executions<String> flushall();
 
+    /**
+     * Remove all keys asynchronously from all databases.
+     *
+     * @return String simple-string-reply
+     */
+    Executions<String> flushallAsync();
+
     /**
      * Remove all keys from the current database.
      * 
@@ -176,6 +212,13 @@ public interface NodeSelectionServerCommands<K, V> {
      */
     Executions<String> flushdb();
 
+    /**
+     * Remove all keys asynchronously from the current database.
+     *
+     * @return String simple-string-reply
+     */
+    Executions<String> flushdbAsync();
+
     /**
      * Get information and statistics about the server.
      *