diff --git a/geode-docs/tools_modules/redis_api_for_geode.html.md.erb b/geode-docs/tools_modules/redis_api_for_geode.html.md.erb
index 5493404..dfb17e3 100644
--- a/geode-docs/tools_modules/redis_api_for_geode.html.md.erb
+++ b/geode-docs/tools_modules/redis_api_for_geode.html.md.erb
@@ -69,7 +69,8 @@
 
 -   **Connection**: AUTH, PING, QUIT
 -   **Hashes**: HGETALL, HMSET, HSET
--   **Keys**: DEL, EXISTS, EXPIRE, EXPIREAT, KEYS, PERSIST, PEXPIRE, PEXPIREAT, PTTL, RENAME, TTL, TYPE
+-   **Keys**: DEL, EXISTS, EXPIRE, EXPIREAT, KEYS, PERSIST, PEXPIRE, PEXPIREAT, PTTL, RENAME, TTL,
+  TYPE
 -   **Publish/Subscribe**: PUBLISH, PSUBSCRIBE, PUNSUBSCRIBE, SUBSCRIBE, UNSUBSCRIBE
 -   **Sets**: SADD, SMEMBERS, SREM
 -   **Strings**: APPEND, GET, SET
@@ -79,14 +80,15 @@
 exactly as expected.
 
 -   **Connection**: ECHO, SELECT
--   **Hashes**: HDEL, HEXISTS, HGET, HINCRBY, HINCRBYFLOAT, HKEYS, HLEN, HMGET, HSCAN, HSETNX, HVALS
+-   **Hashes**: HDEL, HEXISTS, HGET, HINCRBY, HINCRBYFLOAT, HKEYS, HLEN, HMGET, HSCAN, HSETNX,
+  HSTRLEN, HVALS
 -   **Keys**: SCAN, UNLINK
--   **Server**: DBSIZE, FLUSHALL (no async option), FLUSHDB (no async option), SHUTDOWN, SLOWLOG,
-  TIME
+-   **Server**: DBSIZE, FLUSHALL (no async option), FLUSHDB (no async option), INFO, SHUTDOWN,
+  SLOWLOG, TIME
 -   **Sets**: SCARD, SDIFF, SDIFFSTORE, SINTER, SINTERSTORE, SISMEMBER, SMOVE, SPOP, SRANDMEMBER,
   SSCAN, SUNION, SUNIONSTORE
--   **Strings**: BITCOUNT, BITOP, BITPOS, DECR, DECRBY, GETBIT, GETRANGE, GETSET, INCR, INCRBY, INCRBYFLOAT, MGET,
-  MSET, MSETNX, PSETEX, SETBIT, SETEX, SETNX, SETRANGE, STRLEN
+-   **Strings**: BITCOUNT, BITOP, BITPOS, DECR, DECRBY, GETBIT, GETRANGE, GETSET, INCR, INCRBY,
+  INCRBYFLOAT, MGET, MSET, MSETNX, PSETEX, SETBIT, SETEX, SETNX, SETRANGE, STRLEN
 
 
 If you already have some Geode servers running with Redis enabled, you can execute the following
diff --git a/geode-redis/README.md b/geode-redis/README.md
index 130df87..c9b8b96 100644
--- a/geode-redis/README.md
+++ b/geode-redis/README.md
@@ -179,39 +179,39 @@
 | QUIT               	| HMGET                                              	| BZPOPMIN                      	|
 | RENAME             	| HSCAN                                              	| CLIENT CACHING                	|
 | SADD               	| HSETNX                                             	| CLIENT GETNAME                	|
-| SET                	| HVALS                                              	| CLIENT GETREDIR               	|
-| SMEMBERS           	| INCR                                               	| CLIENT ID                     	|
-| SREM               	| INCRBY                                             	| CLIENT KILL                   	|
-| SUBSCRIBE          	| INCRBYFLOAT                                        	| CLIENT LIST                   	|
-| TTL                	| MGET                                               	| CLIENT PAUSE                  	|
-| TYPE               	| MSET                                               	| CLIENT REPLY                  	|
-| UNSUBSCRIBE       	| MSETNX                                             	| CLIENT SETNAME                	|
-|                    	| PSETEX                                             	| CLIENT TRACKING               	|
-|                    	| SCAN                                               	| CLIENT UNBLOCK                	|
-|                    	| SCARD                                              	| CLUSTER ADDSLOTS              	|
-|                    	| SDIFF                                              	| CLUSTER BUMPEPOCH             	|
-|                    	| SDIFFSTORE                                         	| CLUSTER COUNT-FAILURE-REPORTS 	|
-|                    	| SELECT                                             	| CLUSTER COUNTKEYSINSLOT       	|
-|                    	| SETBIT                                             	| CLUSTER DELSLOTS      	        |
-|                    	| SETEX                                              	| CLUSTER FAILOVER              	|
-|                    	| SETNX                                              	| CLUSTER FLUSHSLOTS               	|
-|                    	| SETRANGE                                           	| CLUSTER FORGET                   	|
-|                    	| SHUTDOWN                                           	| CLUSTER GETKEYSINSLOT            	|
-|                    	| SINTER                                             	| CLUSTER INFO                  	|
-|                    	| SINTERSTORE                                        	| CLUSTER KEYSLOT                 	|
-|                    	| SISMEMBER                                          	| CLUSTER MEET                     	|
-|                    	| SLOWLOG                                            	| CLUSTER MYID                   	|
-|                    	| SMOVE                                              	| CLUSTER NODES                 	|
-|                    	| SPOP                                               	| CLUSTER REPLICAS                 	|
-|                    	| SRANDMEMBER                                        	| CLUSTER REPLICATE              	|
-|                    	| SSCAN                                              	| CLUSTER RESET                  	|
-|                    	| STRLEN                                             	| CLUSTER SAVECONFIG                |
-|                    	| SUNION                                             	| CLUSTER SET-CONFIG-EPOCH          |
-|                    	| SUNIONSTORE                                        	| CLUSTER SETSLOT                 	|
-|                    	| TIME                                               	| CLUSTER SLAVES                  	|
-|                    	| UNLINK [1]                                         	| CLUSTER SLOTS                 	|
-|                    	|                                                    	| COMMAND                       	|
-|                    	|                                                    	| COMMAND COUNT                 	|
+| SET                	| HSTRLEN                                           	| CLIENT GETREDIR               	|
+| SMEMBERS           	| HVALS                                              	| CLIENT ID                     	|
+| SREM               	| INCR                                               	| CLIENT KILL                   	|
+| SUBSCRIBE          	| INCRBY                                             	| CLIENT LIST                   	|
+| TTL                	| INCRBYFLOAT                                        	| CLIENT PAUSE                  	|
+| TYPE               	| INFO                                                  | CLIENT REPLY                  	|
+| UNSUBSCRIBE       	| MGET                                               	| CLIENT SETNAME                	|
+|                    	| MSET                                               	| CLIENT TRACKING               	|
+|                    	| MSETNX                                             	| CLIENT UNBLOCK                	|
+|                    	| PSETEX                                             	| CLUSTER ADDSLOTS              	|
+|                    	| SCAN                                               	| CLUSTER BUMPEPOCH             	|
+|                    	| SCARD                                              	| CLUSTER COUNT-FAILURE-REPORTS 	|
+|                    	| SDIFF                                              	| CLUSTER COUNTKEYSINSLOT       	|
+|                    	| SDIFFSTORE                                         	| CLUSTER DELSLOTS     	            |
+|                    	| SELECT                                             	| CLUSTER FAILOVER              	|
+|                    	| SETBIT                                             	| CLUSTER FLUSHSLOTS                |
+|                    	| SETEX                                              	| CLUSTER FORGET                    |
+|                    	| SETNX                                              	| CLUSTER GETKEYSINSLOT             |
+|                    	| SETRANGE                                           	| CLUSTER INFO                  	|
+|                    	| SHUTDOWN                                           	| CLUSTER KEYSLOT                   |
+|                    	| SINTER                                             	| CLUSTER MEET                      |
+|                    	| SINTERSTORE                                        	| CLUSTER MYID                   	|
+|                    	| SISMEMBER                                          	| CLUSTER NODES                 	|
+|                    	| SLOWLOG                                            	| CLUSTER REPLICAS                  |
+|                    	| SMOVE                                              	| CLUSTER REPLICATE              	|
+|                    	| SPOP                                               	| CLUSTER RESET                  	|
+|                    	| SRANDMEMBER                                        	| CLUSTER SAVECONFIG                |
+|                    	| SSCAN                                              	| CLUSTER SET-CONFIG-EPOCH          |
+|                    	| STRLEN                                             	| CLUSTER SETSLOT                   |
+|                    	| SUNION                                             	| CLUSTER SLAVES                    |
+|                    	| SUNIONSTORE                                        	| CLUSTER SLOTS                 	|
+|                    	| TIME                                                  | COMMAND                       	|
+|                    	| UNLINK [1]                                         	| COMMAND COUNT                 	|
 |                    	|                                                    	| COMMAND GETKEYS               	|
 |                    	|                                                    	| COMMAND INFO                  	|
 |                    	|                                                    	| CONFIG GET                    	|
@@ -231,8 +231,6 @@
 |                    	|                                                    	| GEOPOS                        	|
 |                    	|                                                    	| GEORADIUS                     	|
 |                    	|                                                    	| GEORADIUSBYMEMBER             	|
-|                    	|                                                    	| HSTRLEN                       	|
-|                    	|                                                    	| INFO                          	|
 |                    	|                                                    	| LASTSAVE                      	|
 |                    	|                                                    	| LATENCY DOCTOR                	|
 |                    	|                                                    	| LATENCY GRAPH                 	|
diff --git a/geode-redis/src/main/java/org/apache/geode/redis/internal/RedisCommandType.java b/geode-redis/src/main/java/org/apache/geode/redis/internal/RedisCommandType.java
index f06b495..b2aa735 100755
--- a/geode-redis/src/main/java/org/apache/geode/redis/internal/RedisCommandType.java
+++ b/geode-redis/src/main/java/org/apache/geode/redis/internal/RedisCommandType.java
@@ -170,9 +170,9 @@
 
   SUBSCRIBE(new SubscribeExecutor(), SUPPORTED, new MinimumParameterRequirements(2)),
   PUBLISH(new PublishExecutor(), SUPPORTED, new ExactParameterRequirements(3)),
-  UNSUBSCRIBE(new UnsubscribeExecutor(), SUPPORTED, new MinimumParameterRequirements(1)),
   PSUBSCRIBE(new PsubscribeExecutor(), SUPPORTED, new MinimumParameterRequirements(2)),
   PUNSUBSCRIBE(new PunsubscribeExecutor(), SUPPORTED, new MinimumParameterRequirements(1)),
+  UNSUBSCRIBE(new UnsubscribeExecutor(), SUPPORTED, new MinimumParameterRequirements(1)),
 
   UNKNOWN(new UnknownExecutor(), SUPPORTED),
 
@@ -215,8 +215,8 @@
   MSETNX(new MSetNXExecutor(), UNSUPPORTED,
       new MinimumParameterRequirements(3).and(new OddParameterRequirements())),
   PSETEX(new PSetEXExecutor(), UNSUPPORTED, new ExactParameterRequirements(4)),
-  SETEX(new SetEXExecutor(), UNSUPPORTED, new ExactParameterRequirements(4)),
   SETBIT(new SetBitExecutor(), UNSUPPORTED, new ExactParameterRequirements(4)),
+  SETEX(new SetEXExecutor(), UNSUPPORTED, new ExactParameterRequirements(4)),
   SETNX(new SetNXExecutor(), UNSUPPORTED, new ExactParameterRequirements(3)),
   SETRANGE(new SetRangeExecutor(), UNSUPPORTED, new ExactParameterRequirements(4)),
   STRLEN(new StrlenExecutor(), UNSUPPORTED, new ExactParameterRequirements(2)),
@@ -246,17 +246,17 @@
   SCARD(new SCardExecutor(), UNSUPPORTED, new ExactParameterRequirements(2)),
   SDIFF(new SDiffExecutor(), UNSUPPORTED, new MinimumParameterRequirements(2)),
   SDIFFSTORE(new SDiffStoreExecutor(), UNSUPPORTED, new MinimumParameterRequirements(3)),
-  SISMEMBER(new SIsMemberExecutor(), UNSUPPORTED, new ExactParameterRequirements(3)),
   SINTER(new SInterExecutor(), UNSUPPORTED, new MinimumParameterRequirements(2)),
   SINTERSTORE(new SInterStoreExecutor(), UNSUPPORTED, new MinimumParameterRequirements(3)),
+  SISMEMBER(new SIsMemberExecutor(), UNSUPPORTED, new ExactParameterRequirements(3)),
   SMOVE(new SMoveExecutor(), UNSUPPORTED, new ExactParameterRequirements(4)),
   SPOP(new SPopExecutor(), UNSUPPORTED, new MinimumParameterRequirements(2)
       .and(new MaximumParameterRequirements(3, ERROR_SYNTAX)).and(new SpopParameterRequirements())),
   SRANDMEMBER(new SRandMemberExecutor(), UNSUPPORTED, new MinimumParameterRequirements(2)),
-  SUNION(new SUnionExecutor(), UNSUPPORTED, new MinimumParameterRequirements(2)),
-  SUNIONSTORE(new SUnionStoreExecutor(), UNSUPPORTED, new MinimumParameterRequirements(3)),
   SSCAN(new SScanExecutor(), UNSUPPORTED, new MinimumParameterRequirements(3),
       new OddParameterRequirements(ERROR_SYNTAX)),
+  SUNION(new SUnionExecutor(), UNSUPPORTED, new MinimumParameterRequirements(2)),
+  SUNIONSTORE(new SUnionStoreExecutor(), UNSUPPORTED, new MinimumParameterRequirements(3)),
 
   /***************************************
    *************** Server ****************