diff --git a/src/entity_manager/configuration.hpp b/src/entity_manager/configuration.hpp
index 015f713..f7f0b31 100644
--- a/src/entity_manager/configuration.hpp
+++ b/src/entity_manager/configuration.hpp
@@ -2,20 +2,28 @@
 
 #include <nlohmann/json.hpp>
 
-#include <list>
-#include <set>
+#include <unordered_set>
+#include <vector>
 
-namespace configuration
-{
 constexpr const char* globalSchema = "global.json";
 constexpr const char* hostConfigurationDirectory = SYSCONF_DIR "configurations";
 constexpr const char* configurationDirectory = PACKAGE_DIR "configurations";
 constexpr const char* currentConfiguration = "/var/configuration/system.json";
 constexpr const char* schemaDirectory = PACKAGE_DIR "schemas";
 
-bool writeJsonFiles(const nlohmann::json& systemConfiguration);
+class Configuration
+{
+  public:
+    explicit Configuration();
+    std::unordered_set<std::string> probeInterfaces;
+    std::vector<nlohmann::json> configurations;
 
-bool loadConfigurations(std::list<nlohmann::json>& configurations);
+  private:
+    void loadConfigurations();
+    void filterProbeInterfaces();
+};
+
+bool writeJsonFiles(const nlohmann::json& systemConfiguration);
 
 template <typename JsonType>
 bool setJsonFromPointer(const std::string& ptrStr, const JsonType& value,
@@ -39,7 +47,3 @@
 
 bool validateJson(const nlohmann::json& schemaFile,
                   const nlohmann::json& input);
-
-std::set<std::string> getProbeInterfaces();
-
-} // namespace configuration