diff --git a/packages/client/index.ts b/packages/client/index.ts
index 2deb0c39b4..09426cb50a 100644
--- a/packages/client/index.ts
+++ b/packages/client/index.ts
@@ -31,9 +31,7 @@ export const createSentinel = RedisSentinel.create;
 
 export { GEO_REPLY_WITH, GeoReplyWith } from './lib/commands/GEOSEARCH_WITH';
 
-export { SetOptions } from './lib/commands/SET';
 
-export { REDIS_FLUSH_MODES } from './lib/commands/FLUSHALL';
+export { SetOptions, CLIENT_KILL_FILTERS, FAILOVER_MODES, CLUSTER_SLOT_STATES, COMMAND_LIST_FILTER_BY, REDIS_FLUSH_MODES } from './lib/commands'
 
 export { BasicClientSideCache, BasicPooledClientSideCache } from './lib/client/cache';
-
diff --git a/packages/client/lib/commands/index.ts b/packages/client/lib/commands/index.ts
index 05c07bbf34..54ede43d01 100644
--- a/packages/client/lib/commands/index.ts
+++ b/packages/client/lib/commands/index.ts
@@ -35,7 +35,7 @@ import CLIENT_GETNAME from './CLIENT_GETNAME';
 import CLIENT_GETREDIR from './CLIENT_GETREDIR';
 import CLIENT_ID from './CLIENT_ID';
 import CLIENT_INFO from './CLIENT_INFO';
-import CLIENT_KILL from './CLIENT_KILL';
+import CLIENT_KILL, { CLIENT_KILL_FILTERS } from './CLIENT_KILL';
 import CLIENT_LIST from './CLIENT_LIST';
 import CLIENT_NO_EVICT from './CLIENT_NO-EVICT';
 import CLIENT_NO_TOUCH from './CLIENT_NO-TOUCH';
@@ -51,7 +51,7 @@ import CLUSTER_COUNT_FAILURE_REPORTS from './CLUSTER_COUNT-FAILURE-REPORTS';
 import CLUSTER_COUNTKEYSINSLOT from './CLUSTER_COUNTKEYSINSLOT';
 import CLUSTER_DELSLOTS from './CLUSTER_DELSLOTS';
 import CLUSTER_DELSLOTSRANGE from './CLUSTER_DELSLOTSRANGE';
-import CLUSTER_FAILOVER from './CLUSTER_FAILOVER';
+import CLUSTER_FAILOVER, { FAILOVER_MODES } from './CLUSTER_FAILOVER';
 import CLUSTER_FLUSHSLOTS from './CLUSTER_FLUSHSLOTS';
 import CLUSTER_FORGET from './CLUSTER_FORGET';
 import CLUSTER_GETKEYSINSLOT from './CLUSTER_GETKEYSINSLOT';
@@ -67,13 +67,13 @@ import CLUSTER_REPLICATE from './CLUSTER_REPLICATE';
 import CLUSTER_RESET from './CLUSTER_RESET';
 import CLUSTER_SAVECONFIG from './CLUSTER_SAVECONFIG';
 import CLUSTER_SET_CONFIG_EPOCH from './CLUSTER_SET-CONFIG-EPOCH';
-import CLUSTER_SETSLOT from './CLUSTER_SETSLOT';
+import CLUSTER_SETSLOT, { CLUSTER_SLOT_STATES } from './CLUSTER_SETSLOT';
 import CLUSTER_SLOTS from './CLUSTER_SLOTS';
 import COMMAND_COUNT from './COMMAND_COUNT';
 import COMMAND_GETKEYS from './COMMAND_GETKEYS';
 import COMMAND_GETKEYSANDFLAGS from './COMMAND_GETKEYSANDFLAGS';
 import COMMAND_INFO from './COMMAND_INFO';
-import COMMAND_LIST from './COMMAND_LIST';
+import COMMAND_LIST, { COMMAND_LIST_FILTER_BY } from './COMMAND_LIST';
 import COMMAND from './COMMAND';
 import CONFIG_GET from './CONFIG_GET';
 import CONFIG_RESETASTAT from './CONFIG_RESETSTAT';
@@ -117,7 +117,7 @@ import EXISTS from './EXISTS';
 import EXPIRE from './EXPIRE';
 import EXPIREAT from './EXPIREAT';
 import EXPIRETIME from './EXPIRETIME';
-import FLUSHALL from './FLUSHALL';
+import FLUSHALL, { REDIS_FLUSH_MODES } from './FLUSHALL';
 import FLUSHDB from './FLUSHDB';
 import FCALL from './FCALL';
 import FCALL_RO from './FCALL_RO';
@@ -362,6 +362,16 @@ import VSETATTR from './VSETATTR';
 import VSIM from './VSIM';
 import VSIM_WITHSCORES from './VSIM_WITHSCORES';
 
+export {
+  CLIENT_KILL_FILTERS,
+  FAILOVER_MODES,
+  CLUSTER_SLOT_STATES,
+  COMMAND_LIST_FILTER_BY,
+  REDIS_FLUSH_MODES
+};
+
+export { SetOptions } from './SET';
+
 export default {
   ACL_CAT,
   aclCat: ACL_CAT,