diff --git a/control/json/config_base.hpp b/control/json/config_base.hpp
index 3db6907..4f7a425 100644
--- a/control/json/config_base.hpp
+++ b/control/json/config_base.hpp
@@ -47,7 +47,6 @@
 {
   public:
     ConfigBase() = delete;
-    ConfigBase(const ConfigBase&) = delete;
     ConfigBase(ConfigBase&&) = delete;
     ConfigBase& operator=(const ConfigBase&) = delete;
     ConfigBase& operator=(ConfigBase&&) = delete;
@@ -67,6 +66,19 @@
     }
 
     /**
+     * Copy Constructor
+     * Creates a config base from another config base's originally parsed JSON
+     * object data
+     *
+     * @param[in] origObj - Original ConfigBase object to be created from
+     */
+    ConfigBase(const ConfigBase& origObj)
+    {
+        _name = origObj._name;
+        _profiles = origObj._profiles;
+    }
+
+    /**
      * @brief Get the configuration object's name
      *
      * @return Name of the configuration object
