diff --git a/src/DescriptorsCommand.h b/src/DescriptorsCommand.h
index cab1fdca..1027d596 100644
--- a/src/DescriptorsCommand.h
+++ b/src/DescriptorsCommand.h
@@ -58,6 +58,10 @@ class DescriptorsCommand : public RSCommand {
   // for this data structure in tbb
   tbb::concurrent_unordered_map<long, IDDistancePair *> _cache_map;
 
+  static tbb::concurrent_unordered_map<std::string, std::string>
+    _desc_set_locator;
+  static tbb::concurrent_unordered_map<std::string, int> _desc_set_dims;
+
   // Will return the path to the set and the dimensions
   std::string get_set_path(PMGDQuery &query_tx, const std::string &set,
                            int &dim);
diff --git a/src/QueryHandlerPMGD.cc b/src/QueryHandlerPMGD.cc
index fc1d4b07..da2cf2b5 100644
--- a/src/QueryHandlerPMGD.cc
+++ b/src/QueryHandlerPMGD.cc
@@ -60,10 +60,10 @@ using namespace VDMS;
 std::unordered_map<std::string, RSCommand *> QueryHandlerPMGD::_rs_cmds;
 
 // Static globals for use in looking up descriptor set locations, defined in
-// RSCommand.h
+// DescriptorCommand.h
 tbb::concurrent_unordered_map<std::string, std::string>
-    RSCommand::_desc_set_locator;
-tbb::concurrent_unordered_map<std::string, int> RSCommand::_desc_set_dims;
+    DescriptorsCommand::_desc_set_locator;
+tbb::concurrent_unordered_map<std::string, int> DescriptorsCommand::_desc_set_dims;
 
 void QueryHandlerPMGD::init() {
   DescriptorsManager::init();
diff --git a/src/RSCommand.h b/src/RSCommand.h
index cb4cb169..827010c0 100644
--- a/src/RSCommand.h
+++ b/src/RSCommand.h
@@ -50,10 +50,6 @@ class RSCommand {
   const std::string _cmd_name;
   std::map<std::string, int> _valid_params_map;
 
-  static tbb::concurrent_unordered_map<std::string, std::string>
-      _desc_set_locator;
-  static tbb::concurrent_unordered_map<std::string, int> _desc_set_dims;
-
   template <typename T>
   T get_value(const Json::Value &json, const std::string &key, T def = T());