diff --git a/console/atributes_process_event.go b/console/atributes_process_event.go
index 73ff834c6..92bc1e314 100644
--- a/console/atributes_process_event.go
+++ b/console/atributes_process_event.go
@@ -58,14 +58,25 @@ func (self *CmdAttributesProcessEvent) RpcParams(reset bool) interface{} {
 }
 
 func (self *CmdAttributesProcessEvent) PostprocessRpcParams() error { //utils.CGREvent
+	var tenant, context string
 	param := self.rpcParams.(*map[string]interface{})
+	if (*param)[utils.Tenant] != nil && (*param)[utils.Tenant].(string) != "" {
+		tenant = (*param)[utils.Tenant].(string)
+		delete((*param), utils.Tenant)
+	} else {
+		tenant = config.CgrConfig().DefaultTenant
+	}
+	if (*param)[utils.Context] != nil && (*param)[utils.Context].(string) != "" {
+		context = (*param)[utils.Context].(string)
+		delete((*param), utils.Context)
+	}
 	cgrev := utils.CGREvent{
-		Tenant: config.CgrConfig().DefaultTenant,
+		Tenant: tenant,
 		ID:     utils.UUIDSha1Prefix(),
 		Event:  *param,
 	}
-	if (*param)[utils.Tenant] != nil && (*param)[utils.Tenant].(string) != "" {
-		cgrev.Tenant = (*param)[utils.Tenant].(string)
+	if context != "" {
+		cgrev.Context = &context
 	}
 	self.rpcParams = cgrev
 	return nil
diff --git a/console/statqueue_for_event.go b/console/statqueue_for_event.go
index 801411983..45127d9a4 100644
--- a/console/statqueue_for_event.go
+++ b/console/statqueue_for_event.go
@@ -58,15 +58,19 @@ func (self *CmdStatsQueueProcessEvent) RpcParams(reset bool) interface{} {
 }
 
 func (self *CmdStatsQueueProcessEvent) PostprocessRpcParams() error { //utils.CGREvent
+	var tenant string
 	param := self.rpcParams.(*map[string]interface{})
+	if (*param)[utils.Tenant] != nil && (*param)[utils.Tenant].(string) != "" {
+		tenant = (*param)[utils.Tenant].(string)
+		delete((*param), utils.Tenant)
+	} else {
+		tenant = config.CgrConfig().DefaultTenant
+	}
 	cgrev := utils.CGREvent{
-		Tenant: config.CgrConfig().DefaultTenant,
+		Tenant: tenant,
 		ID:     utils.UUIDSha1Prefix(),
 		Event:  *param,
 	}
-	if (*param)[utils.Tenant] != nil && (*param)[utils.Tenant].(string) != "" {
-		cgrev.Tenant = (*param)[utils.Tenant].(string)
-	}
 	self.rpcParams = cgrev
 	return nil
 }
diff --git a/console/statqueue_process_event.go b/console/statqueue_process_event.go
index b4d01aeeb..164001690 100644
--- a/console/statqueue_process_event.go
+++ b/console/statqueue_process_event.go
@@ -57,15 +57,19 @@ func (self *CmdStatQueueProcessEvent) RpcParams(reset bool) interface{} {
 }
 
 func (self *CmdStatQueueProcessEvent) PostprocessRpcParams() error { //utils.CGREvent
+	var tenant string
 	param := self.rpcParams.(*map[string]interface{})
+	if (*param)[utils.Tenant] != nil && (*param)[utils.Tenant].(string) != "" {
+		tenant = (*param)[utils.Tenant].(string)
+		delete((*param), utils.Tenant)
+	} else {
+		tenant = config.CgrConfig().DefaultTenant
+	}
 	cgrev := utils.CGREvent{
-		Tenant: config.CgrConfig().DefaultTenant,
+		Tenant: tenant,
 		ID:     utils.UUIDSha1Prefix(),
 		Event:  *param,
 	}
-	if (*param)[utils.Tenant] != nil && (*param)[utils.Tenant].(string) != "" {
-		cgrev.Tenant = (*param)[utils.Tenant].(string)
-	}
 	self.rpcParams = cgrev
 	return nil
 }
diff --git a/console/threshold_process_event.go b/console/threshold_process_event.go
index 3a7949ff9..a1adddd5d 100644
--- a/console/threshold_process_event.go
+++ b/console/threshold_process_event.go
@@ -57,15 +57,19 @@ func (self *CmdThresholdProcessEvent) RpcParams(reset bool) interface{} {
 }
 
 func (self *CmdThresholdProcessEvent) PostprocessRpcParams() error { //utils.CGREvent
+	var tenant string
 	param := self.rpcParams.(*map[string]interface{})
+	if (*param)[utils.Tenant] != nil && (*param)[utils.Tenant].(string) != "" {
+		tenant = (*param)[utils.Tenant].(string)
+		delete((*param), utils.Tenant)
+	} else {
+		tenant = config.CgrConfig().DefaultTenant
+	}
 	cgrev := utils.CGREvent{
-		Tenant: config.CgrConfig().DefaultTenant,
+		Tenant: tenant,
 		ID:     utils.UUIDSha1Prefix(),
 		Event:  *param,
 	}
-	if (*param)[utils.Tenant] != nil && (*param)[utils.Tenant].(string) != "" {
-		cgrev.Tenant = (*param)[utils.Tenant].(string)
-	}
 	self.rpcParams = cgrev
 	return nil
 }
diff --git a/utils/consts.go b/utils/consts.go
index 420813034..c68a14903 100755
--- a/utils/consts.go
+++ b/utils/consts.go
@@ -129,6 +129,7 @@ const (
 	DIRECTION                       = "Direction"
 	Tenant                          = "Tenant"
 	Category                        = "Category"
+	Context                         = "Context"
 	Account                         = "Account"
 	SUBJECT                         = "Subject"
 	Destination                     = "Destination"