diff --git a/include/Base_Configurator.h b/include/Base_Configurator.h
index 0ba86723f4661968e2e328897cd0d63063082748..97b46e9c8a8711e64a12aa13804df04ad7d343eb 100644
--- a/include/Base_Configurator.h
+++ b/include/Base_Configurator.h
@@ -1,21 +1,25 @@
-#ifndef BASECONFIGURATOR_H_
-#define BASECONFIGURATOR_H_
+#pragma once
 
 #include <map>
 #include <string>
 
+namespace inaf::oasbo::Configurators {
 
 class BaseConfigurator{
 protected:
-	std::map<std::string,std::string> params;
+	std::map<std::string,std::string> config;
 
 public:
-	std::map<std::string,std::string>getParams(){return params;}
-	void setParams(std::map<std::string,std::string> params){this->params = params;}
+	virtual int readConfigFromSource() = 0;
+	virtual int readConfigFromSource(std::string target) = 0;
+	virtual int pushConfigToSource() = 0;
+	virtual int pushConfigToSource(std::string target) = 0;
+	virtual int insert(std::map<std::string, std::string>, std::string target) = 0;
+	virtual std::map<std::string, std::string> getConfig() {return this->config;}
 
 	std::string toString(){
 		std::string ret = "";
-		for( const std::pair<std::string, std::string> n : params) {
+		for( const std::pair<std::string, std::string> n : config) {
 			ret += n.first + " : " + n.second + "\n";
 		}
 		return ret;
@@ -24,5 +28,4 @@ public:
 	virtual ~BaseConfigurator() = default;
 
 };
-
-#endif /* BASECONFIGURATOR_H_ */
+}
diff --git a/include/Base_DAQ.h b/include/Base_DAQ.h
index d66bb1b9b05b1a922f1487e5abd14d107ea324a6..efd7f9e567291bb81bbbb9a731c4235c33082803 100755
--- a/include/Base_DAQ.h
+++ b/include/Base_DAQ.h
@@ -24,7 +24,7 @@ protected:
 	Status currentState;
 	Status nextState;
 	bool changeStateFlag = false;
-	ConnectionProtocols::BaseProtocol *socket = nullptr;
+	ConnectionProtocols::BaseProtocol *protocol = nullptr;
 	Archivers::BaseArchiver *archiver = nullptr;
 	Providers::BaseProvider *provider = nullptr;
 	PacketMonitors::BasePacketMonitor *monitor = nullptr;
@@ -33,7 +33,7 @@ protected:
 
 public:
 	void setProtocol(ConnectionProtocols::BaseProtocol &socket) {
-		this->socket = &socket;
+		this->protocol = &socket;
 	}
 	void setArchiver(Archivers::BaseArchiver &archiver) {
 		this->archiver = &archiver;
@@ -67,7 +67,7 @@ public:
 	}
 
 	ConnectionProtocols::BaseProtocol* getSocketPtr() {
-		return this->socket;
+		return this->protocol;
 	}
 	Archivers::BaseArchiver* getArchiverPtr() {
 		return this->archiver;
@@ -97,7 +97,7 @@ public:
 	virtual int deliverPacket() = 0;
 
 	virtual ~BaseDAQ() {
-		delete socket;
+		delete protocol;
 		delete provider;
 		delete archiver;
 		delete monitor;