diff --git a/agents/kamevent.go b/agents/kamevent.go
index 96140a160..11a2d71bc 100644
--- a/agents/kamevent.go
+++ b/agents/kamevent.go
@@ -47,7 +47,7 @@ const (
 )
 
 var (
-	kamReservedEventFields = []string{EVENT, KamTRIndex, KamTRLabel, KamCGRSubsystems, KamReplyRoute}
+	kamReservedEventFields = []string{EVENT, KamTRIndex, KamTRLabel, KamCGRSubsystems, KamCGRContext, KamReplyRoute}
 	kamReservedCDRFields   = append(kamReservedEventFields, KamHashEntry, KamHashID) // HashEntry and id are needed in events for disconnects
 )
 
diff --git a/data/tariffplans/tutorial2/Attributes.csv b/data/tariffplans/tutorial2/Attributes.csv
new file mode 100644
index 000000000..339dffd11
--- /dev/null
+++ b/data/tariffplans/tutorial2/Attributes.csv
@@ -0,0 +1,8 @@
+#Tenant,ID,Contexts,FilterIDs,ActivationInterval,FieldName,Initial,Substitute,Append,Weight
+cgrates.org,ATTR_1001_SIMPLEAUTH,simpleauth,*string:Account:1001,,Password,*any,CGRateS.org,true,20
+cgrates.org,ATTR_1002_SIMPLEAUTH,simpleauth,*string:Account:1002,,Password,*any,CGRateS.org,true,20
+cgrates.org,ATTR_1001_SESSIONAUTH,*sessions,*string:Account:1001,,Password,*any,CGRateS.org,true,10
+cgrates.org,ATTR_1001_SESSIONAUTH,,,,RequestType,*any,*prepaid,true,
+cgrates.org,ATTR_1001_SESSIONAUTH,,,,PaypalAccount,*any,sendmemoney@paypal.com,true,
+cgrates.org,ATTR_1001_SESSIONAUTH,,,,LCRProfile,*any,premium_cli,true,
+
diff --git a/data/tutorials/kamevapi/cgrates/etc/cgrates/cgrates.json b/data/tutorials/kamevapi/cgrates/etc/cgrates/cgrates.json
index 1ced3cd15..a5ac8db22 100644
--- a/data/tutorials/kamevapi/cgrates/etc/cgrates/cgrates.json
+++ b/data/tutorials/kamevapi/cgrates/etc/cgrates/cgrates.json
@@ -35,9 +35,6 @@
 	"stats_conns": [
 		{"address": "127.0.0.1:2012", "transport": "*json"}
 	],
-	"pubsubs_conns": [
-		{"address": "*internal"}
-	],
 	"attributes_conns": [
 		{"address": "127.0.0.1:2012", "transport": "*json"}
 	],
@@ -86,7 +83,7 @@
 "kamailio_agent": {
 	"enabled": true,
 	"evapi_conns":[							// instantiate connections to multiple Kamailio servers
-		{"address": "127.0.0.1:8448", "reconnects": 5}
+		{"address": "192.168.56.102:8448", "reconnects": 5}
 	],
 	"sessions_conns": [
 		{"address": "*internal"}			// connection towards session service: <*internal>