diff --git a/agents/hapool_it_test.go b/agents/hapool_it_test.go
index 0588793e8..08d788528 100644
--- a/agents/hapool_it_test.go
+++ b/agents/hapool_it_test.go
@@ -88,6 +88,10 @@ func TestHaPoolStartEngine(t *testing.T) {
 	if _, err := engine.StartEngine(cgrSmg2, *waitRater); err != nil {
 		t.Fatal("cgrSmg2: ", err)
 	}
+	cgrDa := path.Join(*dataDir, "conf", "samples", "hapool", "dagent")
+	if _, err := engine.StartEngine(cgrDa, *waitRater); err != nil {
+		t.Fatal("cgrSmg2: ", err)
+	}
 
 }
 
diff --git a/data/conf/samples/hapool/cgrrater1/cgradmin.json b/data/conf/samples/hapool/cgrrater1/cgr.json
similarity index 94%
rename from data/conf/samples/hapool/cgrrater1/cgradmin.json
rename to data/conf/samples/hapool/cgrrater1/cgr.json
index 4c55524fd..74af2d95c 100644
--- a/data/conf/samples/hapool/cgrrater1/cgradmin.json
+++ b/data/conf/samples/hapool/cgrrater1/cgr.json
@@ -1,9 +1,4 @@
 {
-// CGRateS Configuration file
-//
-// Used for cgradmin
-// Starts rater, scheduler
-
 "listen": {
 	"rpc_json": ":2014",			// RPC JSON listening address
 	"rpc_gob": ":2015",			// RPC GOB listening address
diff --git a/data/conf/samples/hapool/cgrrater2/cgradmin.json b/data/conf/samples/hapool/cgrrater2/cgr.json
similarity index 94%
rename from data/conf/samples/hapool/cgrrater2/cgradmin.json
rename to data/conf/samples/hapool/cgrrater2/cgr.json
index 846b4affb..00c31a61b 100644
--- a/data/conf/samples/hapool/cgrrater2/cgradmin.json
+++ b/data/conf/samples/hapool/cgrrater2/cgr.json
@@ -1,8 +1,4 @@
 {
-// CGRateS Configuration file
-//
-// Used for cgradmin
-// Starts rater, scheduler
 
 "listen": {
 	"rpc_json": ":2016",			// RPC JSON listening address
diff --git a/data/conf/samples/hapool/cgrsmg2/cgradmin.json b/data/conf/samples/hapool/cgrsmg1/cgr.json
similarity index 83%
rename from data/conf/samples/hapool/cgrsmg2/cgradmin.json
rename to data/conf/samples/hapool/cgrsmg1/cgr.json
index f224c3c44..a6d002f38 100644
--- a/data/conf/samples/hapool/cgrsmg2/cgradmin.json
+++ b/data/conf/samples/hapool/cgrsmg1/cgr.json
@@ -1,10 +1,4 @@
 {
-// CGRateS Configuration file
-//
-// Used for cgradmin
-// Starts rater, scheduler
-
-
 "cdrs": {
 	"enabled": true,					// start the CDR Server service:  <true|false>
 	"rater": "127.0.0.1:2014",				// address where to reach the Rater for cost calculation, empty to disable functionality: <""|internal|x.y.z.y:1234>
@@ -13,6 +7,7 @@
 
 "sm_generic": {
 	"enabled": true,
+	"listen_bijson": "127.0.0.1:3014",
 	"rater_conns": [
 	      {"server": "127.0.0.1:2014"},
 	      {"server": "127.0.0.1:2016"}
@@ -21,10 +16,4 @@
 	      {"server": "internal"}     // address where to reach CDR Server, empty to disable CDR capturing <internal|x.y.z.y:1234>
 	],
 },
-
-"diameter_agent": {
-	"enabled": true,
-},
-
-
 }
diff --git a/data/conf/samples/hapool/cgrsmg1/cgradmin.json b/data/conf/samples/hapool/cgrsmg2/cgr.json
similarity index 83%
rename from data/conf/samples/hapool/cgrsmg1/cgradmin.json
rename to data/conf/samples/hapool/cgrsmg2/cgr.json
index f224c3c44..400a47eda 100644
--- a/data/conf/samples/hapool/cgrsmg1/cgradmin.json
+++ b/data/conf/samples/hapool/cgrsmg2/cgr.json
@@ -1,10 +1,4 @@
 {
-// CGRateS Configuration file
-//
-// Used for cgradmin
-// Starts rater, scheduler
-
-
 "cdrs": {
 	"enabled": true,					// start the CDR Server service:  <true|false>
 	"rater": "127.0.0.1:2014",				// address where to reach the Rater for cost calculation, empty to disable functionality: <""|internal|x.y.z.y:1234>
@@ -13,6 +7,7 @@
 
 "sm_generic": {
 	"enabled": true,
+	"listen_bijson": "127.0.0.1:3015",
 	"rater_conns": [
 	      {"server": "127.0.0.1:2014"},
 	      {"server": "127.0.0.1:2016"}
@@ -22,9 +17,4 @@
 	],
 },
 
-"diameter_agent": {
-	"enabled": true,
-},
-
-
 }
diff --git a/data/conf/samples/hapool/dagent/cgr.json b/data/conf/samples/hapool/dagent/cgr.json
new file mode 100644
index 000000000..6a3bd6388
--- /dev/null
+++ b/data/conf/samples/hapool/dagent/cgr.json
@@ -0,0 +1,10 @@
+{
+"diameter_agent": {
+	"enabled": true,
+	"listen": "127.0.0.1:3868",
+	"sm_generic_conns": [
+        	{"server": "127.0.0.1:3014"},
+        	{"server": "127.0.0.1:3015"},
+    	],
+},
+}
\ No newline at end of file