diff --git a/native/cpp/CommonCpp/DatabaseManagers/DatabaseQueryExecutor.h b/native/cpp/CommonCpp/DatabaseManagers/DatabaseQueryExecutor.h
--- a/native/cpp/CommonCpp/DatabaseManagers/DatabaseQueryExecutor.h
+++ b/native/cpp/CommonCpp/DatabaseManagers/DatabaseQueryExecutor.h
@@ -26,10 +26,6 @@
  * following the RAII pattern
  */
 class DatabaseQueryExecutor {
-  virtual void setMetadata(std::string entry_name, std::string data) const = 0;
-  virtual void clearMetadata(std::string entry_name) const = 0;
-  virtual std::string getMetadata(std::string entry_name) const = 0;
-
 public:
   virtual std::string getDraft(std::string key) const = 0;
   virtual std::unique_ptr<Thread> getThread(std::string threadID) const = 0;
@@ -83,6 +79,9 @@
   virtual std::string getCurrentUserID() const = 0;
   virtual void setDeviceID(std::string deviceID) const = 0;
   virtual std::string getDeviceID() const = 0;
+  virtual void setMetadata(std::string entry_name, std::string data) const = 0;
+  virtual void clearMetadata(std::string entry_name) const = 0;
+  virtual std::string getMetadata(std::string entry_name) const = 0;
 };
 
 } // namespace comm
diff --git a/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.h b/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.h
--- a/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.h
+++ b/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.h
@@ -13,9 +13,6 @@
   static void migrate();
   static void assign_encryption_key();
   static auto &getStorage();
-  void setMetadata(std::string entry_name, std::string data) const override;
-  void clearMetadata(std::string entry_name) const override;
-  std::string getMetadata(std::string entry_name) const override;
 
   static std::once_flag initialized;
   static int sqlcipherEncryptionKeySize;
@@ -78,6 +75,9 @@
   std::string getCurrentUserID() const override;
   void setDeviceID(std::string deviceID) const override;
   std::string getDeviceID() const override;
+  void setMetadata(std::string entry_name, std::string data) const override;
+  void clearMetadata(std::string entry_name) const override;
+  std::string getMetadata(std::string entry_name) const override;
   static void clearSensitiveData();
 };