diff --git a/src/api/index.py b/src/api/index.py
index 8055370..1cf1304 100644
--- a/src/api/index.py
+++ b/src/api/index.py
@@ -256,6 +256,9 @@ def InitCollector():
 					agent.init(args)
 				lagents.append(agent)
 		config = dict(CONFIG)
+		#
+		# @TODO: The database name should be provided by the active plan
+		#
 		config['store']['args']['dbname'] = 'monitor-logs'
 		config['store']['args']['uid'] = key
 		manager = Manager()
diff --git a/src/utils/agents/manager.py b/src/utils/agents/manager.py
index c4044e5..07ffb74 100644
--- a/src/utils/agents/manager.py
+++ b/src/utils/agents/manager.py
@@ -41,8 +41,8 @@ class Manager() :
 		if len(meta) > 0 :
 			self.DELAY = 60* max([ int(item['delay']) for item in meta])
 			self.LIMIT = max([ int(item['limit']) for item in meta ])
-			dbname = [item['id'] for item in meta if meta['limit'] == self.LIMIT][0]
-			self.conf['store']['args']['dbname'] = dbname
+			dbname = [item['name'] for item in plans if int(item['metadata']['limit']) == self.LIMIT][0]
+			self.config['store']['args']['dbname'] = dbname
 
 		else:
 			self.DELAY = -1
@@ -81,7 +81,6 @@ class Manager() :
 				else:
 					#label = id
 					row = data
-
 				self.lock.acquire()
 				store = self.factory.instance(type=write_class,args=read_args)
 				store.flush(size=self.LIMIT)