diff --git a/messages/const.go b/messages/const.go
index 789d4c8..882bb58 100644
--- a/messages/const.go
+++ b/messages/const.go
@@ -1,17 +1,31 @@
 package messages
 
 const (
-	AGT_START = "AGENT_START"
-	AGT_STOP  = "AGENT_STOP"
+	INIT_AGT_STARTING = "INIT_AGT_STARTING"
 
-	TASK_SENSOR_START           = "TASK_SENSOR_START"
-	TASK_SENSOR_STOP            = "TASK_SENSOR_STOP"
-	TASK_SENSOR_ADD             = "TASK_SENSOR_ADD"
-	TASK_SENSOR_REMOVE          = "TASK_SENSOR_REMOVE"
-	TASK_SENSOR_UPDATE          = "TASK_SENSOR_UPDATE"
-	TASK_CRAWLER_UPDATE         = "TASK_CRAWLER_UPDATE"
-	TASK_AGENT_UPDATE           = "TASK_AGENT_UPDATE"
-	TASK_LOG_SEND               = "TASK_LOG_SEND"
-	TASK_DONE                   = "TASK_DONE"
-	TASK_POLLER_INTERVAL_UPDATE = "TASK_POLLER_INTERVAL_UPDATE"
+	EVENT_AGT_START = "EVENT_AGT_START"
+	EVENT_AGT_STOP  = "EVENT_AGT_STOP"
+	EVENT_AGT_ERROR = "EVENT_AGT_ERROR"
+
+	TASK_SENSOR_START        = "TASK_SENSOR_START"
+	TASK_SENSOR_STOP         = "TASK_SENSOR_STOP"
+	TASK_SENSOR_ADD          = "TASK_SENSOR_ADD"
+	TASK_SENSOR_REMOVE       = "TASK_SENSOR_REMOVE"
+	TASK_SENSOR_UPDATE       = "TASK_SENSOR_UPDATE"
+	TASK_CRAWLER_UPDATE      = "TASK_CRAWLER_UPDATE"
+	TASK_AGENT_UPDATE        = "TASK_AGENT_UPDATE"
+	TASK_LOG_SEND            = "TASK_LOG_SEND"
+	TASK_POL_INTERVAL_UPDATE = "TASK_POLLER_INTERVAL_UPDATE"
+
+	DISCOVERY_START         = "DISCOVERY_START"
+	DISCOVERY_HOST_START    = "DISCOVERY_HOST_START"
+	DISCOVERY_HOST_FOUND    = "DISCOVERY_HOST_FOUND"
+	DISCOVERY_HOST_DONE     = "DISCOVERY_HOST_DONE"
+	DISCOVERY_PORT_START    = "DISCOVERY_PORT_START"
+	DISCOVERY_PORT_FOUND    = "DISCOVERY_PORT_FOUND"
+	DISCOVERY_PORT_DONE     = "DISCOVERY_PORT_DONE"
+	DISCOVERY_SERVICE_START = "DISCOVERY_SERVICE_START"
+	DISCOVERY_SERVICE_FOUND = "DISCOVERY_SERVICE_FOUND"
+	DISCOVERY_SERVICE_DONE  = "DISCOVERY_SERVICE_DONE"
+	DISCOVERY_DONE          = "DISCOVERY_DONE"
 )