diff --git a/actions/actions_test.go b/actions/actions_test.go
index 5314470e9..a4c8ea33c 100644
--- a/actions/actions_test.go
+++ b/actions/actions_test.go
@@ -852,7 +852,7 @@ func TestExportActionResetThresholdStaticTenantID(t *testing.T) {
 	sMock2 := &testMockCDRsConn{
 		calls: map[string]func(arg interface{}, rply interface{}) error{
 			utils.ThresholdSv1ResetThreshold: func(arg interface{}, rply interface{}) error {
-				argConv, can := arg.(*utils.TenantIDWithOpts)
+				argConv, can := arg.(*utils.TenantIDWithAPIOpts)
 				if !can {
 					return fmt.Errorf("Wrong argument type: %T", arg)
 				}
@@ -899,7 +899,7 @@ func TestExportActionResetThresholdStaticID(t *testing.T) {
 	sMock2 := &testMockCDRsConn{
 		calls: map[string]func(arg interface{}, rply interface{}) error{
 			utils.ThresholdSv1ResetThreshold: func(arg interface{}, rply interface{}) error {
-				argConv, can := arg.(*utils.TenantIDWithOpts)
+				argConv, can := arg.(*utils.TenantIDWithAPIOpts)
 				if !can {
 					return fmt.Errorf("Wrong argument type: %T", arg)
 				}
@@ -946,7 +946,7 @@ func TestExportActionResetStatStaticTenantID(t *testing.T) {
 	sMock2 := &testMockCDRsConn{
 		calls: map[string]func(arg interface{}, rply interface{}) error{
 			utils.StatSv1ResetStatQueue: func(arg interface{}, rply interface{}) error {
-				argConv, can := arg.(*utils.TenantIDWithOpts)
+				argConv, can := arg.(*utils.TenantIDWithAPIOpts)
 				if !can {
 					return fmt.Errorf("Wrong argument type: %T", arg)
 				}
@@ -993,7 +993,7 @@ func TestExportActionResetStatStaticID(t *testing.T) {
 	sMock2 := &testMockCDRsConn{
 		calls: map[string]func(arg interface{}, rply interface{}) error{
 			utils.StatSv1ResetStatQueue: func(arg interface{}, rply interface{}) error {
-				argConv, can := arg.(*utils.TenantIDWithOpts)
+				argConv, can := arg.(*utils.TenantIDWithAPIOpts)
 				if !can {
 					return fmt.Errorf("Wrong argument type: %T", arg)
 				}
diff --git a/actions/reset.go b/actions/reset.go
index 64dd4c486..e094ab365 100644
--- a/actions/reset.go
+++ b/actions/reset.go
@@ -43,9 +43,9 @@ func (aL *actResetStat) cfg() *engine.APAction {
 
 // execute implements actioner interface
 func (aL *actResetStat) execute(_ context.Context, data utils.MapStorage, trgID string) (err error) {
-	args := &utils.TenantIDWithOpts{
+	args := &utils.TenantIDWithAPIOpts{
 		TenantID: utils.NewTenantID(trgID),
-		Opts:     data[utils.MetaOpts].(map[string]interface{}),
+		APIOpts:  data[utils.MetaOpts].(map[string]interface{}),
 	}
 	if args.Tenant == utils.EmptyString { // in case that user pass only ID we populate the tenant from the event
 		args.Tenant = aL.tnt
@@ -72,9 +72,9 @@ func (aL *actResetThreshold) cfg() *engine.APAction {
 
 // execute implements actioner interface
 func (aL *actResetThreshold) execute(_ context.Context, data utils.MapStorage, trgID string) (err error) {
-	args := &utils.TenantIDWithOpts{
+	args := &utils.TenantIDWithAPIOpts{
 		TenantID: utils.NewTenantID(trgID),
-		Opts:     data[utils.MetaOpts].(map[string]interface{}),
+		APIOpts:  data[utils.MetaOpts].(map[string]interface{}),
 	}
 	if args.Tenant == utils.EmptyString { // in case that user pass only ID we populate the tenant from the event
 		args.Tenant = aL.tnt
diff --git a/apier/v1/accountprofiles.go b/apier/v1/accountprofiles.go
index c369cd920..2b2a9c9db 100644
--- a/apier/v1/accountprofiles.go
+++ b/apier/v1/accountprofiles.go
@@ -27,7 +27,7 @@ import (
 )
 
 // GetAccountProfile returns an Account Profile
-func (apierSv1 *APIerSv1) GetAccountProfile(arg *utils.TenantIDWithOpts, reply *utils.AccountProfile) error {
+func (apierSv1 *APIerSv1) GetAccountProfile(arg *utils.TenantIDWithAPIOpts, reply *utils.AccountProfile) error {
 	if missing := utils.MissingStructFields(arg, []string{utils.ID}); len(missing) != 0 { //Params missing
 		return utils.NewErrMandatoryIeMissing(missing...)
 	}
@@ -111,7 +111,7 @@ func (apierSv1 *APIerSv1) SetAccountProfile(extAp *utils.APIAccountProfileWithOp
 }
 
 // RemoveAccountProfile remove a specific Account Profile
-func (apierSv1 *APIerSv1) RemoveAccountProfile(arg *utils.TenantIDWithOpts, reply *string) error {
+func (apierSv1 *APIerSv1) RemoveAccountProfile(arg *utils.TenantIDWithAPIOpts, reply *string) error {
 	if missing := utils.MissingStructFields(arg, []string{utils.ID}); len(missing) != 0 { //Params missing
 		return utils.NewErrMandatoryIeMissing(missing...)
 	}
diff --git a/apier/v1/accountprofiles_it_test.go b/apier/v1/accountprofiles_it_test.go
index d726b5841..0ca549cba 100644
--- a/apier/v1/accountprofiles_it_test.go
+++ b/apier/v1/accountprofiles_it_test.go
@@ -208,7 +208,7 @@ func testAccountSGetAccountProfile(t *testing.T) {
 	}
 	var reply *utils.AccountProfile
 	if err := accSRPC.Call(utils.APIerSv1GetAccountProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "1001"}}, &reply); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "1001"}}, &reply); err != nil {
 		t.Fatal(err)
 	} else if !reflect.DeepEqual(eAcnt, reply) {
 		t.Errorf("Expecting : %+v \n received: %+v", utils.ToJSON(eAcnt), utils.ToJSON(reply))
@@ -268,7 +268,7 @@ func testAccountSSettAccountProfile(t *testing.T) {
 	}
 	var result string
 	expErr := utils.ErrNotFound.Error()
-	if err := accSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithOpts{
+	if err := accSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "id_test"}}, &result); err == nil || err.Error() != expErr {
 		t.Errorf("Expected error: %v received: %v", expErr, err)
 	}
@@ -283,7 +283,7 @@ func testAccountSSettAccountProfile(t *testing.T) {
 		t.Error(err)
 	}
 	var reply2 *utils.AccountProfile
-	if err := accSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithOpts{
+	if err := accSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "id_test"}}, &reply2); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(accPrf, reply2) {
@@ -341,7 +341,7 @@ func testAccountSUpdateAccountProfile(t *testing.T) {
 		t.Error(err)
 	}
 	var reply2 *utils.AccountProfile
-	if err := accSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithOpts{
+	if err := accSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "id_test"}}, &reply2); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(accPrf, reply2) {
@@ -351,18 +351,18 @@ func testAccountSUpdateAccountProfile(t *testing.T) {
 
 func testAccountSRemoveAccountProfile(t *testing.T) {
 	var reply string
-	if err := accSRPC.Call(utils.APIerSv1RemoveAccountProfile, &utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "id_test"}}, &reply); err != nil {
+	if err := accSRPC.Call(utils.APIerSv1RemoveAccountProfile, &utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "id_test"}}, &reply); err != nil {
 		t.Error(err)
 	} else if reply != utils.OK {
 		t.Error("Unexpected reply returned", reply)
 	}
 	var reply2 *utils.AccountProfile
 	expErr := utils.ErrNotFound.Error()
-	if err := accSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithOpts{
+	if err := accSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "id_test"}}, &reply2); err == nil || err.Error() != expErr {
 		t.Errorf("Expected error: %v received: %v", expErr, err)
 	}
-	if err := accSRPC.Call(utils.APIerSv1RemoveAccountProfile, &utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "id_test"}}, &reply2); err == nil || err.Error() != expErr {
+	if err := accSRPC.Call(utils.APIerSv1RemoveAccountProfile, &utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "id_test"}}, &reply2); err == nil || err.Error() != expErr {
 		t.Errorf("Expected error: %v received: %v", expErr, err)
 	}
 }
diff --git a/apier/v1/accounts_it_test.go b/apier/v1/accounts_it_test.go
index 2be0dc8cf..65e2c0c25 100644
--- a/apier/v1/accounts_it_test.go
+++ b/apier/v1/accounts_it_test.go
@@ -667,7 +667,7 @@ func testAccITCountAccounts(t *testing.T) {
 func testAccITCountAccountsWithoutTenant(t *testing.T) {
 	var reply int
 	if err := accRPC.Call(utils.APIerSv1GetAccountsCount,
-		&utils.TenantIDWithOpts{},
+		&utils.TenantIDWithAPIOpts{},
 		&reply); err != nil {
 		t.Error(err)
 	} else if reply != 11 {
@@ -892,7 +892,7 @@ func testAccITAddBalanceWithDestinations(t *testing.T) {
 	}
 
 	tStart := time.Date(2016, 3, 31, 0, 0, 0, 0, time.UTC)
-	cd := &engine.CallDescriptorWithOpts{
+	cd := &engine.CallDescriptorWithAPIOpts{
 		CallDescriptor: &engine.CallDescriptor{
 			Category:      "sms",
 			Tenant:        "cgrates.org",
@@ -912,7 +912,7 @@ func testAccITAddBalanceWithDestinations(t *testing.T) {
 	}
 
 	tStart = time.Date(2016, 3, 31, 0, 0, 0, 0, time.UTC)
-	cd = &engine.CallDescriptorWithOpts{
+	cd = &engine.CallDescriptorWithAPIOpts{
 		CallDescriptor: &engine.CallDescriptor{
 			Category:      "sms",
 			Tenant:        "cgrates.org",
@@ -1330,7 +1330,7 @@ func testAccITAddVoiceBalanceWithDestinations(t *testing.T) {
 	}
 
 	tStart := time.Date(2016, 3, 31, 0, 0, 0, 0, time.UTC)
-	cd := &engine.CallDescriptorWithOpts{
+	cd := &engine.CallDescriptorWithAPIOpts{
 		CallDescriptor: &engine.CallDescriptor{
 			Category:      "call",
 			Tenant:        "cgrates.com",
diff --git a/apier/v1/accountsv1_it_test.go b/apier/v1/accountsv1_it_test.go
index 26c6f993e..017b3b38b 100644
--- a/apier/v1/accountsv1_it_test.go
+++ b/apier/v1/accountsv1_it_test.go
@@ -326,7 +326,7 @@ func testAccountSv1MaxAbstracts(t *testing.T) {
 
 	var reply *utils.AccountProfile
 	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "1001"}}, &reply); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "1001"}}, &reply); err != nil {
 		t.Fatal(err)
 	} else if !reflect.DeepEqual(eAcnt, reply) {
 		t.Errorf("Expecting : %+v \n received: %+v", utils.ToJSON(eAcnt), utils.ToJSON(reply))
@@ -433,7 +433,7 @@ func testAccountSv1DebitAbstracts(t *testing.T) {
 
 	var reply *utils.AccountProfile
 	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "1001"}}, &reply); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "1001"}}, &reply); err != nil {
 		t.Fatal(err)
 	} else if !reflect.DeepEqual(eAcnt, reply) {
 		t.Errorf("Expecting : %+v \n received: %+v", utils.ToJSON(eAcnt), utils.ToJSON(reply))
@@ -466,7 +466,7 @@ func testAccountSv1SimpleDebit(t *testing.T) {
 	}
 	var result string
 	expErr := utils.ErrNotFound.Error()
-	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithOpts{
+	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "CustomAccount"}}, &result); err == nil || err.Error() != expErr {
 		t.Errorf("Expected error: %v received: %v", expErr, err)
 	}
@@ -482,7 +482,7 @@ func testAccountSv1SimpleDebit(t *testing.T) {
 		t.Error(err)
 	}
 	var reply2 *utils.AccountProfile
-	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithOpts{
+	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "CustomAccount"}}, &reply2); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(convAcc, reply2) {
@@ -503,7 +503,7 @@ func testAccountSv1SimpleDebit(t *testing.T) {
 		t.Fatalf("received usage: %v", *eEc.Abstracts)
 	}
 
-	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithOpts{
+	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "CustomAccount"}}, &reply2); err != nil {
 		t.Error(err)
 	} else if reply2.Balances["Balance1"].Units.Cmp(decimal.New(99, 0)) != 0 {
@@ -547,7 +547,7 @@ func testAccountSv1DebitMultipleAcc(t *testing.T) {
 		t.Error(err)
 	}
 	var reply2 *utils.AccountProfile
-	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithOpts{
+	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "CustomAccount"}}, &reply2); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(convAcc, reply2) {
@@ -586,7 +586,7 @@ func testAccountSv1DebitMultipleAcc(t *testing.T) {
 	if convAcc2, err = accPrfAPI2.AsAccountProfile(); err != nil {
 		t.Fatal(err)
 	}
-	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithOpts{
+	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "CustomAccount2"}}, &reply2); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(convAcc2, reply2) {
@@ -607,14 +607,14 @@ func testAccountSv1DebitMultipleAcc(t *testing.T) {
 		t.Fatalf("received usage: %v", *eEc.Abstracts)
 	}
 
-	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithOpts{
+	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "CustomAccount"}}, &reply2); err != nil {
 		t.Error(err)
 	} else if reply2.Balances["Balance1"].Units.Cmp(decimal.New(0, 0)) != 0 {
 		t.Errorf("Expecting : %s, received: %s", decimal.New(0, 0), reply2.Balances["Balance1"].Units)
 	}
 
-	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithOpts{
+	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "CustomAccount2"}}, &reply2); err != nil {
 		t.Error(err)
 	} else if reply2.Balances["Balance1"].Units.Cmp(decimal.New(10, 0)) != 0 {
@@ -661,7 +661,7 @@ func testAccountSv1DebitMultipleAccLimited(t *testing.T) {
 		t.Error(err)
 	}
 	var reply2 *utils.AccountProfile
-	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithOpts{
+	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "CustomAccount"}}, &reply2); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(convAcc, reply2) {
@@ -700,7 +700,7 @@ func testAccountSv1DebitMultipleAccLimited(t *testing.T) {
 	if convAcc2, err = accPrfAPI2.AsAccountProfile(); err != nil {
 		t.Fatal(err)
 	}
-	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithOpts{
+	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "CustomAccount2"}}, &reply2); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(convAcc2, reply2) {
@@ -721,14 +721,14 @@ func testAccountSv1DebitMultipleAccLimited(t *testing.T) {
 		t.Fatalf("received usage: %v", *eEc.Abstracts)
 	}
 
-	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithOpts{
+	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "CustomAccount"}}, &reply2); err != nil {
 		t.Error(err)
 	} else if reply2.Balances["Balance1"].Units.Cmp(decimal.New(50, 0)) != 0 {
 		t.Errorf("Expecting : %s, received: %s", decimal.New(50, 0), reply2.Balances["Balance1"].Units)
 	}
 
-	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithOpts{
+	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "CustomAccount2"}}, &reply2); err != nil {
 		t.Error(err)
 	} else if reply2.Balances["Balance1"].Units.Cmp(decimal.New(10, 0)) != 0 {
@@ -773,7 +773,7 @@ func testAccountSv1DebitWithAttributeSandRateS(t *testing.T) {
 		t.Error(err)
 	}
 	var reply2 *utils.AccountProfile
-	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithOpts{
+	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ACC_WITH_ATTRIBUTES"}}, &reply2); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(convAcc, reply2) {
@@ -825,7 +825,7 @@ func testAccountSv1DebitWithAttributeSandRateS(t *testing.T) {
 		t.Fatalf("received usage: %v", *eEc.Abstracts)
 	}
 
-	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithOpts{
+	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ACC_WITH_ATTRIBUTES"}}, &reply2); err != nil {
 		t.Error(err)
 	} else if reply2.Balances["Balance1"].Units.Cmp(decimal.New(99, 0)) != 0 {
@@ -869,7 +869,7 @@ func testAccountSv1DebitWithRateS(t *testing.T) {
 		t.Error(err)
 	}
 	var reply2 *utils.AccountProfile
-	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithOpts{
+	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ACC_WITH_RATES"}}, &reply2); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(convAcc, reply2) {
@@ -922,7 +922,7 @@ func testAccountSv1DebitWithRateS(t *testing.T) {
 		t.Fatalf("received usage: %v", *eEc.Abstracts)
 	}
 
-	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithOpts{
+	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ACC_WITH_RATES"}}, &reply2); err != nil {
 		t.Error(err)
 	} else if reply2.Balances["Balance1"].Units.Cmp(decimal.New(95, 0)) != 0 {
@@ -973,7 +973,7 @@ func testAccountSv1DebitWithRateS2(t *testing.T) {
 		t.Error(err)
 	}
 	var reply2 *utils.AccountProfile
-	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithOpts{
+	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ACC_WITH_RATES2"}}, &reply2); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(convAcc, reply2) {
@@ -1026,7 +1026,7 @@ func testAccountSv1DebitWithRateS2(t *testing.T) {
 		t.Fatalf("received usage: %v", *eEc.Abstracts)
 	}
 
-	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithOpts{
+	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ACC_WITH_RATES2"}}, &reply2); err != nil {
 		t.Error(err)
 	} else if reply2.Balances["Balance1"].Units.Cmp(decimal.New(80, 0)) != 0 {
@@ -1100,7 +1100,7 @@ func testAccountSv1MaxConcretes(t *testing.T) {
 		t.Error(err)
 	}
 	var result *utils.AccountProfile
-	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithOpts{
+	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "1004"}}, &result); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(exp, result) {
@@ -1128,7 +1128,7 @@ func testAccountSv1MaxConcretes(t *testing.T) {
 	if err != nil {
 		t.Error(err)
 	}
-	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithOpts{
+	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "1004"}}, &result); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(exp, result) {
@@ -1218,7 +1218,7 @@ func testAccountSv1DebitConcretes(t *testing.T) {
 
 	var result *utils.AccountProfile
 	//As we debit, our Account balances are changed now
-	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithOpts{
+	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "1004"}}, &result); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(exp, result) {
@@ -1337,7 +1337,7 @@ func testAccountSv1ActionSetBalance(t *testing.T) {
 	}
 
 	var result *utils.AccountProfile
-	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithOpts{
+	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "1004"}}, &result); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(expectedSetBalance, result) {
@@ -1407,7 +1407,7 @@ func testAccountSv1ActionRemoveBalance(t *testing.T) {
 	}
 
 	var result *utils.AccountProfile
-	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithOpts{
+	if err := acntSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "1004"}}, &result); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(expectedSetBalance, result) {
diff --git a/apier/v1/actions.go b/apier/v1/actions.go
index 51d84217e..9182e2edf 100644
--- a/apier/v1/actions.go
+++ b/apier/v1/actions.go
@@ -28,7 +28,7 @@ import (
 )
 
 // GetActionProfile returns an Action Profile
-func (apierSv1 *APIerSv1) GetActionProfile(arg *utils.TenantIDWithOpts, reply *engine.ActionProfile) error {
+func (apierSv1 *APIerSv1) GetActionProfile(arg *utils.TenantIDWithAPIOpts, reply *engine.ActionProfile) error {
 	if missing := utils.MissingStructFields(arg, []string{utils.ID}); len(missing) != 0 { //Params missing
 		return utils.NewErrMandatoryIeMissing(missing...)
 	}
@@ -113,7 +113,7 @@ func (apierSv1 *APIerSv1) SetActionProfile(ap *engine.ActionProfileWithOpts, rep
 }
 
 // RemoveActionProfile remove a specific Action Profile
-func (apierSv1 *APIerSv1) RemoveActionProfile(arg *utils.TenantIDWithOpts, reply *string) error {
+func (apierSv1 *APIerSv1) RemoveActionProfile(arg *utils.TenantIDWithAPIOpts, reply *string) error {
 	if missing := utils.MissingStructFields(arg, []string{utils.ID}); len(missing) != 0 { //Params missing
 		return utils.NewErrMandatoryIeMissing(missing...)
 	}
@@ -129,8 +129,8 @@ func (apierSv1 *APIerSv1) RemoveActionProfile(arg *utils.TenantIDWithOpts, reply
 	if err := apierSv1.DataManager.SetLoadIDs(map[string]int64{utils.CacheActionProfiles: time.Now().UnixNano()}); err != nil {
 		return utils.APIErrorHandler(err)
 	}
-	if err := apierSv1.CallCache(utils.IfaceAsString(arg.Opts[utils.CacheOpt]), tnt, utils.CacheActionProfiles,
-		utils.ConcatenatedKey(tnt, arg.ID), nil, nil, arg.Opts); err != nil {
+	if err := apierSv1.CallCache(utils.IfaceAsString(arg.APIOpts[utils.CacheOpt]), tnt, utils.CacheActionProfiles,
+		utils.ConcatenatedKey(tnt, arg.ID), nil, nil, arg.APIOpts); err != nil {
 		return utils.APIErrorHandler(err)
 	}
 	*reply = utils.OK
diff --git a/apier/v1/actions_it_test.go b/apier/v1/actions_it_test.go
index 40357bac0..977043673 100644
--- a/apier/v1/actions_it_test.go
+++ b/apier/v1/actions_it_test.go
@@ -199,7 +199,7 @@ func testActionSGetActionProfile(t *testing.T) {
 	}
 	var reply *engine.ActionProfile
 	if err := actSRPC.Call(utils.APIerSv1GetActionProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ONE_TIME_ACT"}}, &reply); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ONE_TIME_ACT"}}, &reply); err != nil {
 		t.Fatal(err)
 	} else if !reflect.DeepEqual(expected, reply) {
 		t.Errorf("Expecting : %+v \n received: %+v", utils.ToJSON(expected), utils.ToJSON(reply))
@@ -235,7 +235,7 @@ func testActionSSettActionProfile(t *testing.T) {
 	}
 	var result string
 	expErr := utils.ErrNotFound.Error()
-	if err := actSRPC.Call(utils.APIerSv1GetActionProfile, &utils.TenantIDWithOpts{
+	if err := actSRPC.Call(utils.APIerSv1GetActionProfile, &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{Tenant: "tenant_test", ID: "id_test"}}, &result); err == nil || err.Error() != expErr {
 		t.Errorf("Expected error: %v received: %v", expErr, err)
 	}
@@ -246,7 +246,7 @@ func testActionSSettActionProfile(t *testing.T) {
 		t.Error("Unexpected reply returned", reply)
 	}
 	var reply2 *engine.ActionProfile
-	if err := actSRPC.Call(utils.APIerSv1GetActionProfile, &utils.TenantIDWithOpts{
+	if err := actSRPC.Call(utils.APIerSv1GetActionProfile, &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{Tenant: "tenant_test", ID: "id_test"}}, &reply2); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(actPrf.ActionProfile, reply2) {
@@ -298,7 +298,7 @@ func testActionSUpdateActionProfile(t *testing.T) {
 		t.Error("Unexpected reply returned", reply)
 	}
 	var reply2 *engine.ActionProfile
-	if err := actSRPC.Call(utils.APIerSv1GetActionProfile, &utils.TenantIDWithOpts{
+	if err := actSRPC.Call(utils.APIerSv1GetActionProfile, &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{Tenant: "tenant_test", ID: "id_test"}}, &reply2); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(actPrf.ActionProfile, reply2) {
@@ -308,18 +308,18 @@ func testActionSUpdateActionProfile(t *testing.T) {
 
 func testActionSRemoveActionProfile(t *testing.T) {
 	var reply string
-	if err := actSRPC.Call(utils.APIerSv1RemoveActionProfile, &utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "tenant_test", ID: "id_test"}}, &reply); err != nil {
+	if err := actSRPC.Call(utils.APIerSv1RemoveActionProfile, &utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "tenant_test", ID: "id_test"}}, &reply); err != nil {
 		t.Error(err)
 	} else if reply != utils.OK {
 		t.Error("Unexpected reply returned", reply)
 	}
 	var reply2 *engine.ActionProfile
 	expErr := utils.ErrNotFound.Error()
-	if err := actSRPC.Call(utils.APIerSv1GetActionProfile, &utils.TenantIDWithOpts{
+	if err := actSRPC.Call(utils.APIerSv1GetActionProfile, &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{Tenant: "tenant_test", ID: "id_test"}}, &reply2); err == nil || err.Error() != expErr {
 		t.Errorf("Expected error: %v received: %v", expErr, err)
 	}
-	if err := actSRPC.Call(utils.APIerSv1RemoveActionProfile, &utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "tenant_test", ID: "id_test"}}, &reply2); err == nil || err.Error() != expErr {
+	if err := actSRPC.Call(utils.APIerSv1RemoveActionProfile, &utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "tenant_test", ID: "id_test"}}, &reply2); err == nil || err.Error() != expErr {
 		t.Errorf("Expected error: %v received: %v", expErr, err)
 	}
 }
diff --git a/apier/v1/api_interfaces.go b/apier/v1/api_interfaces.go
index 328c7dfad..8f0c9e487 100644
--- a/apier/v1/api_interfaces.go
+++ b/apier/v1/api_interfaces.go
@@ -32,7 +32,7 @@ import (
 type ThresholdSv1Interface interface {
 	GetThresholdIDs(tenant *utils.TenantWithOpts, tIDs *[]string) error
 	GetThresholdsForEvent(args *engine.ThresholdsArgsProcessEvent, reply *engine.Thresholds) error
-	GetThreshold(tntID *utils.TenantIDWithOpts, t *engine.Threshold) error
+	GetThreshold(tntID *utils.TenantIDWithAPIOpts, t *engine.Threshold) error
 	ProcessEvent(args *engine.ThresholdsArgsProcessEvent, tIDs *[]string) error
 	Ping(ign *utils.CGREvent, reply *string) error
 }
@@ -41,8 +41,8 @@ type StatSv1Interface interface {
 	GetQueueIDs(tenant *utils.TenantWithOpts, qIDs *[]string) error
 	ProcessEvent(args *engine.StatsArgsProcessEvent, reply *[]string) error
 	GetStatQueuesForEvent(args *engine.StatsArgsProcessEvent, reply *[]string) (err error)
-	GetQueueStringMetrics(args *utils.TenantIDWithOpts, reply *map[string]string) (err error)
-	GetQueueFloatMetrics(args *utils.TenantIDWithOpts, reply *map[string]float64) (err error)
+	GetQueueStringMetrics(args *utils.TenantIDWithAPIOpts, reply *map[string]string) (err error)
+	GetQueueFloatMetrics(args *utils.TenantIDWithAPIOpts, reply *map[string]float64) (err error)
 	Ping(ign *utils.CGREvent, reply *string) error
 }
 
@@ -51,8 +51,8 @@ type ResourceSv1Interface interface {
 	AuthorizeResources(args *utils.ArgRSv1ResourceUsage, reply *string) error
 	AllocateResources(args *utils.ArgRSv1ResourceUsage, reply *string) error
 	ReleaseResources(args *utils.ArgRSv1ResourceUsage, reply *string) error
-	GetResource(args *utils.TenantIDWithOpts, reply *engine.Resource) error
-	GetResourceWithConfig(args *utils.TenantIDWithOpts, reply *engine.ResourceWithConfig) error
+	GetResource(args *utils.TenantIDWithAPIOpts, reply *engine.Resource) error
+	GetResourceWithConfig(args *utils.TenantIDWithAPIOpts, reply *engine.ResourceWithConfig) error
 	Ping(ign *utils.CGREvent, reply *string) error
 }
 
@@ -102,12 +102,12 @@ type SessionSv1Interface interface {
 }
 
 type ResponderInterface interface {
-	GetCost(arg *engine.CallDescriptorWithOpts, reply *engine.CallCost) (err error)
-	Debit(arg *engine.CallDescriptorWithOpts, reply *engine.CallCost) (err error)
-	MaxDebit(arg *engine.CallDescriptorWithOpts, reply *engine.CallCost) (err error)
-	RefundIncrements(arg *engine.CallDescriptorWithOpts, reply *engine.Account) (err error)
-	RefundRounding(arg *engine.CallDescriptorWithOpts, reply *float64) (err error)
-	GetMaxSessionTime(arg *engine.CallDescriptorWithOpts, reply *time.Duration) (err error)
+	GetCost(arg *engine.CallDescriptorWithAPIOpts, reply *engine.CallCost) (err error)
+	Debit(arg *engine.CallDescriptorWithAPIOpts, reply *engine.CallCost) (err error)
+	MaxDebit(arg *engine.CallDescriptorWithAPIOpts, reply *engine.CallCost) (err error)
+	RefundIncrements(arg *engine.CallDescriptorWithAPIOpts, reply *engine.Account) (err error)
+	RefundRounding(arg *engine.CallDescriptorWithAPIOpts, reply *float64) (err error)
+	GetMaxSessionTime(arg *engine.CallDescriptorWithAPIOpts, reply *time.Duration) (err error)
 	Shutdown(arg *utils.TenantWithOpts, reply *string) (err error)
 	Ping(ign *utils.CGREvent, reply *string) error
 }
@@ -195,14 +195,14 @@ type ReplicatorSv1Interface interface {
 	GetAccount(args *utils.StringWithOpts, reply *engine.Account) error
 	GetDestination(key *utils.StringWithOpts, reply *engine.Destination) error
 	GetReverseDestination(key *utils.StringWithOpts, reply *[]string) error
-	GetStatQueue(tntID *utils.TenantIDWithOpts, reply *engine.StatQueue) error
-	GetFilter(tntID *utils.TenantIDWithOpts, reply *engine.Filter) error
-	GetThreshold(tntID *utils.TenantIDWithOpts, reply *engine.Threshold) error
-	GetThresholdProfile(tntID *utils.TenantIDWithOpts, reply *engine.ThresholdProfile) error
-	GetStatQueueProfile(tntID *utils.TenantIDWithOpts, reply *engine.StatQueueProfile) error
+	GetStatQueue(tntID *utils.TenantIDWithAPIOpts, reply *engine.StatQueue) error
+	GetFilter(tntID *utils.TenantIDWithAPIOpts, reply *engine.Filter) error
+	GetThreshold(tntID *utils.TenantIDWithAPIOpts, reply *engine.Threshold) error
+	GetThresholdProfile(tntID *utils.TenantIDWithAPIOpts, reply *engine.ThresholdProfile) error
+	GetStatQueueProfile(tntID *utils.TenantIDWithAPIOpts, reply *engine.StatQueueProfile) error
 	GetTiming(id *utils.StringWithOpts, reply *utils.TPTiming) error
-	GetResource(tntID *utils.TenantIDWithOpts, reply *engine.Resource) error
-	GetResourceProfile(tntID *utils.TenantIDWithOpts, reply *engine.ResourceProfile) error
+	GetResource(tntID *utils.TenantIDWithAPIOpts, reply *engine.Resource) error
+	GetResourceProfile(tntID *utils.TenantIDWithAPIOpts, reply *engine.ResourceProfile) error
 	GetActionTriggers(id *utils.StringWithOpts, reply *engine.ActionTriggers) error
 	GetSharedGroup(id *utils.StringWithOpts, reply *engine.SharedGroup) error
 	GetActions(id *utils.StringWithOpts, reply *engine.Actions) error
@@ -211,12 +211,12 @@ type ReplicatorSv1Interface interface {
 	GetAccountActionPlans(id *utils.StringWithOpts, reply *[]string) error
 	GetRatingPlan(id *utils.StringWithOpts, reply *engine.RatingPlan) error
 	GetRatingProfile(id *utils.StringWithOpts, reply *engine.RatingProfile) error
-	GetRouteProfile(tntID *utils.TenantIDWithOpts, reply *engine.RouteProfile) error
-	GetAttributeProfile(tntID *utils.TenantIDWithOpts, reply *engine.AttributeProfile) error
-	GetChargerProfile(tntID *utils.TenantIDWithOpts, reply *engine.ChargerProfile) error
-	GetDispatcherProfile(tntID *utils.TenantIDWithOpts, reply *engine.DispatcherProfile) error
-	GetRateProfile(tntID *utils.TenantIDWithOpts, reply *engine.RateProfile) error
-	GetDispatcherHost(tntID *utils.TenantIDWithOpts, reply *engine.DispatcherHost) error
+	GetRouteProfile(tntID *utils.TenantIDWithAPIOpts, reply *engine.RouteProfile) error
+	GetAttributeProfile(tntID *utils.TenantIDWithAPIOpts, reply *engine.AttributeProfile) error
+	GetChargerProfile(tntID *utils.TenantIDWithAPIOpts, reply *engine.ChargerProfile) error
+	GetDispatcherProfile(tntID *utils.TenantIDWithAPIOpts, reply *engine.DispatcherProfile) error
+	GetRateProfile(tntID *utils.TenantIDWithAPIOpts, reply *engine.RateProfile) error
+	GetDispatcherHost(tntID *utils.TenantIDWithAPIOpts, reply *engine.DispatcherHost) error
 	GetItemLoadIDs(itemID *utils.StringWithOpts, reply *map[string]int64) error
 	SetThresholdProfile(th *engine.ThresholdProfileWithOpts, reply *string) error
 	SetThreshold(th *engine.ThresholdWithOpts, reply *string) error
@@ -242,17 +242,17 @@ type ReplicatorSv1Interface interface {
 	SetActionPlan(args *engine.SetActionPlanArgWithOpts, reply *string) error
 	SetAccountActionPlans(args *engine.SetAccountActionPlansArgWithOpts, reply *string) error
 	SetDispatcherHost(dpp *engine.DispatcherHostWithOpts, reply *string) error
-	RemoveThreshold(args *utils.TenantIDWithOpts, reply *string) error
+	RemoveThreshold(args *utils.TenantIDWithAPIOpts, reply *string) error
 	SetLoadIDs(args *utils.LoadIDsWithOpts, reply *string) error
 	RemoveDestination(id *utils.StringWithOpts, reply *string) error
 	RemoveAccount(id *utils.StringWithOpts, reply *string) error
-	RemoveStatQueue(args *utils.TenantIDWithOpts, reply *string) error
-	RemoveFilter(args *utils.TenantIDWithOpts, reply *string) error
-	RemoveThresholdProfile(args *utils.TenantIDWithOpts, reply *string) error
-	RemoveStatQueueProfile(args *utils.TenantIDWithOpts, reply *string) error
+	RemoveStatQueue(args *utils.TenantIDWithAPIOpts, reply *string) error
+	RemoveFilter(args *utils.TenantIDWithAPIOpts, reply *string) error
+	RemoveThresholdProfile(args *utils.TenantIDWithAPIOpts, reply *string) error
+	RemoveStatQueueProfile(args *utils.TenantIDWithAPIOpts, reply *string) error
 	RemoveTiming(id *utils.StringWithOpts, reply *string) error
-	RemoveResource(args *utils.TenantIDWithOpts, reply *string) error
-	RemoveResourceProfile(args *utils.TenantIDWithOpts, reply *string) error
+	RemoveResource(args *utils.TenantIDWithAPIOpts, reply *string) error
+	RemoveResourceProfile(args *utils.TenantIDWithAPIOpts, reply *string) error
 	RemoveActionTriggers(id *utils.StringWithOpts, reply *string) error
 	RemoveSharedGroup(id *utils.StringWithOpts, reply *string) error
 	RemoveActions(id *utils.StringWithOpts, reply *string) error
@@ -260,24 +260,24 @@ type ReplicatorSv1Interface interface {
 	RemAccountActionPlans(args *engine.RemAccountActionPlansArgsWithOpts, reply *string) error
 	RemoveRatingPlan(id *utils.StringWithOpts, reply *string) error
 	RemoveRatingProfile(id *utils.StringWithOpts, reply *string) error
-	RemoveRouteProfile(args *utils.TenantIDWithOpts, reply *string) error
-	RemoveAttributeProfile(args *utils.TenantIDWithOpts, reply *string) error
-	RemoveChargerProfile(args *utils.TenantIDWithOpts, reply *string) error
-	RemoveDispatcherProfile(args *utils.TenantIDWithOpts, reply *string) error
-	RemoveDispatcherHost(args *utils.TenantIDWithOpts, reply *string) error
-	RemoveRateProfile(args *utils.TenantIDWithOpts, reply *string) error
+	RemoveRouteProfile(args *utils.TenantIDWithAPIOpts, reply *string) error
+	RemoveAttributeProfile(args *utils.TenantIDWithAPIOpts, reply *string) error
+	RemoveChargerProfile(args *utils.TenantIDWithAPIOpts, reply *string) error
+	RemoveDispatcherProfile(args *utils.TenantIDWithAPIOpts, reply *string) error
+	RemoveDispatcherHost(args *utils.TenantIDWithAPIOpts, reply *string) error
+	RemoveRateProfile(args *utils.TenantIDWithAPIOpts, reply *string) error
 
 	GetIndexes(args *utils.GetIndexesArg, reply *map[string]utils.StringSet) error
 	SetIndexes(args *utils.SetIndexesArg, reply *string) error
 	RemoveIndexes(args *utils.GetIndexesArg, reply *string) error
 
-	GetAccountProfile(tntID *utils.TenantIDWithOpts, reply *utils.AccountProfile) error
+	GetAccountProfile(tntID *utils.TenantIDWithAPIOpts, reply *utils.AccountProfile) error
 	SetAccountProfile(args *utils.AccountProfileWithAPIOpts, reply *string) error
-	RemoveAccountProfile(args *utils.TenantIDWithOpts, reply *string) error
+	RemoveAccountProfile(args *utils.TenantIDWithAPIOpts, reply *string) error
 
-	GetActionProfile(tntID *utils.TenantIDWithOpts, reply *engine.ActionProfile) error
+	GetActionProfile(tntID *utils.TenantIDWithAPIOpts, reply *engine.ActionProfile) error
 	SetActionProfile(args *engine.ActionProfileWithOpts, reply *string) error
-	RemoveActionProfile(args *utils.TenantIDWithOpts, reply *string) error
+	RemoveActionProfile(args *utils.TenantIDWithAPIOpts, reply *string) error
 }
 
 type ActionSv1Interface interface {
diff --git a/apier/v1/apier2_it_test.go b/apier/v1/apier2_it_test.go
index f3f958b54..63168f44c 100644
--- a/apier/v1/apier2_it_test.go
+++ b/apier/v1/apier2_it_test.go
@@ -198,7 +198,7 @@ func testAPIerRemoveTPFromFolder(t *testing.T) {
 func testAPIerAfterDelete(t *testing.T) {
 	var reply *engine.AttributeProfile
 	if err := apierRPC.Call(utils.APIerSv1GetAttributeProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_1001_SIMPLEAUTH"}}, &reply); err == nil ||
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_1001_SIMPLEAUTH"}}, &reply); err == nil ||
 		err.Error() != utils.ErrNotFound.Error() {
 		t.Fatal(err)
 	}
diff --git a/apier/v1/apier_it_test.go b/apier/v1/apier_it_test.go
index a1c736f21..6ee4737d9 100644
--- a/apier/v1/apier_it_test.go
+++ b/apier/v1/apier_it_test.go
@@ -895,7 +895,7 @@ func testApierSetRatingProfile(t *testing.T) {
 	// Test here ResponderGetCost
 	tStart, _ := utils.ParseTimeDetectLayout("2013-08-07T17:30:00Z", utils.EmptyString)
 	tEnd, _ := utils.ParseTimeDetectLayout("2013-08-07T17:31:30Z", utils.EmptyString)
-	cd := &engine.CallDescriptorWithOpts{
+	cd := &engine.CallDescriptorWithAPIOpts{
 		CallDescriptor: &engine.CallDescriptor{
 			Category:      "call",
 			Tenant:        "cgrates.org",
@@ -1714,7 +1714,7 @@ func testApierGetAccountAfterLoad(t *testing.T) {
 func testApierResponderGetCost(t *testing.T) {
 	tStart, _ := utils.ParseTimeDetectLayout("2013-08-07T17:30:00Z", utils.EmptyString)
 	tEnd, _ := utils.ParseTimeDetectLayout("2013-08-07T17:31:30Z", utils.EmptyString)
-	cd := &engine.CallDescriptorWithOpts{
+	cd := &engine.CallDescriptorWithAPIOpts{
 		CallDescriptor: &engine.CallDescriptor{
 			Category:      "call",
 			Tenant:        "cgrates.org",
@@ -1737,7 +1737,7 @@ func testApierResponderGetCost(t *testing.T) {
 
 func testApierMaxDebitInexistentAcnt(t *testing.T) {
 	cc := &engine.CallCost{}
-	cd := &engine.CallDescriptorWithOpts{
+	cd := &engine.CallDescriptorWithAPIOpts{
 		CallDescriptor: &engine.CallDescriptor{
 			Tenant:      "cgrates.org",
 			Category:    "call",
diff --git a/apier/v1/attributes.go b/apier/v1/attributes.go
index 3a2421d39..01d98dfbe 100644
--- a/apier/v1/attributes.go
+++ b/apier/v1/attributes.go
@@ -26,7 +26,7 @@ import (
 )
 
 // GetAttributeProfile returns an Attribute Profile
-func (apierSv1 *APIerSv1) GetAttributeProfile(arg *utils.TenantIDWithOpts, reply *engine.AttributeProfile) (err error) {
+func (apierSv1 *APIerSv1) GetAttributeProfile(arg *utils.TenantIDWithAPIOpts, reply *engine.AttributeProfile) (err error) {
 	if missing := utils.MissingStructFields(arg, []string{utils.ID}); len(missing) != 0 { //Params missing
 		return utils.NewErrMandatoryIeMissing(missing...)
 	}
@@ -124,7 +124,7 @@ func (apierSv1 *APIerSv1) SetAttributeProfile(alsWrp *engine.AttributeProfileWit
 }
 
 //RemoveAttributeProfile remove a specific Attribute Profile
-func (apierSv1 *APIerSv1) RemoveAttributeProfile(arg *utils.TenantIDWithOpts, reply *string) error {
+func (apierSv1 *APIerSv1) RemoveAttributeProfile(arg *utils.TenantIDWithAPIOpts, reply *string) error {
 	if missing := utils.MissingStructFields(arg, []string{utils.ID}); len(missing) != 0 { //Params missing
 		return utils.NewErrMandatoryIeMissing(missing...)
 	}
@@ -140,8 +140,8 @@ func (apierSv1 *APIerSv1) RemoveAttributeProfile(arg *utils.TenantIDWithOpts, re
 	if err := apierSv1.DataManager.SetLoadIDs(map[string]int64{utils.CacheAttributeProfiles: time.Now().UnixNano()}); err != nil {
 		return utils.APIErrorHandler(err)
 	}
-	if err := apierSv1.CallCache(utils.IfaceAsString(arg.Opts[utils.CacheOpt]), tnt, utils.CacheAttributeProfiles,
-		utils.ConcatenatedKey(tnt, arg.ID), nil, nil, arg.Opts); err != nil {
+	if err := apierSv1.CallCache(utils.IfaceAsString(arg.APIOpts[utils.CacheOpt]), tnt, utils.CacheAttributeProfiles,
+		utils.ConcatenatedKey(tnt, arg.ID), nil, nil, arg.APIOpts); err != nil {
 		return utils.APIErrorHandler(err)
 	}
 	*reply = utils.OK
diff --git a/apier/v1/attributes_it_test.go b/apier/v1/attributes_it_test.go
index a2da27e6c..8ab7d2579 100644
--- a/apier/v1/attributes_it_test.go
+++ b/apier/v1/attributes_it_test.go
@@ -153,7 +153,7 @@ func testAttributeSRPCConn(t *testing.T) {
 func testAttributeSGetAlsPrfBeforeSet(t *testing.T) {
 	var reply *engine.AttributeProfile
 	if err := attrSRPC.Call(utils.APIerSv1GetAttributeProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ApierTest"}},
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ApierTest"}},
 		&reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
 		t.Error(err)
 	}
@@ -271,7 +271,7 @@ func testAttributeSGetAttributeForEventNotFound(t *testing.T) {
 	}
 	var reply *engine.AttributeProfile
 	if err := attrSRPC.Call(utils.APIerSv1GetAttributeProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_3"}}, &reply); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_3"}}, &reply); err != nil {
 		t.Fatal(err)
 	}
 	reply.Compile()
@@ -323,7 +323,7 @@ func testAttributeSGetAttributeForEventWithMetaAnyContext(t *testing.T) {
 	}
 	var reply *engine.AttributeProfile
 	if err := attrSRPC.Call(utils.APIerSv1GetAttributeProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_2"}}, &reply); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_2"}}, &reply); err != nil {
 		t.Fatal(err)
 	}
 	reply.Compile()
@@ -769,7 +769,7 @@ func testAttributeSSetAlsPrfBrokenReference(t *testing.T) {
 	}
 	var reply *engine.AttributeProfile
 	if err := attrSRPC.Call(utils.APIerSv1GetAttributeProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ApierTest"}}, &reply); err == nil ||
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ApierTest"}}, &reply); err == nil ||
 		err.Error() != utils.ErrNotFound.Error() {
 		t.Fatal(err)
 	}
@@ -804,7 +804,7 @@ func testAttributeSSetAlsPrf(t *testing.T) {
 	}
 	var reply *engine.AttributeProfile
 	if err := attrSRPC.Call(utils.APIerSv1GetAttributeProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ApierTest"}}, &reply); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ApierTest"}}, &reply); err != nil {
 		t.Fatal(err)
 	}
 	reply.Compile()
@@ -833,7 +833,7 @@ func testAttributeSUpdateAlsPrf(t *testing.T) {
 	}
 	var reply *engine.AttributeProfile
 	if err := attrSRPC.Call(utils.APIerSv1GetAttributeProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ApierTest"}}, &reply); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ApierTest"}}, &reply); err != nil {
 		t.Fatal(err)
 	}
 	reply.Compile()
@@ -849,7 +849,7 @@ func testAttributeSUpdateAlsPrf(t *testing.T) {
 func testAttributeSRemAlsPrf(t *testing.T) {
 	var resp string
 	if err := attrSRPC.Call(utils.APIerSv1RemoveAttributeProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: alsPrf.Tenant, ID: alsPrf.ID}}, &resp); err != nil {
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: alsPrf.Tenant, ID: alsPrf.ID}}, &resp); err != nil {
 		t.Error(err)
 	} else if resp != utils.OK {
 		t.Error("Unexpected reply returned", resp)
@@ -859,14 +859,14 @@ func testAttributeSRemAlsPrf(t *testing.T) {
 	}
 	var reply *engine.AttributeProfile
 	if err := attrSRPC.Call(utils.APIerSv1GetAttributeProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ApierTest"}},
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ApierTest"}},
 		&reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
 		t.Error(err)
 	}
 	// remove twice shoud return not found
 	resp = ""
 	if err := attrSRPC.Call(utils.APIerSv1RemoveAttributeProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: alsPrf.Tenant, ID: alsPrf.ID}}, &resp); err.Error() != utils.ErrNotFound.Error() {
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: alsPrf.Tenant, ID: alsPrf.ID}}, &resp); err.Error() != utils.ErrNotFound.Error() {
 		t.Errorf("Expected error: %v received: %v", utils.ErrNotFound, err)
 	}
 }
@@ -905,7 +905,7 @@ func testAttributeSSetAlsPrf2(t *testing.T) {
 	}
 	var reply *engine.AttributeProfile
 	if err := attrSRPC.Call(utils.APIerSv1GetAttributeProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "golant", ID: "ATTR_972587832508_SESSIONAUTH"}}, &reply); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "golant", ID: "ATTR_972587832508_SESSIONAUTH"}}, &reply); err != nil {
 		t.Fatal(err)
 	}
 	reply.Compile()
@@ -1283,11 +1283,11 @@ func testAttributeSGetAttributeProfileIDsCount(t *testing.T) {
 	}
 	var resp string
 	if err := attrSRPC.Call(utils.APIerSv1RemoveAttributeProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{
 			Tenant: "cgrates.org",
 			ID:     "ATTR_1",
 		},
-			Opts: map[string]interface{}{
+			APIOpts: map[string]interface{}{
 				utils.CacheOpt: utils.MetaRemove,
 			}}, &resp); err != nil {
 		t.Error(err)
@@ -1301,11 +1301,11 @@ func testAttributeSGetAttributeProfileIDsCount(t *testing.T) {
 		t.Errorf("Expecting: 6, received: %+v", reply)
 	}
 	if err := attrSRPC.Call(utils.APIerSv1RemoveAttributeProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{
 			Tenant: "cgrates.org",
 			ID:     "ATTR_2",
 		},
-			Opts: map[string]interface{}{
+			APIOpts: map[string]interface{}{
 				utils.CacheOpt: utils.MetaRemove,
 			}}, &resp); err != nil {
 		t.Error(err)
@@ -1319,11 +1319,11 @@ func testAttributeSGetAttributeProfileIDsCount(t *testing.T) {
 		t.Errorf("Expecting: 5, received: %+v", reply)
 	}
 	if err := attrSRPC.Call(utils.APIerSv1RemoveAttributeProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{
 			Tenant: "cgrates.org",
 			ID:     "ATTR_3",
 		},
-			Opts: map[string]interface{}{
+			APIOpts: map[string]interface{}{
 				utils.CacheOpt: utils.MetaRemove,
 			}}, &resp); err != nil {
 		t.Error(err)
@@ -1337,11 +1337,11 @@ func testAttributeSGetAttributeProfileIDsCount(t *testing.T) {
 		t.Errorf("Expecting: 4, received: %+v", reply)
 	}
 	if err := attrSRPC.Call(utils.APIerSv1RemoveAttributeProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{
 			Tenant: "cgrates.org",
 			ID:     "ATTR_Header",
 		},
-			Opts: map[string]interface{}{
+			APIOpts: map[string]interface{}{
 				utils.CacheOpt: utils.MetaRemove,
 			}}, &resp); err != nil {
 		t.Error(err)
@@ -1355,11 +1355,11 @@ func testAttributeSGetAttributeProfileIDsCount(t *testing.T) {
 		t.Errorf("Expecting: 3, received: %+v", reply)
 	}
 	if err := attrSRPC.Call(utils.APIerSv1RemoveAttributeProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{
 			Tenant: "cgrates.org",
 			ID:     "ATTR_PASS",
 		},
-			Opts: map[string]interface{}{
+			APIOpts: map[string]interface{}{
 				utils.CacheOpt: utils.MetaRemove,
 			}}, &resp); err != nil {
 		t.Error(err)
@@ -1373,11 +1373,11 @@ func testAttributeSGetAttributeProfileIDsCount(t *testing.T) {
 		t.Errorf("Expecting: 2, received: %+v", reply)
 	}
 	if err := attrSRPC.Call(utils.APIerSv1RemoveAttributeProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{
 			Tenant: "cgrates.org",
 			ID:     "ATTR_Search_and_replace",
 		},
-			Opts: map[string]interface{}{
+			APIOpts: map[string]interface{}{
 				utils.CacheOpt: utils.MetaRemove,
 			}},
 		&resp); err != nil {
@@ -1392,11 +1392,11 @@ func testAttributeSGetAttributeProfileIDsCount(t *testing.T) {
 		t.Errorf("Expecting: 1, received: %+v", reply)
 	}
 	if err := attrSRPC.Call(utils.APIerSv1RemoveAttributeProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{
 			Tenant: "cgrates.org",
 			ID:     "AttributeWithNonSubstitute",
 		},
-			Opts: map[string]interface{}{
+			APIOpts: map[string]interface{}{
 				utils.CacheOpt: utils.MetaRemove,
 			}},
 		&resp); err != nil {
@@ -1552,8 +1552,8 @@ func testAttributeSCachingMetaLoad(t *testing.T) {
 	//remove from cache and DataManager the profile
 	var resp string
 	if err := attrSRPC.Call(utils.APIerSv1RemoveAttributeProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: attrPrf1.Tenant, ID: attrPrf1.ID},
-			Opts: map[string]interface{}{
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: attrPrf1.Tenant, ID: attrPrf1.ID},
+			APIOpts: map[string]interface{}{
 				utils.CacheOpt: utils.MetaRemove,
 			}}, &resp); err != nil {
 		t.Error(err)
@@ -1679,7 +1679,7 @@ func testAttributeSCachingMetaReload2(t *testing.T) {
 
 	var reply *engine.AttributeProfile
 	if err := attrSRPC.Call(utils.APIerSv1GetAttributeProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_1"}}, &reply); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_1"}}, &reply); err != nil {
 		t.Fatal(err)
 	}
 	attrPrf1.Compile()
@@ -1719,7 +1719,7 @@ func testAttributeSCachingMetaReload2(t *testing.T) {
 	}
 
 	if err := attrSRPC.Call(utils.APIerSv1GetAttributeProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_1"}}, &reply); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_1"}}, &reply); err != nil {
 		t.Fatal(err)
 	}
 	attrPrf2.Compile()
@@ -1918,7 +1918,7 @@ func testAttributeSSetAlsPrfWithoutTenant(t *testing.T) {
 	alsPrf.AttributeProfile.Tenant = "cgrates.org"
 	var result *engine.AttributeProfile
 	if err := attrSRPC.Call(utils.APIerSv1GetAttributeProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{ID: "ApierTest1"}},
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{ID: "ApierTest1"}},
 		&result); err != nil {
 		t.Error(err)
 	} else if result.Compile(); !reflect.DeepEqual(alsPrf.AttributeProfile, result) {
@@ -1929,7 +1929,7 @@ func testAttributeSSetAlsPrfWithoutTenant(t *testing.T) {
 func testAttributeSRmvAlsPrfWithoutTenant(t *testing.T) {
 	var reply string
 	if err := attrSRPC.Call(utils.APIerSv1RemoveAttributeProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{ID: "ApierTest1"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{ID: "ApierTest1"}},
 		&reply); err != nil {
 		t.Error(err)
 	} else if reply != utils.OK {
@@ -1937,7 +1937,7 @@ func testAttributeSRmvAlsPrfWithoutTenant(t *testing.T) {
 	}
 	var result *engine.AttributeProfile
 	if err := attrSRPC.Call(utils.APIerSv1GetAttributeProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{ID: "ApierTest1"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{ID: "ApierTest1"}},
 		&result); err == nil || err.Error() != utils.ErrNotFound.Error() {
 		t.Error(err)
 	}
diff --git a/apier/v1/auth.go b/apier/v1/auth.go
index ca18d05d8..52deb46ff 100644
--- a/apier/v1/auth.go
+++ b/apier/v1/auth.go
@@ -58,9 +58,9 @@ func (apierSv1 *APIerSv1) GetMaxUsage(usageRecord *engine.UsageRecordWithOpts, m
 		return utils.NewErrServerError(err)
 	}
 	var maxDur time.Duration
-	if err := apierSv1.Responder.GetMaxSessionTime(&engine.CallDescriptorWithOpts{
+	if err := apierSv1.Responder.GetMaxSessionTime(&engine.CallDescriptorWithAPIOpts{
 		CallDescriptor: cd,
-		Opts:           usageRecord.Opts,
+		APIOpts:        usageRecord.Opts,
 	}, &maxDur); err != nil {
 		return err
 	}
diff --git a/apier/v1/chargers.go b/apier/v1/chargers.go
index c8951deda..33578a409 100644
--- a/apier/v1/chargers.go
+++ b/apier/v1/chargers.go
@@ -94,7 +94,7 @@ func (apierSv1 *APIerSv1) SetChargerProfile(arg *ChargerWithOpts, reply *string)
 }
 
 //RemoveChargerProfile remove a specific Charger Profile
-func (apierSv1 *APIerSv1) RemoveChargerProfile(arg *utils.TenantIDWithOpts, reply *string) error {
+func (apierSv1 *APIerSv1) RemoveChargerProfile(arg *utils.TenantIDWithAPIOpts, reply *string) error {
 	if missing := utils.MissingStructFields(arg, []string{utils.ID}); len(missing) != 0 { //Params missing
 		return utils.NewErrMandatoryIeMissing(missing...)
 	}
@@ -111,8 +111,8 @@ func (apierSv1 *APIerSv1) RemoveChargerProfile(arg *utils.TenantIDWithOpts, repl
 		return utils.APIErrorHandler(err)
 	}
 	//handle caching for ChargerProfile
-	if err := apierSv1.CallCache(utils.IfaceAsString(arg.Opts[utils.CacheOpt]), tnt, utils.CacheChargerProfiles,
-		utils.ConcatenatedKey(tnt, arg.ID), nil, nil, arg.Opts); err != nil {
+	if err := apierSv1.CallCache(utils.IfaceAsString(arg.APIOpts[utils.CacheOpt]), tnt, utils.CacheChargerProfiles,
+		utils.ConcatenatedKey(tnt, arg.ID), nil, nil, arg.APIOpts); err != nil {
 		return utils.APIErrorHandler(err)
 	}
 	*reply = utils.OK
diff --git a/apier/v1/chargers_it_test.go b/apier/v1/chargers_it_test.go
index a8fd1309a..0f1eb073e 100755
--- a/apier/v1/chargers_it_test.go
+++ b/apier/v1/chargers_it_test.go
@@ -637,7 +637,7 @@ func testChargerSSetChargerProfileWithoutTenant(t *testing.T) {
 func testChargerSRemChargerProfileWithoutTenant(t *testing.T) {
 	var reply string
 	if err := chargerRPC.Call(utils.APIerSv1RemoveChargerProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{ID: "randomID"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{ID: "randomID"}},
 		&reply); err != nil {
 		t.Error(err)
 	} else if reply != utils.OK {
diff --git a/apier/v1/cost_bench_it_test.go b/apier/v1/cost_bench_it_test.go
index e11fbb386..23a1a6ce9 100644
--- a/apier/v1/cost_bench_it_test.go
+++ b/apier/v1/cost_bench_it_test.go
@@ -193,7 +193,7 @@ func BenchmarkCostWithRALs(b *testing.B) {
 	testCostBenchLoadFromFolder(b)
 
 	tNow := time.Now()
-	cd := &engine.CallDescriptorWithOpts{
+	cd := &engine.CallDescriptorWithAPIOpts{
 		CallDescriptor: &engine.CallDescriptor{
 			Category:      "call",
 			Tenant:        "cgrates.org",
@@ -228,7 +228,7 @@ func BenchmarkCostDiffPeriodWithRALs(b *testing.B) {
 
 	tStart, _ := utils.ParseTimeDetectLayout("2020-12-09T07:00:00Z", utils.EmptyString)
 	tEnd, _ := utils.ParseTimeDetectLayout("2020-12-09T09:00:00Z", utils.EmptyString)
-	cd := &engine.CallDescriptorWithOpts{
+	cd := &engine.CallDescriptorWithAPIOpts{
 		CallDescriptor: &engine.CallDescriptor{
 			Category:      "call",
 			Tenant:        "cgrates.org",
diff --git a/apier/v1/costs.go b/apier/v1/costs.go
index 2bcf2309f..421fe81e0 100644
--- a/apier/v1/costs.go
+++ b/apier/v1/costs.go
@@ -60,9 +60,9 @@ func (apierSv1 *APIerSv1) GetCost(attrs *AttrGetCost, ec *engine.EventCost) erro
 	}
 	var cc engine.CallCost
 	if err := apierSv1.Responder.GetCost(
-		&engine.CallDescriptorWithOpts{
+		&engine.CallDescriptorWithAPIOpts{
 			CallDescriptor: cd,
-			Opts:           attrs.Opts,
+			APIOpts:        attrs.Opts,
 		}, &cc); err != nil {
 		return utils.NewErrServerError(err)
 	}
@@ -99,9 +99,9 @@ func (apierSv1 *APIerSv1) GetDataCost(attrs *AttrGetDataCost, reply *engine.Data
 		ToR:           utils.MetaData,
 	}
 	var cc engine.CallCost
-	if err := apierSv1.Responder.GetCost(&engine.CallDescriptorWithOpts{
+	if err := apierSv1.Responder.GetCost(&engine.CallDescriptorWithAPIOpts{
 		CallDescriptor: cd,
-		Opts:           attrs.Opts,
+		APIOpts:        attrs.Opts,
 	}, &cc); err != nil {
 		return utils.NewErrServerError(err)
 	}
diff --git a/apier/v1/debit.go b/apier/v1/debit.go
index 307e7c86b..a69431372 100644
--- a/apier/v1/debit.go
+++ b/apier/v1/debit.go
@@ -78,9 +78,9 @@ func (apierSv1 *APIerSv1) DebitUsageWithOptions(args *AttrDebitUsageWithOptions,
 
 	// Calculate the cost for usage and debit the account
 	var cc engine.CallCost
-	if err := apierSv1.Responder.Debit(&engine.CallDescriptorWithOpts{
+	if err := apierSv1.Responder.Debit(&engine.CallDescriptorWithAPIOpts{
 		CallDescriptor: cd,
-		Opts:           args.UsageRecord.Opts,
+		APIOpts:        args.UsageRecord.Opts,
 	}, &cc); err != nil {
 		return utils.NewErrServerError(err)
 	}
diff --git a/apier/v1/dispatcher.go b/apier/v1/dispatcher.go
index 9fab7ec12..8b2acd7a9 100755
--- a/apier/v1/dispatcher.go
+++ b/apier/v1/dispatcher.go
@@ -98,7 +98,7 @@ func (apierSv1 *APIerSv1) SetDispatcherProfile(args *DispatcherWithAPIOpts, repl
 }
 
 //RemoveDispatcherProfile remove a specific Dispatcher Profile
-func (apierSv1 *APIerSv1) RemoveDispatcherProfile(arg *utils.TenantIDWithOpts, reply *string) error {
+func (apierSv1 *APIerSv1) RemoveDispatcherProfile(arg *utils.TenantIDWithAPIOpts, reply *string) error {
 	if missing := utils.MissingStructFields(arg, []string{utils.ID}); len(missing) != 0 { //Params missing
 		return utils.NewErrMandatoryIeMissing(missing...)
 	}
@@ -115,8 +115,8 @@ func (apierSv1 *APIerSv1) RemoveDispatcherProfile(arg *utils.TenantIDWithOpts, r
 		return utils.APIErrorHandler(err)
 	}
 	//handle caching for DispatcherProfile
-	if err := apierSv1.CallCache(utils.IfaceAsString(arg.Opts[utils.CacheOpt]), tnt, utils.CacheDispatcherProfiles,
-		utils.ConcatenatedKey(tnt, arg.ID), nil, nil, arg.Opts); err != nil {
+	if err := apierSv1.CallCache(utils.IfaceAsString(arg.APIOpts[utils.CacheOpt]), tnt, utils.CacheDispatcherProfiles,
+		utils.ConcatenatedKey(tnt, arg.ID), nil, nil, arg.APIOpts); err != nil {
 		return utils.APIErrorHandler(err)
 	}
 	*reply = utils.OK
@@ -187,7 +187,7 @@ func (apierSv1 *APIerSv1) SetDispatcherHost(args *engine.DispatcherHostWithOpts,
 }
 
 //RemoveDispatcherHost remove a specific Dispatcher Host
-func (apierSv1 *APIerSv1) RemoveDispatcherHost(arg *utils.TenantIDWithOpts, reply *string) error {
+func (apierSv1 *APIerSv1) RemoveDispatcherHost(arg *utils.TenantIDWithAPIOpts, reply *string) error {
 	if missing := utils.MissingStructFields(arg, []string{utils.ID}); len(missing) != 0 { //Params missing
 		return utils.NewErrMandatoryIeMissing(missing...)
 	}
@@ -204,8 +204,8 @@ func (apierSv1 *APIerSv1) RemoveDispatcherHost(arg *utils.TenantIDWithOpts, repl
 		return utils.APIErrorHandler(err)
 	}
 	//handle caching for DispatcherProfile
-	if err := apierSv1.CallCache(utils.IfaceAsString(arg.Opts[utils.CacheOpt]), tnt, utils.CacheDispatcherHosts,
-		utils.ConcatenatedKey(tnt, arg.ID), nil, nil, arg.Opts); err != nil {
+	if err := apierSv1.CallCache(utils.IfaceAsString(arg.APIOpts[utils.CacheOpt]), tnt, utils.CacheDispatcherHosts,
+		utils.ConcatenatedKey(tnt, arg.ID), nil, nil, arg.APIOpts); err != nil {
 		return utils.APIErrorHandler(err)
 	}
 	*reply = utils.OK
@@ -243,7 +243,7 @@ func (dT *DispatcherThresholdSv1) GetThresholdIDs(args *utils.TenantWithOpts,
 	return dT.dS.ThresholdSv1GetThresholdIDs(args, tIDs)
 }
 
-func (dT *DispatcherThresholdSv1) GetThreshold(args *utils.TenantIDWithOpts,
+func (dT *DispatcherThresholdSv1) GetThreshold(args *utils.TenantIDWithAPIOpts,
 	th *engine.Threshold) error {
 	return dT.dS.ThresholdSv1GetThreshold(args, th)
 }
@@ -268,12 +268,12 @@ func (dSts *DispatcherStatSv1) GetStatQueuesForEvent(args *engine.StatsArgsProce
 }
 
 // GetQueueStringMetrics implements StatSv1GetQueueStringMetrics
-func (dSts *DispatcherStatSv1) GetQueueStringMetrics(args *utils.TenantIDWithOpts,
+func (dSts *DispatcherStatSv1) GetQueueStringMetrics(args *utils.TenantIDWithAPIOpts,
 	reply *map[string]string) error {
 	return dSts.dS.StatSv1GetQueueStringMetrics(args, reply)
 }
 
-func (dSts *DispatcherStatSv1) GetQueueFloatMetrics(args *utils.TenantIDWithOpts,
+func (dSts *DispatcherStatSv1) GetQueueFloatMetrics(args *utils.TenantIDWithAPIOpts,
 	reply *map[string]float64) error {
 	return dSts.dS.StatSv1GetQueueFloatMetrics(args, reply)
 }
@@ -308,11 +308,11 @@ func (dRs *DispatcherResourceSv1) GetResourcesForEvent(args *utils.ArgRSv1Resour
 	return dRs.dRs.ResourceSv1GetResourcesForEvent(*args, reply)
 }
 
-func (dRs *DispatcherResourceSv1) GetResource(args *utils.TenantIDWithOpts, reply *engine.Resource) error {
+func (dRs *DispatcherResourceSv1) GetResource(args *utils.TenantIDWithAPIOpts, reply *engine.Resource) error {
 	return dRs.dRs.ResourceSv1GetResource(args, reply)
 }
 
-func (dRs *DispatcherResourceSv1) GetResourceWithConfig(args *utils.TenantIDWithOpts, reply *engine.ResourceWithConfig) error {
+func (dRs *DispatcherResourceSv1) GetResourceWithConfig(args *utils.TenantIDWithAPIOpts, reply *engine.ResourceWithConfig) error {
 	return dRs.dRs.ResourceSv1GetResourceWithConfig(args, reply)
 }
 
@@ -545,27 +545,27 @@ type DispatcherResponder struct {
 	dS *dispatchers.DispatcherService
 }
 
-func (dS *DispatcherResponder) GetCost(args *engine.CallDescriptorWithOpts, reply *engine.CallCost) error {
+func (dS *DispatcherResponder) GetCost(args *engine.CallDescriptorWithAPIOpts, reply *engine.CallCost) error {
 	return dS.dS.ResponderGetCost(args, reply)
 }
 
-func (dS *DispatcherResponder) Debit(args *engine.CallDescriptorWithOpts, reply *engine.CallCost) error {
+func (dS *DispatcherResponder) Debit(args *engine.CallDescriptorWithAPIOpts, reply *engine.CallCost) error {
 	return dS.dS.ResponderDebit(args, reply)
 }
 
-func (dS *DispatcherResponder) MaxDebit(args *engine.CallDescriptorWithOpts, reply *engine.CallCost) error {
+func (dS *DispatcherResponder) MaxDebit(args *engine.CallDescriptorWithAPIOpts, reply *engine.CallCost) error {
 	return dS.dS.ResponderMaxDebit(args, reply)
 }
 
-func (dS *DispatcherResponder) RefundIncrements(args *engine.CallDescriptorWithOpts, reply *engine.Account) error {
+func (dS *DispatcherResponder) RefundIncrements(args *engine.CallDescriptorWithAPIOpts, reply *engine.Account) error {
 	return dS.dS.ResponderRefundIncrements(args, reply)
 }
 
-func (dS *DispatcherResponder) RefundRounding(args *engine.CallDescriptorWithOpts, reply *float64) error {
+func (dS *DispatcherResponder) RefundRounding(args *engine.CallDescriptorWithAPIOpts, reply *float64) error {
 	return dS.dS.ResponderRefundRounding(args, reply)
 }
 
-func (dS *DispatcherResponder) GetMaxSessionTime(args *engine.CallDescriptorWithOpts, reply *time.Duration) error {
+func (dS *DispatcherResponder) GetMaxSessionTime(args *engine.CallDescriptorWithAPIOpts, reply *time.Duration) error {
 	return dS.dS.ResponderGetMaxSessionTime(args, reply)
 }
 
@@ -917,27 +917,27 @@ func (dS *DispatcherReplicatorSv1) GetReverseDestination(key *utils.StringWithOp
 }
 
 // GetStatQueue
-func (dS *DispatcherReplicatorSv1) GetStatQueue(tntID *utils.TenantIDWithOpts, reply *engine.StatQueue) error {
+func (dS *DispatcherReplicatorSv1) GetStatQueue(tntID *utils.TenantIDWithAPIOpts, reply *engine.StatQueue) error {
 	return dS.dS.ReplicatorSv1GetStatQueue(tntID, reply)
 }
 
 // GetFilter
-func (dS *DispatcherReplicatorSv1) GetFilter(tntID *utils.TenantIDWithOpts, reply *engine.Filter) error {
+func (dS *DispatcherReplicatorSv1) GetFilter(tntID *utils.TenantIDWithAPIOpts, reply *engine.Filter) error {
 	return dS.dS.ReplicatorSv1GetFilter(tntID, reply)
 }
 
 // GetThreshold
-func (dS *DispatcherReplicatorSv1) GetThreshold(tntID *utils.TenantIDWithOpts, reply *engine.Threshold) error {
+func (dS *DispatcherReplicatorSv1) GetThreshold(tntID *utils.TenantIDWithAPIOpts, reply *engine.Threshold) error {
 	return dS.dS.ReplicatorSv1GetThreshold(tntID, reply)
 }
 
 // GetThresholdProfile
-func (dS *DispatcherReplicatorSv1) GetThresholdProfile(tntID *utils.TenantIDWithOpts, reply *engine.ThresholdProfile) error {
+func (dS *DispatcherReplicatorSv1) GetThresholdProfile(tntID *utils.TenantIDWithAPIOpts, reply *engine.ThresholdProfile) error {
 	return dS.dS.ReplicatorSv1GetThresholdProfile(tntID, reply)
 }
 
 // GetStatQueueProfile
-func (dS *DispatcherReplicatorSv1) GetStatQueueProfile(tntID *utils.TenantIDWithOpts, reply *engine.StatQueueProfile) error {
+func (dS *DispatcherReplicatorSv1) GetStatQueueProfile(tntID *utils.TenantIDWithAPIOpts, reply *engine.StatQueueProfile) error {
 	return dS.dS.ReplicatorSv1GetStatQueueProfile(tntID, reply)
 }
 
@@ -947,12 +947,12 @@ func (dS *DispatcherReplicatorSv1) GetTiming(id *utils.StringWithOpts, reply *ut
 }
 
 // GetResource
-func (dS *DispatcherReplicatorSv1) GetResource(tntID *utils.TenantIDWithOpts, reply *engine.Resource) error {
+func (dS *DispatcherReplicatorSv1) GetResource(tntID *utils.TenantIDWithAPIOpts, reply *engine.Resource) error {
 	return dS.dS.ReplicatorSv1GetResource(tntID, reply)
 }
 
 // GetResourceProfile
-func (dS *DispatcherReplicatorSv1) GetResourceProfile(tntID *utils.TenantIDWithOpts, reply *engine.ResourceProfile) error {
+func (dS *DispatcherReplicatorSv1) GetResourceProfile(tntID *utils.TenantIDWithAPIOpts, reply *engine.ResourceProfile) error {
 	return dS.dS.ReplicatorSv1GetResourceProfile(tntID, reply)
 }
 
@@ -997,32 +997,32 @@ func (dS *DispatcherReplicatorSv1) GetRatingProfile(id *utils.StringWithOpts, re
 }
 
 // GetRouteProfile
-func (dS *DispatcherReplicatorSv1) GetRouteProfile(tntID *utils.TenantIDWithOpts, reply *engine.RouteProfile) error {
+func (dS *DispatcherReplicatorSv1) GetRouteProfile(tntID *utils.TenantIDWithAPIOpts, reply *engine.RouteProfile) error {
 	return dS.dS.ReplicatorSv1GetRouteProfile(tntID, reply)
 }
 
 // GetAttributeProfile
-func (dS *DispatcherReplicatorSv1) GetAttributeProfile(tntID *utils.TenantIDWithOpts, reply *engine.AttributeProfile) error {
+func (dS *DispatcherReplicatorSv1) GetAttributeProfile(tntID *utils.TenantIDWithAPIOpts, reply *engine.AttributeProfile) error {
 	return dS.dS.ReplicatorSv1GetAttributeProfile(tntID, reply)
 }
 
 // GetChargerProfile
-func (dS *DispatcherReplicatorSv1) GetChargerProfile(tntID *utils.TenantIDWithOpts, reply *engine.ChargerProfile) error {
+func (dS *DispatcherReplicatorSv1) GetChargerProfile(tntID *utils.TenantIDWithAPIOpts, reply *engine.ChargerProfile) error {
 	return dS.dS.ReplicatorSv1GetChargerProfile(tntID, reply)
 }
 
 // GetDispatcherProfile
-func (dS *DispatcherReplicatorSv1) GetDispatcherProfile(tntID *utils.TenantIDWithOpts, reply *engine.DispatcherProfile) error {
+func (dS *DispatcherReplicatorSv1) GetDispatcherProfile(tntID *utils.TenantIDWithAPIOpts, reply *engine.DispatcherProfile) error {
 	return dS.dS.ReplicatorSv1GetDispatcherProfile(tntID, reply)
 }
 
 // GetRateProfile
-func (dS *DispatcherReplicatorSv1) GetRateProfile(tntID *utils.TenantIDWithOpts, reply *engine.RateProfile) error {
+func (dS *DispatcherReplicatorSv1) GetRateProfile(tntID *utils.TenantIDWithAPIOpts, reply *engine.RateProfile) error {
 	return dS.dS.ReplicatorSv1GetRateProfile(tntID, reply)
 }
 
 // GetDispatcherHost
-func (dS *DispatcherReplicatorSv1) GetDispatcherHost(tntID *utils.TenantIDWithOpts, reply *engine.DispatcherHost) error {
+func (dS *DispatcherReplicatorSv1) GetDispatcherHost(tntID *utils.TenantIDWithAPIOpts, reply *engine.DispatcherHost) error {
 	return dS.dS.ReplicatorSv1GetDispatcherHost(tntID, reply)
 }
 
@@ -1154,7 +1154,7 @@ func (dS *DispatcherReplicatorSv1) SetDispatcherHost(args *engine.DispatcherHost
 }
 
 // RemoveThreshold
-func (dS *DispatcherReplicatorSv1) RemoveThreshold(args *utils.TenantIDWithOpts, reply *string) error {
+func (dS *DispatcherReplicatorSv1) RemoveThreshold(args *utils.TenantIDWithAPIOpts, reply *string) error {
 	return dS.dS.ReplicatorSv1RemoveThreshold(args, reply)
 }
 
@@ -1174,22 +1174,22 @@ func (dS *DispatcherReplicatorSv1) RemoveAccount(args *utils.StringWithOpts, rep
 }
 
 // RemoveStatQueue
-func (dS *DispatcherReplicatorSv1) RemoveStatQueue(args *utils.TenantIDWithOpts, reply *string) error {
+func (dS *DispatcherReplicatorSv1) RemoveStatQueue(args *utils.TenantIDWithAPIOpts, reply *string) error {
 	return dS.dS.ReplicatorSv1RemoveStatQueue(args, reply)
 }
 
 // RemoveFilter
-func (dS *DispatcherReplicatorSv1) RemoveFilter(args *utils.TenantIDWithOpts, reply *string) error {
+func (dS *DispatcherReplicatorSv1) RemoveFilter(args *utils.TenantIDWithAPIOpts, reply *string) error {
 	return dS.dS.ReplicatorSv1RemoveFilter(args, reply)
 }
 
 // RemoveThresholdProfile
-func (dS *DispatcherReplicatorSv1) RemoveThresholdProfile(args *utils.TenantIDWithOpts, reply *string) error {
+func (dS *DispatcherReplicatorSv1) RemoveThresholdProfile(args *utils.TenantIDWithAPIOpts, reply *string) error {
 	return dS.dS.ReplicatorSv1RemoveThresholdProfile(args, reply)
 }
 
 // RemoveStatQueueProfile
-func (dS *DispatcherReplicatorSv1) RemoveStatQueueProfile(args *utils.TenantIDWithOpts, reply *string) error {
+func (dS *DispatcherReplicatorSv1) RemoveStatQueueProfile(args *utils.TenantIDWithAPIOpts, reply *string) error {
 	return dS.dS.ReplicatorSv1RemoveStatQueueProfile(args, reply)
 }
 
@@ -1199,12 +1199,12 @@ func (dS *DispatcherReplicatorSv1) RemoveTiming(args *utils.StringWithOpts, repl
 }
 
 // RemoveResource
-func (dS *DispatcherReplicatorSv1) RemoveResource(args *utils.TenantIDWithOpts, reply *string) error {
+func (dS *DispatcherReplicatorSv1) RemoveResource(args *utils.TenantIDWithAPIOpts, reply *string) error {
 	return dS.dS.ReplicatorSv1RemoveResource(args, reply)
 }
 
 // RemoveResourceProfile
-func (dS *DispatcherReplicatorSv1) RemoveResourceProfile(args *utils.TenantIDWithOpts, reply *string) error {
+func (dS *DispatcherReplicatorSv1) RemoveResourceProfile(args *utils.TenantIDWithAPIOpts, reply *string) error {
 	return dS.dS.ReplicatorSv1RemoveResourceProfile(args, reply)
 }
 
@@ -1244,32 +1244,32 @@ func (dS *DispatcherReplicatorSv1) RemoveRatingProfile(args *utils.StringWithOpt
 }
 
 // RemoveRouteProfile
-func (dS *DispatcherReplicatorSv1) RemoveRouteProfile(args *utils.TenantIDWithOpts, reply *string) error {
+func (dS *DispatcherReplicatorSv1) RemoveRouteProfile(args *utils.TenantIDWithAPIOpts, reply *string) error {
 	return dS.dS.ReplicatorSv1RemoveRouteProfile(args, reply)
 }
 
 // RemoveAttributeProfile
-func (dS *DispatcherReplicatorSv1) RemoveAttributeProfile(args *utils.TenantIDWithOpts, reply *string) error {
+func (dS *DispatcherReplicatorSv1) RemoveAttributeProfile(args *utils.TenantIDWithAPIOpts, reply *string) error {
 	return dS.dS.ReplicatorSv1RemoveAttributeProfile(args, reply)
 }
 
 // RemoveChargerProfile
-func (dS *DispatcherReplicatorSv1) RemoveChargerProfile(args *utils.TenantIDWithOpts, reply *string) error {
+func (dS *DispatcherReplicatorSv1) RemoveChargerProfile(args *utils.TenantIDWithAPIOpts, reply *string) error {
 	return dS.dS.ReplicatorSv1RemoveChargerProfile(args, reply)
 }
 
 // RemoveDispatcherProfile
-func (dS *DispatcherReplicatorSv1) RemoveDispatcherProfile(args *utils.TenantIDWithOpts, reply *string) error {
+func (dS *DispatcherReplicatorSv1) RemoveDispatcherProfile(args *utils.TenantIDWithAPIOpts, reply *string) error {
 	return dS.dS.ReplicatorSv1RemoveDispatcherProfile(args, reply)
 }
 
 // RemoveDispatcherHost
-func (dS *DispatcherReplicatorSv1) RemoveDispatcherHost(args *utils.TenantIDWithOpts, reply *string) error {
+func (dS *DispatcherReplicatorSv1) RemoveDispatcherHost(args *utils.TenantIDWithAPIOpts, reply *string) error {
 	return dS.dS.ReplicatorSv1RemoveDispatcherHost(args, reply)
 }
 
 // RemoveRateProfile
-func (dS *DispatcherReplicatorSv1) RemoveRateProfile(args *utils.TenantIDWithOpts, reply *string) error {
+func (dS *DispatcherReplicatorSv1) RemoveRateProfile(args *utils.TenantIDWithAPIOpts, reply *string) error {
 	return dS.dS.ReplicatorSv1RemoveRateProfile(args, reply)
 }
 
@@ -1289,7 +1289,7 @@ func (dS *DispatcherReplicatorSv1) RemoveIndexes(args *utils.GetIndexesArg, repl
 }
 
 // GetAccountProfile .
-func (dS *DispatcherReplicatorSv1) GetAccountProfile(tntID *utils.TenantIDWithOpts, reply *utils.AccountProfile) error {
+func (dS *DispatcherReplicatorSv1) GetAccountProfile(tntID *utils.TenantIDWithAPIOpts, reply *utils.AccountProfile) error {
 	return dS.dS.ReplicatorSv1GetAccountProfile(tntID, reply)
 }
 
@@ -1299,12 +1299,12 @@ func (dS *DispatcherReplicatorSv1) SetAccountProfile(args *utils.AccountProfileW
 }
 
 // RemoveAccountProfile .
-func (dS *DispatcherReplicatorSv1) RemoveAccountProfile(args *utils.TenantIDWithOpts, reply *string) error {
+func (dS *DispatcherReplicatorSv1) RemoveAccountProfile(args *utils.TenantIDWithAPIOpts, reply *string) error {
 	return dS.dS.ReplicatorSv1RemoveAccountProfile(args, reply)
 }
 
 // GetActionProfile .
-func (dS *DispatcherReplicatorSv1) GetActionProfile(tntID *utils.TenantIDWithOpts, reply *engine.ActionProfile) error {
+func (dS *DispatcherReplicatorSv1) GetActionProfile(tntID *utils.TenantIDWithAPIOpts, reply *engine.ActionProfile) error {
 	return dS.dS.ReplicatorSv1GetActionProfile(tntID, reply)
 }
 
@@ -1314,7 +1314,7 @@ func (dS *DispatcherReplicatorSv1) SetActionProfile(args *engine.ActionProfileWi
 }
 
 //  RemoveActionProfile .
-func (dS *DispatcherReplicatorSv1) RemoveActionProfile(args *utils.TenantIDWithOpts, reply *string) error {
+func (dS *DispatcherReplicatorSv1) RemoveActionProfile(args *utils.TenantIDWithAPIOpts, reply *string) error {
 	return dS.dS.ReplicatorSv1RemoveActionProfile(args, reply)
 }
 
diff --git a/apier/v1/dispatcher_it_test.go b/apier/v1/dispatcher_it_test.go
index 64103cb8d..eab7490e9 100644
--- a/apier/v1/dispatcher_it_test.go
+++ b/apier/v1/dispatcher_it_test.go
@@ -233,7 +233,7 @@ func testDispatcherSGetDispatcherProfileCache(t *testing.T) {
 func testDispatcherSRemDispatcherProfile(t *testing.T) {
 	var result string
 	if err := dispatcherRPC.Call(utils.APIerSv1RemoveDispatcherProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Dsp1"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Dsp1"}},
 		&result); err != nil {
 		t.Error(err)
 	} else if result != utils.OK {
@@ -248,7 +248,7 @@ func testDispatcherSRemDispatcherProfile(t *testing.T) {
 	}
 
 	if err := dispatcherRPC.Call(utils.APIerSv1RemoveDispatcherProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Dsp1"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Dsp1"}},
 		&result); err.Error() != utils.ErrNotFound.Error() {
 		t.Errorf("Expected error: %v received: %v", utils.ErrNotFound, err)
 	}
@@ -347,7 +347,7 @@ func testDispatcherSGetDispatcherHostCache(t *testing.T) {
 func testDispatcherSRemDispatcherHost(t *testing.T) {
 	var result string
 	if err := dispatcherRPC.Call(utils.APIerSv1RemoveDispatcherHost,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "DspHst1"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "DspHst1"}},
 		&result); err != nil {
 		t.Error(err)
 	} else if result != utils.OK {
@@ -362,7 +362,7 @@ func testDispatcherSRemDispatcherHost(t *testing.T) {
 	}
 
 	if err := dispatcherRPC.Call(utils.APIerSv1RemoveDispatcherHost,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "DspHst1"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "DspHst1"}},
 		&result); err.Error() != utils.ErrNotFound.Error() {
 		t.Errorf("Expected error: %v received: %v", utils.ErrNotFound, err)
 	}
@@ -403,7 +403,7 @@ func testDispatcherSSetDispatcherProfileWithoutTenant(t *testing.T) {
 func testDispatcherSRemDispatcherProfileWithoutTenant(t *testing.T) {
 	var reply string
 	if err := dispatcherRPC.Call(utils.APIerSv1RemoveDispatcherProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{ID: "Dsp1"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{ID: "Dsp1"}},
 		&reply); err != nil {
 		t.Error(err)
 	} else if reply != utils.OK {
@@ -446,7 +446,7 @@ func testDispatcherSSetDispatcherHostWithoutTenant(t *testing.T) {
 func testDispatcherSRemDispatcherHostWithoutTenant(t *testing.T) {
 	var reply string
 	if err := dispatcherRPC.Call(utils.APIerSv1RemoveDispatcherHost,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{ID: "DspHst7"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{ID: "DspHst7"}},
 		&reply); err != nil {
 		t.Error(err)
 	} else if reply != utils.OK {
diff --git a/apier/v1/filter_indexes_it_test.go b/apier/v1/filter_indexes_it_test.go
index 405e2c346..5adcdfec2 100644
--- a/apier/v1/filter_indexes_it_test.go
+++ b/apier/v1/filter_indexes_it_test.go
@@ -1192,7 +1192,7 @@ func testV1FISetAccountProfileIndexes(t *testing.T) {
 
 	//there is not an accPrf in database, so we will get NOT_FOUND
 	if err := tFIdxRpc.Call(utils.APIerSv1GetAccountProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "ACC_PRF"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "ACC_PRF"}},
 		&reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
 		t.Error(err)
 	}
@@ -1222,7 +1222,7 @@ func testV1FISetAccountProfileIndexes(t *testing.T) {
 		t.Error(err)
 	}
 	if err := tFIdxRpc.Call(utils.APIerSv1GetAccountProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "ACC_PRF"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "ACC_PRF"}},
 		&reply); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(reply, newAccPrf) {
@@ -1338,7 +1338,7 @@ func testV1FISetSecondFilterForAccountProfile(t *testing.T) {
 	}
 	var reply *utils.AccountProfile
 	if err := tFIdxRpc.Call(utils.APIerSv1GetAccountProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "ACC_PRF"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "ACC_PRF"}},
 		&reply); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(reply, newAccPrf) {
@@ -1412,7 +1412,7 @@ func testV1FIRemoveAccountProfile(t *testing.T) {
 	//removing accPrf from db will delete the indexes from dB
 	var result string
 	if err := tFIdxRpc.Call(utils.APIerSv1RemoveAccountProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "ACC_PRF"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "ACC_PRF"}},
 		&result); err != nil {
 		t.Error(err)
 	} else if result != utils.OK {
@@ -1422,7 +1422,7 @@ func testV1FIRemoveAccountProfile(t *testing.T) {
 	var reply *utils.AccountProfile
 	//there is not an accPrf in database, so we will get NOT_FOUND
 	if err := tFIdxRpc.Call(utils.APIerSv1GetAccountProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "ACC_PRF"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "ACC_PRF"}},
 		&reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
 		t.Error(err)
 	}
@@ -1462,7 +1462,7 @@ func testV1FISetActionProfileIndexes(t *testing.T) {
 	//there is not an actPrf in db, so we will get NOT_FOUND
 	var reply *engine.ActionProfile
 	if err := tFIdxRpc.Call(utils.APIerSv1GetActionProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "ACT_PRF"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "ACT_PRF"}},
 		&reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
 		t.Errorf("Expected %+v, received %+v", utils.ErrNotFound, err)
 	}
@@ -1495,7 +1495,7 @@ func testV1FISetActionProfileIndexes(t *testing.T) {
 
 	//get it from db and compare
 	if err := tFIdxRpc.Call(utils.APIerSv1GetActionProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "ACT_PRF"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "ACT_PRF"}},
 		&reply); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(reply, actPrf.ActionProfile) {
@@ -1648,7 +1648,7 @@ func testVF1SetSecondActionProfile(t *testing.T) {
 	//get it from db and compare
 	var reply *engine.ActionProfile
 	if err := tFIdxRpc.Call(utils.APIerSv1GetActionProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "ACT_PRF2"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "ACT_PRF2"}},
 		&reply); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(reply, actPrf.ActionProfile) {
@@ -1748,7 +1748,7 @@ func testV1FIRemoveActionProfile(t *testing.T) {
 	//we will remove actionProfiles 1 by one(ACT_PRF) first
 	var result string
 	if err := tFIdxRpc.Call(utils.APIerSv1RemoveActionProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "ACT_PRF"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "ACT_PRF"}},
 		&result); err != nil {
 		t.Error(err)
 	} else if result != utils.OK {
@@ -1758,14 +1758,14 @@ func testV1FIRemoveActionProfile(t *testing.T) {
 	var reply *engine.ActionProfile
 	//there is not an actPrf in database, so we will get NOT_FOUND
 	if err := tFIdxRpc.Call(utils.APIerSv1GetActionProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "ACT_PRF"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "ACT_PRF"}},
 		&reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
 		t.Error(err)
 	}
 
 	//we will remove actionProfiles 1 by one(ACT_PRF2) second
 	if err := tFIdxRpc.Call(utils.APIerSv1RemoveActionProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "ACT_PRF2"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "ACT_PRF2"}},
 		&result); err != nil {
 		t.Error(err)
 	} else if result != utils.OK {
@@ -1774,7 +1774,7 @@ func testV1FIRemoveActionProfile(t *testing.T) {
 
 	//there is not an actPrf in database, so we will get NOT_FOUND
 	if err := tFIdxRpc.Call(utils.APIerSv1GetActionProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "ACT_PRF2"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "ACT_PRF2"}},
 		&reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
 		t.Error(err)
 	}
@@ -1850,7 +1850,7 @@ func testV1FISetRateProfileRatesIndexes(t *testing.T) {
 
 	//get it from db and compare
 	if err := tFIdxRpc.Call(utils.APIerSv1GetRateProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "RP1"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "RP1"}},
 		&reply); err != nil {
 		t.Error(err)
 	} else {
@@ -2043,7 +2043,7 @@ func testV1FISetSecondRateProfileRate(t *testing.T) {
 	//get it from db and compare
 	var reply utils.RateProfile
 	if err := tFIdxRpc.Call(utils.APIerSv1GetRateProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "RP1"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "RP1"}},
 		&reply); err != nil {
 		t.Error(err)
 	} else {
@@ -2150,7 +2150,7 @@ func testVF1RemoveRateProfileRates(t *testing.T) {
 
 	var reply utils.RateProfile
 	if err := tFIdxRpc.Call(utils.APIerSv1GetRateProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "RP1"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "RP1"}},
 		&reply); err != nil {
 		t.Error(err)
 	} else {
@@ -2239,7 +2239,7 @@ func testV1FISetRateProfileIndexes(t *testing.T) {
 	//there are not any rates in db
 	var reply *engine.RateProfile
 	if err := tFIdxRpc.Call(utils.APIerSv1GetRateProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "RP2"}}, &reply); err == nil ||
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "RP2"}}, &reply); err == nil ||
 		err.Error() != utils.ErrNotFound.Error() {
 		t.Error(err)
 	}
@@ -2272,7 +2272,7 @@ func testV1FISetRateProfileIndexes(t *testing.T) {
 
 	//get it from db and compare
 	if err := tFIdxRpc.Call(utils.APIerSv1GetRateProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "RP2"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "RP2"}},
 		&reply); err != nil {
 		t.Error(err)
 	} else {
@@ -2455,7 +2455,7 @@ func testV1FISetSecondRateProfile(t *testing.T) {
 	//get it from db and compare
 	var reply utils.RateProfile
 	if err := tFIdxRpc.Call(utils.APIerSv1GetRateProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "RP3"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "RP3"}},
 		&reply); err != nil {
 		t.Error(err)
 	} else {
@@ -2535,7 +2535,7 @@ func testVF1RemoveRateProfile(t *testing.T) {
 	//removing rate profile from db will delete the indexes from db
 	var result string
 	if err := tFIdxRpc.Call(utils.APIerSv1RemoveRateProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{
 			ID:     "RP2",
 			Tenant: tenant},
 		},
@@ -2546,7 +2546,7 @@ func testVF1RemoveRateProfile(t *testing.T) {
 	}
 
 	if err := tFIdxRpc.Call(utils.APIerSv1RemoveRateProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{
 			ID:     "RP3",
 			Tenant: tenant}},
 		&result); err != nil {
@@ -2558,13 +2558,13 @@ func testVF1RemoveRateProfile(t *testing.T) {
 	//nothing to get from db
 	var reply utils.RateProfile
 	if err := tFIdxRpc.Call(utils.APIerSv1GetRateProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "RP2"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "RP2"}},
 		&reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
 		t.Error(err)
 	}
 
 	if err := tFIdxRpc.Call(utils.APIerSv1GetRateProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "RP3"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "RP3"}},
 		&reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
 		t.Error(err)
 	}
@@ -2603,7 +2603,7 @@ func testV1FIdxSetAttributeProfileIndexes(t *testing.T) {
 		t.Error("Unexpected reply returned", result)
 	}
 	if err := tFIdxRpc.Call(utils.APIerSv1GetAttributeProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "ApierTest"}}, &reply); err == nil ||
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "ApierTest"}}, &reply); err == nil ||
 		err.Error() != utils.ErrNotFound.Error() {
 		t.Error(err)
 	}
@@ -2633,7 +2633,7 @@ func testV1FIdxSetAttributeProfileIndexes(t *testing.T) {
 		t.Error("Unexpected reply returned", result)
 	}
 	if err := tFIdxRpc.Call(utils.APIerSv1GetAttributeProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "ApierTest"}}, &reply); err != nil {
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: "ApierTest"}}, &reply); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(alsPrf.FilterIDs, reply.FilterIDs) {
 		t.Errorf("Expecting : %+v, received: %+v", alsPrf.FilterIDs, reply.FilterIDs)
@@ -2711,7 +2711,7 @@ func testV1FIdxSetSecondAttributeProfileIndexes(t *testing.T) {
 		t.Error("Unexpected reply returned", result)
 	}
 	if err := tFIdxRpc.Call(utils.APIerSv1GetAttributeProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{
 			Tenant: tenant, ID: "ApierTest2"}}, &reply); err == nil ||
 		err.Error() != utils.ErrNotFound.Error() {
 		t.Error(err)
@@ -2740,7 +2740,7 @@ func testV1FIdxSetSecondAttributeProfileIndexes(t *testing.T) {
 		t.Error("Unexpected reply returned", result)
 	}
 	if err := tFIdxRpc.Call(utils.APIerSv1GetAttributeProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{
 			Tenant: tenant, ID: "ApierTest2"}}, &reply); err != nil {
 		t.Error(err)
 		t.Error(err)
@@ -2837,14 +2837,14 @@ func testV1FIdxRemoveAttributeProfile(t *testing.T) {
 	} else if result != utils.OK {
 		t.Error("Unexpected reply returned", result)
 	}
-	if err := tFIdxRpc.Call(utils.APIerSv1RemoveAttributeProfile, &utils.TenantIDWithOpts{TenantID: &utils.TenantID{
+	if err := tFIdxRpc.Call(utils.APIerSv1RemoveAttributeProfile, &utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{
 		Tenant: tenant,
 		ID:     "ApierTest"}}, &result); err != nil {
 		t.Error(err)
 	} else if result != utils.OK {
 		t.Error("Unexpected reply returned", result)
 	}
-	if err := tFIdxRpc.Call(utils.APIerSv1RemoveAttributeProfile, &utils.TenantIDWithOpts{TenantID: &utils.TenantID{
+	if err := tFIdxRpc.Call(utils.APIerSv1RemoveAttributeProfile, &utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{
 		Tenant: tenant,
 		ID:     "ApierTest2"}}, &result); err != nil {
 		t.Error(err)
@@ -2853,13 +2853,13 @@ func testV1FIdxRemoveAttributeProfile(t *testing.T) {
 	}
 	var reply *engine.AttributeProfile
 	if err := tFIdxRpc.Call(utils.APIerSv1GetAttributeProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{
 			Tenant: tenant, ID: "ApierTest2"}}, &reply); err == nil ||
 		err.Error() != utils.ErrNotFound.Error() {
 		t.Error(err)
 	}
 	if err := tFIdxRpc.Call(utils.APIerSv1GetAttributeProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{
 			Tenant: tenant, ID: "ApierTest"}}, &reply); err == nil ||
 		err.Error() != utils.ErrNotFound.Error() {
 		t.Error(err)
diff --git a/apier/v1/filterindexecache_it_test.go b/apier/v1/filterindexecache_it_test.go
index f4f840683..51adab858 100644
--- a/apier/v1/filterindexecache_it_test.go
+++ b/apier/v1/filterindexecache_it_test.go
@@ -1163,7 +1163,7 @@ func testV1FIdxCaUpdateAttributeProfileFromTP(t *testing.T) {
 	}
 	var reply engine.AttributeProfile
 	if err := tFIdxCaRpc.Call(utils.APIerSv1GetAttributeProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_1"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_1"}},
 		&reply); err != nil {
 		t.Error(err)
 	}
@@ -1224,7 +1224,7 @@ func testV1FIdxCaRemoveAttributeProfile(t *testing.T) {
 		t.Error(err)
 	}
 	//Remove threshold profile that was set form api
-	if err := tFIdxCaRpc.Call(utils.APIerSv1RemoveAttributeProfile, &utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org",
+	if err := tFIdxCaRpc.Call(utils.APIerSv1RemoveAttributeProfile, &utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org",
 		ID: "TEST_PROFILE1"}}, &resp); err != nil {
 		t.Error(err)
 	} else if resp != utils.OK {
@@ -1233,13 +1233,13 @@ func testV1FIdxCaRemoveAttributeProfile(t *testing.T) {
 	var sqp *engine.AttributeProfile
 	//Test the remove
 	if err := tFIdxCaRpc.Call(utils.APIerSv1GetAttributeProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "TEST_PROFILE1"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "TEST_PROFILE1"}},
 		&sqp); err == nil ||
 		err.Error() != utils.ErrNotFound.Error() {
 		t.Error(err)
 	}
 	//Remove threshold profile that was set form tariffplan
-	if err := tFIdxCaRpc.Call(utils.APIerSv1RemoveAttributeProfile, &utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org",
+	if err := tFIdxCaRpc.Call(utils.APIerSv1RemoveAttributeProfile, &utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org",
 		ID: "ATTR_1"}}, &resp); err != nil {
 		t.Error(err)
 	} else if resp != utils.OK {
@@ -1247,7 +1247,7 @@ func testV1FIdxCaRemoveAttributeProfile(t *testing.T) {
 	}
 	//Test the remove
 	if err := tFIdxCaRpc.Call(utils.APIerSv1GetAttributeProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_1"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_1"}},
 		&sqp); err == nil ||
 		err.Error() != utils.ErrNotFound.Error() {
 		t.Error(err)
diff --git a/apier/v1/filters.go b/apier/v1/filters.go
index 60e8cd176..d07af7c58 100644
--- a/apier/v1/filters.go
+++ b/apier/v1/filters.go
@@ -89,7 +89,7 @@ func (apierSv1 *APIerSv1) GetFilterIDs(args *utils.PaginatorWithTenant, fltrIDs
 }
 
 //RemoveFilter  remove a specific filter
-func (apierSv1 *APIerSv1) RemoveFilter(arg *utils.TenantIDWithOpts, reply *string) error {
+func (apierSv1 *APIerSv1) RemoveFilter(arg *utils.TenantIDWithAPIOpts, reply *string) error {
 	if missing := utils.MissingStructFields(arg, []string{utils.ID}); len(missing) != 0 { //Params missing
 		return utils.NewErrMandatoryIeMissing(missing...)
 	}
@@ -105,8 +105,8 @@ func (apierSv1 *APIerSv1) RemoveFilter(arg *utils.TenantIDWithOpts, reply *strin
 		return utils.APIErrorHandler(err)
 	}
 	//handle caching for Filter
-	if err := apierSv1.CallCache(utils.IfaceAsString(arg.Opts[utils.CacheOpt]), tnt, utils.CacheFilters,
-		utils.ConcatenatedKey(tnt, arg.ID), nil, nil, arg.Opts); err != nil {
+	if err := apierSv1.CallCache(utils.IfaceAsString(arg.APIOpts[utils.CacheOpt]), tnt, utils.CacheFilters,
+		utils.ConcatenatedKey(tnt, arg.ID), nil, nil, arg.APIOpts); err != nil {
 		return utils.APIErrorHandler(err)
 	}
 	*reply = utils.OK
diff --git a/apier/v1/filters_it_test.go b/apier/v1/filters_it_test.go
index e6518ae40..e07509128 100644
--- a/apier/v1/filters_it_test.go
+++ b/apier/v1/filters_it_test.go
@@ -202,7 +202,7 @@ func testFilterGetFilterAfterUpdate(t *testing.T) {
 func testFilterRemoveFilter(t *testing.T) {
 	var resp string
 	if err := filterRPC.Call(utils.APIerSv1RemoveFilter,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Filter1"}}, &resp); err != nil {
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Filter1"}}, &resp); err != nil {
 		t.Error(err)
 	} else if resp != utils.OK {
 		t.Error("Unexpected reply returned", resp)
@@ -261,7 +261,7 @@ func testFilterSetFilterWithoutTenant(t *testing.T) {
 func testFilterRemoveFilterWithoutTenant(t *testing.T) {
 	var reply string
 	if err := filterRPC.Call(utils.APIerSv1RemoveFilter,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{ID: "FilterWithoutTenant"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{ID: "FilterWithoutTenant"}},
 		&reply); err != nil {
 		t.Error(err)
 	} else if reply != utils.OK {
diff --git a/apier/v1/full_remote_it_test.go b/apier/v1/full_remote_it_test.go
index caa6338f4..b51c101c6 100644
--- a/apier/v1/full_remote_it_test.go
+++ b/apier/v1/full_remote_it_test.go
@@ -125,7 +125,7 @@ func testFullRemoteITAttribute(t *testing.T) {
 	// verify for not found in internal
 	var reply *engine.AttributeProfile
 	if err := fullRemInternalRPC.Call(utils.APIerSv1GetAttributeProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_1001_SIMPLEAUTH"}},
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_1001_SIMPLEAUTH"}},
 		&reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
 		t.Fatal(err)
 	}
@@ -154,7 +154,7 @@ func testFullRemoteITAttribute(t *testing.T) {
 	}
 
 	if err := fullRemInternalRPC.Call(utils.APIerSv1GetAttributeProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_1001_SIMPLEAUTH"}},
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_1001_SIMPLEAUTH"}},
 		&reply); err != nil {
 		t.Fatal(err)
 	}
@@ -172,7 +172,7 @@ func testFullRemoteITAttribute(t *testing.T) {
 	}
 
 	if err := fullRemInternalRPC.Call(utils.APIerSv1GetAttributeProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_1001_SIMPLEAUTH"}},
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_1001_SIMPLEAUTH"}},
 		&reply); err != nil {
 		t.Fatal(err)
 	}
@@ -186,7 +186,7 @@ func testFullRemoteITStatQueue(t *testing.T) {
 	// verify for not found in internal
 	var reply *engine.StatQueueProfile
 	if err := fullRemInternalRPC.Call(utils.APIerSv1GetStatQueueProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "TEST_PROFILE1"}},
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "TEST_PROFILE1"}},
 		&reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
 		t.Fatal(err)
 	}
@@ -226,7 +226,7 @@ func testFullRemoteITStatQueue(t *testing.T) {
 	}
 
 	if err := fullRemInternalRPC.Call(utils.APIerSv1GetStatQueueProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "TEST_PROFILE1"}},
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "TEST_PROFILE1"}},
 		&reply); err != nil {
 		t.Fatal(err)
 	} else if !reflect.DeepEqual(stat.StatQueueProfile, reply) {
@@ -241,7 +241,7 @@ func testFullRemoteITStatQueue(t *testing.T) {
 	}
 
 	if err := fullRemInternalRPC.Call(utils.APIerSv1GetStatQueueProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "TEST_PROFILE1"}},
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "TEST_PROFILE1"}},
 		&reply); err != nil {
 		t.Fatal(err)
 	} else if !reflect.DeepEqual(stat.StatQueueProfile, reply) {
@@ -253,7 +253,7 @@ func testFullRemoteITThreshold(t *testing.T) {
 	// verify for not found in internal
 	var reply *engine.ThresholdProfile
 	if err := fullRemInternalRPC.Call(utils.APIerSv1GetThresholdProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "THD_Test"}},
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "THD_Test"}},
 		&reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
 		t.Fatal(err)
 	}
@@ -284,7 +284,7 @@ func testFullRemoteITThreshold(t *testing.T) {
 	}
 
 	if err := fullRemInternalRPC.Call(utils.APIerSv1GetThresholdProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "THD_Test"}},
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "THD_Test"}},
 		&reply); err != nil {
 		t.Fatal(err)
 	} else if !reflect.DeepEqual(tPrfl.ThresholdProfile, reply) {
@@ -299,7 +299,7 @@ func testFullRemoteITThreshold(t *testing.T) {
 	}
 
 	if err := fullRemInternalRPC.Call(utils.APIerSv1GetThresholdProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "THD_Test"}},
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "THD_Test"}},
 		&reply); err != nil {
 		t.Fatal(err)
 	} else if !reflect.DeepEqual(tPrfl.ThresholdProfile, reply) {
@@ -311,7 +311,7 @@ func testFullRemoteITResource(t *testing.T) {
 	// verify for not found in internal
 	var reply *engine.ResourceProfile
 	if err := fullRemInternalRPC.Call(utils.APIerSv1GetResourceProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ResGroup1"}},
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ResGroup1"}},
 		&reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
 		t.Fatal(err)
 	}
@@ -341,7 +341,7 @@ func testFullRemoteITResource(t *testing.T) {
 	}
 
 	if err := fullRemInternalRPC.Call(utils.APIerSv1GetResourceProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ResGroup1"}},
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ResGroup1"}},
 		&reply); err != nil {
 		t.Fatal(err)
 	} else if !reflect.DeepEqual(rlsPrf.ResourceProfile, reply) {
@@ -356,7 +356,7 @@ func testFullRemoteITResource(t *testing.T) {
 	}
 
 	if err := fullRemInternalRPC.Call(utils.APIerSv1GetResourceProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ResGroup1"}},
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ResGroup1"}},
 		&reply); err != nil {
 		t.Fatal(err)
 	} else if !reflect.DeepEqual(rlsPrf.ResourceProfile, reply) {
@@ -368,7 +368,7 @@ func testFullRemoteITRoute(t *testing.T) {
 	// verify for not found in internal
 	var reply *engine.RouteProfile
 	if err := fullRemInternalRPC.Call(utils.APIerSv1GetRouteProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ROUTE_ACNT_1001"}},
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ROUTE_ACNT_1001"}},
 		&reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
 		t.Fatal(err)
 	}
@@ -399,7 +399,7 @@ func testFullRemoteITRoute(t *testing.T) {
 	}
 
 	if err := fullRemInternalRPC.Call(utils.APIerSv1GetRouteProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ROUTE_ACNT_1001"}},
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ROUTE_ACNT_1001"}},
 		&reply); err != nil {
 		t.Fatal(err)
 	} else if !reflect.DeepEqual(routePrf, reply) {
@@ -414,7 +414,7 @@ func testFullRemoteITRoute(t *testing.T) {
 	}
 
 	if err := fullRemInternalRPC.Call(utils.APIerSv1GetRouteProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ROUTE_ACNT_1001"}},
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ROUTE_ACNT_1001"}},
 		&reply); err != nil {
 		t.Fatal(err)
 	} else if !reflect.DeepEqual(routePrf, reply) {
@@ -426,7 +426,7 @@ func testFullRemoteITFilter(t *testing.T) {
 	// verify for not found in internal
 	var reply *engine.Filter
 	if err := fullRemInternalRPC.Call(utils.APIerSv1GetFilter,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "FLTR_ACNT_1001"}},
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "FLTR_ACNT_1001"}},
 		&reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
 		t.Fatal(err)
 	}
@@ -454,7 +454,7 @@ func testFullRemoteITFilter(t *testing.T) {
 	}
 
 	if err := fullRemInternalRPC.Call(utils.APIerSv1GetFilter,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "FLTR_ACNT_1001"}},
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "FLTR_ACNT_1001"}},
 		&reply); err != nil {
 		t.Fatal(err)
 	} else if !reflect.DeepEqual(fltr, reply) {
@@ -480,7 +480,7 @@ func testFullRemoteITFilter(t *testing.T) {
 	}
 
 	if err := fullRemInternalRPC.Call(utils.APIerSv1GetFilter,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "FLTR_ACNT_1001"}},
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "FLTR_ACNT_1001"}},
 		&reply); err != nil {
 		t.Fatal(err)
 	} else if !reflect.DeepEqual(fltr, reply) {
@@ -492,7 +492,7 @@ func testFullRemoteITCharger(t *testing.T) {
 	// verify for not found in internal
 	var reply *engine.ChargerProfile
 	if err := fullRemInternalRPC.Call(utils.APIerSv1GetChargerProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "DEFAULT"}},
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "DEFAULT"}},
 		&reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
 		t.Fatal(err)
 	}
@@ -513,7 +513,7 @@ func testFullRemoteITCharger(t *testing.T) {
 	}
 
 	if err := fullRemInternalRPC.Call(utils.APIerSv1GetChargerProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "DEFAULT"}},
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "DEFAULT"}},
 		&reply); err != nil {
 		t.Fatal(err)
 	} else if !reflect.DeepEqual(chargerProfile, reply) {
@@ -528,7 +528,7 @@ func testFullRemoteITCharger(t *testing.T) {
 	}
 
 	if err := fullRemInternalRPC.Call(utils.APIerSv1GetChargerProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "DEFAULT"}},
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "DEFAULT"}},
 		&reply); err != nil {
 		t.Fatal(err)
 	} else if !reflect.DeepEqual(chargerProfile, reply) {
@@ -540,7 +540,7 @@ func testFullRemoteITDispatcher(t *testing.T) {
 	// verify for not found in internal
 	var reply *engine.DispatcherProfile
 	if err := fullRemInternalRPC.Call(utils.APIerSv1GetDispatcherProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Dsp1"}},
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Dsp1"}},
 		&reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
 		t.Fatal(err)
 	}
@@ -563,7 +563,7 @@ func testFullRemoteITDispatcher(t *testing.T) {
 	}
 
 	if err := fullRemInternalRPC.Call(utils.APIerSv1GetDispatcherProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Dsp1"}},
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Dsp1"}},
 		&reply); err != nil {
 		t.Fatal(err)
 	} else if !reflect.DeepEqual(dispatcherProfile.DispatcherProfile, reply) {
@@ -578,7 +578,7 @@ func testFullRemoteITDispatcher(t *testing.T) {
 	}
 
 	if err := fullRemInternalRPC.Call(utils.APIerSv1GetDispatcherProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Dsp1"}},
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Dsp1"}},
 		&reply); err != nil {
 		t.Fatal(err)
 	} else if !reflect.DeepEqual(dispatcherProfile.DispatcherProfile, reply) {
@@ -590,7 +590,7 @@ func testFullRemoteITRate(t *testing.T) {
 	// verify for not found in internal
 	var reply *engine.RateProfile
 	if err := fullRemInternalRPC.Call(utils.APIerSv1GetRateProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "RP1"}},
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "RP1"}},
 		&reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
 		t.Fatal(err)
 	}
@@ -634,7 +634,7 @@ func testFullRemoteITRate(t *testing.T) {
 		t.Error(err)
 	}
 	if err := fullRemInternalRPC.Call(utils.APIerSv1GetRateProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "RP1"}},
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "RP1"}},
 		&reply); err != nil {
 		t.Fatal(err)
 	}
@@ -654,7 +654,7 @@ func testFullRemoteITRate(t *testing.T) {
 		t.Error(err)
 	}
 	if err := fullRemInternalRPC.Call(utils.APIerSv1GetRateProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "RP1"}},
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "RP1"}},
 		&reply); err != nil {
 		t.Fatal(err)
 	}
@@ -668,7 +668,7 @@ func testFullRemoteITAction(t *testing.T) {
 	// verify for not found in internal
 	var reply *engine.ActionProfile
 	if err := fullRemInternalRPC.Call(utils.APIerSv1GetActionProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ACT_1"}},
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ACT_1"}},
 		&reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
 		t.Fatal(err)
 	}
@@ -699,7 +699,7 @@ func testFullRemoteITAction(t *testing.T) {
 	}
 
 	if err := fullRemInternalRPC.Call(utils.APIerSv1GetActionProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ACT_1"}},
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ACT_1"}},
 		&reply); err != nil {
 		t.Fatal(err)
 	} else if !reflect.DeepEqual(actPrf.ActionProfile, reply) {
@@ -713,7 +713,7 @@ func testFullRemoteITAction(t *testing.T) {
 		t.Error("Unexpected reply returned", replySet)
 	}
 	if err := fullRemInternalRPC.Call(utils.APIerSv1GetActionProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ACT_1"}},
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ACT_1"}},
 		&reply); err != nil {
 		t.Fatal(err)
 	} else if !reflect.DeepEqual(actPrf.ActionProfile, reply) {
@@ -725,7 +725,7 @@ func testFullRemoteITAccount(t *testing.T) {
 	// verify for not found in internal
 	var reply *utils.AccountProfile
 	if err := fullRemInternalRPC.Call(utils.APIerSv1GetAccountProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "1001"}},
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "1001"}},
 		&reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
 		t.Fatal(err)
 	}
@@ -793,7 +793,7 @@ func testFullRemoteITAccount(t *testing.T) {
 	}
 
 	if err := fullRemInternalRPC.Call(utils.APIerSv1GetAccountProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "1001"}},
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "1001"}},
 		&reply); err != nil {
 		t.Fatal(err)
 	} else if !reflect.DeepEqual(accPrf, reply) {
@@ -814,7 +814,7 @@ func testFullRemoteITAccount(t *testing.T) {
 	}
 
 	if err := fullRemInternalRPC.Call(utils.APIerSv1GetAccountProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "1001"}},
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "1001"}},
 		&reply); err != nil {
 		t.Fatal(err)
 	} else if !reflect.DeepEqual(accPrf, reply) {
diff --git a/apier/v1/preload_it_test.go b/apier/v1/preload_it_test.go
index f3b81bbd9..2a2ee2dc1 100644
--- a/apier/v1/preload_it_test.go
+++ b/apier/v1/preload_it_test.go
@@ -149,7 +149,7 @@ func testPreloadITVerifyAttributes(t *testing.T) {
 
 	var reply *engine.AttributeProfile
 	if err := preloadRPC.Call(utils.APIerSv1GetAttributeProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ALS1"}}, &reply); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ALS1"}}, &reply); err != nil {
 		t.Fatal(err)
 	}
 	reply.Compile()
diff --git a/apier/v1/rateprofiles.go b/apier/v1/rateprofiles.go
index 2720c7fa9..b844848f9 100644
--- a/apier/v1/rateprofiles.go
+++ b/apier/v1/rateprofiles.go
@@ -28,7 +28,7 @@ import (
 )
 
 // GetRateProfile returns an Rate Profile
-func (apierSv1 *APIerSv1) GetRateProfile(arg *utils.TenantIDWithOpts, reply *engine.RateProfile) error {
+func (apierSv1 *APIerSv1) GetRateProfile(arg *utils.TenantIDWithAPIOpts, reply *engine.RateProfile) error {
 	if missing := utils.MissingStructFields(arg, []string{utils.ID}); len(missing) != 0 { //Params missing
 		return utils.NewErrMandatoryIeMissing(missing...)
 	}
@@ -173,7 +173,7 @@ func (apierSv1 *APIerSv1) RemoveRateProfileRates(args *RemoveRPrfRatesWithOpts,
 }
 
 // RemoveRateProfile remove a specific Rate Profile
-func (apierSv1 *APIerSv1) RemoveRateProfile(arg *utils.TenantIDWithOpts, reply *string) error {
+func (apierSv1 *APIerSv1) RemoveRateProfile(arg *utils.TenantIDWithAPIOpts, reply *string) error {
 	if missing := utils.MissingStructFields(arg, []string{utils.ID}); len(missing) != 0 { //Params missing
 		return utils.NewErrMandatoryIeMissing(missing...)
 	}
@@ -189,8 +189,8 @@ func (apierSv1 *APIerSv1) RemoveRateProfile(arg *utils.TenantIDWithOpts, reply *
 	if err := apierSv1.DataManager.SetLoadIDs(map[string]int64{utils.CacheRateProfiles: time.Now().UnixNano()}); err != nil {
 		return utils.APIErrorHandler(err)
 	}
-	if err := apierSv1.CallCache(utils.IfaceAsString(arg.Opts[utils.CacheOpt]), tnt, utils.CacheRateProfiles,
-		utils.ConcatenatedKey(tnt, arg.ID), nil, nil, arg.Opts); err != nil {
+	if err := apierSv1.CallCache(utils.IfaceAsString(arg.APIOpts[utils.CacheOpt]), tnt, utils.CacheRateProfiles,
+		utils.ConcatenatedKey(tnt, arg.ID), nil, nil, arg.APIOpts); err != nil {
 		return utils.APIErrorHandler(err)
 	}
 	*reply = utils.OK
diff --git a/apier/v1/rateprofiles_it_test.go b/apier/v1/rateprofiles_it_test.go
index fe91c71db..3cdb4d74a 100644
--- a/apier/v1/rateprofiles_it_test.go
+++ b/apier/v1/rateprofiles_it_test.go
@@ -127,7 +127,7 @@ func testV1RatePrfRpcConn(t *testing.T) {
 func testV1RatePrfNotFound(t *testing.T) {
 	var reply *engine.RateProfile
 	if err := ratePrfRpc.Call(utils.APIerSv1GetRateProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "RP1"}},
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "RP1"}},
 		&reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
 		t.Error(err)
 	}
@@ -145,7 +145,7 @@ func testV1RatePrfFromFolder(t *testing.T) {
 func testV1RatePrfVerifyRateProfile(t *testing.T) {
 	var reply *engine.RateProfile
 	if err := ratePrfRpc.Call(utils.APIerSv1GetRateProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "RP1"}}, &reply); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "RP1"}}, &reply); err != nil {
 		t.Fatal(err)
 	}
 	minDecimal, err := utils.NewDecimalFromUsage("1m")
@@ -237,7 +237,7 @@ func testV1RatePrfVerifyRateProfile(t *testing.T) {
 func testV1RatePrfRemoveRateProfile(t *testing.T) {
 	var reply string
 	if err := ratePrfRpc.Call(utils.APIerSv1RemoveRateProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "RP1"}}, &reply); err != nil {
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "RP1"}}, &reply); err != nil {
 		t.Fatal(err)
 	} else if reply != utils.OK {
 		t.Errorf("Expecting: %+v, received: %+v", utils.OK, reply)
@@ -431,7 +431,7 @@ func testV1RatePrfSetRateProfileRates(t *testing.T) {
 	}
 	var rply *engine.RateProfile
 	if err := ratePrfRpc.Call(utils.APIerSv1GetRateProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "RP1"}}, &rply); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "RP1"}}, &rply); err != nil {
 		t.Fatal(err)
 	} else if !reflect.DeepEqual(rPrfUpdated, rply) {
 		t.Errorf("Expecting: %+v, \n received: %+v",
@@ -549,7 +549,7 @@ func testV1RatePrfRemoveRateProfileRates(t *testing.T) {
 	}
 	var rply *engine.RateProfile
 	if err := ratePrfRpc.Call(utils.APIerSv1GetRateProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "SpecialRate"}}, &rply); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "SpecialRate"}}, &rply); err != nil {
 		t.Fatal(err)
 	} else if !reflect.DeepEqual(rPrfUpdated, rply) {
 		t.Errorf("Expecting: %+v, \n received: %+v",
@@ -580,7 +580,7 @@ func testV1RatePrfRemoveRateProfileRates(t *testing.T) {
 	}
 	var rply2 *engine.RateProfile
 	if err := ratePrfRpc.Call(utils.APIerSv1GetRateProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "SpecialRate"}}, &rply2); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "SpecialRate"}}, &rply2); err != nil {
 		t.Fatal(err)
 	} else if !reflect.DeepEqual(rPrfUpdated2, rply2) {
 		t.Errorf("Expecting: %+v, \n received: %+v",
@@ -662,7 +662,7 @@ func testV1RateGetRemoveRateProfileWithoutTenant(t *testing.T) {
 	var result *engine.RateProfile
 	rateProfile.Tenant = "cgrates.org"
 	if err := ratePrfRpc.Call(utils.APIerSv1GetRateProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{ID: "RPWithoutTenant"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{ID: "RPWithoutTenant"}},
 		&result); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(result, rateProfile) {
@@ -673,7 +673,7 @@ func testV1RateGetRemoveRateProfileWithoutTenant(t *testing.T) {
 func testV1RatePrfRemoveRateProfileWithoutTenant(t *testing.T) {
 	var reply string
 	if err := ratePrfRpc.Call(utils.APIerSv1RemoveRateProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{ID: "RPWithoutTenant"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{ID: "RPWithoutTenant"}},
 		&reply); err != nil {
 		t.Error(err)
 	} else if reply != utils.OK {
@@ -681,7 +681,7 @@ func testV1RatePrfRemoveRateProfileWithoutTenant(t *testing.T) {
 	}
 	var result *engine.RateProfile
 	if err := ratePrfRpc.Call(utils.APIerSv1GetRateProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{ID: "RPWithoutTenant"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{ID: "RPWithoutTenant"}},
 		&result); err == nil || err.Error() != utils.ErrNotFound.Error() {
 		t.Error(err)
 	}
@@ -803,7 +803,7 @@ func testV1RatePrfGetRateProfileRatesWithoutTenant(t *testing.T) {
 	rPrf.Tenant = "cgrates.org"
 	var rply *engine.RateProfile
 	if err := ratePrfRpc.Call(utils.APIerSv1GetRateProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{ID: "SpecialRate"}},
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{ID: "SpecialRate"}},
 		&rply); err != nil {
 		t.Fatal(err)
 	} else if !reflect.DeepEqual(rPrf, rply) {
diff --git a/apier/v1/remote_it_test.go b/apier/v1/remote_it_test.go
index b09777a3c..184cb957a 100644
--- a/apier/v1/remote_it_test.go
+++ b/apier/v1/remote_it_test.go
@@ -249,7 +249,7 @@ func testInternalRemoteITGetAttribute(t *testing.T) {
 	alsPrf.Compile()
 	var reply *engine.AttributeProfile
 	if err := internalRPC.Call(utils.APIerSv1GetAttributeProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_1001_SIMPLEAUTH"}}, &reply); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_1001_SIMPLEAUTH"}}, &reply); err != nil {
 		t.Fatal(err)
 	}
 	if *encoding == utils.MetaGOB { // in gob emtpty slice is encoded as nil
@@ -265,7 +265,7 @@ func testInternalRemoteITGetThreshold(t *testing.T) {
 	var td engine.Threshold
 	eTd := engine.Threshold{Tenant: "cgrates.org", ID: "THD_ACNT_1001"}
 	if err := internalRPC.Call(utils.ThresholdSv1GetThreshold,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "THD_ACNT_1001"}}, &td); err != nil {
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "THD_ACNT_1001"}}, &td); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(eTd, td) {
 		t.Errorf("expecting: %+v, received: %+v", eTd, td)
@@ -306,14 +306,14 @@ func testInternalRemoteITGetResource(t *testing.T) {
 		Usages: map[string]*engine.ResourceUsage{},
 	}
 	if err := internalRPC.Call(utils.ResourceSv1GetResource,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ResGroup1"}}, &reply); err != nil {
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ResGroup1"}}, &reply); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(reply, expectedResources) {
 		t.Errorf("Expecting: %+v, received: %+v", utils.ToJSON(expectedResources), utils.ToJSON(reply))
 	}
 
 	if err := internalRPC.Call(utils.ResourceSv1GetResource,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{ID: "ResGroup1"}}, &reply); err != nil {
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{ID: "ResGroup1"}}, &reply); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(reply, expectedResources) {
 		t.Errorf("Expecting: %+v, received: %+v", utils.ToJSON(expectedResources), utils.ToJSON(reply))
@@ -666,7 +666,7 @@ func testInternalRemoteITGetDispatcherHost(t *testing.T) {
 func testInternalRemoteITGetRateProfile(t *testing.T) {
 	var rcv *engine.RateProfile
 	if err := internalRPC.Call(utils.APIerSv1GetRateProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "RP1"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "RP1"}},
 		&rcv); err == nil || err.Error() != utils.ErrNotFound.Error() {
 		t.Error(err)
 	}
@@ -747,7 +747,7 @@ func testInternalRemoteITGetRateProfile(t *testing.T) {
 
 	var rPfrg *engine.RateProfile
 	if err := internalRPC.Call(utils.APIerSv1GetRateProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "RP1"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "RP1"}},
 		&rPfrg); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(rPrf, rPfrg) {
diff --git a/apier/v1/replicate_it_test.go b/apier/v1/replicate_it_test.go
index 81f779686..52a312c29 100644
--- a/apier/v1/replicate_it_test.go
+++ b/apier/v1/replicate_it_test.go
@@ -238,7 +238,7 @@ func testInternalReplicateITAttributeProfile(t *testing.T) {
 	// check
 	var reply *engine.AttributeProfile
 	if err := engineOneRPC.Call(utils.APIerSv1GetAttributeProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: alsPrf.Tenant, ID: alsPrf.ID}}, &reply); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: alsPrf.Tenant, ID: alsPrf.ID}}, &reply); err != nil {
 		t.Fatal(err)
 	}
 	reply.Compile()
@@ -246,7 +246,7 @@ func testInternalReplicateITAttributeProfile(t *testing.T) {
 		t.Errorf("Expecting : %+v, received: %+v", alsPrf.AttributeProfile, reply)
 	}
 	if err := engineTwoRPC.Call(utils.APIerSv1GetAttributeProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: alsPrf.Tenant, ID: alsPrf.ID}}, &reply); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: alsPrf.Tenant, ID: alsPrf.ID}}, &reply); err != nil {
 		t.Fatal(err)
 	}
 	reply.Compile()
@@ -255,7 +255,7 @@ func testInternalReplicateITAttributeProfile(t *testing.T) {
 	}
 	reply = &engine.AttributeProfile{}
 	//remove
-	if err := internalRPC.Call(utils.APIerSv1RemoveAttributeProfile, &utils.TenantIDWithOpts{TenantID: &utils.TenantID{
+	if err := internalRPC.Call(utils.APIerSv1RemoveAttributeProfile, &utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{
 		Tenant: alsPrf.Tenant, ID: alsPrf.ID}}, &result); err != nil {
 		t.Error(err)
 	} else if result != utils.OK {
@@ -263,11 +263,11 @@ func testInternalReplicateITAttributeProfile(t *testing.T) {
 	}
 	//check again
 	if err := engineOneRPC.Call(utils.APIerSv1GetAttributeProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: alsPrf.Tenant, ID: alsPrf.ID}}, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: alsPrf.Tenant, ID: alsPrf.ID}}, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
 		t.Errorf("Expecting: %+v received: %+v", utils.ErrNotFound, err)
 	}
 	if err := engineTwoRPC.Call(utils.APIerSv1GetAttributeProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: alsPrf.Tenant, ID: alsPrf.ID}}, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: alsPrf.Tenant, ID: alsPrf.ID}}, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() {
 		t.Errorf("Expecting: %+v received: %+v", utils.ErrNotFound, err)
 	}
 }
@@ -391,7 +391,7 @@ func testInternalReplicateITRouteProfile(t *testing.T) {
 	// remove
 	var resp string
 	if err := internalRPC.Call(utils.APIerSv1RemoveRouteProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "TEST_PROFILE1"}}, &resp); err != nil {
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "TEST_PROFILE1"}}, &resp); err != nil {
 		t.Error(err)
 	} else if resp != utils.OK {
 		t.Error("Unexpected reply returned", resp)
@@ -535,14 +535,14 @@ func testInternalReplicateITDispatcherProfile(t *testing.T) {
 	// remove
 	var result string
 	if err := internalRPC.Call(utils.APIerSv1RemoveDispatcherProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Dsp1"}}, &result); err != nil {
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Dsp1"}}, &result); err != nil {
 		t.Error(err)
 	} else if result != utils.OK {
 		t.Errorf("Expecting : %+v, received: %+v", utils.OK, result)
 	}
 	// remove again
 	if err := internalRPC.Call(utils.APIerSv1RemoveDispatcherProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Dsp1"}}, &result); err == nil || err.Error() != utils.ErrNotFound.Error() {
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Dsp1"}}, &result); err == nil || err.Error() != utils.ErrNotFound.Error() {
 		t.Error(err)
 	}
 	// check again
@@ -669,7 +669,7 @@ func testInternalReplicateITDispatcherHost(t *testing.T) {
 	}
 	// remove
 	if err := internalRPC.Call(utils.APIerSv1RemoveDispatcherHost,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "DspHst1"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "DspHst1"}},
 		&reply); err != nil {
 		t.Error(err)
 	} else if reply != utils.OK {
@@ -735,7 +735,7 @@ func testInternalReplicateITFilter(t *testing.T) {
 	// remove
 	var resp string
 	if err := internalRPC.Call(utils.APIerSv1RemoveFilter,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Filter1"}}, &resp); err != nil {
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Filter1"}}, &resp); err != nil {
 		t.Error(err)
 	} else if resp != utils.OK {
 		t.Error("Unexpected reply returned", resp)
@@ -1189,7 +1189,7 @@ func testInternalReplicateITThreshold(t *testing.T) {
 	// get threshold
 	var td engine.Threshold
 	if err := engineOneRPC.Call(utils.ThresholdSv1GetThreshold,
-		&utils.TenantIDWithOpts{
+		&utils.TenantIDWithAPIOpts{
 			TenantID: &utils.TenantID{
 				Tenant: tenant,
 				ID:     "THD_Test"},
@@ -1198,7 +1198,7 @@ func testInternalReplicateITThreshold(t *testing.T) {
 		t.Error(err)
 	}
 	if err := engineTwoRPC.Call(utils.ThresholdSv1GetThreshold,
-		&utils.TenantIDWithOpts{
+		&utils.TenantIDWithAPIOpts{
 			TenantID: &utils.TenantID{
 				Tenant: tenant,
 				ID:     "THD_Test"},
@@ -1249,7 +1249,7 @@ func testInternalReplicateITThreshold(t *testing.T) {
 	}
 	//get
 	if err := internalRPC.Call(utils.ThresholdSv1GetThreshold,
-		&utils.TenantIDWithOpts{
+		&utils.TenantIDWithAPIOpts{
 			TenantID: &utils.TenantID{
 				Tenant: tenant,
 				ID:     "THD_Test"},
@@ -1295,7 +1295,7 @@ func testInternalReplicateITThreshold(t *testing.T) {
 	}
 	//get
 	if err := internalRPC.Call(utils.ThresholdSv1GetThreshold,
-		&utils.TenantIDWithOpts{
+		&utils.TenantIDWithAPIOpts{
 			TenantID: &utils.TenantID{
 				Tenant: tenant,
 				ID:     "THD_Test"},
@@ -1315,7 +1315,7 @@ func testInternalReplicateITThreshold(t *testing.T) {
 	}
 
 	if err := engineOneRPC.Call(utils.ThresholdSv1GetThreshold,
-		&utils.TenantIDWithOpts{
+		&utils.TenantIDWithAPIOpts{
 			TenantID: &utils.TenantID{
 				Tenant: tenant,
 				ID:     "THD_Test"},
@@ -1324,7 +1324,7 @@ func testInternalReplicateITThreshold(t *testing.T) {
 		t.Error(err)
 	}
 	if err := engineTwoRPC.Call(utils.ThresholdSv1GetThreshold,
-		&utils.TenantIDWithOpts{
+		&utils.TenantIDWithAPIOpts{
 			TenantID: &utils.TenantID{
 				Tenant: tenant,
 				ID:     "THD_Test"},
@@ -1411,19 +1411,19 @@ func testInternalReplicateITRateProfile(t *testing.T) {
 	// check
 	var reply *engine.RateProfile
 	if err := engineOneRPC.Call(utils.APIerSv1GetRateProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: rPrf.Tenant, ID: rPrf.ID}}, &reply); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: rPrf.Tenant, ID: rPrf.ID}}, &reply); err != nil {
 		t.Fatal(err)
 	} else if !reflect.DeepEqual(rPrf, reply) {
 		t.Errorf("Expecting : %+v, received: %+v", rPrf, reply)
 	}
 	if err := engineTwoRPC.Call(utils.APIerSv1GetRateProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: rPrf.Tenant, ID: rPrf.ID}}, &reply); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: rPrf.Tenant, ID: rPrf.ID}}, &reply); err != nil {
 		t.Fatal(err)
 	} else if !reflect.DeepEqual(rPrf, reply) {
 		t.Errorf("Expecting : %+v, received: %+v", rPrf, reply)
 	}
 	//remove
-	if err := internalRPC.Call(utils.APIerSv1RemoveRateProfile, &utils.TenantIDWithOpts{TenantID: &utils.TenantID{
+	if err := internalRPC.Call(utils.APIerSv1RemoveRateProfile, &utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{
 		Tenant: rPrf.Tenant, ID: rPrf.ID}}, &result); err != nil {
 		t.Error(err)
 	} else if result != utils.OK {
@@ -1431,12 +1431,12 @@ func testInternalReplicateITRateProfile(t *testing.T) {
 	}
 	//check again
 	if err := engineOneRPC.Call(utils.APIerSv1GetRateProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: rPrf.Tenant, ID: rPrf.ID}}, &reply); err == nil ||
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: rPrf.Tenant, ID: rPrf.ID}}, &reply); err == nil ||
 		err.Error() != utils.ErrNotFound.Error() {
 		t.Errorf("Expecting: %+v received: %+v", utils.ErrNotFound, err)
 	}
 	if err := engineTwoRPC.Call(utils.APIerSv1GetRateProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: rPrf.Tenant, ID: rPrf.ID}}, &reply); err == nil ||
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: rPrf.Tenant, ID: rPrf.ID}}, &reply); err == nil ||
 		err.Error() != utils.ErrNotFound.Error() {
 		t.Errorf("Expecting: %+v received: %+v", utils.ErrNotFound, err)
 	}
@@ -1490,7 +1490,7 @@ func testInternalReplicateITLoadIds(t *testing.T) {
 	// check AttributeProfile
 	var reply *engine.AttributeProfile
 	if err := engineOneRPC.Call(utils.APIerSv1GetAttributeProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: alsPrf.Tenant, ID: alsPrf.ID}}, &reply); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: alsPrf.Tenant, ID: alsPrf.ID}}, &reply); err != nil {
 		t.Fatal(err)
 	}
 	reply.Compile()
diff --git a/apier/v1/replicator.go b/apier/v1/replicator.go
index 6c271dd63..b2d49ddc7 100644
--- a/apier/v1/replicator.go
+++ b/apier/v1/replicator.go
@@ -78,8 +78,8 @@ func (rplSv1 *ReplicatorSv1) GetReverseDestination(key *utils.StringWithOpts, re
 }
 
 // GetStatQueue is the remote method coresponding to the dataDb driver method
-func (rplSv1 *ReplicatorSv1) GetStatQueue(tntID *utils.TenantIDWithOpts, reply *engine.StatQueue) error {
-	engine.UpdateReplicationFilters(utils.StatQueuePrefix, tntID.TenantID.TenantID(), utils.IfaceAsString(tntID.Opts[utils.RemoteHostOpt]))
+func (rplSv1 *ReplicatorSv1) GetStatQueue(tntID *utils.TenantIDWithAPIOpts, reply *engine.StatQueue) error {
+	engine.UpdateReplicationFilters(utils.StatQueuePrefix, tntID.TenantID.TenantID(), utils.IfaceAsString(tntID.APIOpts[utils.RemoteHostOpt]))
 	rcv, err := rplSv1.dm.DataDB().GetStatQueueDrv(tntID.Tenant, tntID.ID)
 	if err != nil {
 		return err
@@ -89,8 +89,8 @@ func (rplSv1 *ReplicatorSv1) GetStatQueue(tntID *utils.TenantIDWithOpts, reply *
 }
 
 // GetFilter is the remote method coresponding to the dataDb driver method
-func (rplSv1 *ReplicatorSv1) GetFilter(tntID *utils.TenantIDWithOpts, reply *engine.Filter) error {
-	engine.UpdateReplicationFilters(utils.FilterPrefix, tntID.TenantID.TenantID(), utils.IfaceAsString(tntID.Opts[utils.RemoteHostOpt]))
+func (rplSv1 *ReplicatorSv1) GetFilter(tntID *utils.TenantIDWithAPIOpts, reply *engine.Filter) error {
+	engine.UpdateReplicationFilters(utils.FilterPrefix, tntID.TenantID.TenantID(), utils.IfaceAsString(tntID.APIOpts[utils.RemoteHostOpt]))
 	rcv, err := rplSv1.dm.DataDB().GetFilterDrv(tntID.Tenant, tntID.ID)
 	if err != nil {
 		return err
@@ -100,8 +100,8 @@ func (rplSv1 *ReplicatorSv1) GetFilter(tntID *utils.TenantIDWithOpts, reply *eng
 }
 
 // GetThreshold is the remote method coresponding to the dataDb driver method
-func (rplSv1 *ReplicatorSv1) GetThreshold(tntID *utils.TenantIDWithOpts, reply *engine.Threshold) error {
-	engine.UpdateReplicationFilters(utils.ThresholdPrefix, tntID.TenantID.TenantID(), utils.IfaceAsString(tntID.Opts[utils.RemoteHostOpt]))
+func (rplSv1 *ReplicatorSv1) GetThreshold(tntID *utils.TenantIDWithAPIOpts, reply *engine.Threshold) error {
+	engine.UpdateReplicationFilters(utils.ThresholdPrefix, tntID.TenantID.TenantID(), utils.IfaceAsString(tntID.APIOpts[utils.RemoteHostOpt]))
 	rcv, err := rplSv1.dm.DataDB().GetThresholdDrv(tntID.Tenant, tntID.ID)
 	if err != nil {
 		return err
@@ -111,8 +111,8 @@ func (rplSv1 *ReplicatorSv1) GetThreshold(tntID *utils.TenantIDWithOpts, reply *
 }
 
 // GetThresholdProfile is the remote method coresponding to the dataDb driver method
-func (rplSv1 *ReplicatorSv1) GetThresholdProfile(tntID *utils.TenantIDWithOpts, reply *engine.ThresholdProfile) error {
-	engine.UpdateReplicationFilters(utils.ThresholdProfilePrefix, tntID.TenantID.TenantID(), utils.IfaceAsString(tntID.Opts[utils.RemoteHostOpt]))
+func (rplSv1 *ReplicatorSv1) GetThresholdProfile(tntID *utils.TenantIDWithAPIOpts, reply *engine.ThresholdProfile) error {
+	engine.UpdateReplicationFilters(utils.ThresholdProfilePrefix, tntID.TenantID.TenantID(), utils.IfaceAsString(tntID.APIOpts[utils.RemoteHostOpt]))
 	rcv, err := rplSv1.dm.DataDB().GetThresholdProfileDrv(tntID.Tenant, tntID.ID)
 	if err != nil {
 		return err
@@ -122,8 +122,8 @@ func (rplSv1 *ReplicatorSv1) GetThresholdProfile(tntID *utils.TenantIDWithOpts,
 }
 
 // GetStatQueueProfile is the remote method coresponding to the dataDb driver method
-func (rplSv1 *ReplicatorSv1) GetStatQueueProfile(tntID *utils.TenantIDWithOpts, reply *engine.StatQueueProfile) error {
-	engine.UpdateReplicationFilters(utils.StatQueueProfilePrefix, tntID.TenantID.TenantID(), utils.IfaceAsString(tntID.Opts[utils.RemoteHostOpt]))
+func (rplSv1 *ReplicatorSv1) GetStatQueueProfile(tntID *utils.TenantIDWithAPIOpts, reply *engine.StatQueueProfile) error {
+	engine.UpdateReplicationFilters(utils.StatQueueProfilePrefix, tntID.TenantID.TenantID(), utils.IfaceAsString(tntID.APIOpts[utils.RemoteHostOpt]))
 	rcv, err := rplSv1.dm.DataDB().GetStatQueueProfileDrv(tntID.Tenant, tntID.ID)
 	if err != nil {
 		return err
@@ -144,8 +144,8 @@ func (rplSv1 *ReplicatorSv1) GetTiming(id *utils.StringWithOpts, reply *utils.TP
 }
 
 // GetResource is the remote method coresponding to the dataDb driver method
-func (rplSv1 *ReplicatorSv1) GetResource(tntID *utils.TenantIDWithOpts, reply *engine.Resource) error {
-	engine.UpdateReplicationFilters(utils.ResourcesPrefix, tntID.TenantID.TenantID(), utils.IfaceAsString(tntID.Opts[utils.RemoteHostOpt]))
+func (rplSv1 *ReplicatorSv1) GetResource(tntID *utils.TenantIDWithAPIOpts, reply *engine.Resource) error {
+	engine.UpdateReplicationFilters(utils.ResourcesPrefix, tntID.TenantID.TenantID(), utils.IfaceAsString(tntID.APIOpts[utils.RemoteHostOpt]))
 	rcv, err := rplSv1.dm.DataDB().GetResourceDrv(tntID.Tenant, tntID.ID)
 	if err != nil {
 		return err
@@ -155,8 +155,8 @@ func (rplSv1 *ReplicatorSv1) GetResource(tntID *utils.TenantIDWithOpts, reply *e
 }
 
 // GetResourceProfile is the remote method coresponding to the dataDb driver method
-func (rplSv1 *ReplicatorSv1) GetResourceProfile(tntID *utils.TenantIDWithOpts, reply *engine.ResourceProfile) error {
-	engine.UpdateReplicationFilters(utils.ResourceProfilesPrefix, tntID.TenantID.TenantID(), utils.IfaceAsString(tntID.Opts[utils.RemoteHostOpt]))
+func (rplSv1 *ReplicatorSv1) GetResourceProfile(tntID *utils.TenantIDWithAPIOpts, reply *engine.ResourceProfile) error {
+	engine.UpdateReplicationFilters(utils.ResourceProfilesPrefix, tntID.TenantID.TenantID(), utils.IfaceAsString(tntID.APIOpts[utils.RemoteHostOpt]))
 	rcv, err := rplSv1.dm.DataDB().GetResourceProfileDrv(tntID.Tenant, tntID.ID)
 	if err != nil {
 		return err
@@ -256,8 +256,8 @@ func (rplSv1 *ReplicatorSv1) GetRatingProfile(id *utils.StringWithOpts, reply *e
 }
 
 // GetRouteProfile is the remote method coresponding to the dataDb driver method
-func (rplSv1 *ReplicatorSv1) GetRouteProfile(tntID *utils.TenantIDWithOpts, reply *engine.RouteProfile) error {
-	engine.UpdateReplicationFilters(utils.RouteProfilePrefix, tntID.TenantID.TenantID(), utils.IfaceAsString(tntID.Opts[utils.RemoteHostOpt]))
+func (rplSv1 *ReplicatorSv1) GetRouteProfile(tntID *utils.TenantIDWithAPIOpts, reply *engine.RouteProfile) error {
+	engine.UpdateReplicationFilters(utils.RouteProfilePrefix, tntID.TenantID.TenantID(), utils.IfaceAsString(tntID.APIOpts[utils.RemoteHostOpt]))
 	rcv, err := rplSv1.dm.DataDB().GetRouteProfileDrv(tntID.Tenant, tntID.ID)
 	if err != nil {
 		return err
@@ -267,8 +267,8 @@ func (rplSv1 *ReplicatorSv1) GetRouteProfile(tntID *utils.TenantIDWithOpts, repl
 }
 
 // GetAttributeProfile is the remote method coresponding to the dataDb driver method
-func (rplSv1 *ReplicatorSv1) GetAttributeProfile(tntID *utils.TenantIDWithOpts, reply *engine.AttributeProfile) error {
-	engine.UpdateReplicationFilters(utils.AttributeProfilePrefix, tntID.TenantID.TenantID(), utils.IfaceAsString(tntID.Opts[utils.RemoteHostOpt]))
+func (rplSv1 *ReplicatorSv1) GetAttributeProfile(tntID *utils.TenantIDWithAPIOpts, reply *engine.AttributeProfile) error {
+	engine.UpdateReplicationFilters(utils.AttributeProfilePrefix, tntID.TenantID.TenantID(), utils.IfaceAsString(tntID.APIOpts[utils.RemoteHostOpt]))
 	rcv, err := rplSv1.dm.DataDB().GetAttributeProfileDrv(tntID.Tenant, tntID.ID)
 	if err != nil {
 		return err
@@ -278,8 +278,8 @@ func (rplSv1 *ReplicatorSv1) GetAttributeProfile(tntID *utils.TenantIDWithOpts,
 }
 
 // GetChargerProfile is the remote method coresponding to the dataDb driver method
-func (rplSv1 *ReplicatorSv1) GetChargerProfile(tntID *utils.TenantIDWithOpts, reply *engine.ChargerProfile) error {
-	engine.UpdateReplicationFilters(utils.ChargerProfilePrefix, tntID.TenantID.TenantID(), utils.IfaceAsString(tntID.Opts[utils.RemoteHostOpt]))
+func (rplSv1 *ReplicatorSv1) GetChargerProfile(tntID *utils.TenantIDWithAPIOpts, reply *engine.ChargerProfile) error {
+	engine.UpdateReplicationFilters(utils.ChargerProfilePrefix, tntID.TenantID.TenantID(), utils.IfaceAsString(tntID.APIOpts[utils.RemoteHostOpt]))
 	rcv, err := rplSv1.dm.DataDB().GetChargerProfileDrv(tntID.Tenant, tntID.ID)
 	if err != nil {
 		return err
@@ -289,8 +289,8 @@ func (rplSv1 *ReplicatorSv1) GetChargerProfile(tntID *utils.TenantIDWithOpts, re
 }
 
 // GetDispatcherProfile is the remote method coresponding to the dataDb driver method
-func (rplSv1 *ReplicatorSv1) GetDispatcherProfile(tntID *utils.TenantIDWithOpts, reply *engine.DispatcherProfile) error {
-	engine.UpdateReplicationFilters(utils.DispatcherProfilePrefix, tntID.TenantID.TenantID(), utils.IfaceAsString(tntID.Opts[utils.RemoteHostOpt]))
+func (rplSv1 *ReplicatorSv1) GetDispatcherProfile(tntID *utils.TenantIDWithAPIOpts, reply *engine.DispatcherProfile) error {
+	engine.UpdateReplicationFilters(utils.DispatcherProfilePrefix, tntID.TenantID.TenantID(), utils.IfaceAsString(tntID.APIOpts[utils.RemoteHostOpt]))
 	rcv, err := rplSv1.dm.DataDB().GetDispatcherProfileDrv(tntID.Tenant, tntID.ID)
 	if err != nil {
 		return err
@@ -300,8 +300,8 @@ func (rplSv1 *ReplicatorSv1) GetDispatcherProfile(tntID *utils.TenantIDWithOpts,
 }
 
 // GetDispatcherHost is the remote method coresponding to the dataDb driver method
-func (rplSv1 *ReplicatorSv1) GetDispatcherHost(tntID *utils.TenantIDWithOpts, reply *engine.DispatcherHost) error {
-	engine.UpdateReplicationFilters(utils.DispatcherHostPrefix, tntID.TenantID.TenantID(), utils.IfaceAsString(tntID.Opts[utils.RemoteHostOpt]))
+func (rplSv1 *ReplicatorSv1) GetDispatcherHost(tntID *utils.TenantIDWithAPIOpts, reply *engine.DispatcherHost) error {
+	engine.UpdateReplicationFilters(utils.DispatcherHostPrefix, tntID.TenantID.TenantID(), utils.IfaceAsString(tntID.APIOpts[utils.RemoteHostOpt]))
 	rcv, err := rplSv1.dm.DataDB().GetDispatcherHostDrv(tntID.Tenant, tntID.ID)
 	if err != nil {
 		return err
@@ -311,8 +311,8 @@ func (rplSv1 *ReplicatorSv1) GetDispatcherHost(tntID *utils.TenantIDWithOpts, re
 }
 
 // GetRateProfile is the remote method coresponding to the dataDb driver method
-func (rplSv1 *ReplicatorSv1) GetRateProfile(tntID *utils.TenantIDWithOpts, reply *engine.RateProfile) error {
-	engine.UpdateReplicationFilters(utils.RateProfilePrefix, tntID.TenantID.TenantID(), utils.IfaceAsString(tntID.Opts[utils.RemoteHostOpt]))
+func (rplSv1 *ReplicatorSv1) GetRateProfile(tntID *utils.TenantIDWithAPIOpts, reply *engine.RateProfile) error {
+	engine.UpdateReplicationFilters(utils.RateProfilePrefix, tntID.TenantID.TenantID(), utils.IfaceAsString(tntID.APIOpts[utils.RemoteHostOpt]))
 	rcv, err := rplSv1.dm.DataDB().GetRateProfileDrv(tntID.Tenant, tntID.ID)
 	if err != nil {
 		return err
@@ -322,8 +322,8 @@ func (rplSv1 *ReplicatorSv1) GetRateProfile(tntID *utils.TenantIDWithOpts, reply
 }
 
 // GetActionProfile is the remote method coresponding to the dataDb driver method
-func (rplSv1 *ReplicatorSv1) GetActionProfile(tntID *utils.TenantIDWithOpts, reply *engine.ActionProfile) error {
-	engine.UpdateReplicationFilters(utils.ActionProfilePrefix, tntID.TenantID.TenantID(), utils.IfaceAsString(tntID.Opts[utils.RemoteHostOpt]))
+func (rplSv1 *ReplicatorSv1) GetActionProfile(tntID *utils.TenantIDWithAPIOpts, reply *engine.ActionProfile) error {
+	engine.UpdateReplicationFilters(utils.ActionProfilePrefix, tntID.TenantID.TenantID(), utils.IfaceAsString(tntID.APIOpts[utils.RemoteHostOpt]))
 	rcv, err := rplSv1.dm.DataDB().GetActionProfileDrv(tntID.Tenant, tntID.ID)
 	if err != nil {
 		return err
@@ -333,8 +333,8 @@ func (rplSv1 *ReplicatorSv1) GetActionProfile(tntID *utils.TenantIDWithOpts, rep
 }
 
 // GetAccountProfile is the remote method coresponding to the dataDb driver method
-func (rplSv1 *ReplicatorSv1) GetAccountProfile(tntID *utils.TenantIDWithOpts, reply *utils.AccountProfile) error {
-	engine.UpdateReplicationFilters(utils.AccountProfilePrefix, tntID.TenantID.TenantID(), utils.IfaceAsString(tntID.Opts[utils.RemoteHostOpt]))
+func (rplSv1 *ReplicatorSv1) GetAccountProfile(tntID *utils.TenantIDWithAPIOpts, reply *utils.AccountProfile) error {
+	engine.UpdateReplicationFilters(utils.AccountProfilePrefix, tntID.TenantID.TenantID(), utils.IfaceAsString(tntID.APIOpts[utils.RemoteHostOpt]))
 	rcv, err := rplSv1.dm.DataDB().GetAccountProfileDrv(tntID.Tenant, tntID.ID)
 	if err != nil {
 		return err
@@ -692,8 +692,8 @@ func (rplSv1 *ReplicatorSv1) SetAccountProfile(acp *utils.AccountProfileWithAPIO
 	if err = rplSv1.dm.DataDB().SetAccountProfileDrv(acp.AccountProfile); err != nil {
 		return
 	}
-	if err = rplSv1.v1.CallCache(utils.IfaceAsString(acp.Opts[utils.CacheOpt]),
-		acp.Tenant, utils.CacheAccountProfiles, acp.TenantID(), &acp.FilterIDs, nil, acp.Opts); err != nil {
+	if err = rplSv1.v1.CallCache(utils.IfaceAsString(acp.APIOpts[utils.CacheOpt]),
+		acp.Tenant, utils.CacheAccountProfiles, acp.TenantID(), &acp.FilterIDs, nil, acp.APIOpts); err != nil {
 		return
 	}
 	*reply = utils.OK
@@ -735,12 +735,12 @@ func (rplSv1 *ReplicatorSv1) SetIndexes(args *utils.SetIndexesArg, reply *string
 }
 
 // RemoveThreshold is the replication method coresponding to the dataDb driver method
-func (rplSv1 *ReplicatorSv1) RemoveThreshold(args *utils.TenantIDWithOpts, reply *string) (err error) {
+func (rplSv1 *ReplicatorSv1) RemoveThreshold(args *utils.TenantIDWithAPIOpts, reply *string) (err error) {
 	if err = rplSv1.dm.DataDB().RemoveThresholdDrv(args.Tenant, args.ID); err != nil {
 		return
 	}
-	if err = rplSv1.v1.CallCache(utils.IfaceAsString(args.Opts[utils.CacheOpt]),
-		args.Tenant, utils.CacheThresholds, args.TenantID.TenantID(), nil, nil, args.Opts); err != nil {
+	if err = rplSv1.v1.CallCache(utils.IfaceAsString(args.APIOpts[utils.CacheOpt]),
+		args.Tenant, utils.CacheThresholds, args.TenantID.TenantID(), nil, nil, args.APIOpts); err != nil {
 		return
 	}
 	*reply = utils.OK
@@ -771,12 +771,12 @@ func (rplSv1 *ReplicatorSv1) RemoveAccount(id *utils.StringWithOpts, reply *stri
 }
 
 // RemoveStatQueue is the replication method coresponding to the dataDb driver method
-func (rplSv1 *ReplicatorSv1) RemoveStatQueue(args *utils.TenantIDWithOpts, reply *string) (err error) {
+func (rplSv1 *ReplicatorSv1) RemoveStatQueue(args *utils.TenantIDWithAPIOpts, reply *string) (err error) {
 	if err = rplSv1.dm.DataDB().RemStatQueueDrv(args.Tenant, args.ID); err != nil {
 		return
 	}
-	if err = rplSv1.v1.CallCache(utils.IfaceAsString(args.Opts[utils.CacheOpt]),
-		args.Tenant, utils.CacheStatQueues, args.TenantID.TenantID(), nil, nil, args.Opts); err != nil {
+	if err = rplSv1.v1.CallCache(utils.IfaceAsString(args.APIOpts[utils.CacheOpt]),
+		args.Tenant, utils.CacheStatQueues, args.TenantID.TenantID(), nil, nil, args.APIOpts); err != nil {
 		return
 	}
 	*reply = utils.OK
@@ -784,12 +784,12 @@ func (rplSv1 *ReplicatorSv1) RemoveStatQueue(args *utils.TenantIDWithOpts, reply
 }
 
 // RemoveFilter is the replication method coresponding to the dataDb driver method
-func (rplSv1 *ReplicatorSv1) RemoveFilter(args *utils.TenantIDWithOpts, reply *string) (err error) {
+func (rplSv1 *ReplicatorSv1) RemoveFilter(args *utils.TenantIDWithAPIOpts, reply *string) (err error) {
 	if err = rplSv1.dm.DataDB().RemoveFilterDrv(args.Tenant, args.ID); err != nil {
 		return
 	}
-	if err = rplSv1.v1.CallCache(utils.IfaceAsString(args.Opts[utils.CacheOpt]),
-		args.Tenant, utils.CacheFilters, args.TenantID.TenantID(), nil, nil, args.Opts); err != nil {
+	if err = rplSv1.v1.CallCache(utils.IfaceAsString(args.APIOpts[utils.CacheOpt]),
+		args.Tenant, utils.CacheFilters, args.TenantID.TenantID(), nil, nil, args.APIOpts); err != nil {
 		return
 	}
 	*reply = utils.OK
@@ -797,12 +797,12 @@ func (rplSv1 *ReplicatorSv1) RemoveFilter(args *utils.TenantIDWithOpts, reply *s
 }
 
 // RemoveThresholdProfile is the replication method coresponding to the dataDb driver method
-func (rplSv1 *ReplicatorSv1) RemoveThresholdProfile(args *utils.TenantIDWithOpts, reply *string) (err error) {
+func (rplSv1 *ReplicatorSv1) RemoveThresholdProfile(args *utils.TenantIDWithAPIOpts, reply *string) (err error) {
 	if err = rplSv1.dm.DataDB().RemThresholdProfileDrv(args.Tenant, args.ID); err != nil {
 		return
 	}
-	if err = rplSv1.v1.CallCache(utils.IfaceAsString(args.Opts[utils.CacheOpt]),
-		args.Tenant, utils.CacheThresholdProfiles, args.TenantID.TenantID(), nil, nil, args.Opts); err != nil {
+	if err = rplSv1.v1.CallCache(utils.IfaceAsString(args.APIOpts[utils.CacheOpt]),
+		args.Tenant, utils.CacheThresholdProfiles, args.TenantID.TenantID(), nil, nil, args.APIOpts); err != nil {
 		return
 	}
 	*reply = utils.OK
@@ -810,12 +810,12 @@ func (rplSv1 *ReplicatorSv1) RemoveThresholdProfile(args *utils.TenantIDWithOpts
 }
 
 // RemoveStatQueueProfile is the replication method coresponding to the dataDb driver method
-func (rplSv1 *ReplicatorSv1) RemoveStatQueueProfile(args *utils.TenantIDWithOpts, reply *string) (err error) {
+func (rplSv1 *ReplicatorSv1) RemoveStatQueueProfile(args *utils.TenantIDWithAPIOpts, reply *string) (err error) {
 	if err = rplSv1.dm.DataDB().RemStatQueueProfileDrv(args.Tenant, args.ID); err != nil {
 		return
 	}
-	if err = rplSv1.v1.CallCache(utils.IfaceAsString(args.Opts[utils.CacheOpt]),
-		args.Tenant, utils.CacheStatQueueProfiles, args.TenantID.TenantID(), nil, nil, args.Opts); err != nil {
+	if err = rplSv1.v1.CallCache(utils.IfaceAsString(args.APIOpts[utils.CacheOpt]),
+		args.Tenant, utils.CacheStatQueueProfiles, args.TenantID.TenantID(), nil, nil, args.APIOpts); err != nil {
 		return
 	}
 	*reply = utils.OK
@@ -836,12 +836,12 @@ func (rplSv1 *ReplicatorSv1) RemoveTiming(id *utils.StringWithOpts, reply *strin
 }
 
 // RemoveResource is the replication method coresponding to the dataDb driver method
-func (rplSv1 *ReplicatorSv1) RemoveResource(args *utils.TenantIDWithOpts, reply *string) (err error) {
+func (rplSv1 *ReplicatorSv1) RemoveResource(args *utils.TenantIDWithAPIOpts, reply *string) (err error) {
 	if err = rplSv1.dm.DataDB().RemoveResourceDrv(args.Tenant, args.ID); err != nil {
 		return
 	}
-	if err = rplSv1.v1.CallCache(utils.IfaceAsString(args.Opts[utils.CacheOpt]),
-		args.Tenant, utils.CacheResources, args.TenantID.TenantID(), nil, nil, args.Opts); err != nil {
+	if err = rplSv1.v1.CallCache(utils.IfaceAsString(args.APIOpts[utils.CacheOpt]),
+		args.Tenant, utils.CacheResources, args.TenantID.TenantID(), nil, nil, args.APIOpts); err != nil {
 		return
 	}
 	*reply = utils.OK
@@ -849,12 +849,12 @@ func (rplSv1 *ReplicatorSv1) RemoveResource(args *utils.TenantIDWithOpts, reply
 }
 
 // RemoveResourceProfile is the replication method coresponding to the dataDb driver method
-func (rplSv1 *ReplicatorSv1) RemoveResourceProfile(args *utils.TenantIDWithOpts, reply *string) (err error) {
+func (rplSv1 *ReplicatorSv1) RemoveResourceProfile(args *utils.TenantIDWithAPIOpts, reply *string) (err error) {
 	if err = rplSv1.dm.DataDB().RemoveResourceProfileDrv(args.Tenant, args.ID); err != nil {
 		return
 	}
-	if err = rplSv1.v1.CallCache(utils.IfaceAsString(args.Opts[utils.CacheOpt]),
-		args.Tenant, utils.CacheResourceProfiles, args.TenantID.TenantID(), nil, nil, args.Opts); err != nil {
+	if err = rplSv1.v1.CallCache(utils.IfaceAsString(args.APIOpts[utils.CacheOpt]),
+		args.Tenant, utils.CacheResourceProfiles, args.TenantID.TenantID(), nil, nil, args.APIOpts); err != nil {
 		return
 	}
 	*reply = utils.OK
@@ -953,12 +953,12 @@ func (rplSv1 *ReplicatorSv1) RemoveRatingProfile(id *utils.StringWithOpts, reply
 }
 
 // RemoveRouteProfile is the replication method coresponding to the dataDb driver method
-func (rplSv1 *ReplicatorSv1) RemoveRouteProfile(args *utils.TenantIDWithOpts, reply *string) (err error) {
+func (rplSv1 *ReplicatorSv1) RemoveRouteProfile(args *utils.TenantIDWithAPIOpts, reply *string) (err error) {
 	if err = rplSv1.dm.DataDB().RemoveRouteProfileDrv(args.Tenant, args.ID); err != nil {
 		return
 	}
-	if err = rplSv1.v1.CallCache(utils.IfaceAsString(args.Opts[utils.CacheOpt]),
-		args.Tenant, utils.CacheRouteProfiles, args.TenantID.TenantID(), nil, nil, args.Opts); err != nil {
+	if err = rplSv1.v1.CallCache(utils.IfaceAsString(args.APIOpts[utils.CacheOpt]),
+		args.Tenant, utils.CacheRouteProfiles, args.TenantID.TenantID(), nil, nil, args.APIOpts); err != nil {
 		return
 	}
 	*reply = utils.OK
@@ -966,12 +966,12 @@ func (rplSv1 *ReplicatorSv1) RemoveRouteProfile(args *utils.TenantIDWithOpts, re
 }
 
 // RemoveAttributeProfile is the replication method coresponding to the dataDb driver method
-func (rplSv1 *ReplicatorSv1) RemoveAttributeProfile(args *utils.TenantIDWithOpts, reply *string) (err error) {
+func (rplSv1 *ReplicatorSv1) RemoveAttributeProfile(args *utils.TenantIDWithAPIOpts, reply *string) (err error) {
 	if err = rplSv1.dm.DataDB().RemoveAttributeProfileDrv(args.Tenant, args.ID); err != nil {
 		return
 	}
-	if err = rplSv1.v1.CallCache(utils.IfaceAsString(args.Opts[utils.CacheOpt]),
-		args.Tenant, utils.CacheAttributeProfiles, args.TenantID.TenantID(), nil, nil, args.Opts); err != nil {
+	if err = rplSv1.v1.CallCache(utils.IfaceAsString(args.APIOpts[utils.CacheOpt]),
+		args.Tenant, utils.CacheAttributeProfiles, args.TenantID.TenantID(), nil, nil, args.APIOpts); err != nil {
 		return
 	}
 	*reply = utils.OK
@@ -979,12 +979,12 @@ func (rplSv1 *ReplicatorSv1) RemoveAttributeProfile(args *utils.TenantIDWithOpts
 }
 
 // RemoveChargerProfile is the replication method coresponding to the dataDb driver method
-func (rplSv1 *ReplicatorSv1) RemoveChargerProfile(args *utils.TenantIDWithOpts, reply *string) (err error) {
+func (rplSv1 *ReplicatorSv1) RemoveChargerProfile(args *utils.TenantIDWithAPIOpts, reply *string) (err error) {
 	if err = rplSv1.dm.DataDB().RemoveChargerProfileDrv(args.Tenant, args.ID); err != nil {
 		return
 	}
-	if err = rplSv1.v1.CallCache(utils.IfaceAsString(args.Opts[utils.CacheOpt]),
-		args.Tenant, utils.CacheChargerProfiles, args.TenantID.TenantID(), nil, nil, args.Opts); err != nil {
+	if err = rplSv1.v1.CallCache(utils.IfaceAsString(args.APIOpts[utils.CacheOpt]),
+		args.Tenant, utils.CacheChargerProfiles, args.TenantID.TenantID(), nil, nil, args.APIOpts); err != nil {
 		return
 	}
 	*reply = utils.OK
@@ -992,12 +992,12 @@ func (rplSv1 *ReplicatorSv1) RemoveChargerProfile(args *utils.TenantIDWithOpts,
 }
 
 // RemoveDispatcherProfile is the replication method coresponding to the dataDb driver method
-func (rplSv1 *ReplicatorSv1) RemoveDispatcherProfile(args *utils.TenantIDWithOpts, reply *string) (err error) {
+func (rplSv1 *ReplicatorSv1) RemoveDispatcherProfile(args *utils.TenantIDWithAPIOpts, reply *string) (err error) {
 	if err = rplSv1.dm.DataDB().RemoveDispatcherProfileDrv(args.Tenant, args.ID); err != nil {
 		return
 	}
-	if err = rplSv1.v1.CallCache(utils.IfaceAsString(args.Opts[utils.CacheOpt]),
-		args.Tenant, utils.CacheDispatcherProfiles, args.TenantID.TenantID(), nil, nil, args.Opts); err != nil {
+	if err = rplSv1.v1.CallCache(utils.IfaceAsString(args.APIOpts[utils.CacheOpt]),
+		args.Tenant, utils.CacheDispatcherProfiles, args.TenantID.TenantID(), nil, nil, args.APIOpts); err != nil {
 		return
 	}
 	*reply = utils.OK
@@ -1005,12 +1005,12 @@ func (rplSv1 *ReplicatorSv1) RemoveDispatcherProfile(args *utils.TenantIDWithOpt
 }
 
 // RemoveRateProfile is the replication method coresponding to the dataDb driver method
-func (rplSv1 *ReplicatorSv1) RemoveRateProfile(args *utils.TenantIDWithOpts, reply *string) (err error) {
+func (rplSv1 *ReplicatorSv1) RemoveRateProfile(args *utils.TenantIDWithAPIOpts, reply *string) (err error) {
 	if err = rplSv1.dm.DataDB().RemoveRateProfileDrv(args.Tenant, args.ID); err != nil {
 		return
 	}
-	if err = rplSv1.v1.CallCache(utils.IfaceAsString(args.Opts[utils.CacheOpt]),
-		args.Tenant, utils.CacheRateProfiles, args.TenantID.TenantID(), nil, nil, args.Opts); err != nil {
+	if err = rplSv1.v1.CallCache(utils.IfaceAsString(args.APIOpts[utils.CacheOpt]),
+		args.Tenant, utils.CacheRateProfiles, args.TenantID.TenantID(), nil, nil, args.APIOpts); err != nil {
 		return
 	}
 	*reply = utils.OK
@@ -1018,12 +1018,12 @@ func (rplSv1 *ReplicatorSv1) RemoveRateProfile(args *utils.TenantIDWithOpts, rep
 }
 
 // RemoveActionProfile is the replication method coresponding to the dataDb driver method
-func (rplSv1 *ReplicatorSv1) RemoveActionProfile(args *utils.TenantIDWithOpts, reply *string) (err error) {
+func (rplSv1 *ReplicatorSv1) RemoveActionProfile(args *utils.TenantIDWithAPIOpts, reply *string) (err error) {
 	if err = rplSv1.dm.DataDB().RemoveActionProfileDrv(args.Tenant, args.ID); err != nil {
 		return
 	}
-	if err = rplSv1.v1.CallCache(utils.IfaceAsString(args.Opts[utils.CacheOpt]),
-		args.Tenant, utils.CacheActionProfiles, args.TenantID.TenantID(), nil, nil, args.Opts); err != nil {
+	if err = rplSv1.v1.CallCache(utils.IfaceAsString(args.APIOpts[utils.CacheOpt]),
+		args.Tenant, utils.CacheActionProfiles, args.TenantID.TenantID(), nil, nil, args.APIOpts); err != nil {
 		return
 	}
 	*reply = utils.OK
@@ -1031,12 +1031,12 @@ func (rplSv1 *ReplicatorSv1) RemoveActionProfile(args *utils.TenantIDWithOpts, r
 }
 
 // RemoveAccountProfile is the replication method coresponding to the dataDb driver method
-func (rplSv1 *ReplicatorSv1) RemoveAccountProfile(args *utils.TenantIDWithOpts, reply *string) (err error) {
+func (rplSv1 *ReplicatorSv1) RemoveAccountProfile(args *utils.TenantIDWithAPIOpts, reply *string) (err error) {
 	if err = rplSv1.dm.DataDB().RemoveAccountProfileDrv(args.Tenant, args.ID); err != nil {
 		return
 	}
-	if err = rplSv1.v1.CallCache(utils.IfaceAsString(args.Opts[utils.CacheOpt]),
-		args.Tenant, utils.CacheAccountProfiles, args.TenantID.TenantID(), nil, nil, args.Opts); err != nil {
+	if err = rplSv1.v1.CallCache(utils.IfaceAsString(args.APIOpts[utils.CacheOpt]),
+		args.Tenant, utils.CacheAccountProfiles, args.TenantID.TenantID(), nil, nil, args.APIOpts); err != nil {
 		return
 	}
 	*reply = utils.OK
@@ -1044,12 +1044,12 @@ func (rplSv1 *ReplicatorSv1) RemoveAccountProfile(args *utils.TenantIDWithOpts,
 }
 
 // RemoveDispatcherHost is the replication method coresponding to the dataDb driver method
-func (rplSv1 *ReplicatorSv1) RemoveDispatcherHost(args *utils.TenantIDWithOpts, reply *string) (err error) {
+func (rplSv1 *ReplicatorSv1) RemoveDispatcherHost(args *utils.TenantIDWithAPIOpts, reply *string) (err error) {
 	if err = rplSv1.dm.DataDB().RemoveDispatcherHostDrv(args.Tenant, args.ID); err != nil {
 		return
 	}
-	if err = rplSv1.v1.CallCache(utils.IfaceAsString(args.Opts[utils.CacheOpt]),
-		args.Tenant, utils.CacheDispatcherHosts, args.TenantID.TenantID(), nil, nil, args.Opts); err != nil {
+	if err = rplSv1.v1.CallCache(utils.IfaceAsString(args.APIOpts[utils.CacheOpt]),
+		args.Tenant, utils.CacheDispatcherHosts, args.TenantID.TenantID(), nil, nil, args.APIOpts); err != nil {
 		return
 	}
 	*reply = utils.OK
diff --git a/apier/v1/resourcesv1.go b/apier/v1/resourcesv1.go
index 1578d4a80..7e1879fe6 100644
--- a/apier/v1/resourcesv1.go
+++ b/apier/v1/resourcesv1.go
@@ -60,11 +60,11 @@ func (rsv1 *ResourceSv1) ReleaseResources(args *utils.ArgRSv1ResourceUsage, repl
 }
 
 // GetResource returns a resource configuration
-func (rsv1 *ResourceSv1) GetResource(args *utils.TenantIDWithOpts, reply *engine.Resource) error {
+func (rsv1 *ResourceSv1) GetResource(args *utils.TenantIDWithAPIOpts, reply *engine.Resource) error {
 	return rsv1.rls.V1GetResource(args, reply)
 }
 
-func (rsv1 *ResourceSv1) GetResourceWithConfig(args *utils.TenantIDWithOpts, reply *engine.ResourceWithConfig) error {
+func (rsv1 *ResourceSv1) GetResourceWithConfig(args *utils.TenantIDWithAPIOpts, reply *engine.ResourceWithConfig) error {
 	return rsv1.rls.V1GetResourceWithConfig(args, reply)
 }
 
@@ -154,7 +154,7 @@ func (apierSv1 *APIerSv1) SetResourceProfile(arg *engine.ResourceProfileWithOpts
 }
 
 //RemoveResourceProfile remove a specific resource configuration
-func (apierSv1 *APIerSv1) RemoveResourceProfile(arg *utils.TenantIDWithOpts, reply *string) error {
+func (apierSv1 *APIerSv1) RemoveResourceProfile(arg *utils.TenantIDWithAPIOpts, reply *string) error {
 	if missing := utils.MissingStructFields(arg, []string{utils.ID}); len(missing) != 0 { //Params missing
 		return utils.NewErrMandatoryIeMissing(missing...)
 	}
@@ -166,8 +166,8 @@ func (apierSv1 *APIerSv1) RemoveResourceProfile(arg *utils.TenantIDWithOpts, rep
 		return utils.APIErrorHandler(err)
 	}
 	//handle caching for ResourceProfile
-	if err := apierSv1.CallCache(utils.IfaceAsString(arg.Opts[utils.CacheOpt]), tnt, utils.CacheResourceProfiles,
-		utils.ConcatenatedKey(tnt, arg.ID), nil, nil, arg.Opts); err != nil {
+	if err := apierSv1.CallCache(utils.IfaceAsString(arg.APIOpts[utils.CacheOpt]), tnt, utils.CacheResourceProfiles,
+		utils.ConcatenatedKey(tnt, arg.ID), nil, nil, arg.APIOpts); err != nil {
 		return utils.APIErrorHandler(err)
 	}
 	if err := apierSv1.DataManager.RemoveResource(tnt, arg.ID, utils.NonTransactional); err != nil {
@@ -180,8 +180,8 @@ func (apierSv1 *APIerSv1) RemoveResourceProfile(arg *utils.TenantIDWithOpts, rep
 		return utils.APIErrorHandler(err)
 	}
 	//handle caching for Resource
-	if err := apierSv1.CallCache(utils.IfaceAsString(arg.Opts[utils.CacheOpt]), tnt, utils.CacheResources,
-		utils.ConcatenatedKey(tnt, arg.ID), nil, nil, arg.Opts); err != nil {
+	if err := apierSv1.CallCache(utils.IfaceAsString(arg.APIOpts[utils.CacheOpt]), tnt, utils.CacheResources,
+		utils.ConcatenatedKey(tnt, arg.ID), nil, nil, arg.APIOpts); err != nil {
 		return utils.APIErrorHandler(err)
 	}
 	*reply = utils.OK
diff --git a/apier/v1/resourcesv1_it_test.go b/apier/v1/resourcesv1_it_test.go
index d2fe2dd95..31f37351d 100644
--- a/apier/v1/resourcesv1_it_test.go
+++ b/apier/v1/resourcesv1_it_test.go
@@ -874,7 +874,7 @@ func testV1RsAllocateUnlimited(t *testing.T) {
 			},
 		},
 	}
-	if err := rlsV1Rpc.Call(utils.ResourceSv1GetResource, &utils.TenantIDWithOpts{
+	if err := rlsV1Rpc.Call(utils.ResourceSv1GetResource, &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "RES_ULTIMITED"},
 	}, &rplyRes); err != nil {
 		t.Error(err)
@@ -928,7 +928,7 @@ func testV1RsGetResourceProfileWithoutTenant(t *testing.T) {
 func testV1RsRemResourceProfileWithoutTenant(t *testing.T) {
 	var reply string
 	if err := rlsV1Rpc.Call(utils.APIerSv1RemoveResourceProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{ID: rlsConfig.ID}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{ID: rlsConfig.ID}},
 		&reply); err != nil {
 		t.Error(err)
 	} else if reply != utils.OK {
@@ -1017,7 +1017,7 @@ func testV1RsCheckAuthorizeResourcesAfterRestart(t *testing.T) {
 			},
 		},
 	}
-	if err := rlsV1Rpc.Call(utils.ResourceSv1GetResource, &utils.TenantIDWithOpts{
+	if err := rlsV1Rpc.Call(utils.ResourceSv1GetResource, &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "RES_ULTIMITED"},
 	}, &rplyRes); err != nil {
 		t.Error(err)
@@ -1031,7 +1031,7 @@ func testV1RsCheckAuthorizeResourcesAfterRestart(t *testing.T) {
 		ID:     "TEST_WITH_OPTS",
 		Usages: map[string]*engine.ResourceUsage{},
 	}
-	if err := rlsV1Rpc.Call(utils.ResourceSv1GetResource, &utils.TenantIDWithOpts{
+	if err := rlsV1Rpc.Call(utils.ResourceSv1GetResource, &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "TEST_WITH_OPTS"},
 	}, &rplyRes); err != nil {
 		t.Error(err)
diff --git a/apier/v1/routes.go b/apier/v1/routes.go
index e50609159..47534e912 100644
--- a/apier/v1/routes.go
+++ b/apier/v1/routes.go
@@ -94,7 +94,7 @@ func (apierSv1 *APIerSv1) SetRouteProfile(args *RouteWithOpts, reply *string) er
 }
 
 //RemoveRouteProfile remove a specific Route configuration
-func (apierSv1 *APIerSv1) RemoveRouteProfile(args *utils.TenantIDWithOpts, reply *string) error {
+func (apierSv1 *APIerSv1) RemoveRouteProfile(args *utils.TenantIDWithAPIOpts, reply *string) error {
 	if missing := utils.MissingStructFields(args, []string{utils.ID}); len(missing) != 0 { //Params missing
 		return utils.NewErrMandatoryIeMissing(missing...)
 	}
@@ -110,8 +110,8 @@ func (apierSv1 *APIerSv1) RemoveRouteProfile(args *utils.TenantIDWithOpts, reply
 		return utils.APIErrorHandler(err)
 	}
 	//handle caching for SupplierProfile
-	if err := apierSv1.CallCache(utils.IfaceAsString(args.Opts[utils.CacheOpt]), tnt, utils.CacheRouteProfiles,
-		utils.ConcatenatedKey(tnt, args.ID), nil, nil, args.Opts); err != nil {
+	if err := apierSv1.CallCache(utils.IfaceAsString(args.APIOpts[utils.CacheOpt]), tnt, utils.CacheRouteProfiles,
+		utils.ConcatenatedKey(tnt, args.ID), nil, nil, args.APIOpts); err != nil {
 		return utils.APIErrorHandler(err)
 	}
 	*reply = utils.OK
diff --git a/apier/v1/routes_it_test.go b/apier/v1/routes_it_test.go
index be95c264c..8f9019fd7 100644
--- a/apier/v1/routes_it_test.go
+++ b/apier/v1/routes_it_test.go
@@ -976,7 +976,7 @@ func testV1RouteUpdateRouteProfiles(t *testing.T) {
 func testV1RouteRemRouteProfiles(t *testing.T) {
 	var resp string
 	if err := routeSv1Rpc.Call(utils.APIerSv1RemoveRouteProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "TEST_PROFILE1"}}, &resp); err != nil {
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "TEST_PROFILE1"}}, &resp); err != nil {
 		t.Error(err)
 	} else if resp != utils.OK {
 		t.Error("Unexpected reply returned", resp)
@@ -988,7 +988,7 @@ func testV1RouteRemRouteProfiles(t *testing.T) {
 		t.Error(err)
 	}
 	if err := routeSv1Rpc.Call(utils.APIerSv1RemoveRouteProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "TEST_PROFILE1"}}, &resp); err.Error() != utils.ErrNotFound.Error() {
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "TEST_PROFILE1"}}, &resp); err.Error() != utils.ErrNotFound.Error() {
 		t.Errorf("Expected error: %v received: %v", utils.ErrNotFound, err)
 	}
 }
@@ -1606,7 +1606,7 @@ func testV1RouteSetRouteProfilesWithoutTenant(t *testing.T) {
 func testV1RouteRemRouteProfilesWithoutTenant(t *testing.T) {
 	var reply string
 	if err := routeSv1Rpc.Call(utils.APIerSv1RemoveRouteProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{ID: "TEST_PROFILE10"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{ID: "TEST_PROFILE10"}},
 		&reply); err != nil {
 		t.Error(err)
 	}
diff --git a/apier/v1/stats.go b/apier/v1/stats.go
index b2d3adec2..9f7f8e654 100644
--- a/apier/v1/stats.go
+++ b/apier/v1/stats.go
@@ -118,7 +118,7 @@ func (apierSv1 *APIerSv1) SetStatQueueProfile(arg *engine.StatQueueProfileWithOp
 }
 
 // RemoveStatQueueProfile remove a specific stat configuration
-func (apierSv1 *APIerSv1) RemoveStatQueueProfile(args *utils.TenantIDWithOpts, reply *string) error {
+func (apierSv1 *APIerSv1) RemoveStatQueueProfile(args *utils.TenantIDWithAPIOpts, reply *string) error {
 	if missing := utils.MissingStructFields(args, []string{utils.ID}); len(missing) != 0 { //Params missing
 		return utils.NewErrMandatoryIeMissing(missing...)
 	}
@@ -130,8 +130,8 @@ func (apierSv1 *APIerSv1) RemoveStatQueueProfile(args *utils.TenantIDWithOpts, r
 		return utils.APIErrorHandler(err)
 	}
 	//handle caching for StatQueueProfile
-	if err := apierSv1.CallCache(utils.IfaceAsString(args.Opts[utils.CacheOpt]), tnt, utils.CacheStatQueueProfiles,
-		utils.ConcatenatedKey(tnt, args.ID), nil, nil, args.Opts); err != nil {
+	if err := apierSv1.CallCache(utils.IfaceAsString(args.APIOpts[utils.CacheOpt]), tnt, utils.CacheStatQueueProfiles,
+		utils.ConcatenatedKey(tnt, args.ID), nil, nil, args.APIOpts); err != nil {
 		return utils.APIErrorHandler(err)
 	}
 	if err := apierSv1.DataManager.RemoveStatQueue(tnt, args.ID, utils.NonTransactional); err != nil {
@@ -144,8 +144,8 @@ func (apierSv1 *APIerSv1) RemoveStatQueueProfile(args *utils.TenantIDWithOpts, r
 		return utils.APIErrorHandler(err)
 	}
 	//handle caching for StatQueues
-	if err := apierSv1.CallCache(utils.IfaceAsString(args.Opts[utils.CacheOpt]), tnt, utils.CacheStatQueues,
-		utils.ConcatenatedKey(tnt, args.ID), nil, nil, args.Opts); err != nil {
+	if err := apierSv1.CallCache(utils.IfaceAsString(args.APIOpts[utils.CacheOpt]), tnt, utils.CacheStatQueues,
+		utils.ConcatenatedKey(tnt, args.ID), nil, nil, args.APIOpts); err != nil {
 		return utils.APIErrorHandler(err)
 	}
 	*reply = utils.OK
@@ -183,22 +183,22 @@ func (stsv1 *StatSv1) GetStatQueuesForEvent(args *engine.StatsArgsProcessEvent,
 }
 
 // GetStatQueue returns a StatQueue object
-func (stsv1 *StatSv1) GetStatQueue(args *utils.TenantIDWithOpts, reply *engine.StatQueue) (err error) {
+func (stsv1 *StatSv1) GetStatQueue(args *utils.TenantIDWithAPIOpts, reply *engine.StatQueue) (err error) {
 	return stsv1.sS.V1GetStatQueue(args, reply)
 }
 
 // GetQueueStringMetrics returns the string metrics for a Queue
-func (stsv1 *StatSv1) GetQueueStringMetrics(args *utils.TenantIDWithOpts, reply *map[string]string) (err error) {
+func (stsv1 *StatSv1) GetQueueStringMetrics(args *utils.TenantIDWithAPIOpts, reply *map[string]string) (err error) {
 	return stsv1.sS.V1GetQueueStringMetrics(args.TenantID, reply)
 }
 
 // GetQueueFloatMetrics returns the float metrics for a Queue
-func (stsv1 *StatSv1) GetQueueFloatMetrics(args *utils.TenantIDWithOpts, reply *map[string]float64) (err error) {
+func (stsv1 *StatSv1) GetQueueFloatMetrics(args *utils.TenantIDWithAPIOpts, reply *map[string]float64) (err error) {
 	return stsv1.sS.V1GetQueueFloatMetrics(args.TenantID, reply)
 }
 
 // ResetStatQueue resets the stat queue
-func (stsv1 *StatSv1) ResetStatQueue(tntID *utils.TenantIDWithOpts, reply *string) error {
+func (stsv1 *StatSv1) ResetStatQueue(tntID *utils.TenantIDWithAPIOpts, reply *string) error {
 	return stsv1.sS.V1ResetStatQueue(tntID.TenantID, reply)
 }
 
diff --git a/apier/v1/stats_it_test.go b/apier/v1/stats_it_test.go
index eb2e452bb..dbcabc178 100644
--- a/apier/v1/stats_it_test.go
+++ b/apier/v1/stats_it_test.go
@@ -185,7 +185,7 @@ func testV1STSGetStats(t *testing.T) {
 		utils.MetaAverage + utils.HashtagSep + utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Usage: utils.NotAvailable,
 	}
 	if err := stsV1Rpc.Call(utils.StatSv1GetQueueStringMetrics,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: expectedIDs[0]}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: expectedIDs[0]}},
 		&metrics); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(expectedMetrics, metrics) {
@@ -213,7 +213,7 @@ func testV1STSV1StatSv1GetQueueStringMetricsWithoutTenant(t *testing.T) {
 		utils.MetaSum + utils.HashtagSep + utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.CustomValue: "10",
 	}
 	if err := stsV1Rpc.Call(utils.StatSv1GetQueueStringMetrics,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{ID: expectedIDs[0]}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{ID: expectedIDs[0]}},
 		&metrics); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(expectedMetrics, metrics) {
@@ -241,7 +241,7 @@ func testV1STSV1StatSv1ResetAction(t *testing.T) {
 		utils.MetaSum + utils.HashtagSep + utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.CustomValue: utils.NotAvailable,
 	}
 	if err := stsV1Rpc.Call(utils.StatSv1GetQueueStringMetrics,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "CustomStatProfile"}}, &metrics); err != nil {
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "CustomStatProfile"}}, &metrics); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(expectedMetrics, metrics) {
 		t.Errorf("expecting: %+v, received reply: %s", utils.ToJSON(expectedMetrics), utils.ToJSON(metrics))
@@ -282,7 +282,7 @@ func testV1STSProcessEvent(t *testing.T) {
 	}
 	var metrics map[string]string
 	if err := stsV1Rpc.Call(utils.StatSv1GetQueueStringMetrics,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Stats1"}}, &metrics); err != nil {
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Stats1"}}, &metrics); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(expectedMetrics, metrics) {
 		t.Errorf("expecting: %+v, received reply: %s", expectedMetrics, metrics)
@@ -301,7 +301,7 @@ func testV1STSProcessEvent(t *testing.T) {
 	}
 	var floatMetrics map[string]float64
 	if err := stsV1Rpc.Call(utils.StatSv1GetQueueFloatMetrics,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Stats1"}}, &floatMetrics); err != nil {
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Stats1"}}, &floatMetrics); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(expectedFloatMetrics, floatMetrics) {
 		t.Errorf("expecting: %+v, received reply: %+v", expectedFloatMetrics, floatMetrics)
@@ -353,7 +353,7 @@ func testV1STSProcessEvent(t *testing.T) {
 	}
 	var metrics2 map[string]string
 	if err := stsV1Rpc.Call(utils.StatSv1GetQueueStringMetrics,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Stats1"}}, &metrics2); err != nil {
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Stats1"}}, &metrics2); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(expectedMetrics2, metrics2) {
 		t.Errorf("expecting: %+v, received reply: %s", expectedMetrics2, metrics2)
@@ -371,14 +371,14 @@ func testV1STSProcessEvent(t *testing.T) {
 	}
 	var floatMetrics2 map[string]float64
 	if err := stsV1Rpc.Call(utils.StatSv1GetQueueFloatMetrics,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Stats1"}}, &floatMetrics2); err != nil {
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Stats1"}}, &floatMetrics2); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(expectedFloatMetrics2, floatMetrics2) {
 		t.Errorf("expecting: %+v, received reply: %+v", expectedFloatMetrics2, floatMetrics2)
 	}
 
 	if err := stsV1Rpc.Call(utils.StatSv1GetQueueFloatMetrics,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{ID: "Stats1"}}, &floatMetrics2); err != nil {
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{ID: "Stats1"}}, &floatMetrics2); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(expectedFloatMetrics2, floatMetrics2) {
 		t.Errorf("expecting: %+v, received reply: %+v", expectedFloatMetrics2, floatMetrics2)
@@ -414,7 +414,7 @@ func testV1STSGetStatsAfterRestart(t *testing.T) {
 	}
 	var metrics2 map[string]string
 	if err := stsV1Rpc.Call(utils.StatSv1GetQueueStringMetrics,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Stats1"}}, &metrics2); err != nil {
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Stats1"}}, &metrics2); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(expectedMetrics2, metrics2) {
 		t.Errorf("After restat expecting: %+v, received reply: %s", expectedMetrics2, metrics2)
@@ -631,7 +631,7 @@ func testV1STSProcessMetricsWithFilter(t *testing.T) {
 		utils.MetaSum + utils.HashtagSep + utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + "CustomValue": utils.NotAvailable,
 	}
 	if err := stsV1Rpc.Call(utils.StatSv1GetQueueStringMetrics,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: expectedIDs[0]}}, &metrics); err != nil {
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: expectedIDs[0]}}, &metrics); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(expectedMetrics, metrics) {
 		t.Errorf("expecting: %+v, received reply: %s", expectedMetrics, metrics)
@@ -662,7 +662,7 @@ func testV1STSProcessMetricsWithFilter(t *testing.T) {
 		utils.MetaSum + utils.HashtagSep + utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + "CustomValue": utils.NotAvailable,
 	}
 	if err := stsV1Rpc.Call(utils.StatSv1GetQueueStringMetrics,
-		&utils.TenantIDWithOpts{
+		&utils.TenantIDWithAPIOpts{
 			TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: expectedIDs[0]}}, &metrics); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(expectedMetrics, metrics) {
@@ -692,7 +692,7 @@ func testV1STSProcessMetricsWithFilter(t *testing.T) {
 		utils.MetaSum + utils.HashtagSep + utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + "CustomValue": "10",
 	}
 	if err := stsV1Rpc.Call(utils.StatSv1GetQueueStringMetrics,
-		&utils.TenantIDWithOpts{
+		&utils.TenantIDWithAPIOpts{
 			TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: expectedIDs[0]}}, &metrics); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(expectedMetrics, metrics) {
@@ -770,7 +770,7 @@ func testV1STSProcessStaticMetrics(t *testing.T) {
 		utils.MetaAverage + utils.HashtagSep + "2": "2",
 	}
 	if err := stsV1Rpc.Call(utils.StatSv1GetQueueStringMetrics,
-		&utils.TenantIDWithOpts{
+		&utils.TenantIDWithAPIOpts{
 			TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: expectedIDs[0]}}, &metrics); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(expectedMetrics, metrics) {
@@ -787,7 +787,7 @@ func testV1STSProcessStaticMetrics(t *testing.T) {
 		utils.MetaAverage + utils.HashtagSep + "2": "2",
 	}
 	if err := stsV1Rpc.Call(utils.StatSv1GetQueueStringMetrics,
-		&utils.TenantIDWithOpts{
+		&utils.TenantIDWithAPIOpts{
 			TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: expectedIDs[0]}}, &metrics); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(expectedMetrics, metrics) {
@@ -795,7 +795,7 @@ func testV1STSProcessStaticMetrics(t *testing.T) {
 	}
 
 	if err := stsV1Rpc.Call(utils.StatSv1ResetStatQueue,
-		&utils.TenantIDWithOpts{
+		&utils.TenantIDWithAPIOpts{
 			TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: expectedIDs[0]}}, &result); err != nil {
 		t.Error(err)
 	} else if result != utils.OK {
@@ -806,7 +806,7 @@ func testV1STSProcessStaticMetrics(t *testing.T) {
 		utils.MetaAverage + utils.HashtagSep + "2": utils.NotAvailable,
 	}
 	if err := stsV1Rpc.Call(utils.StatSv1GetQueueStringMetrics,
-		&utils.TenantIDWithOpts{
+		&utils.TenantIDWithAPIOpts{
 			TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: expectedIDs[0]}}, &metrics); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(expectedMetrics, metrics) {
@@ -896,7 +896,7 @@ func testV1STSProcessStatWithThreshold(t *testing.T) {
 	var td engine.Threshold
 	eTd := engine.Threshold{Tenant: "cgrates.org", ID: "THD_Stat", Hits: 1}
 	if err := stsV1Rpc.Call(utils.ThresholdSv1GetThreshold,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "THD_Stat"}}, &td); err != nil {
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "THD_Stat"}}, &td); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(eTd.Hits, td.Hits) {
 		t.Errorf("expecting: %+v, received: %+v", eTd, td)
@@ -1014,7 +1014,7 @@ func testV1STSProcessCDRStat(t *testing.T) {
 		utils.MetaSum + utils.HashtagSep + "~*req.CostDetails.Usage": "10000000000",
 	}
 	if err := stsV1Rpc.Call(utils.StatSv1GetQueueStringMetrics,
-		&utils.TenantIDWithOpts{
+		&utils.TenantIDWithAPIOpts{
 			TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "StatForCDR"}}, &metrics); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(expectedMetrics, metrics) {
@@ -1030,7 +1030,7 @@ func testV1STSProcessCDRStat(t *testing.T) {
 		utils.MetaSum + utils.HashtagSep + "~*req.CostDetails.Usage": "20000000000",
 	}
 	if err := stsV1Rpc.Call(utils.StatSv1GetQueueStringMetrics,
-		&utils.TenantIDWithOpts{
+		&utils.TenantIDWithAPIOpts{
 			TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "StatForCDR"}}, &metrics); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(expectedMetrics, metrics) {
@@ -1082,7 +1082,7 @@ func testV1STSOverWriteStats(t *testing.T) {
 		utils.MetaSum + utils.HashtagSep + "1": utils.NotAvailable,
 	}
 	if err := stsV1Rpc.Call(utils.StatSv1GetQueueStringMetrics,
-		&utils.TenantIDWithOpts{
+		&utils.TenantIDWithAPIOpts{
 			TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "InitStat"}}, &metrics); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(expectedMetrics, metrics) {
@@ -1122,7 +1122,7 @@ func testV1STSOverWriteStats(t *testing.T) {
 		utils.MetaSum + utils.HashtagSep + "~*req.Test": utils.NotAvailable,
 	}
 	if err := stsV1Rpc.Call(utils.StatSv1GetQueueStringMetrics,
-		&utils.TenantIDWithOpts{
+		&utils.TenantIDWithAPIOpts{
 			TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "InitStat"}}, &metrics2); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(expectedMetrics2, metrics2) {
@@ -1203,7 +1203,7 @@ func testV1STSProcessStatWithThreshold2(t *testing.T) {
 	var td engine.Threshold
 	eTd := engine.Threshold{Tenant: "cgrates.org", ID: "THD_Stat2", Hits: 1}
 	if err := stsV1Rpc.Call(utils.ThresholdSv1GetThreshold,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "THD_Stat"}}, &td); err != nil {
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "THD_Stat"}}, &td); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(eTd.Hits, td.Hits) {
 		t.Errorf("expecting: %+v, received: %+v", eTd, td)
@@ -1245,7 +1245,7 @@ func BenchmarkSTSV1GetQueueStringMetrics(b *testing.B) {
 	for i := 0; i < b.N; i++ {
 		var metrics map[string]string
 		if err := stsV1Rpc.Call(utils.StatSv1GetQueueStringMetrics,
-			&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "STATS_1"}},
+			&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "STATS_1"}},
 			&metrics); err != nil {
 			b.Error(err)
 		}
@@ -1298,7 +1298,7 @@ func testV1STSGetStatQueueProfileWithoutTenant(t *testing.T) {
 func testV1STSRemStatQueueProfileWithoutTenant(t *testing.T) {
 	var reply string
 	if err := stsV1Rpc.Call(utils.APIerSv1RemoveStatQueueProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{ID: "TEST_PROFILE10"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{ID: "TEST_PROFILE10"}},
 		&reply); err != nil {
 		t.Error(err)
 	} else if reply != utils.OK {
@@ -1459,7 +1459,7 @@ func testV1STSSimulateAccountUpdate(t *testing.T) {
 		utils.MetaSum + utils.HashtagSep + "~*asm.BalanceSummaries.HolidayBalance.Value": "1.5",
 	}
 	if err := stsV1Rpc.Call(utils.StatSv1GetQueueStringMetrics,
-		&utils.TenantIDWithOpts{
+		&utils.TenantIDWithAPIOpts{
 			TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "StatForAccountUpdate"}}, &metrics); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(expectedMetrics, metrics) {
@@ -1475,7 +1475,7 @@ func testV1STSSimulateAccountUpdate(t *testing.T) {
 		utils.MetaSum + utils.HashtagSep + "~*asm.BalanceSummaries.HolidayBalance.Value": "3",
 	}
 	if err := stsV1Rpc.Call(utils.StatSv1GetQueueStringMetrics,
-		&utils.TenantIDWithOpts{
+		&utils.TenantIDWithAPIOpts{
 			TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "StatForAccountUpdate"}}, &metrics); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(expectedMetrics, metrics) {
@@ -1538,7 +1538,7 @@ func testV1STSGetStatQueueWithoutExpired(t *testing.T) {
 	}
 	//verify metrics after first process
 	if err := stsV1Rpc.Call(utils.StatSv1GetQueueStringMetrics,
-		&utils.TenantIDWithOpts{
+		&utils.TenantIDWithAPIOpts{
 			TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Sq1Nanao"}}, &metrics); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(expectedMetrics, metrics) {
@@ -1600,7 +1600,7 @@ func testV1STSGetStatQueueWithoutStored(t *testing.T) {
 	}
 	//verify metrics after first process
 	if err := stsV1Rpc.Call(utils.StatSv1GetQueueStringMetrics,
-		&utils.TenantIDWithOpts{
+		&utils.TenantIDWithAPIOpts{
 			TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Sq1NotStored"}}, &metrics); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(expectedMetrics, metrics) {
@@ -1618,7 +1618,7 @@ func testV1STSGetStatQueueWithoutStored(t *testing.T) {
 	}
 	//verify metrics after first process
 	if err := stsV1Rpc.Call(utils.StatSv1GetQueueStringMetrics,
-		&utils.TenantIDWithOpts{
+		&utils.TenantIDWithAPIOpts{
 			TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Sq1NotStored"}}, &metrics); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(expectedMetrics, metrics) {
@@ -1633,7 +1633,7 @@ func testV1STSCheckMetricsAfterRestart(t *testing.T) {
 		utils.MetaSum + utils.HashtagSep + "~*asm.BalanceSummaries.HolidayBalance.Value": "3",
 	}
 	if err := stsV1Rpc.Call(utils.StatSv1GetQueueStringMetrics,
-		&utils.TenantIDWithOpts{
+		&utils.TenantIDWithAPIOpts{
 			TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "StatForAccountUpdate"}}, &metrics); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(expectedMetrics, metrics) {
@@ -1644,7 +1644,7 @@ func testV1STSCheckMetricsAfterRestart(t *testing.T) {
 	}
 	metrics = map[string]string{}
 	if err := stsV1Rpc.Call(utils.StatSv1GetQueueStringMetrics,
-		&utils.TenantIDWithOpts{
+		&utils.TenantIDWithAPIOpts{
 			TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Sq1NotStored"}}, &metrics); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(expectedMetrics, metrics) {
diff --git a/apier/v1/thresholds.go b/apier/v1/thresholds.go
index 77e3f7721..8c11926f7 100644
--- a/apier/v1/thresholds.go
+++ b/apier/v1/thresholds.go
@@ -51,7 +51,7 @@ func (tSv1 *ThresholdSv1) GetThresholdsForEvent(args *engine.ThresholdsArgsProce
 }
 
 // GetThreshold queries a Threshold
-func (tSv1 *ThresholdSv1) GetThreshold(tntID *utils.TenantIDWithOpts, t *engine.Threshold) error {
+func (tSv1 *ThresholdSv1) GetThreshold(tntID *utils.TenantIDWithAPIOpts, t *engine.Threshold) error {
 	return tSv1.tS.V1GetThreshold(tntID.TenantID, t)
 }
 
@@ -61,7 +61,7 @@ func (tSv1 *ThresholdSv1) ProcessEvent(args *engine.ThresholdsArgsProcessEvent,
 }
 
 // ResetThreshold resets the threshold hits
-func (tSv1 *ThresholdSv1) ResetThreshold(tntID *utils.TenantIDWithOpts, reply *string) error {
+func (tSv1 *ThresholdSv1) ResetThreshold(tntID *utils.TenantIDWithAPIOpts, reply *string) error {
 	return tSv1.tS.V1ResetThreshold(tntID.TenantID, reply)
 }
 
@@ -159,7 +159,7 @@ func (apierSv1 *APIerSv1) SetThresholdProfile(args *engine.ThresholdProfileWithO
 }
 
 // RemoveThresholdProfile removes a specific Threshold Profile
-func (apierSv1 *APIerSv1) RemoveThresholdProfile(args *utils.TenantIDWithOpts, reply *string) error {
+func (apierSv1 *APIerSv1) RemoveThresholdProfile(args *utils.TenantIDWithAPIOpts, reply *string) error {
 	if missing := utils.MissingStructFields(args, []string{utils.ID}); len(missing) != 0 { //Params missing
 		return utils.NewErrMandatoryIeMissing(missing...)
 	}
@@ -171,8 +171,8 @@ func (apierSv1 *APIerSv1) RemoveThresholdProfile(args *utils.TenantIDWithOpts, r
 		return utils.APIErrorHandler(err)
 	}
 	//handle caching for ThresholdProfile
-	if err := apierSv1.CallCache(utils.IfaceAsString(args.Opts[utils.CacheOpt]), tnt, utils.CacheThresholdProfiles,
-		utils.ConcatenatedKey(tnt, args.ID), nil, nil, args.Opts); err != nil {
+	if err := apierSv1.CallCache(utils.IfaceAsString(args.APIOpts[utils.CacheOpt]), tnt, utils.CacheThresholdProfiles,
+		utils.ConcatenatedKey(tnt, args.ID), nil, nil, args.APIOpts); err != nil {
 		return utils.APIErrorHandler(err)
 	}
 	if err := apierSv1.DataManager.RemoveThreshold(tnt, args.ID, utils.NonTransactional); err != nil {
@@ -185,8 +185,8 @@ func (apierSv1 *APIerSv1) RemoveThresholdProfile(args *utils.TenantIDWithOpts, r
 		return utils.APIErrorHandler(err)
 	}
 	//handle caching for Threshold
-	if err := apierSv1.CallCache(utils.IfaceAsString(args.Opts[utils.CacheOpt]), tnt, utils.CacheThresholds,
-		utils.ConcatenatedKey(tnt, args.ID), nil, nil, args.Opts); err != nil {
+	if err := apierSv1.CallCache(utils.IfaceAsString(args.APIOpts[utils.CacheOpt]), tnt, utils.CacheThresholds,
+		utils.ConcatenatedKey(tnt, args.ID), nil, nil, args.APIOpts); err != nil {
 		return utils.APIErrorHandler(err)
 	}
 	*reply = utils.OK
diff --git a/apier/v1/thresholds_it_test.go b/apier/v1/thresholds_it_test.go
index 03e1b3344..ce486a5eb 100644
--- a/apier/v1/thresholds_it_test.go
+++ b/apier/v1/thresholds_it_test.go
@@ -314,7 +314,7 @@ func testV1TSGetThresholds(t *testing.T) {
 	var td engine.Threshold
 	eTd := engine.Threshold{Tenant: "cgrates.org", ID: expectedIDs[0]}
 	if err := tSv1Rpc.Call(utils.ThresholdSv1GetThreshold,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: expectedIDs[0]}}, &td); err != nil {
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: expectedIDs[0]}}, &td); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(eTd, td) {
 		t.Errorf("expecting: %+v, received: %+v", eTd, td)
@@ -388,7 +388,7 @@ func testV1TSGetThresholdsAfterProcess(t *testing.T) {
 	}
 	var td engine.Threshold
 	if err := tSv1Rpc.Call(utils.ThresholdSv1GetThreshold,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "THD_ACNT_BALANCE_1"}}, &td); err != nil {
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "THD_ACNT_BALANCE_1"}}, &td); err != nil {
 		t.Error(err)
 	} else if td.Snooze.IsZero() { // make sure Snooze time was reset during execution
 		t.Errorf("received: %+v", td)
@@ -411,7 +411,7 @@ func testV1TSGetThresholdsAfterRestart(t *testing.T) {
 	}
 	var td engine.Threshold
 	if err := tSv1Rpc.Call(utils.ThresholdSv1GetThreshold,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "THD_ACNT_BALANCE_1"}}, &td); err != nil {
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "THD_ACNT_BALANCE_1"}}, &td); err != nil {
 		t.Error(err)
 	} else if td.Snooze.IsZero() { // make sure Snooze time was reset during execution
 		t.Errorf("received: %+v", td)
@@ -526,7 +526,7 @@ func testV1TSUpdateThresholdProfile(t *testing.T) {
 func testV1TSRemoveThresholdProfile(t *testing.T) {
 	var resp string
 	if err := tSv1Rpc.Call(utils.APIerSv1RemoveThresholdProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "THD_Test"}}, &resp); err != nil {
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "THD_Test"}}, &resp); err != nil {
 		t.Error(err)
 	} else if resp != utils.OK {
 		t.Error("Unexpected reply returned", resp)
@@ -538,7 +538,7 @@ func testV1TSRemoveThresholdProfile(t *testing.T) {
 		t.Errorf("Received %s and the error:%+v", utils.ToJSON(sqp), err)
 	}
 	if err := tSv1Rpc.Call(utils.APIerSv1RemoveThresholdProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "THD_Test"}}, &resp); err.Error() != utils.ErrNotFound.Error() {
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "THD_Test"}}, &resp); err.Error() != utils.ErrNotFound.Error() {
 		t.Errorf("Expected error: %v received: %v", utils.ErrNotFound, err)
 	}
 }
@@ -586,7 +586,7 @@ func testV1TSMaxHits(t *testing.T) {
 	var td engine.Threshold
 	eTd := engine.Threshold{Tenant: "cgrates.org", ID: "TH3", Hits: 1}
 	if err := tSv1Rpc.Call(utils.ThresholdSv1GetThreshold,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "TH3"}}, &td); err != nil {
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "TH3"}}, &td); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(eTd.Hits, td.Hits) {
 		t.Errorf("expecting: %+v, received: %+v", eTd, td)
@@ -628,7 +628,7 @@ func testV1TSMaxHits(t *testing.T) {
 	//check threshold after second process ( hits : 2)
 	eTd.Hits = 2
 	if err := tSv1Rpc.Call(utils.ThresholdSv1GetThreshold,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "TH3"}}, &td); err != nil {
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "TH3"}}, &td); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(eTd.Hits, td.Hits) {
 		t.Errorf("expecting: %+v, received: %+v", eTd, td)
@@ -642,7 +642,7 @@ func testV1TSMaxHits(t *testing.T) {
 	}
 	//check threshold after third process (reached the maximum hits and should be removed)
 	if err := tSv1Rpc.Call(utils.ThresholdSv1GetThreshold,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "TH3"}}, &td); err == nil ||
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "TH3"}}, &td); err == nil ||
 		err.Error() != utils.ErrNotFound.Error() {
 		t.Errorf("Err : %+v \n, td : %+v", err, utils.ToJSON(td))
 	}
@@ -695,7 +695,7 @@ func testV1TSUpdateSnooze(t *testing.T) {
 	var td engine.Threshold
 	eTd := engine.Threshold{Tenant: "cgrates.org", ID: "TH4", Hits: 1}
 	if err := tSv1Rpc.Call(utils.ThresholdSv1GetThreshold,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "TH4"}}, &td); err != nil {
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "TH4"}}, &td); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(eTd.Hits, td.Hits) {
 		t.Errorf("expecting: %+v, received: %+v", eTd, td)
@@ -720,7 +720,7 @@ func testV1TSUpdateSnooze(t *testing.T) {
 	}
 
 	if err := tSv1Rpc.Call(utils.ThresholdSv1GetThreshold,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "TH4"}}, &td); err != nil {
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "TH4"}}, &td); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(eTd.Hits, td.Hits) {
 		t.Errorf("expecting: %+v, received: %+v", eTd, td)
@@ -773,7 +773,7 @@ func testV1TSGetThresholdProfileWithoutTenant(t *testing.T) {
 func testV1TSRemThresholdProfileWithoutTenant(t *testing.T) {
 	var reply string
 	if err := tSv1Rpc.Call(utils.APIerSv1RemoveThresholdProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{ID: "randomID"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{ID: "randomID"}},
 		&reply); err != nil {
 		t.Error(err)
 	} else if reply != utils.OK {
@@ -832,7 +832,7 @@ func testV1TSGetThresholdsWithoutTenant(t *testing.T) {
 	}
 	var reply *engine.Threshold
 	if err := tSv1Rpc.Call(utils.ThresholdSv1GetThreshold,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{ID: "THD_ACNT_BALANCE_1"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{ID: "THD_ACNT_BALANCE_1"}},
 		&reply); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(expectedThreshold.ID, reply.ID) {
@@ -928,7 +928,7 @@ func testV1TSResetThresholdsWithoutTenant(t *testing.T) {
 	}
 	var reply *engine.Threshold
 	if err := tSv1Rpc.Call(utils.ThresholdSv1GetThreshold,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{ID: "THD_ACNT_BALANCE_1"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{ID: "THD_ACNT_BALANCE_1"}},
 		&reply); err != nil {
 		t.Fatal(err)
 	}
@@ -938,7 +938,7 @@ func testV1TSResetThresholdsWithoutTenant(t *testing.T) {
 	}
 	var result string
 	if err := tSv1Rpc.Call(utils.ThresholdSv1ResetThreshold,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{ID: "THD_ACNT_BALANCE_1"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{ID: "THD_ACNT_BALANCE_1"}},
 		&result); err != nil {
 		t.Fatal(err)
 	} else if result != utils.OK {
@@ -947,7 +947,7 @@ func testV1TSResetThresholdsWithoutTenant(t *testing.T) {
 	expectedThreshold.Hits = 0
 	reply = nil
 	if err := tSv1Rpc.Call(utils.ThresholdSv1GetThreshold,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{ID: "THD_ACNT_BALANCE_1"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{ID: "THD_ACNT_BALANCE_1"}},
 		&reply); err != nil {
 		t.Fatal(err)
 	}
diff --git a/apier/v2/attributes_it_test.go b/apier/v2/attributes_it_test.go
index f9eae679f..1fb30e5fb 100644
--- a/apier/v2/attributes_it_test.go
+++ b/apier/v2/attributes_it_test.go
@@ -160,7 +160,7 @@ func testAttributeSSetAlsPrf(t *testing.T) {
 	alsPrf.Compile()
 	var reply *engine.AttributeProfile
 	if err := attrSRPC.Call(utils.APIerSv1GetAttributeProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ExternalAttribute"}}, &reply); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ExternalAttribute"}}, &reply); err != nil {
 		t.Fatal(err)
 	}
 	reply.Compile()
@@ -227,7 +227,7 @@ func testAttributeSUpdateAlsPrf(t *testing.T) {
 	alsPrf.Compile()
 	var reply *engine.AttributeProfile
 	if err := attrSRPC.Call(utils.APIerSv1GetAttributeProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ExternalAttribute"}}, &reply); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ExternalAttribute"}}, &reply); err != nil {
 		t.Fatal(err)
 	}
 	sort.Strings(reply.Contexts)
@@ -291,7 +291,7 @@ func testAttributeSSetAlsPrfWithoutTenant(t *testing.T) {
 	alsPrf.Compile()
 	var reply *engine.AttributeProfile
 	if err := attrSRPC.Call(utils.APIerSv1GetAttributeProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{ID: "ExternalAttribute"}}, &reply); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{ID: "ExternalAttribute"}}, &reply); err != nil {
 		t.Fatal(err)
 	}
 	reply.Compile()
diff --git a/apier/v2/cdrs_it_test.go b/apier/v2/cdrs_it_test.go
index 8a1372f0e..d29b12f7b 100644
--- a/apier/v2/cdrs_it_test.go
+++ b/apier/v2/cdrs_it_test.go
@@ -455,7 +455,7 @@ func testV2CDRsDifferentTenants(t *testing.T) {
 	}
 	var reply *engine.AttributeProfile
 	if err := cdrsRpc.Call(utils.APIerSv1GetAttributeProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.com", ID: "ATTR_Tenant"}}, &reply); err != nil {
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.com", ID: "ATTR_Tenant"}}, &reply); err != nil {
 		t.Fatal(err)
 	}
 	reply.Compile()
@@ -805,7 +805,7 @@ func testV2CDRsProcessCDRWithThreshold(t *testing.T) {
 func testV2CDRsGetThreshold(t *testing.T) {
 	var td engine.Threshold
 	if err := cdrsRpc.Call(utils.ThresholdSv1GetThreshold,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "THD_Test"}}, &td); err != nil {
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "THD_Test"}}, &td); err != nil {
 		t.Error(err)
 	} else if td.Hits != 1 {
 		t.Errorf("Expecting threshold to be hit once received: %v", td.Hits)
@@ -1171,7 +1171,7 @@ func testV2CDRsResetThresholdAction(t *testing.T) {
 	}
 	var td engine.Threshold
 	if err := cdrsRpc.Call(utils.ThresholdSv1GetThreshold,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "THD_Test"}}, &td); err != nil {
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "THD_Test"}}, &td); err != nil {
 		t.Error(err)
 	} else if td.Hits != 0 {
 		t.Errorf("Expecting threshold to be reset received: %v", td.Hits)
diff --git a/cmd/cgr-tester/cgr-tester.go b/cmd/cgr-tester/cgr-tester.go
index d825ba6af..f4014b828 100644
--- a/cmd/cgr-tester/cgr-tester.go
+++ b/cmd/cgr-tester/cgr-tester.go
@@ -79,7 +79,7 @@ var (
 	err error
 )
 
-func durInternalRater(cd *engine.CallDescriptorWithOpts) (time.Duration, error) {
+func durInternalRater(cd *engine.CallDescriptorWithAPIOpts) (time.Duration, error) {
 	dbConn, err := engine.NewDataDBConn(tstCfg.DataDbCfg().Type,
 		tstCfg.DataDbCfg().Host, tstCfg.DataDbCfg().Port,
 		tstCfg.DataDbCfg().Name, tstCfg.DataDbCfg().User,
@@ -120,7 +120,7 @@ func durInternalRater(cd *engine.CallDescriptorWithOpts) (time.Duration, error)
 	return time.Since(start), nil
 }
 
-func durRemoteRater(cd *engine.CallDescriptorWithOpts) (time.Duration, error) {
+func durRemoteRater(cd *engine.CallDescriptorWithAPIOpts) (time.Duration, error) {
 	result := engine.CallCost{}
 	var client *rpc.Client
 	var err error
@@ -243,7 +243,7 @@ func main() {
 	tstart := time.Now()
 	timeparsed, err = utils.ParseDurationWithNanosecs(*usage)
 	tend := tstart.Add(timeparsed)
-	cd := &engine.CallDescriptorWithOpts{
+	cd := &engine.CallDescriptorWithAPIOpts{
 		CallDescriptor: &engine.CallDescriptor{
 			TimeStart:     tstart,
 			TimeEnd:       tend,
diff --git a/cmd/cgr-tester/combined_max_usage/combined_max_usage.go b/cmd/cgr-tester/combined_max_usage/combined_max_usage.go
index b1d341528..24758cf1f 100644
--- a/cmd/cgr-tester/combined_max_usage/combined_max_usage.go
+++ b/cmd/cgr-tester/combined_max_usage/combined_max_usage.go
@@ -101,7 +101,7 @@ func main() {
 		go func() {
 			tStart := time.Date(2016, 3, 31, 0, 0, 0, 0, time.UTC)
 			usageDur, _ := utils.ParseDurationWithNanosecs(usage)
-			cd := &engine.CallDescriptorWithOpts{
+			cd := &engine.CallDescriptorWithAPIOpts{
 				CallDescriptor: &engine.CallDescriptor{
 					Category:    "call",
 					Tenant:      "cgrates.org",
diff --git a/cmd/cgr-tester/combined_max_usage2/combined_max_usage2.go b/cmd/cgr-tester/combined_max_usage2/combined_max_usage2.go
index 707f53c0f..8d349fbcf 100644
--- a/cmd/cgr-tester/combined_max_usage2/combined_max_usage2.go
+++ b/cmd/cgr-tester/combined_max_usage2/combined_max_usage2.go
@@ -101,7 +101,7 @@ func main() {
 		go func() {
 			tStart := time.Date(2016, 3, 31, 0, 0, 0, 0, time.UTC)
 			usageDur, _ := utils.ParseDurationWithNanosecs(usage)
-			cd := &engine.CallDescriptorWithOpts{
+			cd := &engine.CallDescriptorWithAPIOpts{
 				CallDescriptor: &engine.CallDescriptor{
 					Category:    "call",
 					Tenant:      "cgrates.org",
diff --git a/cmd/cgr-tester/simple_max_usage/simple_max_usage.go b/cmd/cgr-tester/simple_max_usage/simple_max_usage.go
index f7e96cf8a..3f9ee64d8 100644
--- a/cmd/cgr-tester/simple_max_usage/simple_max_usage.go
+++ b/cmd/cgr-tester/simple_max_usage/simple_max_usage.go
@@ -98,7 +98,7 @@ func main() {
 		go func() {
 			tStart := time.Date(2016, 3, 31, 0, 0, 0, 0, time.UTC)
 			usageDur, _ := utils.ParseDurationWithNanosecs(usage)
-			cd := &engine.CallDescriptorWithOpts{
+			cd := &engine.CallDescriptorWithAPIOpts{
 				CallDescriptor: &engine.CallDescriptor{
 					Category:    "call",
 					Tenant:      "cgrates.org",
diff --git a/console/accounts_profile.go b/console/accounts_profile.go
index 06660f1b8..f0b24e91f 100644
--- a/console/accounts_profile.go
+++ b/console/accounts_profile.go
@@ -26,7 +26,7 @@ func init() {
 	c := &CmdGetAccountsProfile{
 		name:      "accounts_profile",
 		rpcMethod: utils.APIerSv1GetAccountProfile,
-		rpcParams: &utils.TenantIDWithOpts{},
+		rpcParams: &utils.TenantIDWithAPIOpts{},
 	}
 	commands[c.Name()] = c
 	c.CommandExecuter = &CommandExecuter{c}
@@ -36,7 +36,7 @@ func init() {
 type CmdGetAccountsProfile struct {
 	name      string
 	rpcMethod string
-	rpcParams *utils.TenantIDWithOpts
+	rpcParams *utils.TenantIDWithAPIOpts
 	*CommandExecuter
 }
 
@@ -50,7 +50,7 @@ func (self *CmdGetAccountsProfile) RpcMethod() string {
 
 func (self *CmdGetAccountsProfile) RpcParams(reset bool) interface{} {
 	if reset || self.rpcParams == nil {
-		self.rpcParams = &utils.TenantIDWithOpts{}
+		self.rpcParams = &utils.TenantIDWithAPIOpts{}
 	}
 	return self.rpcParams
 }
diff --git a/console/accounts_profile_rem.go b/console/accounts_profile_rem.go
index 7f7356a52..dfae57eb0 100644
--- a/console/accounts_profile_rem.go
+++ b/console/accounts_profile_rem.go
@@ -24,7 +24,7 @@ func init() {
 	c := &CmdRemoveAccountsProfile{
 		name:      "accounts_profile_remove",
 		rpcMethod: utils.APIerSv1RemoveAccountProfile,
-		rpcParams: &utils.TenantIDWithOpts{},
+		rpcParams: &utils.TenantIDWithAPIOpts{},
 	}
 	commands[c.Name()] = c
 	c.CommandExecuter = &CommandExecuter{c}
@@ -33,7 +33,7 @@ func init() {
 type CmdRemoveAccountsProfile struct {
 	name      string
 	rpcMethod string
-	rpcParams *utils.TenantIDWithOpts
+	rpcParams *utils.TenantIDWithAPIOpts
 	*CommandExecuter
 }
 
@@ -47,7 +47,7 @@ func (self *CmdRemoveAccountsProfile) RpcMethod() string {
 
 func (self *CmdRemoveAccountsProfile) RpcParams(reset bool) interface{} {
 	if reset || self.rpcParams == nil {
-		self.rpcParams = &utils.TenantIDWithOpts{Opts: make(map[string]interface{})}
+		self.rpcParams = &utils.TenantIDWithAPIOpts{APIOpts: make(map[string]interface{})}
 	}
 	return self.rpcParams
 }
diff --git a/console/attributes_profile.go b/console/attributes_profile.go
index b53114a48..347314a0a 100644
--- a/console/attributes_profile.go
+++ b/console/attributes_profile.go
@@ -27,7 +27,7 @@ func init() {
 	c := &CmdGetAttributes{
 		name:      "attributes_profile",
 		rpcMethod: utils.APIerSv1GetAttributeProfile,
-		rpcParams: &utils.TenantIDWithOpts{},
+		rpcParams: &utils.TenantIDWithAPIOpts{},
 	}
 	commands[c.Name()] = c
 	c.CommandExecuter = &CommandExecuter{c}
@@ -37,7 +37,7 @@ func init() {
 type CmdGetAttributes struct {
 	name      string
 	rpcMethod string
-	rpcParams *utils.TenantIDWithOpts
+	rpcParams *utils.TenantIDWithAPIOpts
 	*CommandExecuter
 }
 
@@ -51,7 +51,7 @@ func (self *CmdGetAttributes) RpcMethod() string {
 
 func (self *CmdGetAttributes) RpcParams(reset bool) interface{} {
 	if reset || self.rpcParams == nil {
-		self.rpcParams = &utils.TenantIDWithOpts{}
+		self.rpcParams = &utils.TenantIDWithAPIOpts{}
 	}
 	return self.rpcParams
 }
diff --git a/console/attributes_profile_rem.go b/console/attributes_profile_rem.go
index 2c8760e1b..39d4ba5f8 100644
--- a/console/attributes_profile_rem.go
+++ b/console/attributes_profile_rem.go
@@ -24,7 +24,7 @@ func init() {
 	c := &CmdRemoveAttributes{
 		name:      "attributes_profile_remove",
 		rpcMethod: utils.APIerSv1RemoveAttributeProfile,
-		rpcParams: &utils.TenantIDWithOpts{},
+		rpcParams: &utils.TenantIDWithAPIOpts{},
 	}
 	commands[c.Name()] = c
 	c.CommandExecuter = &CommandExecuter{c}
@@ -33,7 +33,7 @@ func init() {
 type CmdRemoveAttributes struct {
 	name      string
 	rpcMethod string
-	rpcParams *utils.TenantIDWithOpts
+	rpcParams *utils.TenantIDWithAPIOpts
 	*CommandExecuter
 }
 
@@ -47,7 +47,7 @@ func (self *CmdRemoveAttributes) RpcMethod() string {
 
 func (self *CmdRemoveAttributes) RpcParams(reset bool) interface{} {
 	if reset || self.rpcParams == nil {
-		self.rpcParams = &utils.TenantIDWithOpts{Opts: make(map[string]interface{})}
+		self.rpcParams = &utils.TenantIDWithAPIOpts{APIOpts: make(map[string]interface{})}
 	}
 	return self.rpcParams
 }
diff --git a/console/chargers_profile_rem.go b/console/chargers_profile_rem.go
index f4550ab27..cc1176689 100644
--- a/console/chargers_profile_rem.go
+++ b/console/chargers_profile_rem.go
@@ -24,7 +24,7 @@ func init() {
 	c := &CmdRemoveChargers{
 		name:      "chargers_profile_remove",
 		rpcMethod: utils.APIerSv1RemoveChargerProfile,
-		rpcParams: &utils.TenantIDWithOpts{},
+		rpcParams: &utils.TenantIDWithAPIOpts{},
 	}
 	commands[c.Name()] = c
 	c.CommandExecuter = &CommandExecuter{c}
@@ -33,7 +33,7 @@ func init() {
 type CmdRemoveChargers struct {
 	name      string
 	rpcMethod string
-	rpcParams *utils.TenantIDWithOpts
+	rpcParams *utils.TenantIDWithAPIOpts
 	*CommandExecuter
 }
 
@@ -47,7 +47,7 @@ func (self *CmdRemoveChargers) RpcMethod() string {
 
 func (self *CmdRemoveChargers) RpcParams(reset bool) interface{} {
 	if reset || self.rpcParams == nil {
-		self.rpcParams = &utils.TenantIDWithOpts{}
+		self.rpcParams = &utils.TenantIDWithAPIOpts{}
 	}
 	return self.rpcParams
 }
diff --git a/console/command_executer_test.go b/console/command_executer_test.go
index 5917b0238..2fadb238b 100644
--- a/console/command_executer_test.go
+++ b/console/command_executer_test.go
@@ -244,13 +244,13 @@ func TestGetFormatedSliceResult(t *testing.T) {
 }
 
 func TestFromJSONInterestingFields2(t *testing.T) {
-	jsn := utils.ToJSON(&utils.TenantIDWithOpts{
+	jsn := utils.ToJSON(&utils.TenantIDWithAPIOpts{
 		TenantID: new(utils.TenantID),
-		Opts:     make(map[string]interface{}),
+		APIOpts:  make(map[string]interface{}),
 	})
 
-	line := FromJSON([]byte(jsn), []string{"Tenant", "ID", "Opts"})
-	expected := `Tenant="" ID="" Opts={}`
+	line := FromJSON([]byte(jsn), []string{"Tenant", "ID", "APIOpts"})
+	expected := `Tenant="" ID="" APIOpts={}`
 	if line != expected {
 		t.Log(jsn)
 		t.Errorf("Expected: %s got: '%s'", expected, line)
diff --git a/console/debit.go b/console/debit.go
index f270a444c..484e2a9fd 100644
--- a/console/debit.go
+++ b/console/debit.go
@@ -37,7 +37,7 @@ func init() {
 type CmdDebit struct {
 	name       string
 	rpcMethod  string
-	rpcParams  *engine.CallDescriptorWithOpts
+	rpcParams  *engine.CallDescriptorWithAPIOpts
 	clientArgs []string
 	*CommandExecuter
 }
@@ -52,9 +52,9 @@ func (self *CmdDebit) RpcMethod() string {
 
 func (self *CmdDebit) RpcParams(reset bool) interface{} {
 	if reset || self.rpcParams == nil {
-		self.rpcParams = &engine.CallDescriptorWithOpts{
+		self.rpcParams = &engine.CallDescriptorWithAPIOpts{
 			CallDescriptor: new(engine.CallDescriptor),
-			Opts:           make(map[string]interface{}),
+			APIOpts:        make(map[string]interface{}),
 		}
 	}
 	return self.rpcParams
diff --git a/console/debit_max.go b/console/debit_max.go
index ab55eda14..7a31bd703 100644
--- a/console/debit_max.go
+++ b/console/debit_max.go
@@ -37,7 +37,7 @@ func init() {
 type CmdMaxDebit struct {
 	name       string
 	rpcMethod  string
-	rpcParams  *engine.CallDescriptorWithOpts
+	rpcParams  *engine.CallDescriptorWithAPIOpts
 	clientArgs []string
 	*CommandExecuter
 }
@@ -52,9 +52,9 @@ func (self *CmdMaxDebit) RpcMethod() string {
 
 func (self *CmdMaxDebit) RpcParams(reset bool) interface{} {
 	if reset || self.rpcParams == nil {
-		self.rpcParams = &engine.CallDescriptorWithOpts{
+		self.rpcParams = &engine.CallDescriptorWithAPIOpts{
 			CallDescriptor: new(engine.CallDescriptor),
-			Opts:           make(map[string]interface{}),
+			APIOpts:        make(map[string]interface{}),
 		}
 	}
 	return self.rpcParams
diff --git a/console/dispatchers_host_rem.go b/console/dispatchers_host_rem.go
index 9e68c61dd..82d614dc3 100644
--- a/console/dispatchers_host_rem.go
+++ b/console/dispatchers_host_rem.go
@@ -35,7 +35,7 @@ func init() {
 type CmdRemoveDispatcherHost struct {
 	name      string
 	rpcMethod string
-	rpcParams *utils.TenantIDWithOpts
+	rpcParams *utils.TenantIDWithAPIOpts
 	*CommandExecuter
 }
 
@@ -49,7 +49,7 @@ func (self *CmdRemoveDispatcherHost) RpcMethod() string {
 
 func (self *CmdRemoveDispatcherHost) RpcParams(reset bool) interface{} {
 	if reset || self.rpcParams == nil {
-		self.rpcParams = &utils.TenantIDWithOpts{Opts: make(map[string]interface{})}
+		self.rpcParams = &utils.TenantIDWithAPIOpts{APIOpts: make(map[string]interface{})}
 	}
 	return self.rpcParams
 }
diff --git a/console/dispatchers_profile_rem.go b/console/dispatchers_profile_rem.go
index 73cdaa507..a10083f9e 100644
--- a/console/dispatchers_profile_rem.go
+++ b/console/dispatchers_profile_rem.go
@@ -35,7 +35,7 @@ func init() {
 type CmdRemoveDispatcherProfile struct {
 	name      string
 	rpcMethod string
-	rpcParams *utils.TenantIDWithOpts
+	rpcParams *utils.TenantIDWithAPIOpts
 	*CommandExecuter
 }
 
@@ -49,7 +49,7 @@ func (self *CmdRemoveDispatcherProfile) RpcMethod() string {
 
 func (self *CmdRemoveDispatcherProfile) RpcParams(reset bool) interface{} {
 	if reset || self.rpcParams == nil {
-		self.rpcParams = &utils.TenantIDWithOpts{Opts: make(map[string]interface{})}
+		self.rpcParams = &utils.TenantIDWithAPIOpts{APIOpts: make(map[string]interface{})}
 	}
 	return self.rpcParams
 }
diff --git a/console/filter_remove.go b/console/filter_remove.go
index 7283ea721..a3f4911fe 100644
--- a/console/filter_remove.go
+++ b/console/filter_remove.go
@@ -24,7 +24,7 @@ func init() {
 	c := &CmdRemoveFilter{
 		name:      "filter_remove",
 		rpcMethod: utils.APIerSv1RemoveFilter,
-		rpcParams: &utils.TenantIDWithOpts{},
+		rpcParams: &utils.TenantIDWithAPIOpts{},
 	}
 	commands[c.Name()] = c
 	c.CommandExecuter = &CommandExecuter{c}
@@ -34,7 +34,7 @@ func init() {
 type CmdRemoveFilter struct {
 	name      string
 	rpcMethod string
-	rpcParams *utils.TenantIDWithOpts
+	rpcParams *utils.TenantIDWithAPIOpts
 	*CommandExecuter
 }
 
@@ -48,7 +48,7 @@ func (self *CmdRemoveFilter) RpcMethod() string {
 
 func (self *CmdRemoveFilter) RpcParams(reset bool) interface{} {
 	if reset || self.rpcParams == nil {
-		self.rpcParams = &utils.TenantIDWithOpts{Opts: make(map[string]interface{})}
+		self.rpcParams = &utils.TenantIDWithAPIOpts{APIOpts: make(map[string]interface{})}
 	}
 	return self.rpcParams
 }
diff --git a/console/maxduration.go b/console/maxduration.go
index 090c7f0aa..3f21bb970 100644
--- a/console/maxduration.go
+++ b/console/maxduration.go
@@ -41,7 +41,7 @@ func init() {
 type CmdGetMaxDuration struct {
 	name       string
 	rpcMethod  string
-	rpcParams  *engine.CallDescriptorWithOpts
+	rpcParams  *engine.CallDescriptorWithAPIOpts
 	clientArgs []string
 	*CommandExecuter
 }
@@ -56,9 +56,9 @@ func (self *CmdGetMaxDuration) RpcMethod() string {
 
 func (self *CmdGetMaxDuration) RpcParams(reset bool) interface{} {
 	if reset || self.rpcParams == nil {
-		self.rpcParams = &engine.CallDescriptorWithOpts{
+		self.rpcParams = &engine.CallDescriptorWithAPIOpts{
 			CallDescriptor: new(engine.CallDescriptor),
-			Opts:           make(map[string]interface{}),
+			APIOpts:        make(map[string]interface{}),
 		}
 	}
 	return self.rpcParams
diff --git a/console/rates_profile.go b/console/rates_profile.go
index 8b405c3ab..9af36a608 100644
--- a/console/rates_profile.go
+++ b/console/rates_profile.go
@@ -27,7 +27,7 @@ func init() {
 	c := &CmdGetRateProfile{
 		name:      "rates_profile",
 		rpcMethod: utils.APIerSv1GetRateProfile,
-		rpcParams: &utils.TenantIDWithOpts{},
+		rpcParams: &utils.TenantIDWithAPIOpts{},
 	}
 	commands[c.Name()] = c
 	c.CommandExecuter = &CommandExecuter{c}
@@ -37,7 +37,7 @@ func init() {
 type CmdGetRateProfile struct {
 	name      string
 	rpcMethod string
-	rpcParams *utils.TenantIDWithOpts
+	rpcParams *utils.TenantIDWithAPIOpts
 	*CommandExecuter
 }
 
@@ -51,7 +51,7 @@ func (self *CmdGetRateProfile) RpcMethod() string {
 
 func (self *CmdGetRateProfile) RpcParams(reset bool) interface{} {
 	if reset || self.rpcParams == nil {
-		self.rpcParams = &utils.TenantIDWithOpts{}
+		self.rpcParams = &utils.TenantIDWithAPIOpts{}
 	}
 	return self.rpcParams
 }
diff --git a/console/rates_profile_remove.go b/console/rates_profile_remove.go
index 5f2ca18f4..b56ae2e11 100644
--- a/console/rates_profile_remove.go
+++ b/console/rates_profile_remove.go
@@ -24,7 +24,7 @@ func init() {
 	c := &CmdRemoveRateProfile{
 		name:      "rates_profile_remove",
 		rpcMethod: utils.APIerSv1RemoveRateProfile,
-		rpcParams: &utils.TenantIDWithOpts{},
+		rpcParams: &utils.TenantIDWithAPIOpts{},
 	}
 	commands[c.Name()] = c
 	c.CommandExecuter = &CommandExecuter{c}
@@ -33,7 +33,7 @@ func init() {
 type CmdRemoveRateProfile struct {
 	name      string
 	rpcMethod string
-	rpcParams *utils.TenantIDWithOpts
+	rpcParams *utils.TenantIDWithAPIOpts
 	*CommandExecuter
 }
 
@@ -47,7 +47,7 @@ func (self *CmdRemoveRateProfile) RpcMethod() string {
 
 func (self *CmdRemoveRateProfile) RpcParams(reset bool) interface{} {
 	if reset || self.rpcParams == nil {
-		self.rpcParams = &utils.TenantIDWithOpts{Opts: make(map[string]interface{})}
+		self.rpcParams = &utils.TenantIDWithAPIOpts{APIOpts: make(map[string]interface{})}
 	}
 	return self.rpcParams
 }
diff --git a/console/resources.go b/console/resources.go
index 533665a1b..6f3b7eb26 100644
--- a/console/resources.go
+++ b/console/resources.go
@@ -27,7 +27,7 @@ func init() {
 	c := &CmdGetResource{
 		name:      "resources",
 		rpcMethod: utils.ResourceSv1GetResource,
-		rpcParams: &utils.TenantIDWithOpts{},
+		rpcParams: &utils.TenantIDWithAPIOpts{},
 	}
 	commands[c.Name()] = c
 	c.CommandExecuter = &CommandExecuter{c}
@@ -37,7 +37,7 @@ func init() {
 type CmdGetResource struct {
 	name      string
 	rpcMethod string
-	rpcParams *utils.TenantIDWithOpts
+	rpcParams *utils.TenantIDWithAPIOpts
 	*CommandExecuter
 }
 
@@ -51,9 +51,9 @@ func (self *CmdGetResource) RpcMethod() string {
 
 func (self *CmdGetResource) RpcParams(reset bool) interface{} {
 	if reset || self.rpcParams == nil {
-		self.rpcParams = &utils.TenantIDWithOpts{
+		self.rpcParams = &utils.TenantIDWithAPIOpts{
 			TenantID: new(utils.TenantID),
-			Opts:     map[string]interface{}{},
+			APIOpts:  map[string]interface{}{},
 		}
 	}
 	return self.rpcParams
diff --git a/console/resources_profile_rem.go b/console/resources_profile_rem.go
index 8731acadf..1ca82f5a9 100644
--- a/console/resources_profile_rem.go
+++ b/console/resources_profile_rem.go
@@ -24,7 +24,7 @@ func init() {
 	c := &CmdRemoveResource{
 		name:      "resources_profile_remove",
 		rpcMethod: utils.APIerSv1RemoveResourceProfile,
-		rpcParams: &utils.TenantIDWithOpts{},
+		rpcParams: &utils.TenantIDWithAPIOpts{},
 	}
 	commands[c.Name()] = c
 	c.CommandExecuter = &CommandExecuter{c}
@@ -34,7 +34,7 @@ func init() {
 type CmdRemoveResource struct {
 	name      string
 	rpcMethod string
-	rpcParams *utils.TenantIDWithOpts
+	rpcParams *utils.TenantIDWithAPIOpts
 	*CommandExecuter
 }
 
@@ -48,7 +48,7 @@ func (self *CmdRemoveResource) RpcMethod() string {
 
 func (self *CmdRemoveResource) RpcParams(reset bool) interface{} {
 	if reset || self.rpcParams == nil {
-		self.rpcParams = &utils.TenantIDWithOpts{Opts: make(map[string]interface{})}
+		self.rpcParams = &utils.TenantIDWithAPIOpts{APIOpts: make(map[string]interface{})}
 	}
 	return self.rpcParams
 }
diff --git a/console/routes_profile_remove.go b/console/routes_profile_remove.go
index 8797c1cce..37f8bc43d 100644
--- a/console/routes_profile_remove.go
+++ b/console/routes_profile_remove.go
@@ -24,7 +24,7 @@ func init() {
 	c := &CmdRemoveRoute{
 		name:      "routes_profile_remove",
 		rpcMethod: utils.APIerSv1RemoveRouteProfile,
-		rpcParams: &utils.TenantIDWithOpts{},
+		rpcParams: &utils.TenantIDWithAPIOpts{},
 	}
 	commands[c.Name()] = c
 	c.CommandExecuter = &CommandExecuter{c}
@@ -33,7 +33,7 @@ func init() {
 type CmdRemoveRoute struct {
 	name      string
 	rpcMethod string
-	rpcParams *utils.TenantIDWithOpts
+	rpcParams *utils.TenantIDWithAPIOpts
 	*CommandExecuter
 }
 
@@ -47,7 +47,7 @@ func (self *CmdRemoveRoute) RpcMethod() string {
 
 func (self *CmdRemoveRoute) RpcParams(reset bool) interface{} {
 	if reset || self.rpcParams == nil {
-		self.rpcParams = &utils.TenantIDWithOpts{Opts: make(map[string]interface{})}
+		self.rpcParams = &utils.TenantIDWithAPIOpts{APIOpts: make(map[string]interface{})}
 	}
 	return self.rpcParams
 }
diff --git a/console/stats_metrics.go b/console/stats_metrics.go
index 2c0a41945..2bc00c2a0 100644
--- a/console/stats_metrics.go
+++ b/console/stats_metrics.go
@@ -26,7 +26,7 @@ func init() {
 	c := &CmdGetStatQueueStringMetrics{
 		name:      "stats_metrics",
 		rpcMethod: utils.StatSv1GetQueueStringMetrics,
-		rpcParams: &utils.TenantIDWithOpts{},
+		rpcParams: &utils.TenantIDWithAPIOpts{},
 	}
 	commands[c.Name()] = c
 	c.CommandExecuter = &CommandExecuter{c}
@@ -36,7 +36,7 @@ func init() {
 type CmdGetStatQueueStringMetrics struct {
 	name      string
 	rpcMethod string
-	rpcParams *utils.TenantIDWithOpts
+	rpcParams *utils.TenantIDWithAPIOpts
 	*CommandExecuter
 }
 
@@ -50,9 +50,9 @@ func (self *CmdGetStatQueueStringMetrics) RpcMethod() string {
 
 func (self *CmdGetStatQueueStringMetrics) RpcParams(reset bool) interface{} {
 	if reset || self.rpcParams == nil {
-		self.rpcParams = &utils.TenantIDWithOpts{
+		self.rpcParams = &utils.TenantIDWithAPIOpts{
 			TenantID: new(utils.TenantID),
-			Opts:     make(map[string]interface{}),
+			APIOpts:  make(map[string]interface{}),
 		}
 	}
 	return self.rpcParams
diff --git a/console/stats_profile_rem.go b/console/stats_profile_rem.go
index 33720db73..7448add54 100644
--- a/console/stats_profile_rem.go
+++ b/console/stats_profile_rem.go
@@ -24,7 +24,7 @@ func init() {
 	c := &CmdRemoveStatQueue{
 		name:      "stats_profile_remove",
 		rpcMethod: utils.APIerSv1RemoveStatQueueProfile,
-		rpcParams: &utils.TenantIDWithOpts{},
+		rpcParams: &utils.TenantIDWithAPIOpts{},
 	}
 	commands[c.Name()] = c
 	c.CommandExecuter = &CommandExecuter{c}
@@ -34,7 +34,7 @@ func init() {
 type CmdRemoveStatQueue struct {
 	name      string
 	rpcMethod string
-	rpcParams *utils.TenantIDWithOpts
+	rpcParams *utils.TenantIDWithAPIOpts
 	*CommandExecuter
 }
 
@@ -48,7 +48,7 @@ func (self *CmdRemoveStatQueue) RpcMethod() string {
 
 func (self *CmdRemoveStatQueue) RpcParams(reset bool) interface{} {
 	if reset || self.rpcParams == nil {
-		self.rpcParams = &utils.TenantIDWithOpts{Opts: make(map[string]interface{})}
+		self.rpcParams = &utils.TenantIDWithAPIOpts{APIOpts: make(map[string]interface{})}
 	}
 	return self.rpcParams
 }
diff --git a/console/threshold.go b/console/threshold.go
index 159c30980..e0b3802a6 100644
--- a/console/threshold.go
+++ b/console/threshold.go
@@ -27,7 +27,7 @@ func init() {
 	c := &CmdGetThreshold{
 		name:      "threshold",
 		rpcMethod: utils.ThresholdSv1GetThreshold,
-		rpcParams: &utils.TenantIDWithOpts{},
+		rpcParams: &utils.TenantIDWithAPIOpts{},
 	}
 	commands[c.Name()] = c
 	c.CommandExecuter = &CommandExecuter{c}
@@ -36,7 +36,7 @@ func init() {
 type CmdGetThreshold struct {
 	name      string
 	rpcMethod string
-	rpcParams *utils.TenantIDWithOpts
+	rpcParams *utils.TenantIDWithAPIOpts
 	*CommandExecuter
 }
 
@@ -50,9 +50,9 @@ func (self *CmdGetThreshold) RpcMethod() string {
 
 func (self *CmdGetThreshold) RpcParams(reset bool) interface{} {
 	if reset || self.rpcParams == nil {
-		self.rpcParams = &utils.TenantIDWithOpts{
+		self.rpcParams = &utils.TenantIDWithAPIOpts{
 			TenantID: new(utils.TenantID),
-			Opts:     make(map[string]interface{}),
+			APIOpts:  make(map[string]interface{}),
 		}
 	}
 	return self.rpcParams
diff --git a/console/thresholds_profile_remove.go b/console/thresholds_profile_remove.go
index 6f7bde5cd..55bcae56e 100644
--- a/console/thresholds_profile_remove.go
+++ b/console/thresholds_profile_remove.go
@@ -24,7 +24,7 @@ func init() {
 	c := &CmdRemoveThreshold{
 		name:      "thresholds_profile_remove",
 		rpcMethod: utils.APIerSv1RemoveThresholdProfile,
-		rpcParams: &utils.TenantIDWithOpts{},
+		rpcParams: &utils.TenantIDWithAPIOpts{},
 	}
 	commands[c.Name()] = c
 	c.CommandExecuter = &CommandExecuter{c}
@@ -33,7 +33,7 @@ func init() {
 type CmdRemoveThreshold struct {
 	name      string
 	rpcMethod string
-	rpcParams *utils.TenantIDWithOpts
+	rpcParams *utils.TenantIDWithAPIOpts
 	*CommandExecuter
 }
 
@@ -47,7 +47,7 @@ func (self *CmdRemoveThreshold) RpcMethod() string {
 
 func (self *CmdRemoveThreshold) RpcParams(reset bool) interface{} {
 	if reset || self.rpcParams == nil {
-		self.rpcParams = &utils.TenantIDWithOpts{Opts: make(map[string]interface{})}
+		self.rpcParams = &utils.TenantIDWithAPIOpts{APIOpts: make(map[string]interface{})}
 	}
 	return self.rpcParams
 }
diff --git a/dispatchers/replicator.go b/dispatchers/replicator.go
index f02aa3cd9..874e20a46 100644
--- a/dispatchers/replicator.go
+++ b/dispatchers/replicator.go
@@ -90,93 +90,93 @@ func (dS *DispatcherService) ReplicatorSv1GetReverseDestination(args *utils.Stri
 	}, utils.MetaReplicator, utils.ReplicatorSv1GetReverseDestination, args, rpl)
 }
 
-func (dS *DispatcherService) ReplicatorSv1GetStatQueue(args *utils.TenantIDWithOpts, reply *engine.StatQueue) (err error) {
+func (dS *DispatcherService) ReplicatorSv1GetStatQueue(args *utils.TenantIDWithAPIOpts, reply *engine.StatQueue) (err error) {
 	tnt := dS.cfg.GeneralCfg().DefaultTenant
 	if args.TenantID != nil && args.TenantID.Tenant != utils.EmptyString {
 		tnt = args.TenantID.Tenant
 	}
 	if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
 		if err = dS.authorize(utils.ReplicatorSv1GetStatQueue, tnt,
-			utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
+			utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
 			return
 		}
 	}
 	return dS.Dispatch(&utils.CGREvent{
 		Tenant: tnt,
 		ID:     args.ID,
-		Opts:   args.Opts,
+		Opts:   args.APIOpts,
 	}, utils.MetaReplicator, utils.ReplicatorSv1GetStatQueue, args, reply)
 }
 
-func (dS *DispatcherService) ReplicatorSv1GetFilter(args *utils.TenantIDWithOpts, reply *engine.Filter) (err error) {
+func (dS *DispatcherService) ReplicatorSv1GetFilter(args *utils.TenantIDWithAPIOpts, reply *engine.Filter) (err error) {
 	tnt := dS.cfg.GeneralCfg().DefaultTenant
 	if args.TenantID != nil && args.TenantID.Tenant != utils.EmptyString {
 		tnt = args.TenantID.Tenant
 	}
 	if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
 		if err = dS.authorize(utils.ReplicatorSv1GetFilter, tnt,
-			utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
+			utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
 			return
 		}
 	}
 	return dS.Dispatch(&utils.CGREvent{
 		Tenant: tnt,
 		ID:     args.ID,
-		Opts:   args.Opts,
+		Opts:   args.APIOpts,
 	}, utils.MetaReplicator, utils.ReplicatorSv1GetFilter, args, reply)
 }
 
-func (dS *DispatcherService) ReplicatorSv1GetThreshold(args *utils.TenantIDWithOpts, reply *engine.Threshold) (err error) {
+func (dS *DispatcherService) ReplicatorSv1GetThreshold(args *utils.TenantIDWithAPIOpts, reply *engine.Threshold) (err error) {
 	tnt := dS.cfg.GeneralCfg().DefaultTenant
 	if args.TenantID != nil && args.TenantID.Tenant != utils.EmptyString {
 		tnt = args.TenantID.Tenant
 	}
 	if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
 		if err = dS.authorize(utils.ReplicatorSv1GetThreshold, tnt,
-			utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
+			utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
 			return
 		}
 	}
 	return dS.Dispatch(&utils.CGREvent{
 		Tenant: tnt,
 		ID:     args.ID,
-		Opts:   args.Opts,
+		Opts:   args.APIOpts,
 	}, utils.MetaReplicator, utils.ReplicatorSv1GetThreshold, args, reply)
 }
 
-func (dS *DispatcherService) ReplicatorSv1GetThresholdProfile(args *utils.TenantIDWithOpts, reply *engine.ThresholdProfile) (err error) {
+func (dS *DispatcherService) ReplicatorSv1GetThresholdProfile(args *utils.TenantIDWithAPIOpts, reply *engine.ThresholdProfile) (err error) {
 	tnt := dS.cfg.GeneralCfg().DefaultTenant
 	if args.TenantID != nil && args.TenantID.Tenant != utils.EmptyString {
 		tnt = args.TenantID.Tenant
 	}
 	if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
 		if err = dS.authorize(utils.ReplicatorSv1GetThresholdProfile, tnt,
-			utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
+			utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
 			return
 		}
 	}
 	return dS.Dispatch(&utils.CGREvent{
 		Tenant: tnt,
 		ID:     args.ID,
-		Opts:   args.Opts,
+		Opts:   args.APIOpts,
 	}, utils.MetaReplicator, utils.ReplicatorSv1GetThresholdProfile, args, reply)
 }
 
-func (dS *DispatcherService) ReplicatorSv1GetStatQueueProfile(args *utils.TenantIDWithOpts, reply *engine.StatQueueProfile) (err error) {
+func (dS *DispatcherService) ReplicatorSv1GetStatQueueProfile(args *utils.TenantIDWithAPIOpts, reply *engine.StatQueueProfile) (err error) {
 	tnt := dS.cfg.GeneralCfg().DefaultTenant
 	if args.TenantID != nil && args.TenantID.Tenant != utils.EmptyString {
 		tnt = args.TenantID.Tenant
 	}
 	if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
 		if err = dS.authorize(utils.ReplicatorSv1GetStatQueueProfile, tnt,
-			utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
+			utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
 			return
 		}
 	}
 	return dS.Dispatch(&utils.CGREvent{
 		Tenant: tnt,
 		ID:     args.ID,
-		Opts:   args.Opts,
+		Opts:   args.APIOpts,
 	}, utils.MetaReplicator, utils.ReplicatorSv1GetStatQueueProfile, args, reply)
 }
 
@@ -197,39 +197,39 @@ func (dS *DispatcherService) ReplicatorSv1GetTiming(args *utils.StringWithOpts,
 	}, utils.MetaReplicator, utils.ReplicatorSv1GetTiming, args, rpl)
 }
 
-func (dS *DispatcherService) ReplicatorSv1GetResource(args *utils.TenantIDWithOpts, reply *engine.Resource) (err error) {
+func (dS *DispatcherService) ReplicatorSv1GetResource(args *utils.TenantIDWithAPIOpts, reply *engine.Resource) (err error) {
 	tnt := dS.cfg.GeneralCfg().DefaultTenant
 	if args.TenantID != nil && args.TenantID.Tenant != utils.EmptyString {
 		tnt = args.TenantID.Tenant
 	}
 	if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
 		if err = dS.authorize(utils.ReplicatorSv1GetResource, tnt,
-			utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
+			utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
 			return
 		}
 	}
 	return dS.Dispatch(&utils.CGREvent{
 		Tenant: tnt,
 		ID:     args.ID,
-		Opts:   args.Opts,
+		Opts:   args.APIOpts,
 	}, utils.MetaReplicator, utils.ReplicatorSv1GetResource, args, reply)
 }
 
-func (dS *DispatcherService) ReplicatorSv1GetResourceProfile(args *utils.TenantIDWithOpts, reply *engine.ResourceProfile) (err error) {
+func (dS *DispatcherService) ReplicatorSv1GetResourceProfile(args *utils.TenantIDWithAPIOpts, reply *engine.ResourceProfile) (err error) {
 	tnt := dS.cfg.GeneralCfg().DefaultTenant
 	if args.TenantID != nil && args.TenantID.Tenant != utils.EmptyString {
 		tnt = args.TenantID.Tenant
 	}
 	if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
 		if err = dS.authorize(utils.ReplicatorSv1GetResourceProfile, tnt,
-			utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
+			utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
 			return
 		}
 	}
 	return dS.Dispatch(&utils.CGREvent{
 		Tenant: tnt,
 		ID:     args.ID,
-		Opts:   args.Opts,
+		Opts:   args.APIOpts,
 	}, utils.MetaReplicator, utils.ReplicatorSv1GetResourceProfile, args, reply)
 }
 
@@ -369,129 +369,129 @@ func (dS *DispatcherService) ReplicatorSv1GetRatingProfile(args *utils.StringWit
 	}, utils.MetaReplicator, utils.ReplicatorSv1GetRatingProfile, args, rpl)
 }
 
-func (dS *DispatcherService) ReplicatorSv1GetRouteProfile(args *utils.TenantIDWithOpts, reply *engine.RouteProfile) (err error) {
+func (dS *DispatcherService) ReplicatorSv1GetRouteProfile(args *utils.TenantIDWithAPIOpts, reply *engine.RouteProfile) (err error) {
 	tnt := dS.cfg.GeneralCfg().DefaultTenant
 	if args.TenantID != nil && args.TenantID.Tenant != utils.EmptyString {
 		tnt = args.TenantID.Tenant
 	}
 	if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
 		if err = dS.authorize(utils.ReplicatorSv1GetRouteProfile, tnt,
-			utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
+			utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
 			return
 		}
 	}
 	return dS.Dispatch(&utils.CGREvent{
 		Tenant: tnt,
 		ID:     args.ID,
-		Opts:   args.Opts,
+		Opts:   args.APIOpts,
 	}, utils.MetaReplicator, utils.ReplicatorSv1GetRouteProfile, args, reply)
 }
 
-func (dS *DispatcherService) ReplicatorSv1GetAttributeProfile(args *utils.TenantIDWithOpts, reply *engine.AttributeProfile) (err error) {
+func (dS *DispatcherService) ReplicatorSv1GetAttributeProfile(args *utils.TenantIDWithAPIOpts, reply *engine.AttributeProfile) (err error) {
 	tnt := dS.cfg.GeneralCfg().DefaultTenant
 	if args.TenantID != nil && args.TenantID.Tenant != utils.EmptyString {
 		tnt = args.TenantID.Tenant
 	}
 	if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
 		if err = dS.authorize(utils.ReplicatorSv1GetAttributeProfile, tnt,
-			utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
+			utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
 			return
 		}
 	}
 	return dS.Dispatch(&utils.CGREvent{
 		Tenant: tnt,
 		ID:     args.ID,
-		Opts:   args.Opts,
+		Opts:   args.APIOpts,
 	}, utils.MetaReplicator, utils.ReplicatorSv1GetAttributeProfile, args, reply)
 }
 
-func (dS *DispatcherService) ReplicatorSv1GetChargerProfile(args *utils.TenantIDWithOpts, reply *engine.ChargerProfile) (err error) {
+func (dS *DispatcherService) ReplicatorSv1GetChargerProfile(args *utils.TenantIDWithAPIOpts, reply *engine.ChargerProfile) (err error) {
 	tnt := dS.cfg.GeneralCfg().DefaultTenant
 	if args.TenantID != nil && args.TenantID.Tenant != utils.EmptyString {
 		tnt = args.TenantID.Tenant
 	}
 	if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
 		if err = dS.authorize(utils.ReplicatorSv1GetChargerProfile, tnt,
-			utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
+			utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
 			return
 		}
 	}
 	return dS.Dispatch(&utils.CGREvent{
 		Tenant: tnt,
 		ID:     args.ID,
-		Opts:   args.Opts,
+		Opts:   args.APIOpts,
 	}, utils.MetaReplicator, utils.ReplicatorSv1GetChargerProfile, args, reply)
 }
 
-func (dS *DispatcherService) ReplicatorSv1GetDispatcherProfile(args *utils.TenantIDWithOpts, reply *engine.DispatcherProfile) (err error) {
+func (dS *DispatcherService) ReplicatorSv1GetDispatcherProfile(args *utils.TenantIDWithAPIOpts, reply *engine.DispatcherProfile) (err error) {
 	tnt := dS.cfg.GeneralCfg().DefaultTenant
 	if args.TenantID != nil && args.TenantID.Tenant != utils.EmptyString {
 		tnt = args.TenantID.Tenant
 	}
 	if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
 		if err = dS.authorize(utils.ReplicatorSv1GetDispatcherProfile, tnt,
-			utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
+			utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
 			return
 		}
 	}
 	return dS.Dispatch(&utils.CGREvent{
 		Tenant: tnt,
 		ID:     args.ID,
-		Opts:   args.Opts,
+		Opts:   args.APIOpts,
 	}, utils.MetaReplicator, utils.ReplicatorSv1GetDispatcherProfile, args, reply)
 }
 
-func (dS *DispatcherService) ReplicatorSv1GetDispatcherHost(args *utils.TenantIDWithOpts, reply *engine.DispatcherHost) (err error) {
+func (dS *DispatcherService) ReplicatorSv1GetDispatcherHost(args *utils.TenantIDWithAPIOpts, reply *engine.DispatcherHost) (err error) {
 	tnt := dS.cfg.GeneralCfg().DefaultTenant
 	if args.TenantID != nil && args.TenantID.Tenant != utils.EmptyString {
 		tnt = args.TenantID.Tenant
 	}
 	if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
 		if err = dS.authorize(utils.ReplicatorSv1GetDispatcherHost, tnt,
-			utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
+			utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
 			return
 		}
 	}
 	return dS.Dispatch(&utils.CGREvent{
 		Tenant: tnt,
 		ID:     args.ID,
-		Opts:   args.Opts,
+		Opts:   args.APIOpts,
 	}, utils.MetaReplicator, utils.ReplicatorSv1GetDispatcherHost, args, reply)
 }
 
-func (dS *DispatcherService) ReplicatorSv1GetRateProfile(args *utils.TenantIDWithOpts, reply *engine.RateProfile) (err error) {
+func (dS *DispatcherService) ReplicatorSv1GetRateProfile(args *utils.TenantIDWithAPIOpts, reply *engine.RateProfile) (err error) {
 	tnt := dS.cfg.GeneralCfg().DefaultTenant
 	if args.TenantID != nil && args.TenantID.Tenant != utils.EmptyString {
 		tnt = args.TenantID.Tenant
 	}
 	if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
 		if err = dS.authorize(utils.ReplicatorSv1GetRateProfile, tnt,
-			utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
+			utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
 			return
 		}
 	}
 	return dS.Dispatch(&utils.CGREvent{
 		Tenant: tnt,
 		ID:     args.ID,
-		Opts:   args.Opts,
+		Opts:   args.APIOpts,
 	}, utils.MetaReplicator, utils.ReplicatorSv1GetRateProfile, args, reply)
 }
 
-func (dS *DispatcherService) ReplicatorSv1GetActionProfile(args *utils.TenantIDWithOpts, reply *engine.ActionProfile) (err error) {
+func (dS *DispatcherService) ReplicatorSv1GetActionProfile(args *utils.TenantIDWithAPIOpts, reply *engine.ActionProfile) (err error) {
 	tnt := dS.cfg.GeneralCfg().DefaultTenant
 	if args.TenantID != nil && args.TenantID.Tenant != utils.EmptyString {
 		tnt = args.TenantID.Tenant
 	}
 	if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
 		if err = dS.authorize(utils.ReplicatorSv1GetActionProfile, tnt,
-			utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
+			utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
 			return
 		}
 	}
 	return dS.Dispatch(&utils.CGREvent{
 		Tenant: tnt,
 		ID:     args.ID,
-		Opts:   args.Opts,
+		Opts:   args.APIOpts,
 	}, utils.MetaReplicator, utils.ReplicatorSv1GetActionProfile, args, reply)
 }
 
@@ -937,20 +937,20 @@ func (dS *DispatcherService) ReplicatorSv1SetDispatcherHost(args *engine.Dispatc
 	}, utils.MetaReplicator, utils.ReplicatorSv1SetDispatcherHost, args, rpl)
 }
 
-func (dS *DispatcherService) ReplicatorSv1RemoveThreshold(args *utils.TenantIDWithOpts, rpl *string) (err error) {
+func (dS *DispatcherService) ReplicatorSv1RemoveThreshold(args *utils.TenantIDWithAPIOpts, rpl *string) (err error) {
 	if args == nil {
-		args = &utils.TenantIDWithOpts{}
+		args = &utils.TenantIDWithAPIOpts{}
 	}
 	args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
 		if err = dS.authorize(utils.ReplicatorSv1RemoveThreshold, args.Tenant,
-			utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
+			utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
 			return
 		}
 	}
 	return dS.Dispatch(&utils.CGREvent{
 		Tenant: args.Tenant,
-		Opts:   args.Opts,
+		Opts:   args.APIOpts,
 	}, utils.MetaReplicator, utils.ReplicatorSv1RemoveThreshold, args, rpl)
 }
 
@@ -1005,71 +1005,71 @@ func (dS *DispatcherService) ReplicatorSv1RemoveAccount(args *utils.StringWithOp
 	}, utils.MetaReplicator, utils.ReplicatorSv1RemoveAccount, args, rpl)
 }
 
-func (dS *DispatcherService) ReplicatorSv1RemoveStatQueue(args *utils.TenantIDWithOpts, rpl *string) (err error) {
+func (dS *DispatcherService) ReplicatorSv1RemoveStatQueue(args *utils.TenantIDWithAPIOpts, rpl *string) (err error) {
 	if args == nil {
-		args = &utils.TenantIDWithOpts{}
+		args = &utils.TenantIDWithAPIOpts{}
 	}
 	args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
 		if err = dS.authorize(utils.ReplicatorSv1RemoveStatQueue, args.Tenant,
-			utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
+			utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
 			return
 		}
 	}
 	return dS.Dispatch(&utils.CGREvent{
 		Tenant: args.Tenant,
-		Opts:   args.Opts,
+		Opts:   args.APIOpts,
 	}, utils.MetaReplicator, utils.ReplicatorSv1RemoveStatQueue, args, rpl)
 }
 
-func (dS *DispatcherService) ReplicatorSv1RemoveFilter(args *utils.TenantIDWithOpts, rpl *string) (err error) {
+func (dS *DispatcherService) ReplicatorSv1RemoveFilter(args *utils.TenantIDWithAPIOpts, rpl *string) (err error) {
 	if args == nil {
-		args = &utils.TenantIDWithOpts{}
+		args = &utils.TenantIDWithAPIOpts{}
 	}
 	args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
 		if err = dS.authorize(utils.ReplicatorSv1RemoveFilter, args.Tenant,
-			utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
+			utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
 			return
 		}
 	}
 	return dS.Dispatch(&utils.CGREvent{
 		Tenant: args.Tenant,
-		Opts:   args.Opts,
+		Opts:   args.APIOpts,
 	}, utils.MetaReplicator, utils.ReplicatorSv1RemoveFilter, args, rpl)
 }
 
-func (dS *DispatcherService) ReplicatorSv1RemoveThresholdProfile(args *utils.TenantIDWithOpts, rpl *string) (err error) {
+func (dS *DispatcherService) ReplicatorSv1RemoveThresholdProfile(args *utils.TenantIDWithAPIOpts, rpl *string) (err error) {
 	if args == nil {
-		args = &utils.TenantIDWithOpts{}
+		args = &utils.TenantIDWithAPIOpts{}
 	}
 	args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
 		if err = dS.authorize(utils.ReplicatorSv1RemoveThresholdProfile, args.Tenant,
-			utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
+			utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
 			return
 		}
 	}
 	return dS.Dispatch(&utils.CGREvent{
 		Tenant: args.Tenant,
-		Opts:   args.Opts,
+		Opts:   args.APIOpts,
 	}, utils.MetaReplicator, utils.ReplicatorSv1RemoveThresholdProfile, args, rpl)
 }
 
-func (dS *DispatcherService) ReplicatorSv1RemoveStatQueueProfile(args *utils.TenantIDWithOpts, rpl *string) (err error) {
+func (dS *DispatcherService) ReplicatorSv1RemoveStatQueueProfile(args *utils.TenantIDWithAPIOpts, rpl *string) (err error) {
 	if args == nil {
-		args = &utils.TenantIDWithOpts{}
+		args = &utils.TenantIDWithAPIOpts{}
 	}
 	args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
 		if err = dS.authorize(utils.ReplicatorSv1RemoveStatQueueProfile, args.Tenant,
-			utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
+			utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
 			return
 		}
 	}
 	return dS.Dispatch(&utils.CGREvent{
 		Tenant: args.Tenant,
-		Opts:   args.Opts,
+		Opts:   args.APIOpts,
 	}, utils.MetaReplicator, utils.ReplicatorSv1RemoveStatQueueProfile, args, rpl)
 }
 
@@ -1090,37 +1090,37 @@ func (dS *DispatcherService) ReplicatorSv1RemoveTiming(args *utils.StringWithOpt
 	}, utils.MetaReplicator, utils.ReplicatorSv1RemoveTiming, args, rpl)
 }
 
-func (dS *DispatcherService) ReplicatorSv1RemoveResource(args *utils.TenantIDWithOpts, rpl *string) (err error) {
+func (dS *DispatcherService) ReplicatorSv1RemoveResource(args *utils.TenantIDWithAPIOpts, rpl *string) (err error) {
 	if args == nil {
-		args = &utils.TenantIDWithOpts{}
+		args = &utils.TenantIDWithAPIOpts{}
 	}
 	args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
 		if err = dS.authorize(utils.ReplicatorSv1RemoveResource, args.Tenant,
-			utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
+			utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
 			return
 		}
 	}
 	return dS.Dispatch(&utils.CGREvent{
 		Tenant: args.Tenant,
-		Opts:   args.Opts,
+		Opts:   args.APIOpts,
 	}, utils.MetaReplicator, utils.ReplicatorSv1RemoveResource, args, rpl)
 }
 
-func (dS *DispatcherService) ReplicatorSv1RemoveResourceProfile(args *utils.TenantIDWithOpts, rpl *string) (err error) {
+func (dS *DispatcherService) ReplicatorSv1RemoveResourceProfile(args *utils.TenantIDWithAPIOpts, rpl *string) (err error) {
 	if args == nil {
-		args = &utils.TenantIDWithOpts{}
+		args = &utils.TenantIDWithAPIOpts{}
 	}
 	args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
 		if err = dS.authorize(utils.ReplicatorSv1RemoveResourceProfile, args.Tenant,
-			utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
+			utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
 			return
 		}
 	}
 	return dS.Dispatch(&utils.CGREvent{
 		Tenant: args.Tenant,
-		Opts:   args.Opts,
+		Opts:   args.APIOpts,
 	}, utils.MetaReplicator, utils.ReplicatorSv1RemoveResourceProfile, args, rpl)
 }
 
@@ -1243,122 +1243,122 @@ func (dS *DispatcherService) ReplicatorSv1RemoveRatingProfile(args *utils.String
 	}, utils.MetaReplicator, utils.ReplicatorSv1RemoveRatingProfile, args, rpl)
 }
 
-func (dS *DispatcherService) ReplicatorSv1RemoveRouteProfile(args *utils.TenantIDWithOpts, rpl *string) (err error) {
+func (dS *DispatcherService) ReplicatorSv1RemoveRouteProfile(args *utils.TenantIDWithAPIOpts, rpl *string) (err error) {
 	if args == nil {
-		args = &utils.TenantIDWithOpts{}
+		args = &utils.TenantIDWithAPIOpts{}
 	}
 	args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
 		if err = dS.authorize(utils.ReplicatorSv1RemoveRouteProfile, args.Tenant,
-			utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
+			utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
 			return
 		}
 	}
 	return dS.Dispatch(&utils.CGREvent{
 		Tenant: args.Tenant,
-		Opts:   args.Opts,
+		Opts:   args.APIOpts,
 	}, utils.MetaReplicator, utils.ReplicatorSv1RemoveRouteProfile, args, rpl)
 }
 
-func (dS *DispatcherService) ReplicatorSv1RemoveAttributeProfile(args *utils.TenantIDWithOpts, rpl *string) (err error) {
+func (dS *DispatcherService) ReplicatorSv1RemoveAttributeProfile(args *utils.TenantIDWithAPIOpts, rpl *string) (err error) {
 	if args == nil {
-		args = &utils.TenantIDWithOpts{}
+		args = &utils.TenantIDWithAPIOpts{}
 	}
 	args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
 		if err = dS.authorize(utils.ReplicatorSv1RemoveAttributeProfile, args.Tenant,
-			utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
+			utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
 			return
 		}
 	}
 	return dS.Dispatch(&utils.CGREvent{
 		Tenant: args.Tenant,
-		Opts:   args.Opts,
+		Opts:   args.APIOpts,
 	}, utils.MetaReplicator, utils.ReplicatorSv1RemoveAttributeProfile, args, rpl)
 }
 
-func (dS *DispatcherService) ReplicatorSv1RemoveChargerProfile(args *utils.TenantIDWithOpts, rpl *string) (err error) {
+func (dS *DispatcherService) ReplicatorSv1RemoveChargerProfile(args *utils.TenantIDWithAPIOpts, rpl *string) (err error) {
 	if args == nil {
-		args = &utils.TenantIDWithOpts{}
+		args = &utils.TenantIDWithAPIOpts{}
 	}
 	args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
 		if err = dS.authorize(utils.ReplicatorSv1RemoveChargerProfile, args.Tenant,
-			utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
+			utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
 			return
 		}
 	}
 	return dS.Dispatch(&utils.CGREvent{
 		Tenant: args.Tenant,
-		Opts:   args.Opts,
+		Opts:   args.APIOpts,
 	}, utils.MetaReplicator, utils.ReplicatorSv1RemoveChargerProfile, args, rpl)
 }
 
-func (dS *DispatcherService) ReplicatorSv1RemoveDispatcherProfile(args *utils.TenantIDWithOpts, rpl *string) (err error) {
+func (dS *DispatcherService) ReplicatorSv1RemoveDispatcherProfile(args *utils.TenantIDWithAPIOpts, rpl *string) (err error) {
 	if args == nil {
-		args = &utils.TenantIDWithOpts{}
+		args = &utils.TenantIDWithAPIOpts{}
 	}
 	args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
 		if err = dS.authorize(utils.ReplicatorSv1RemoveDispatcherProfile, args.Tenant,
-			utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
+			utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
 			return
 		}
 	}
 	return dS.Dispatch(&utils.CGREvent{
 		Tenant: args.Tenant,
-		Opts:   args.Opts,
+		Opts:   args.APIOpts,
 	}, utils.MetaReplicator, utils.ReplicatorSv1RemoveDispatcherProfile, args, rpl)
 }
 
-func (dS *DispatcherService) ReplicatorSv1RemoveDispatcherHost(args *utils.TenantIDWithOpts, rpl *string) (err error) {
+func (dS *DispatcherService) ReplicatorSv1RemoveDispatcherHost(args *utils.TenantIDWithAPIOpts, rpl *string) (err error) {
 	if args == nil {
-		args = &utils.TenantIDWithOpts{}
+		args = &utils.TenantIDWithAPIOpts{}
 	}
 	args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
 		if err = dS.authorize(utils.ReplicatorSv1RemoveDispatcherHost, args.Tenant,
-			utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
+			utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
 			return
 		}
 	}
 	return dS.Dispatch(&utils.CGREvent{
 		Tenant: args.Tenant,
-		Opts:   args.Opts,
+		Opts:   args.APIOpts,
 	}, utils.MetaReplicator, utils.ReplicatorSv1RemoveDispatcherHost, args, rpl)
 }
 
-func (dS *DispatcherService) ReplicatorSv1RemoveRateProfile(args *utils.TenantIDWithOpts, rpl *string) (err error) {
+func (dS *DispatcherService) ReplicatorSv1RemoveRateProfile(args *utils.TenantIDWithAPIOpts, rpl *string) (err error) {
 	if args == nil {
-		args = &utils.TenantIDWithOpts{}
+		args = &utils.TenantIDWithAPIOpts{}
 	}
 	args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
 		if err = dS.authorize(utils.ReplicatorSv1RemoveRateProfile, args.Tenant,
-			utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
+			utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
 			return
 		}
 	}
 	return dS.Dispatch(&utils.CGREvent{
 		Tenant: args.Tenant,
-		Opts:   args.Opts,
+		Opts:   args.APIOpts,
 	}, utils.MetaReplicator, utils.ReplicatorSv1RemoveRateProfile, args, rpl)
 }
 
-func (dS *DispatcherService) ReplicatorSv1RemoveActionProfile(args *utils.TenantIDWithOpts, rpl *string) (err error) {
+func (dS *DispatcherService) ReplicatorSv1RemoveActionProfile(args *utils.TenantIDWithAPIOpts, rpl *string) (err error) {
 	if args == nil {
-		args = &utils.TenantIDWithOpts{}
+		args = &utils.TenantIDWithAPIOpts{}
 	}
 	args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
 		if err = dS.authorize(utils.ReplicatorSv1RemoveActionProfile, args.Tenant,
-			utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
+			utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
 			return
 		}
 	}
 	return dS.Dispatch(&utils.CGREvent{
 		Tenant: args.Tenant,
-		Opts:   args.Opts,
+		Opts:   args.APIOpts,
 	}, utils.MetaReplicator, utils.ReplicatorSv1RemoveActionProfile, args, rpl)
 }
 
@@ -1416,21 +1416,21 @@ func (dS *DispatcherService) ReplicatorSv1RemoveIndexes(args *utils.GetIndexesAr
 	}, utils.MetaReplicator, utils.ReplicatorSv1RemoveIndexes, args, reply)
 }
 
-func (dS *DispatcherService) ReplicatorSv1GetAccountProfile(args *utils.TenantIDWithOpts, reply *utils.AccountProfile) (err error) {
+func (dS *DispatcherService) ReplicatorSv1GetAccountProfile(args *utils.TenantIDWithAPIOpts, reply *utils.AccountProfile) (err error) {
 	tnt := dS.cfg.GeneralCfg().DefaultTenant
 	if args.TenantID != nil && args.TenantID.Tenant != utils.EmptyString {
 		tnt = args.TenantID.Tenant
 	}
 	if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
 		if err = dS.authorize(utils.ReplicatorSv1GetAccountProfile, tnt,
-			utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
+			utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
 			return
 		}
 	}
 	return dS.Dispatch(&utils.CGREvent{
 		Tenant: tnt,
 		ID:     args.ID,
-		Opts:   args.Opts,
+		Opts:   args.APIOpts,
 	}, utils.MetaReplicator, utils.ReplicatorSv1GetAccountProfile, args, reply)
 }
 
@@ -1441,29 +1441,29 @@ func (dS *DispatcherService) ReplicatorSv1SetAccountProfile(args *utils.AccountP
 	args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
 		if err = dS.authorize(utils.ReplicatorSv1SetAccountProfile, args.Tenant,
-			utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
+			utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
 			return
 		}
 	}
 	return dS.Dispatch(&utils.CGREvent{
 		Tenant: args.Tenant,
-		Opts:   args.Opts,
+		Opts:   args.APIOpts,
 	}, utils.MetaReplicator, utils.ReplicatorSv1SetAccountProfile, args, rpl)
 }
 
-func (dS *DispatcherService) ReplicatorSv1RemoveAccountProfile(args *utils.TenantIDWithOpts, rpl *string) (err error) {
+func (dS *DispatcherService) ReplicatorSv1RemoveAccountProfile(args *utils.TenantIDWithAPIOpts, rpl *string) (err error) {
 	if args == nil {
-		args = &utils.TenantIDWithOpts{}
+		args = &utils.TenantIDWithAPIOpts{}
 	}
 	args.Tenant = utils.FirstNonEmpty(args.Tenant, dS.cfg.GeneralCfg().DefaultTenant)
 	if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
 		if err = dS.authorize(utils.ReplicatorSv1RemoveAccountProfile, args.Tenant,
-			utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
+			utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
 			return
 		}
 	}
 	return dS.Dispatch(&utils.CGREvent{
 		Tenant: args.Tenant,
-		Opts:   args.Opts,
+		Opts:   args.APIOpts,
 	}, utils.MetaReplicator, utils.ReplicatorSv1RemoveAccountProfile, args, rpl)
 }
diff --git a/dispatchers/replicator_it_test.go b/dispatchers/replicator_it_test.go
index f1660e9a0..8106c81cd 100644
--- a/dispatchers/replicator_it_test.go
+++ b/dispatchers/replicator_it_test.go
@@ -214,12 +214,12 @@ func testDspRplSupplierProfile(t *testing.T) {
 
 	// Get RouteProfile
 	var reply *engine.RouteProfile
-	argRouteProfile := &utils.TenantIDWithOpts{
+	argRouteProfile := &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{
 			Tenant: "cgrates.org",
 			ID:     "ID",
 		},
-		Opts: map[string]interface{}{
+		APIOpts: map[string]interface{}{
 			utils.OptsAPIKey: "repl12345",
 		},
 	}
@@ -274,12 +274,12 @@ func testDspRplAttributeProfile(t *testing.T) {
 
 	// Get AttributeProfile
 	var reply engine.AttributeProfile
-	argAttributeProfile := &utils.TenantIDWithOpts{
+	argAttributeProfile := &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{
 			Tenant: "cgrates.org",
 			ID:     "id",
 		},
-		Opts: map[string]interface{}{
+		APIOpts: map[string]interface{}{
 			utils.OptsAPIKey: "repl12345",
 		},
 	}
@@ -333,12 +333,12 @@ func testDspRplChargerProfile(t *testing.T) {
 	}
 	// Get ChargerProfile
 	var reply engine.ChargerProfile
-	argsChargerProfile := &utils.TenantIDWithOpts{
+	argsChargerProfile := &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{
 			Tenant: "cgrates.org",
 			ID:     "id",
 		},
-		Opts: map[string]interface{}{
+		APIOpts: map[string]interface{}{
 			utils.OptsAPIKey: "repl12345",
 		},
 	}
@@ -392,12 +392,12 @@ func testDspRplDispatcherProfile(t *testing.T) {
 	}
 	// Get DispatcherProfile
 	var reply engine.DispatcherProfile
-	argsDispatcherProfile := &utils.TenantIDWithOpts{
+	argsDispatcherProfile := &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{
 			Tenant: "cgrates.org",
 			ID:     "ID",
 		},
-		Opts: map[string]interface{}{
+		APIOpts: map[string]interface{}{
 			utils.OptsAPIKey: "repl12345",
 		},
 	}
@@ -453,12 +453,12 @@ func testDspRplDispatcherHost(t *testing.T) {
 	}
 	// Get DispatcherHost
 	var reply engine.DispatcherHost
-	argsDispatcherHost := &utils.TenantIDWithOpts{
+	argsDispatcherHost := &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{
 			Tenant: "cgrates.org",
 			ID:     "ID",
 		},
-		Opts: map[string]interface{}{
+		APIOpts: map[string]interface{}{
 			utils.OptsAPIKey: "repl12345",
 		},
 	}
@@ -512,12 +512,12 @@ func testDspRplFilter(t *testing.T) {
 	}
 	// Get Filter
 	var reply engine.Filter
-	argsFilter := &utils.TenantIDWithOpts{
+	argsFilter := &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{
 			Tenant: "cgrates.org",
 			ID:     "ID",
 		},
-		Opts: map[string]interface{}{
+		APIOpts: map[string]interface{}{
 			utils.OptsAPIKey: "repl12345",
 		},
 	}
@@ -571,12 +571,12 @@ func testDspRplThreshold(t *testing.T) {
 	}
 	// Get Threshold
 	var reply engine.Threshold
-	argsThreshold := &utils.TenantIDWithOpts{
+	argsThreshold := &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{
 			Tenant: "cgrates.org",
 			ID:     "ID",
 		},
-		Opts: map[string]interface{}{
+		APIOpts: map[string]interface{}{
 			utils.OptsAPIKey: "repl12345",
 		},
 	}
@@ -630,12 +630,12 @@ func testDspRplThresholdProfile(t *testing.T) {
 	}
 	// Get ThresholdProfile
 	var reply engine.ThresholdProfile
-	argsThresholdProfile := &utils.TenantIDWithOpts{
+	argsThresholdProfile := &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{
 			Tenant: "cgrates.org",
 			ID:     "ID",
 		},
-		Opts: map[string]interface{}{
+		APIOpts: map[string]interface{}{
 			utils.OptsAPIKey: "repl12345",
 		},
 	}
@@ -689,12 +689,12 @@ func testDspRplStatQueue(t *testing.T) {
 	}
 	// Get StatQueue
 	var reply engine.StatQueue
-	argsStatQueue := &utils.TenantIDWithOpts{
+	argsStatQueue := &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{
 			Tenant: "cgrates.org",
 			ID:     "ID",
 		},
-		Opts: map[string]interface{}{
+		APIOpts: map[string]interface{}{
 			utils.OptsAPIKey: "repl12345",
 		},
 	}
@@ -748,12 +748,12 @@ func testDspRplStatQueueProfile(t *testing.T) {
 	}
 	// Get StatQueueProfile
 	var reply engine.StatQueueProfile
-	argsStatQueueProfile := &utils.TenantIDWithOpts{
+	argsStatQueueProfile := &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{
 			Tenant: "cgrates.org",
 			ID:     "ID",
 		},
-		Opts: map[string]interface{}{
+		APIOpts: map[string]interface{}{
 			utils.OptsAPIKey: "repl12345",
 		},
 	}
@@ -807,12 +807,12 @@ func testDspRplResource(t *testing.T) {
 	}
 	// Get Resource
 	var reply engine.Resource
-	argsResource := &utils.TenantIDWithOpts{
+	argsResource := &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{
 			Tenant: "cgrates.org",
 			ID:     "ID",
 		},
-		Opts: map[string]interface{}{
+		APIOpts: map[string]interface{}{
 			utils.OptsAPIKey: "repl12345",
 		},
 	}
@@ -866,12 +866,12 @@ func testDspRplResourceProfile(t *testing.T) {
 	}
 	// Get ResourceProfile
 	var reply engine.ResourceProfile
-	argsResourceProfile := &utils.TenantIDWithOpts{
+	argsResourceProfile := &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{
 			Tenant: "cgrates.org",
 			ID:     "ID",
 		},
-		Opts: map[string]interface{}{
+		APIOpts: map[string]interface{}{
 			utils.OptsAPIKey: "repl12345",
 		},
 	}
@@ -1518,12 +1518,12 @@ func testDspRplRateProfile(t *testing.T) {
 	}
 	// Get RateProfile
 	var reply *engine.RateProfile
-	args := &utils.TenantIDWithOpts{
+	args := &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{
 			Tenant: "cgrates.org",
 			ID:     "RP1",
 		},
-		Opts: map[string]interface{}{
+		APIOpts: map[string]interface{}{
 			utils.OptsAPIKey: "repl12345",
 		},
 	}
@@ -1576,12 +1576,12 @@ func testDspRplAccountProfile(t *testing.T) {
 	}
 	// Get RateProfile
 	var reply *utils.AccountProfile
-	args := &utils.TenantIDWithOpts{
+	args := &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{
 			Tenant: "cgrates.org",
 			ID:     "RP1",
 		},
-		Opts: map[string]interface{}{
+		APIOpts: map[string]interface{}{
 			utils.OptsAPIKey: "repl12345",
 		},
 	}
@@ -1636,12 +1636,12 @@ func testDspRplActionProfile(t *testing.T) {
 	}
 	// Get RateProfile
 	var reply *engine.ActionProfile
-	args := &utils.TenantIDWithOpts{
+	args := &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{
 			Tenant: "cgrates.org",
 			ID:     "RP1",
 		},
-		Opts: map[string]interface{}{
+		APIOpts: map[string]interface{}{
 			utils.OptsAPIKey: "repl12345",
 		},
 	}
diff --git a/dispatchers/resources.go b/dispatchers/resources.go
index d8fab056d..02bd42543 100755
--- a/dispatchers/resources.go
+++ b/dispatchers/resources.go
@@ -99,38 +99,38 @@ func (dS *DispatcherService) ResourceSv1ReleaseResources(args utils.ArgRSv1Resou
 	return dS.Dispatch(args.CGREvent, utils.MetaResources, utils.ResourceSv1ReleaseResources, args, reply)
 }
 
-func (dS *DispatcherService) ResourceSv1GetResource(args *utils.TenantIDWithOpts, reply *engine.Resource) (err error) {
+func (dS *DispatcherService) ResourceSv1GetResource(args *utils.TenantIDWithAPIOpts, reply *engine.Resource) (err error) {
 	tnt := dS.cfg.GeneralCfg().DefaultTenant
 	if args.TenantID != nil && args.TenantID.Tenant != utils.EmptyString {
 		tnt = args.TenantID.Tenant
 	}
 	if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
 		if err = dS.authorize(utils.ResourceSv1GetResource, tnt,
-			utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
+			utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
 			return
 		}
 	}
 	return dS.Dispatch(&utils.CGREvent{
 		Tenant: tnt,
 		ID:     args.ID,
-		Opts:   args.Opts,
+		Opts:   args.APIOpts,
 	}, utils.MetaResources, utils.ResourceSv1GetResource, args, reply)
 }
 
-func (dS *DispatcherService) ResourceSv1GetResourceWithConfig(args *utils.TenantIDWithOpts, reply *engine.ResourceWithConfig) (err error) {
+func (dS *DispatcherService) ResourceSv1GetResourceWithConfig(args *utils.TenantIDWithAPIOpts, reply *engine.ResourceWithConfig) (err error) {
 	tnt := dS.cfg.GeneralCfg().DefaultTenant
 	if args.TenantID != nil && args.TenantID.Tenant != utils.EmptyString {
 		tnt = args.TenantID.Tenant
 	}
 	if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
 		if err = dS.authorize(utils.ResourceSv1GetResourceWithConfig, tnt,
-			utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
+			utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
 			return
 		}
 	}
 	return dS.Dispatch(&utils.CGREvent{
 		Tenant: tnt,
 		ID:     args.ID,
-		Opts:   args.Opts,
+		Opts:   args.APIOpts,
 	}, utils.MetaResources, utils.ResourceSv1GetResourceWithConfig, args, reply)
 }
diff --git a/dispatchers/resources_it_test.go b/dispatchers/resources_it_test.go
index f061e8dcf..ecf906d52 100755
--- a/dispatchers/resources_it_test.go
+++ b/dispatchers/resources_it_test.go
@@ -301,9 +301,9 @@ func testDspResTestAuthKey3(t *testing.T) {
 		}
 	}
 	var r *engine.Resource
-	argsGetResource := &utils.TenantIDWithOpts{
+	argsGetResource := &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ResGroup1"},
-		Opts: map[string]interface{}{
+		APIOpts: map[string]interface{}{
 			utils.OptsAPIKey: "res12345",
 		},
 	}
diff --git a/dispatchers/responder.go b/dispatchers/responder.go
index faff16675..3ff8f8edc 100644
--- a/dispatchers/responder.go
+++ b/dispatchers/responder.go
@@ -41,70 +41,70 @@ func (dS *DispatcherService) ResponderPing(args *utils.CGREvent,
 	return dS.Dispatch(args, utils.MetaResponder, utils.ResponderPing, args, reply)
 }
 
-func (dS *DispatcherService) ResponderGetCost(args *engine.CallDescriptorWithOpts,
+func (dS *DispatcherService) ResponderGetCost(args *engine.CallDescriptorWithAPIOpts,
 	reply *engine.CallCost) (err error) {
 	if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
 		if err = dS.authorize(utils.ResponderGetCost, args.Tenant,
-			utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
+			utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
 			return
 		}
 	}
-	return dS.Dispatch(args.AsCGREvent(args.Opts), utils.MetaResponder, utils.ResponderGetCost, args, reply)
+	return dS.Dispatch(args.AsCGREvent(args.APIOpts), utils.MetaResponder, utils.ResponderGetCost, args, reply)
 }
 
-func (dS *DispatcherService) ResponderDebit(args *engine.CallDescriptorWithOpts,
+func (dS *DispatcherService) ResponderDebit(args *engine.CallDescriptorWithAPIOpts,
 	reply *engine.CallCost) (err error) {
 	if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
 		if err = dS.authorize(utils.ResponderDebit, args.Tenant,
-			utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
+			utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
 			return
 		}
 	}
-	return dS.Dispatch(args.AsCGREvent(args.Opts), utils.MetaResponder, utils.ResponderDebit, args, reply)
+	return dS.Dispatch(args.AsCGREvent(args.APIOpts), utils.MetaResponder, utils.ResponderDebit, args, reply)
 }
 
-func (dS *DispatcherService) ResponderMaxDebit(args *engine.CallDescriptorWithOpts,
+func (dS *DispatcherService) ResponderMaxDebit(args *engine.CallDescriptorWithAPIOpts,
 	reply *engine.CallCost) (err error) {
 	if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
 		if err = dS.authorize(utils.ResponderMaxDebit, args.Tenant,
-			utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
+			utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
 			return
 		}
 	}
-	return dS.Dispatch(args.AsCGREvent(args.Opts), utils.MetaResponder, utils.ResponderMaxDebit, args, reply)
+	return dS.Dispatch(args.AsCGREvent(args.APIOpts), utils.MetaResponder, utils.ResponderMaxDebit, args, reply)
 }
 
-func (dS *DispatcherService) ResponderRefundIncrements(args *engine.CallDescriptorWithOpts,
+func (dS *DispatcherService) ResponderRefundIncrements(args *engine.CallDescriptorWithAPIOpts,
 	reply *engine.Account) (err error) {
 	if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
 		if err = dS.authorize(utils.ResponderRefundIncrements, args.Tenant,
-			utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
+			utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
 			return
 		}
 	}
-	return dS.Dispatch(args.AsCGREvent(args.Opts), utils.MetaResponder, utils.ResponderRefundIncrements, args, reply)
+	return dS.Dispatch(args.AsCGREvent(args.APIOpts), utils.MetaResponder, utils.ResponderRefundIncrements, args, reply)
 }
 
-func (dS *DispatcherService) ResponderRefundRounding(args *engine.CallDescriptorWithOpts,
+func (dS *DispatcherService) ResponderRefundRounding(args *engine.CallDescriptorWithAPIOpts,
 	reply *float64) (err error) {
 	if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
 		if err = dS.authorize(utils.ResponderRefundRounding, args.Tenant,
-			utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
+			utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
 			return
 		}
 	}
-	return dS.Dispatch(args.AsCGREvent(args.Opts), utils.MetaResponder, utils.ResponderRefundRounding, args, reply)
+	return dS.Dispatch(args.AsCGREvent(args.APIOpts), utils.MetaResponder, utils.ResponderRefundRounding, args, reply)
 }
 
-func (dS *DispatcherService) ResponderGetMaxSessionTime(args *engine.CallDescriptorWithOpts,
+func (dS *DispatcherService) ResponderGetMaxSessionTime(args *engine.CallDescriptorWithAPIOpts,
 	reply *time.Duration) (err error) {
 	if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
 		if err = dS.authorize(utils.ResponderGetMaxSessionTime, args.Tenant,
-			utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
+			utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
 			return
 		}
 	}
-	return dS.Dispatch(args.AsCGREvent(args.Opts), utils.MetaResponder, utils.ResponderGetMaxSessionTime, args, reply)
+	return dS.Dispatch(args.AsCGREvent(args.APIOpts), utils.MetaResponder, utils.ResponderGetMaxSessionTime, args, reply)
 }
 
 func (dS *DispatcherService) ResponderShutdown(args *utils.TenantWithOpts,
diff --git a/dispatchers/stats.go b/dispatchers/stats.go
index 8bd0a37f8..5df0492c9 100755
--- a/dispatchers/stats.go
+++ b/dispatchers/stats.go
@@ -53,20 +53,20 @@ func (dS *DispatcherService) StatSv1GetStatQueuesForEvent(args *engine.StatsArgs
 	return dS.Dispatch(args.CGREvent, utils.MetaStats, utils.StatSv1GetStatQueuesForEvent, args, reply)
 }
 
-func (dS *DispatcherService) StatSv1GetQueueStringMetrics(args *utils.TenantIDWithOpts,
+func (dS *DispatcherService) StatSv1GetQueueStringMetrics(args *utils.TenantIDWithAPIOpts,
 	reply *map[string]string) (err error) {
 
 	if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
 		if err = dS.authorize(utils.StatSv1GetQueueStringMetrics,
 			args.TenantID.Tenant,
-			utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
+			utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
 			return
 		}
 	}
 	return dS.Dispatch(&utils.CGREvent{
 		Tenant: args.Tenant,
 		ID:     args.ID,
-		Opts:   args.Opts,
+		Opts:   args.APIOpts,
 	}, utils.MetaStats, utils.StatSv1GetQueueStringMetrics, args, reply)
 }
 
@@ -83,19 +83,19 @@ func (dS *DispatcherService) StatSv1ProcessEvent(args *engine.StatsArgsProcessEv
 	return dS.Dispatch(args.CGREvent, utils.MetaStats, utils.StatSv1ProcessEvent, args, reply)
 }
 
-func (dS *DispatcherService) StatSv1GetQueueFloatMetrics(args *utils.TenantIDWithOpts,
+func (dS *DispatcherService) StatSv1GetQueueFloatMetrics(args *utils.TenantIDWithAPIOpts,
 	reply *map[string]float64) (err error) {
 	if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
 		if err = dS.authorize(utils.StatSv1GetQueueFloatMetrics,
 			args.TenantID.Tenant,
-			utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
+			utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
 			return
 		}
 	}
 	return dS.Dispatch(&utils.CGREvent{
 		Tenant: args.Tenant,
 		ID:     args.ID,
-		Opts:   args.Opts,
+		Opts:   args.APIOpts,
 	}, utils.MetaStats, utils.StatSv1GetQueueFloatMetrics, args, reply)
 }
 
diff --git a/dispatchers/stats_it_test.go b/dispatchers/stats_it_test.go
index 8e4f1eaa9..89fdcb0ac 100755
--- a/dispatchers/stats_it_test.go
+++ b/dispatchers/stats_it_test.go
@@ -128,8 +128,8 @@ func testDspStsGetStatFailover(t *testing.T) {
 		t.Errorf("Expecting: %+v, received: %+v", expected, reply)
 	}
 
-	args2 := utils.TenantIDWithOpts{
-		Opts: map[string]interface{}{
+	args2 := utils.TenantIDWithAPIOpts{
+		APIOpts: map[string]interface{}{
 			utils.OptsAPIKey: "stat12345",
 		},
 		TenantID: &utils.TenantID{
@@ -194,8 +194,8 @@ func testDspStsTestAuthKey(t *testing.T) {
 		t.Error(err)
 	}
 
-	args2 := utils.TenantIDWithOpts{
-		Opts: map[string]interface{}{
+	args2 := utils.TenantIDWithAPIOpts{
+		APIOpts: map[string]interface{}{
 			utils.OptsAPIKey: "12345",
 		},
 		TenantID: &utils.TenantID{
@@ -237,8 +237,8 @@ func testDspStsTestAuthKey2(t *testing.T) {
 		t.Errorf("Expecting: %+v, received: %+v", expected, reply)
 	}
 
-	args2 := utils.TenantIDWithOpts{
-		Opts: map[string]interface{}{
+	args2 := utils.TenantIDWithAPIOpts{
+		APIOpts: map[string]interface{}{
 			utils.OptsAPIKey: "stat12345",
 		},
 		TenantID: &utils.TenantID{
@@ -297,8 +297,8 @@ func testDspStsTestAuthKey3(t *testing.T) {
 	var reply []string
 	var metrics map[string]float64
 
-	args2 := utils.TenantIDWithOpts{
-		Opts: map[string]interface{}{
+	args2 := utils.TenantIDWithAPIOpts{
+		APIOpts: map[string]interface{}{
 			utils.OptsAPIKey: "stat12345",
 		},
 		TenantID: &utils.TenantID{
diff --git a/dispatchers/thresholds.go b/dispatchers/thresholds.go
index 18556a95a..4fd91941c 100755
--- a/dispatchers/thresholds.go
+++ b/dispatchers/thresholds.go
@@ -82,20 +82,20 @@ func (dS *DispatcherService) ThresholdSv1GetThresholdIDs(args *utils.TenantWithO
 	}, utils.MetaThresholds, utils.ThresholdSv1GetThresholdIDs, args, tIDs)
 }
 
-func (dS *DispatcherService) ThresholdSv1GetThreshold(args *utils.TenantIDWithOpts, th *engine.Threshold) (err error) {
+func (dS *DispatcherService) ThresholdSv1GetThreshold(args *utils.TenantIDWithAPIOpts, th *engine.Threshold) (err error) {
 	tnt := dS.cfg.GeneralCfg().DefaultTenant
 	if args.TenantID != nil && args.TenantID.Tenant != utils.EmptyString {
 		tnt = args.TenantID.Tenant
 	}
 	if len(dS.cfg.DispatcherSCfg().AttributeSConns) != 0 {
 		if err = dS.authorize(utils.ThresholdSv1GetThreshold, tnt,
-			utils.IfaceAsString(args.Opts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
+			utils.IfaceAsString(args.APIOpts[utils.OptsAPIKey]), utils.TimePointer(time.Now())); err != nil {
 			return
 		}
 	}
 	return dS.Dispatch(&utils.CGREvent{
 		Tenant: tnt,
 		ID:     args.ID,
-		Opts:   args.Opts,
+		Opts:   args.APIOpts,
 	}, utils.MetaThresholds, utils.ThresholdSv1GetThreshold, args, th)
 }
diff --git a/dispatchers/thresholds_it_test.go b/dispatchers/thresholds_it_test.go
index 130416ba2..adcf77c5c 100755
--- a/dispatchers/thresholds_it_test.go
+++ b/dispatchers/thresholds_it_test.go
@@ -229,12 +229,12 @@ func testDspThTestAuthKey3(t *testing.T) {
 		ID:     "THD_ACNT_1002",
 		Hits:   1,
 	}
-	if err := dispEngine.RPC.Call(utils.ThresholdSv1GetThreshold, &utils.TenantIDWithOpts{
+	if err := dispEngine.RPC.Call(utils.ThresholdSv1GetThreshold, &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{
 			Tenant: "cgrates.org",
 			ID:     "THD_ACNT_1002",
 		},
-		Opts: map[string]interface{}{
+		APIOpts: map[string]interface{}{
 			utils.OptsAPIKey: "thr12345",
 		},
 	}, &th); err != nil {
diff --git a/engine/action.go b/engine/action.go
index 7690f8516..145bd5e00 100644
--- a/engine/action.go
+++ b/engine/action.go
@@ -486,7 +486,7 @@ func setddestinations(ub *Account, a *Action, acs Actions, extraData interface{}
 			}
 			var sts StatQueue
 			if err = connMgr.Call(config.CgrConfig().RalsCfg().StatSConns, nil, utils.StatSv1GetStatQueue,
-				&utils.TenantIDWithOpts{
+				&utils.TenantIDWithAPIOpts{
 					TenantID: &utils.TenantID{
 						Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
 						ID:     statID,
@@ -1051,7 +1051,7 @@ func export(ub *Account, a *Action, acs Actions, extraData interface{}) (err err
 }
 
 func resetThreshold(ub *Account, a *Action, acs Actions, extraData interface{}) (err error) {
-	args := &utils.TenantIDWithOpts{
+	args := &utils.TenantIDWithAPIOpts{
 		TenantID: utils.NewTenantID(a.ExtraParameters),
 	}
 	var rply string
@@ -1060,7 +1060,7 @@ func resetThreshold(ub *Account, a *Action, acs Actions, extraData interface{})
 }
 
 func resetStatQueue(ub *Account, a *Action, acs Actions, extraData interface{}) (err error) {
-	args := &utils.TenantIDWithOpts{
+	args := &utils.TenantIDWithAPIOpts{
 		TenantID: utils.NewTenantID(a.ExtraParameters),
 	}
 	var rply string
diff --git a/engine/calldesc.go b/engine/calldesc.go
index 3200cad54..d51902a2e 100644
--- a/engine/calldesc.go
+++ b/engine/calldesc.go
@@ -1043,7 +1043,7 @@ func (cd *CallDescriptor) RemoteHost() net.Addr {
 	return utils.LocalAddr()
 }
 
-type CallDescriptorWithOpts struct {
+type CallDescriptorWithAPIOpts struct {
 	*CallDescriptor
-	Opts map[string]interface{}
+	APIOpts map[string]interface{}
 }
diff --git a/engine/cdrs.go b/engine/cdrs.go
index 7dd086330..6d1d55fba 100644
--- a/engine/cdrs.go
+++ b/engine/cdrs.go
@@ -276,9 +276,9 @@ func (cdrS *CDRServer) getCostFromRater(cdr *CDRWithOpts) (*CallCost, error) {
 	if reqTypes.Has(cdr.RequestType) { // Prepaid - Cost can be recalculated in case of missing records from SM
 		err = cdrS.connMgr.Call(cdrS.cgrCfg.CdrsCfg().RaterConns, nil,
 			utils.ResponderDebit,
-			&CallDescriptorWithOpts{
+			&CallDescriptorWithAPIOpts{
 				CallDescriptor: cd,
-				Opts:           cdr.Opts,
+				APIOpts:        cdr.Opts,
 			}, cc)
 		if err != nil && err.Error() == utils.ErrAccountNotFound.Error() &&
 			cdr.RequestType == utils.MetaDynaprepaid {
@@ -294,17 +294,17 @@ func (cdrS *CDRServer) getCostFromRater(cdr *CDRWithOpts) (*CallCost, error) {
 			// execute again the Debit operation
 			err = cdrS.connMgr.Call(cdrS.cgrCfg.CdrsCfg().RaterConns, nil,
 				utils.ResponderDebit,
-				&CallDescriptorWithOpts{
+				&CallDescriptorWithAPIOpts{
 					CallDescriptor: cd,
-					Opts:           cdr.Opts,
+					APIOpts:        cdr.Opts,
 				}, cc)
 		}
 	} else {
 		err = cdrS.connMgr.Call(cdrS.cgrCfg.CdrsCfg().RaterConns, nil,
 			utils.ResponderGetCost,
-			&CallDescriptorWithOpts{
+			&CallDescriptorWithAPIOpts{
 				CallDescriptor: cd,
-				Opts:           cdr.Opts,
+				APIOpts:        cdr.Opts,
 			}, cc)
 	}
 	if err != nil {
@@ -341,7 +341,7 @@ func (cdrS *CDRServer) refundEventCost(ec *EventCost, reqType, tor string) (rfnd
 	var acnt Account
 	if err = cdrS.connMgr.Call(cdrS.cgrCfg.CdrsCfg().RaterConns, nil,
 		utils.ResponderRefundIncrements,
-		&CallDescriptorWithOpts{CallDescriptor: cd}, &acnt); err != nil {
+		&CallDescriptorWithAPIOpts{CallDescriptor: cd}, &acnt); err != nil {
 		return
 	}
 	return true, nil
@@ -983,7 +983,7 @@ func (cdrS *CDRServer) V2StoreSessionCost(args *ArgsV2CDRSStoreSMCost, reply *st
 		var response float64
 		if err := cdrS.connMgr.Call(cdrS.cgrCfg.CdrsCfg().RaterConns, nil,
 			utils.ResponderRefundRounding,
-			&CallDescriptorWithOpts{CallDescriptor: cd},
+			&CallDescriptorWithAPIOpts{CallDescriptor: cd},
 			&response); err != nil {
 			utils.Logger.Warning(
 				fmt.Sprintf("<CDRS> RefundRounding for cc: %+v, got error: %s",
diff --git a/engine/datamanager.go b/engine/datamanager.go
index 791716ccb..de4e5a523 100644
--- a/engine/datamanager.go
+++ b/engine/datamanager.go
@@ -679,9 +679,9 @@ func (dm *DataManager) GetStatQueue(tenant, id string,
 	if err != nil {
 		if itm := config.CgrConfig().DataDbCfg().Items[utils.MetaStatQueues]; err == utils.ErrNotFound && itm.Remote {
 			if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil, utils.ReplicatorSv1GetStatQueue,
-				&utils.TenantIDWithOpts{
+				&utils.TenantIDWithAPIOpts{
 					TenantID: &utils.TenantID{Tenant: tenant, ID: id},
-					Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString,
+					APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString,
 						utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID,
 							config.CgrConfig().GeneralCfg().NodeID)),
 				}, &sq); err == nil {
@@ -815,9 +815,9 @@ func (dm *DataManager) RemoveStatQueue(tenant, id string, transactionID string)
 			config.CgrConfig().DataDbCfg().RplFiltered,
 			utils.StatQueuePrefix, utils.ConcatenatedKey(tenant, id), // this are used to get the host IDs from cache
 			utils.ReplicatorSv1RemoveStatQueue,
-			&utils.TenantIDWithOpts{
+			&utils.TenantIDWithAPIOpts{
 				TenantID: &utils.TenantID{Tenant: tenant, ID: id},
-				Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
+				APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
 					config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)})
 	}
 	return
@@ -847,9 +847,9 @@ func (dm *DataManager) GetFilter(tenant, id string, cacheRead, cacheWrite bool,
 		if err != nil {
 			if itm := config.CgrConfig().DataDbCfg().Items[utils.MetaFilters]; err == utils.ErrNotFound && itm.Remote {
 				if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil, utils.ReplicatorSv1GetFilter,
-					&utils.TenantIDWithOpts{
+					&utils.TenantIDWithAPIOpts{
 						TenantID: &utils.TenantID{Tenant: tenant, ID: id},
-						Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString,
+						APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString,
 							utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID,
 								config.CgrConfig().GeneralCfg().NodeID)),
 					}, &fltr); err == nil {
@@ -945,9 +945,9 @@ func (dm *DataManager) RemoveFilter(tenant, id, transactionID string, withIndex
 			config.CgrConfig().DataDbCfg().RplFiltered,
 			utils.FilterPrefix, utils.ConcatenatedKey(tenant, id), // this are used to get the host IDs from cache
 			utils.ReplicatorSv1RemoveFilter,
-			&utils.TenantIDWithOpts{
+			&utils.TenantIDWithAPIOpts{
 				TenantID: &utils.TenantID{Tenant: tenant, ID: id},
-				Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
+				APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
 					config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)})
 	}
 	return
@@ -972,9 +972,9 @@ func (dm *DataManager) GetThreshold(tenant, id string,
 	if err != nil {
 		if itm := config.CgrConfig().DataDbCfg().Items[utils.MetaThresholds]; err == utils.ErrNotFound && itm.Remote {
 			if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil,
-				utils.ReplicatorSv1GetThreshold, &utils.TenantIDWithOpts{
+				utils.ReplicatorSv1GetThreshold, &utils.TenantIDWithAPIOpts{
 					TenantID: &utils.TenantID{Tenant: tenant, ID: id},
-					Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString,
+					APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString,
 						utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID,
 							config.CgrConfig().GeneralCfg().NodeID)),
 				}, &th); err == nil {
@@ -1051,9 +1051,9 @@ func (dm *DataManager) RemoveThreshold(tenant, id, transactionID string) (err er
 			config.CgrConfig().DataDbCfg().RplFiltered,
 			utils.ThresholdPrefix, utils.ConcatenatedKey(tenant, id), // this are used to get the host IDs from cache
 			utils.ReplicatorSv1RemoveThreshold,
-			&utils.TenantIDWithOpts{
+			&utils.TenantIDWithAPIOpts{
 				TenantID: &utils.TenantID{Tenant: tenant, ID: id},
-				Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
+				APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
 					config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)})
 	}
 	return
@@ -1079,9 +1079,9 @@ func (dm *DataManager) GetThresholdProfile(tenant, id string, cacheRead, cacheWr
 		if itm := config.CgrConfig().DataDbCfg().Items[utils.MetaThresholdProfiles]; err == utils.ErrNotFound && itm.Remote {
 			if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil,
 				utils.ReplicatorSv1GetThresholdProfile,
-				&utils.TenantIDWithOpts{
+				&utils.TenantIDWithAPIOpts{
 					TenantID: &utils.TenantID{Tenant: tenant, ID: id},
-					Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString,
+					APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString,
 						utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID,
 							config.CgrConfig().GeneralCfg().NodeID)),
 				}, &th); err == nil {
@@ -1179,9 +1179,9 @@ func (dm *DataManager) RemoveThresholdProfile(tenant, id,
 			config.CgrConfig().DataDbCfg().RplFiltered,
 			utils.ThresholdProfilePrefix, utils.ConcatenatedKey(tenant, id), // this are used to get the host IDs from cache
 			utils.ReplicatorSv1RemoveThresholdProfile,
-			&utils.TenantIDWithOpts{
+			&utils.TenantIDWithAPIOpts{
 				TenantID: &utils.TenantID{Tenant: tenant, ID: id},
-				Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
+				APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
 					config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)})
 	}
 	return
@@ -1207,9 +1207,9 @@ func (dm *DataManager) GetStatQueueProfile(tenant, id string, cacheRead, cacheWr
 		if itm := config.CgrConfig().DataDbCfg().Items[utils.MetaStatQueueProfiles]; err == utils.ErrNotFound && itm.Remote {
 			if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil,
 				utils.ReplicatorSv1GetStatQueueProfile,
-				&utils.TenantIDWithOpts{
+				&utils.TenantIDWithAPIOpts{
 					TenantID: &utils.TenantID{Tenant: tenant, ID: id},
-					Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString,
+					APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString,
 						utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID,
 							config.CgrConfig().GeneralCfg().NodeID)),
 				}, &sqp); err == nil {
@@ -1307,9 +1307,9 @@ func (dm *DataManager) RemoveStatQueueProfile(tenant, id,
 			config.CgrConfig().DataDbCfg().RplFiltered,
 			utils.StatQueueProfilePrefix, utils.ConcatenatedKey(tenant, id), // this are used to get the host IDs from cache
 			utils.ReplicatorSv1RemoveStatQueueProfile,
-			&utils.TenantIDWithOpts{
+			&utils.TenantIDWithAPIOpts{
 				TenantID: &utils.TenantID{Tenant: tenant, ID: id},
-				Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
+				APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
 					config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)})
 	}
 	return
@@ -1426,9 +1426,9 @@ func (dm *DataManager) GetResource(tenant, id string, cacheRead, cacheWrite bool
 		if itm := config.CgrConfig().DataDbCfg().Items[utils.MetaResources]; err == utils.ErrNotFound && itm.Remote {
 			if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil,
 				utils.ReplicatorSv1GetResource,
-				&utils.TenantIDWithOpts{
+				&utils.TenantIDWithAPIOpts{
 					TenantID: &utils.TenantID{Tenant: tenant, ID: id},
-					Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString,
+					APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString,
 						utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID,
 							config.CgrConfig().GeneralCfg().NodeID)),
 				}, &rs); err == nil {
@@ -1514,9 +1514,9 @@ func (dm *DataManager) RemoveResource(tenant, id, transactionID string) (err err
 			config.CgrConfig().DataDbCfg().RplFiltered,
 			utils.ResourcesPrefix, utils.ConcatenatedKey(tenant, id), // this are used to get the host IDs from cache
 			utils.ReplicatorSv1RemoveResource,
-			&utils.TenantIDWithOpts{
+			&utils.TenantIDWithAPIOpts{
 				TenantID: &utils.TenantID{Tenant: tenant, ID: id},
-				Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
+				APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
 					config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)})
 	}
 	return
@@ -1541,9 +1541,9 @@ func (dm *DataManager) GetResourceProfile(tenant, id string, cacheRead, cacheWri
 	if err != nil {
 		if itm := config.CgrConfig().DataDbCfg().Items[utils.MetaResourceProfile]; err == utils.ErrNotFound && itm.Remote {
 			if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil,
-				utils.ReplicatorSv1GetResourceProfile, &utils.TenantIDWithOpts{
+				utils.ReplicatorSv1GetResourceProfile, &utils.TenantIDWithAPIOpts{
 					TenantID: &utils.TenantID{Tenant: tenant, ID: id},
-					Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString,
+					APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString,
 						utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID,
 							config.CgrConfig().GeneralCfg().NodeID)),
 				}, &rp); err == nil {
@@ -1641,9 +1641,9 @@ func (dm *DataManager) RemoveResourceProfile(tenant, id, transactionID string, w
 			config.CgrConfig().DataDbCfg().RplFiltered,
 			utils.ResourceProfilesPrefix, utils.ConcatenatedKey(tenant, id), // this are used to get the host IDs from cache
 			utils.ReplicatorSv1RemoveResourceProfile,
-			&utils.TenantIDWithOpts{
+			&utils.TenantIDWithAPIOpts{
 				TenantID: &utils.TenantID{Tenant: tenant, ID: id},
-				Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
+				APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
 					config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)})
 	}
 	return
@@ -2358,9 +2358,9 @@ func (dm *DataManager) GetRouteProfile(tenant, id string, cacheRead, cacheWrite
 	if err != nil {
 		if itm := config.CgrConfig().DataDbCfg().Items[utils.MetaRouteProfiles]; err == utils.ErrNotFound && itm.Remote {
 			if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil, utils.ReplicatorSv1GetRouteProfile,
-				&utils.TenantIDWithOpts{
+				&utils.TenantIDWithAPIOpts{
 					TenantID: &utils.TenantID{Tenant: tenant, ID: id},
-					Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString,
+					APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString,
 						utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID,
 							config.CgrConfig().GeneralCfg().NodeID)),
 				}, &rpp); err == nil {
@@ -2461,9 +2461,9 @@ func (dm *DataManager) RemoveRouteProfile(tenant, id, transactionID string, with
 			config.CgrConfig().DataDbCfg().RplFiltered,
 			utils.RouteProfilePrefix, utils.ConcatenatedKey(tenant, id), // this are used to get the host IDs from cache
 			utils.ReplicatorSv1RemoveRouteProfile,
-			&utils.TenantIDWithOpts{
+			&utils.TenantIDWithAPIOpts{
 				TenantID: &utils.TenantID{Tenant: tenant, ID: id},
-				Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
+				APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
 					config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)})
 	}
 	return
@@ -2492,9 +2492,9 @@ func (dm *DataManager) GetAttributeProfile(tenant, id string, cacheRead, cacheWr
 			if itm := config.CgrConfig().DataDbCfg().Items[utils.MetaAttributeProfiles]; err == utils.ErrNotFound && itm.Remote {
 				if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil,
 					utils.ReplicatorSv1GetAttributeProfile,
-					&utils.TenantIDWithOpts{
+					&utils.TenantIDWithAPIOpts{
 						TenantID: &utils.TenantID{Tenant: tenant, ID: id},
-						Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString,
+						APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString,
 							utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID,
 								config.CgrConfig().GeneralCfg().NodeID)),
 					}, &attrPrfl); err == nil {
@@ -2599,9 +2599,9 @@ func (dm *DataManager) RemoveAttributeProfile(tenant, id string, transactionID s
 			config.CgrConfig().DataDbCfg().RplFiltered,
 			utils.AttributeProfilePrefix, utils.ConcatenatedKey(tenant, id), // this are used to get the host IDs from cache
 			utils.ReplicatorSv1RemoveAttributeProfile,
-			&utils.TenantIDWithOpts{
+			&utils.TenantIDWithAPIOpts{
 				TenantID: &utils.TenantID{Tenant: tenant, ID: id},
-				Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
+				APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
 					config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)})
 	}
 	return
@@ -2627,9 +2627,9 @@ func (dm *DataManager) GetChargerProfile(tenant, id string, cacheRead, cacheWrit
 		if itm := config.CgrConfig().DataDbCfg().Items[utils.MetaChargerProfiles]; err == utils.ErrNotFound && itm.Remote {
 			if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil,
 				utils.ReplicatorSv1GetChargerProfile,
-				&utils.TenantIDWithOpts{
+				&utils.TenantIDWithAPIOpts{
 					TenantID: &utils.TenantID{Tenant: tenant, ID: id},
-					Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString,
+					APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString,
 						utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID,
 							config.CgrConfig().GeneralCfg().NodeID)),
 				}, &cpp); err == nil {
@@ -2727,9 +2727,9 @@ func (dm *DataManager) RemoveChargerProfile(tenant, id string,
 			config.CgrConfig().DataDbCfg().RplFiltered,
 			utils.ChargerProfilePrefix, utils.ConcatenatedKey(tenant, id), // this are used to get the host IDs from cache
 			utils.ReplicatorSv1RemoveChargerProfile,
-			&utils.TenantIDWithOpts{
+			&utils.TenantIDWithAPIOpts{
 				TenantID: &utils.TenantID{Tenant: tenant, ID: id},
-				Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
+				APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
 					config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)})
 	}
 	return
@@ -2755,9 +2755,9 @@ func (dm *DataManager) GetDispatcherProfile(tenant, id string, cacheRead, cacheW
 		if itm := config.CgrConfig().DataDbCfg().Items[utils.MetaDispatcherProfiles]; err == utils.ErrNotFound && itm.Remote {
 			if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil,
 				utils.ReplicatorSv1GetDispatcherProfile,
-				&utils.TenantIDWithOpts{
+				&utils.TenantIDWithAPIOpts{
 					TenantID: &utils.TenantID{Tenant: tenant, ID: id},
-					Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString,
+					APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString,
 						utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID,
 							config.CgrConfig().GeneralCfg().NodeID)),
 				}, &dpp); err == nil {
@@ -2859,9 +2859,9 @@ func (dm *DataManager) RemoveDispatcherProfile(tenant, id string,
 			config.CgrConfig().DataDbCfg().RplFiltered,
 			utils.DispatcherProfilePrefix, utils.ConcatenatedKey(tenant, id), // this are used to get the host IDs from cache
 			utils.ReplicatorSv1RemoveDispatcherProfile,
-			&utils.TenantIDWithOpts{
+			&utils.TenantIDWithAPIOpts{
 				TenantID: &utils.TenantID{Tenant: tenant, ID: id},
-				Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
+				APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
 					config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)})
 	}
 	return
@@ -2887,9 +2887,9 @@ func (dm *DataManager) GetDispatcherHost(tenant, id string, cacheRead, cacheWrit
 		if itm := config.CgrConfig().DataDbCfg().Items[utils.MetaDispatcherHosts]; err == utils.ErrNotFound && itm.Remote {
 			if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil,
 				utils.ReplicatorSv1GetDispatcherHost,
-				&utils.TenantIDWithOpts{
+				&utils.TenantIDWithAPIOpts{
 					TenantID: &utils.TenantID{Tenant: tenant, ID: id},
-					Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString,
+					APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString,
 						utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID,
 							config.CgrConfig().GeneralCfg().NodeID)),
 				}, &dH); err == nil {
@@ -2957,9 +2957,9 @@ func (dm *DataManager) RemoveDispatcherHost(tenant, id string,
 			config.CgrConfig().DataDbCfg().RplFiltered,
 			utils.DispatcherHostPrefix, utils.ConcatenatedKey(tenant, id), // this are used to get the host IDs from cache
 			utils.ReplicatorSv1RemoveDispatcherHost,
-			&utils.TenantIDWithOpts{
+			&utils.TenantIDWithAPIOpts{
 				TenantID: &utils.TenantID{Tenant: tenant, ID: id},
-				Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
+				APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
 					config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)})
 	}
 	return
@@ -3056,9 +3056,9 @@ func (dm *DataManager) GetRateProfile(tenant, id string, cacheRead, cacheWrite b
 		if itm := config.CgrConfig().DataDbCfg().Items[utils.MetaRateProfiles]; err == utils.ErrNotFound && itm.Remote {
 			if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil,
 				utils.ReplicatorSv1GetRateProfile,
-				&utils.TenantIDWithOpts{
+				&utils.TenantIDWithAPIOpts{
 					TenantID: &utils.TenantID{Tenant: tenant, ID: id},
-					Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString,
+					APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString,
 						utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID,
 							config.CgrConfig().GeneralCfg().NodeID)),
 				}, &rpp); err == nil {
@@ -3198,9 +3198,9 @@ func (dm *DataManager) RemoveRateProfile(tenant, id string,
 			config.CgrConfig().DataDbCfg().RplFiltered,
 			utils.RateProfilePrefix, utils.ConcatenatedKey(tenant, id), // this are used to get the host IDs from cache
 			utils.ReplicatorSv1RemoveRateProfile,
-			&utils.TenantIDWithOpts{
+			&utils.TenantIDWithAPIOpts{
 				TenantID: &utils.TenantID{Tenant: tenant, ID: id},
-				Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
+				APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
 					config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)})
 	}
 	return
@@ -3326,9 +3326,9 @@ func (dm *DataManager) GetActionProfile(tenant, id string, cacheRead, cacheWrite
 		if itm := config.CgrConfig().DataDbCfg().Items[utils.MetaActionProfiles]; err == utils.ErrNotFound && itm.Remote {
 			if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil,
 				utils.ReplicatorSv1GetActionProfile,
-				&utils.TenantIDWithOpts{
+				&utils.TenantIDWithAPIOpts{
 					TenantID: &utils.TenantID{Tenant: tenant, ID: id},
-					Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString,
+					APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString,
 						utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID,
 							config.CgrConfig().GeneralCfg().NodeID)),
 				}, &ap); err == nil {
@@ -3423,9 +3423,9 @@ func (dm *DataManager) RemoveActionProfile(tenant, id string,
 			config.CgrConfig().DataDbCfg().RplFiltered,
 			utils.ActionProfilePrefix, utils.ConcatenatedKey(tenant, id), // this are used to get the host IDs from cache
 			utils.ReplicatorSv1RemoveActionProfile,
-			&utils.TenantIDWithOpts{
+			&utils.TenantIDWithAPIOpts{
 				TenantID: &utils.TenantID{Tenant: tenant, ID: id},
-				Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
+				APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
 					config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)})
 	}
 	return
@@ -3608,9 +3608,9 @@ func (dm *DataManager) checkFilters(tenant string, ids []string) (brokenReferenc
 			if itm := config.CgrConfig().DataDbCfg().Items[utils.MetaFilters]; err == utils.ErrNotFound && itm.Remote {
 				var fltr *Filter
 				err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil, utils.ReplicatorSv1GetFilter,
-					&utils.TenantIDWithOpts{
+					&utils.TenantIDWithAPIOpts{
 						TenantID: &utils.TenantID{Tenant: tenant, ID: id},
-						Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString,
+						APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString,
 							utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID,
 								config.CgrConfig().GeneralCfg().NodeID)),
 					}, &fltr)
@@ -3635,9 +3635,9 @@ func (dm *DataManager) GetAccountProfile(tenant, id string) (ap *utils.AccountPr
 		if itm := config.CgrConfig().DataDbCfg().Items[utils.MetaAccountProfiles]; err == utils.ErrNotFound && itm.Remote {
 			if err = dm.connMgr.Call(config.CgrConfig().DataDbCfg().RmtConns, nil,
 				utils.ReplicatorSv1GetAccountProfile,
-				&utils.TenantIDWithOpts{
+				&utils.TenantIDWithAPIOpts{
 					TenantID: &utils.TenantID{Tenant: tenant, ID: id},
-					Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString,
+					APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID, utils.EmptyString,
 						utils.FirstNonEmpty(config.CgrConfig().DataDbCfg().RmtConnID,
 							config.CgrConfig().GeneralCfg().NodeID)),
 				}, &ap); err == nil {
@@ -3718,9 +3718,9 @@ func (dm *DataManager) RemoveAccountProfile(tenant, id string,
 			config.CgrConfig().DataDbCfg().RplFiltered,
 			utils.AccountProfilePrefix, utils.ConcatenatedKey(tenant, id), // this are used to get the host IDs from cache
 			utils.ReplicatorSv1RemoveAccountProfile,
-			&utils.TenantIDWithOpts{
+			&utils.TenantIDWithAPIOpts{
 				TenantID: &utils.TenantID{Tenant: tenant, ID: id},
-				Opts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
+				APIOpts: utils.GenerateDBItemOpts(itm.APIKey, itm.RouteID,
 					config.CgrConfig().DataDbCfg().RplCache, utils.EmptyString)})
 	}
 	return
diff --git a/engine/dynamicdp.go b/engine/dynamicdp.go
index 5ada33af7..bd89509b2 100644
--- a/engine/dynamicdp.go
+++ b/engine/dynamicdp.go
@@ -114,7 +114,7 @@ func (dDP *dynamicDP) fieldAsInterface(fldPath []string) (val interface{}, err e
 		var statValues map[string]float64
 
 		if err := connMgr.Call(dDP.stsConns, nil, utils.StatSv1GetQueueFloatMetrics,
-			&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: dDP.tenant, ID: fldPath[1]}},
+			&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: dDP.tenant, ID: fldPath[1]}},
 			&statValues); err != nil {
 			return nil, err
 		}
diff --git a/engine/resources.go b/engine/resources.go
index 34bea895d..0a1130eab 100644
--- a/engine/resources.go
+++ b/engine/resources.go
@@ -798,7 +798,7 @@ func (rS *ResourceService) V1ReleaseResource(args utils.ArgRSv1ResourceUsage, re
 }
 
 // V1GetResource returns a resource configuration
-func (rS *ResourceService) V1GetResource(arg *utils.TenantIDWithOpts, reply *Resource) error {
+func (rS *ResourceService) V1GetResource(arg *utils.TenantIDWithAPIOpts, reply *Resource) error {
 	if missing := utils.MissingStructFields(arg, []string{utils.ID}); len(missing) != 0 { //Params missing
 		return utils.NewErrMandatoryIeMissing(missing...)
 	}
@@ -819,7 +819,7 @@ type ResourceWithConfig struct {
 	Config *ResourceProfile
 }
 
-func (rS *ResourceService) V1GetResourceWithConfig(arg *utils.TenantIDWithOpts, reply *ResourceWithConfig) (err error) {
+func (rS *ResourceService) V1GetResourceWithConfig(arg *utils.TenantIDWithAPIOpts, reply *ResourceWithConfig) (err error) {
 	if missing := utils.MissingStructFields(arg, []string{utils.ID}); len(missing) != 0 { //Params missing
 		return utils.NewErrMandatoryIeMissing(missing...)
 	}
diff --git a/engine/responder.go b/engine/responder.go
index 389bd761a..55a92ae83 100644
--- a/engine/responder.go
+++ b/engine/responder.go
@@ -65,7 +65,7 @@ func (rs *Responder) usageAllowed(tor string, reqUsage time.Duration) (allowed b
 /*
 RPC method that provides the external RPC interface for getting the rating information.
 */
-func (rs *Responder) GetCost(arg *CallDescriptorWithOpts, reply *CallCost) (err error) {
+func (rs *Responder) GetCost(arg *CallDescriptorWithAPIOpts, reply *CallCost) (err error) {
 	// RPC caching
 	if arg.CgrID != utils.EmptyString && config.CgrConfig().CacheCfg().Partitions[utils.CacheRPCResponses].Limit != 0 {
 		cacheKey := utils.ConcatenatedKey(utils.ResponderGetCost, arg.CgrID)
@@ -171,7 +171,7 @@ func (rs *Responder) GetCostOnRatingPlans(arg *utils.GetCostOnRatingPlansArgs, r
 	return
 }
 
-func (rs *Responder) Debit(arg *CallDescriptorWithOpts, reply *CallCost) (err error) {
+func (rs *Responder) Debit(arg *CallDescriptorWithAPIOpts, reply *CallCost) (err error) {
 	// RPC caching
 	if arg.Tenant == utils.EmptyString {
 		arg.Tenant = config.CgrConfig().GeneralCfg().DefaultTenant
@@ -212,7 +212,7 @@ func (rs *Responder) Debit(arg *CallDescriptorWithOpts, reply *CallCost) (err er
 	return
 }
 
-func (rs *Responder) MaxDebit(arg *CallDescriptorWithOpts, reply *CallCost) (err error) {
+func (rs *Responder) MaxDebit(arg *CallDescriptorWithAPIOpts, reply *CallCost) (err error) {
 	// RPC caching
 	if arg.Tenant == utils.EmptyString {
 		arg.Tenant = config.CgrConfig().GeneralCfg().DefaultTenant
@@ -252,7 +252,7 @@ func (rs *Responder) MaxDebit(arg *CallDescriptorWithOpts, reply *CallCost) (err
 	return
 }
 
-func (rs *Responder) RefundIncrements(arg *CallDescriptorWithOpts, reply *Account) (err error) {
+func (rs *Responder) RefundIncrements(arg *CallDescriptorWithAPIOpts, reply *Account) (err error) {
 	// RPC caching
 	if arg.Tenant == utils.EmptyString {
 		arg.Tenant = config.CgrConfig().GeneralCfg().DefaultTenant
@@ -293,7 +293,7 @@ func (rs *Responder) RefundIncrements(arg *CallDescriptorWithOpts, reply *Accoun
 	return
 }
 
-func (rs *Responder) RefundRounding(arg *CallDescriptorWithOpts, reply *float64) (err error) {
+func (rs *Responder) RefundRounding(arg *CallDescriptorWithAPIOpts, reply *float64) (err error) {
 	// RPC caching
 	if arg.Tenant == utils.EmptyString {
 		arg.Tenant = config.CgrConfig().GeneralCfg().DefaultTenant
@@ -327,7 +327,7 @@ func (rs *Responder) RefundRounding(arg *CallDescriptorWithOpts, reply *float64)
 	return
 }
 
-func (rs *Responder) GetMaxSessionTime(arg *CallDescriptorWithOpts, reply *time.Duration) (err error) {
+func (rs *Responder) GetMaxSessionTime(arg *CallDescriptorWithAPIOpts, reply *time.Duration) (err error) {
 	if arg.Tenant == utils.EmptyString {
 		arg.Tenant = config.CgrConfig().GeneralCfg().DefaultTenant
 	}
diff --git a/engine/responder_test.go b/engine/responder_test.go
index 21c29e186..61375d616 100644
--- a/engine/responder_test.go
+++ b/engine/responder_test.go
@@ -152,7 +152,7 @@ func TestResponderGetCostMaxUsageANY(t *testing.T) {
 	}
 	tStart, _ := utils.ParseTimeDetectLayout("2013-08-07T17:30:00Z", "")
 	tEnd, _ := utils.ParseTimeDetectLayout("2013-08-07T17:31:11Z", "")
-	cd := &CallDescriptorWithOpts{
+	cd := &CallDescriptorWithAPIOpts{
 		CallDescriptor: &CallDescriptor{
 			Category:      "call",
 			Tenant:        "cgrates.org",
@@ -179,7 +179,7 @@ func TestResponderGetCostMaxUsageVOICE(t *testing.T) {
 	}
 	tStart, _ := utils.ParseTimeDetectLayout("2013-08-07T17:30:00Z", "")
 	tEnd, _ := utils.ParseTimeDetectLayout("2013-08-07T17:31:21Z", "")
-	cd := &CallDescriptorWithOpts{
+	cd := &CallDescriptorWithAPIOpts{
 		CallDescriptor: &CallDescriptor{
 			Category:      "call",
 			Tenant:        "cgrates.org",
@@ -206,7 +206,7 @@ func TestResponderDebitMaxUsageANY(t *testing.T) {
 	}
 	tStart, _ := utils.ParseTimeDetectLayout("2013-08-07T17:30:00Z", "")
 	tEnd, _ := utils.ParseTimeDetectLayout("2013-08-07T17:31:11Z", "")
-	cd := &CallDescriptorWithOpts{
+	cd := &CallDescriptorWithAPIOpts{
 		CallDescriptor: &CallDescriptor{
 			Category:      "call",
 			Tenant:        "cgrates.org",
@@ -233,7 +233,7 @@ func TestResponderDebitMaxUsageVOICE(t *testing.T) {
 	}
 	tStart, _ := utils.ParseTimeDetectLayout("2013-08-07T17:30:00Z", "")
 	tEnd, _ := utils.ParseTimeDetectLayout("2013-08-07T17:31:21Z", "")
-	cd := &CallDescriptorWithOpts{
+	cd := &CallDescriptorWithAPIOpts{
 		CallDescriptor: &CallDescriptor{
 			Category:      "call",
 			Tenant:        "cgrates.org",
@@ -260,7 +260,7 @@ func TestResponderMaxDebitMaxUsageANY(t *testing.T) {
 	}
 	tStart, _ := utils.ParseTimeDetectLayout("2013-08-07T17:30:00Z", "")
 	tEnd, _ := utils.ParseTimeDetectLayout("2013-08-07T17:31:11Z", "")
-	cd := &CallDescriptorWithOpts{
+	cd := &CallDescriptorWithAPIOpts{
 		CallDescriptor: &CallDescriptor{
 			Category:      "call",
 			Tenant:        "cgrates.org",
@@ -287,7 +287,7 @@ func TestResponderMaxDebitMaxUsageVOICE(t *testing.T) {
 	}
 	tStart, _ := utils.ParseTimeDetectLayout("2013-08-07T17:30:00Z", "")
 	tEnd, _ := utils.ParseTimeDetectLayout("2013-08-07T17:31:21Z", "")
-	cd := &CallDescriptorWithOpts{
+	cd := &CallDescriptorWithAPIOpts{
 		CallDescriptor: &CallDescriptor{
 			Category:      "call",
 			Tenant:        "cgrates.org",
@@ -314,7 +314,7 @@ func TestResponderRefundIncrementsMaxUsageANY(t *testing.T) {
 	}
 	tStart, _ := utils.ParseTimeDetectLayout("2013-08-07T17:30:00Z", "")
 	tEnd, _ := utils.ParseTimeDetectLayout("2013-08-07T17:31:11Z", "")
-	cd := &CallDescriptorWithOpts{
+	cd := &CallDescriptorWithAPIOpts{
 		CallDescriptor: &CallDescriptor{
 			Category:      "call",
 			Tenant:        "cgrates.org",
@@ -341,7 +341,7 @@ func TestResponderRefundIncrementsMaxUsageVOICE(t *testing.T) {
 	}
 	tStart, _ := utils.ParseTimeDetectLayout("2013-08-07T17:30:00Z", "")
 	tEnd, _ := utils.ParseTimeDetectLayout("2013-08-07T17:31:21Z", "")
-	cd := &CallDescriptorWithOpts{
+	cd := &CallDescriptorWithAPIOpts{
 		CallDescriptor: &CallDescriptor{
 			Category:      "call",
 			Tenant:        "cgrates.org",
@@ -368,7 +368,7 @@ func TestResponderRefundRoundingMaxUsageANY(t *testing.T) {
 	}
 	tStart, _ := utils.ParseTimeDetectLayout("2013-08-07T17:30:00Z", "")
 	tEnd, _ := utils.ParseTimeDetectLayout("2013-08-07T17:31:11Z", "")
-	cd := &CallDescriptorWithOpts{
+	cd := &CallDescriptorWithAPIOpts{
 		CallDescriptor: &CallDescriptor{
 			Category:      "call",
 			Tenant:        "cgrates.org",
@@ -395,7 +395,7 @@ func TestResponderRefundRoundingMaxUsageVOICE(t *testing.T) {
 	}
 	tStart, _ := utils.ParseTimeDetectLayout("2013-08-07T17:30:00Z", "")
 	tEnd, _ := utils.ParseTimeDetectLayout("2013-08-07T17:31:21Z", "")
-	cd := &CallDescriptorWithOpts{
+	cd := &CallDescriptorWithAPIOpts{
 		CallDescriptor: &CallDescriptor{
 			Category:      "call",
 			Tenant:        "cgrates.org",
@@ -422,7 +422,7 @@ func TestResponderGetMaxSessionTimeMaxUsageANY(t *testing.T) {
 	}
 	tStart, _ := utils.ParseTimeDetectLayout("2013-08-07T17:30:00Z", "")
 	tEnd, _ := utils.ParseTimeDetectLayout("2013-08-07T17:31:11Z", "")
-	cd := &CallDescriptorWithOpts{
+	cd := &CallDescriptorWithAPIOpts{
 		CallDescriptor: &CallDescriptor{
 			Category:      "call",
 			Tenant:        "cgrates.org",
@@ -449,7 +449,7 @@ func TestResponderGetMaxSessionTimeMaxUsageVOICE(t *testing.T) {
 	}
 	tStart, _ := utils.ParseTimeDetectLayout("2013-08-07T17:30:00Z", "")
 	tEnd, _ := utils.ParseTimeDetectLayout("2013-08-07T17:31:21Z", "")
-	cd := &CallDescriptorWithOpts{
+	cd := &CallDescriptorWithAPIOpts{
 		CallDescriptor: &CallDescriptor{
 			Category:      "call",
 			Tenant:        "cgrates.org",
diff --git a/engine/routes.go b/engine/routes.go
index f023a4918..14ee5cbb7 100644
--- a/engine/routes.go
+++ b/engine/routes.go
@@ -302,7 +302,7 @@ func (rpS *RouteService) statMetrics(statIDs []string, tenant string) (stsMetric
 		for _, statID := range statIDs {
 			var metrics map[string]float64
 			if err = rpS.connMgr.Call(rpS.cgrcfg.RouteSCfg().StatSConns, nil, utils.StatSv1GetQueueFloatMetrics,
-				&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: statID}}, &metrics); err != nil &&
+				&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: statID}}, &metrics); err != nil &&
 				err.Error() != utils.ErrNotFound.Error() {
 				utils.Logger.Warning(
 					fmt.Sprintf("<%s> error: %s getting statMetrics for stat : %s", utils.RouteS, err.Error(), statID))
@@ -335,7 +335,7 @@ func (rpS *RouteService) statMetricsForLoadDistribution(statIDs []string, tenant
 			if err = rpS.connMgr.Call(
 				rpS.cgrcfg.RouteSCfg().StatSConns, nil,
 				utils.StatSv1GetQueueFloatMetrics,
-				&utils.TenantIDWithOpts{
+				&utils.TenantIDWithAPIOpts{
 					TenantID: &utils.TenantID{
 						Tenant: tenant, ID: statWithMetric[0]}},
 				&metrics); err != nil &&
@@ -376,7 +376,7 @@ func (rpS *RouteService) resourceUsage(resIDs []string, tenant string) (tUsage f
 		for _, resID := range resIDs {
 			var res Resource
 			if err = rpS.connMgr.Call(rpS.cgrcfg.RouteSCfg().ResourceSConns, nil, utils.ResourceSv1GetResource,
-				&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: resID}}, &res); err != nil && err.Error() != utils.ErrNotFound.Error() {
+				&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: tenant, ID: resID}}, &res); err != nil && err.Error() != utils.ErrNotFound.Error() {
 				utils.Logger.Warning(
 					fmt.Sprintf("<%s> error: %s getting resource for ID : %s", utils.RouteS, err.Error(), resID))
 				continue
diff --git a/engine/stats.go b/engine/stats.go
index 1bacefb8e..101802900 100644
--- a/engine/stats.go
+++ b/engine/stats.go
@@ -407,7 +407,7 @@ func (sS *StatService) V1GetStatQueuesForEvent(args *StatsArgsProcessEvent, repl
 }
 
 // V1GetStatQueue returns a StatQueue object
-func (sS *StatService) V1GetStatQueue(args *utils.TenantIDWithOpts, reply *StatQueue) (err error) {
+func (sS *StatService) V1GetStatQueue(args *utils.TenantIDWithAPIOpts, reply *StatQueue) (err error) {
 	if missing := utils.MissingStructFields(args, []string{utils.ID}); len(missing) != 0 { //Params missing
 		return utils.NewErrMandatoryIeMissing(missing...)
 	}
diff --git a/general_tests/a1_it_test.go b/general_tests/a1_it_test.go
index 3d8acab4d..79f4583e9 100644
--- a/general_tests/a1_it_test.go
+++ b/general_tests/a1_it_test.go
@@ -119,7 +119,7 @@ func testA1itLoadTPFromFolder(t *testing.T) {
 	time.Sleep(100 * time.Millisecond)
 	tStart := time.Date(2017, 3, 3, 10, 39, 33, 0, time.UTC)
 	tEnd := time.Date(2017, 3, 3, 10, 39, 33, 10240, time.UTC)
-	cd := &engine.CallDescriptorWithOpts{
+	cd := &engine.CallDescriptorWithAPIOpts{
 		CallDescriptor: &engine.CallDescriptor{
 			Category:    "data1",
 			Tenant:      "cgrates.org",
diff --git a/general_tests/accountactions_it_test.go b/general_tests/accountactions_it_test.go
index 6bd61323f..284d09692 100644
--- a/general_tests/accountactions_it_test.go
+++ b/general_tests/accountactions_it_test.go
@@ -188,7 +188,7 @@ func testAccActionsSetActionProfile(t *testing.T) {
 		t.Error("Unexpected reply returned", reply)
 	}
 	var result *engine.ActionProfile
-	if err := accSRPC.Call(utils.APIerSv1GetActionProfile, &utils.TenantIDWithOpts{
+	if err := accSRPC.Call(utils.APIerSv1GetActionProfile, &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{Tenant: actPrf.Tenant, ID: actPrf.ID}}, &result); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(actPrf.ActionProfile, result) {
@@ -271,7 +271,7 @@ func testAccActionsGetAccountAfterActions(t *testing.T) {
 		ThresholdIDs: []string{utils.MetaNone},
 	}
 	var result *utils.AccountProfile
-	if err := accSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithOpts{
+	if err := accSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "1001"}}, &result); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(accPrf, result) {
@@ -312,7 +312,7 @@ func testAccActionsSetActionProfile2(t *testing.T) {
 		t.Error("Unexpected reply returned", reply)
 	}
 	var result *engine.ActionProfile
-	if err := accSRPC.Call(utils.APIerSv1GetActionProfile, &utils.TenantIDWithOpts{
+	if err := accSRPC.Call(utils.APIerSv1GetActionProfile, &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{Tenant: actPrf.Tenant, ID: actPrf.ID}}, &result); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(actPrf.ActionProfile, result) {
@@ -345,7 +345,7 @@ func testAccActionsGetAccountAfterRemActions(t *testing.T) {
 		ThresholdIDs: []string{utils.MetaNone},
 	}
 	var result *utils.AccountProfile
-	if err := accSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithOpts{
+	if err := accSRPC.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "1001"}}, &result); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(accPrf, result) {
diff --git a/general_tests/attributes_it_test.go b/general_tests/attributes_it_test.go
index c34362d15..8b959cc6c 100644
--- a/general_tests/attributes_it_test.go
+++ b/general_tests/attributes_it_test.go
@@ -201,7 +201,7 @@ func testAttributeSProcessEventWithAccount(t *testing.T) {
 	}
 	var replyAttr *engine.AttributeProfile
 	if err := attrRPC.Call(utils.APIerSv1GetAttributeProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_ACCOUNT"}}, &replyAttr); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_ACCOUNT"}}, &replyAttr); err != nil {
 		t.Fatal(err)
 	}
 	replyAttr.Compile()
@@ -283,7 +283,7 @@ func testAttributeSProcessEventWithAccountFull(t *testing.T) {
 	}
 	var replyAttr *engine.AttributeProfile
 	if err := attrRPC.Call(utils.APIerSv1GetAttributeProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_ACCOUNT2"}}, &replyAttr); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_ACCOUNT2"}}, &replyAttr); err != nil {
 		t.Fatal(err)
 	}
 	replyAttr.Compile()
@@ -414,7 +414,7 @@ func testAttributeSProcessEventWithStat(t *testing.T) {
 	}
 	var replyAttr *engine.AttributeProfile
 	if err := attrRPC.Call(utils.APIerSv1GetAttributeProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_STATS"}}, &replyAttr); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_STATS"}}, &replyAttr); err != nil {
 		t.Fatal(err)
 	}
 	replyAttr.Compile()
@@ -497,7 +497,7 @@ func testAttributeSProcessEventWithStatFull(t *testing.T) {
 	}
 	var replyAttr *engine.AttributeProfile
 	if err := attrRPC.Call(utils.APIerSv1GetAttributeProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_STATS2"}}, &replyAttr); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_STATS2"}}, &replyAttr); err != nil {
 		t.Fatal(err)
 	}
 	replyAttr.Compile()
@@ -642,7 +642,7 @@ func testAttributeSProcessEventWithResource(t *testing.T) {
 	}
 	var replyAttr *engine.AttributeProfile
 	if err := attrRPC.Call(utils.APIerSv1GetAttributeProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_RESOURCE"}}, &replyAttr); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_RESOURCE"}}, &replyAttr); err != nil {
 		t.Fatal(err)
 	}
 	replyAttr.Compile()
@@ -725,7 +725,7 @@ func testAttributeSProcessEventWithResourceFull(t *testing.T) {
 	}
 	var replyAttr *engine.AttributeProfile
 	if err := attrRPC.Call(utils.APIerSv1GetAttributeProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_RESOURCE2"}}, &replyAttr); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_RESOURCE2"}}, &replyAttr); err != nil {
 		t.Fatal(err)
 	}
 	replyAttr.Compile()
@@ -816,7 +816,7 @@ func testAttributeSProcessEventWithLibPhoneNumber(t *testing.T) {
 	}
 	var replyAttr *engine.AttributeProfile
 	if err := attrRPC.Call(utils.APIerSv1GetAttributeProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_LIBPHONENUMBER2"}}, &replyAttr); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_LIBPHONENUMBER2"}}, &replyAttr); err != nil {
 		t.Fatal(err)
 	}
 	replyAttr.Compile()
@@ -918,7 +918,7 @@ func testAttributeSProcessEventWithLibPhoneNumberComposed(t *testing.T) {
 	}
 	var replyAttr *engine.AttributeProfile
 	if err := attrRPC.Call(utils.APIerSv1GetAttributeProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_LIBPHONENUMBER_COMPOSED"}}, &replyAttr); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_LIBPHONENUMBER_COMPOSED"}}, &replyAttr); err != nil {
 		t.Fatal(err)
 	}
 	replyAttr.Compile()
@@ -1002,7 +1002,7 @@ func testAttributeSProcessEventWithLibPhoneNumberFull(t *testing.T) {
 	}
 	var replyAttr *engine.AttributeProfile
 	if err := attrRPC.Call(utils.APIerSv1GetAttributeProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_LIBPHONENUMBER"}}, &replyAttr); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_LIBPHONENUMBER"}}, &replyAttr); err != nil {
 		t.Fatal(err)
 	}
 	replyAttr.Compile()
diff --git a/general_tests/auth_test.go b/general_tests/auth_test.go
index bb8593ad4..502dcf023 100644
--- a/general_tests/auth_test.go
+++ b/general_tests/auth_test.go
@@ -133,7 +133,7 @@ func TestAuthPostpaidNoAcnt(t *testing.T) {
 		t.Error(err)
 	}
 	var maxSessionTime time.Duration
-	if err := rsponder.GetMaxSessionTime(&engine.CallDescriptorWithOpts{CallDescriptor: cd}, &maxSessionTime); err != utils.ErrAccountNotFound {
+	if err := rsponder.GetMaxSessionTime(&engine.CallDescriptorWithAPIOpts{CallDescriptor: cd}, &maxSessionTime); err != utils.ErrAccountNotFound {
 		t.Error(err)
 	}
 }
@@ -148,7 +148,7 @@ func TestAuthPostpaidFallbackDest(t *testing.T) {
 		t.Error(err)
 	}
 	var maxSessionTime time.Duration
-	if err = rsponder.GetMaxSessionTime(&engine.CallDescriptorWithOpts{CallDescriptor: cd}, &maxSessionTime); err != nil {
+	if err = rsponder.GetMaxSessionTime(&engine.CallDescriptorWithAPIOpts{CallDescriptor: cd}, &maxSessionTime); err != nil {
 		t.Error(err)
 	} else if maxSessionTime != 0 {
 		t.Error("Unexpected maxSessionTime received: ", maxSessionTime)
@@ -165,7 +165,7 @@ func TestAuthPostpaidWithDestination(t *testing.T) {
 		t.Error(err)
 	}
 	var maxSessionTime time.Duration
-	if err := rsponder.GetMaxSessionTime(&engine.CallDescriptorWithOpts{CallDescriptor: cd}, &maxSessionTime); err != nil {
+	if err := rsponder.GetMaxSessionTime(&engine.CallDescriptorWithAPIOpts{CallDescriptor: cd}, &maxSessionTime); err != nil {
 		t.Error(err)
 	} else if maxSessionTime != 0 {
 		t.Error("Unexpected maxSessionTime received: ", maxSessionTime)
diff --git a/general_tests/cdrs_it_test.go b/general_tests/cdrs_it_test.go
index f0c2af7f9..44b9d69ed 100644
--- a/general_tests/cdrs_it_test.go
+++ b/general_tests/cdrs_it_test.go
@@ -588,7 +588,7 @@ func testV2CDRsGetStats1(t *testing.T) {
 		utils.MetaSum + utils.HashtagSep + utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Usage: utils.NotAvailable,
 	}
 	if err := cdrsRpc.Call(utils.StatSv1GetQueueStringMetrics,
-		&utils.TenantIDWithOpts{
+		&utils.TenantIDWithAPIOpts{
 			TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: expectedIDs[0]},
 		}, &metrics); err != nil {
 		t.Error(err)
@@ -608,7 +608,7 @@ func testV2CDRsGetThreshold1(t *testing.T) {
 	}
 	var td engine.Threshold
 	if err := cdrsRpc.Call(utils.ThresholdSv1GetThreshold,
-		&utils.TenantIDWithOpts{
+		&utils.TenantIDWithAPIOpts{
 			TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "THD_PoccessCDR"},
 		}, &td); err != nil {
 		t.Error(err)
@@ -654,7 +654,7 @@ func testV2CDRsGetStats2(t *testing.T) {
 		utils.MetaSum + utils.HashtagSep + utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Usage: "120000000000",
 	}
 	if err := cdrsRpc.Call(utils.StatSv1GetQueueStringMetrics,
-		&utils.TenantIDWithOpts{
+		&utils.TenantIDWithAPIOpts{
 			TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: expectedIDs[0]},
 		}, &metrics); err != nil {
 		t.Error(err)
@@ -666,7 +666,7 @@ func testV2CDRsGetStats2(t *testing.T) {
 func testV2CDRsGetThreshold2(t *testing.T) {
 	var td engine.Threshold
 	if err := cdrsRpc.Call(utils.ThresholdSv1GetThreshold,
-		&utils.TenantIDWithOpts{
+		&utils.TenantIDWithAPIOpts{
 			TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "THD_PoccessCDR"},
 		}, &td); err != nil {
 		t.Error(err)
diff --git a/general_tests/cdrs_processevent_it_test.go b/general_tests/cdrs_processevent_it_test.go
index 1d48179c4..85503627e 100644
--- a/general_tests/cdrs_processevent_it_test.go
+++ b/general_tests/cdrs_processevent_it_test.go
@@ -194,7 +194,7 @@ func testV1CDRsProcessEventAttrS(t *testing.T) {
 		t.Error("Unexpected reply returned", result)
 	}
 	var replyAt *engine.AttributeProfile
-	if err := pecdrsRpc.Call(utils.APIerSv1GetAttributeProfile, &utils.TenantIDWithOpts{
+	if err := pecdrsRpc.Call(utils.APIerSv1GetAttributeProfile, &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ApierTest"}}, &replyAt); err != nil {
 		t.Fatal(err)
 	}
@@ -392,7 +392,7 @@ func testV1CDRsProcessEventSts(t *testing.T) {
 	}
 
 	if err := pecdrsRpc.Call(utils.StatSv1GetQueueStringMetrics,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Stat_1"}}, &metrics); err != nil {
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Stat_1"}}, &metrics); err != nil {
 		t.Error(err)
 	}
 	if !reflect.DeepEqual(statMetrics, metrics) {
@@ -527,7 +527,7 @@ func testV1CDRsProcessEventThreshold(t *testing.T) {
 	}
 	var td engine.Threshold
 	if err := pecdrsRpc.Call(utils.ThresholdSv1GetThreshold,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "THD_Test"}}, &td); err != nil {
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "THD_Test"}}, &td); err != nil {
 		t.Error(err)
 	} else if td.Hits != 1 {
 		t.Errorf("Expecting threshold to be hit once received: %v", td.Hits)
diff --git a/general_tests/export_it_test.go b/general_tests/export_it_test.go
index c44454359..7c6bd1c12 100644
--- a/general_tests/export_it_test.go
+++ b/general_tests/export_it_test.go
@@ -170,7 +170,7 @@ func testExpVerifyAttributes(t *testing.T) {
 	}
 	var reply *engine.AttributeProfile
 	if err := expRpc.Call(utils.APIerSv1GetAttributeProfile,
-		utils.TenantIDWithOpts{
+		utils.TenantIDWithAPIOpts{
 			TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_ACNT_1001"}}, &reply); err != nil {
 		t.Fatal(err)
 	}
@@ -415,7 +415,7 @@ func testExpVerifyRateProfiles(t *testing.T) {
 	if *encoding == utils.MetaGOB {
 		splPrf.FilterIDs = nil
 	}
-	if err := expRpc.Call(utils.APIerSv1GetRateProfile, &utils.TenantIDWithOpts{
+	if err := expRpc.Call(utils.APIerSv1GetRateProfile, &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "RT_SPECIAL_1002"}}, &reply); err != nil {
 		t.Fatal(err)
 	}
@@ -501,7 +501,7 @@ func testExpVerifyActionProfiles(t *testing.T) {
 			act.FilterIDs = nil
 		}
 	}
-	if err := expRpc.Call(utils.APIerSv1GetActionProfile, &utils.TenantIDWithOpts{
+	if err := expRpc.Call(utils.APIerSv1GetActionProfile, &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ONE_TIME_ACT"}}, &reply); err != nil {
 		t.Fatal(err)
 	} else if !reflect.DeepEqual(actPrf, reply) {
@@ -556,7 +556,7 @@ func testExpVerifyAccountProfiles(t *testing.T) {
 	sort.Strings(acctPrf.Balances["MonetaryBalance"].CostIncrements[0].FilterIDs)
 	sort.Strings(acctPrf.Balances["MonetaryBalance"].UnitFactors[0].FilterIDs)
 	sort.Strings(acctPrf.Balances["MonetaryBalance"].AttributeIDs)
-	if err := expRpc.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithOpts{
+	if err := expRpc.Call(utils.APIerSv1GetAccountProfile, &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ACC_PRF_1"}}, &reply); err != nil {
 		t.Fatal(err)
 	} else {
diff --git a/general_tests/filtered_replication_it_test.go b/general_tests/filtered_replication_it_test.go
index 8bc86b783..2ca80ab6f 100644
--- a/general_tests/filtered_replication_it_test.go
+++ b/general_tests/filtered_replication_it_test.go
@@ -192,7 +192,7 @@ func testFltrRplAttributeProfile(t *testing.T) {
 		t.Error("Unexpected reply returned", result)
 	}
 	if err := fltrRplInternalRPC.Call(utils.APIerSv1GetAttributeProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: attrID}}, &replyPrfl); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: attrID}}, &replyPrfl); err != nil {
 		t.Fatal(err)
 	}
 	replyPrfl.Compile()
@@ -211,7 +211,7 @@ func testFltrRplAttributeProfile(t *testing.T) {
 	}
 
 	if err := fltrRplEngine1RPC.Call(utils.APIerSv1GetAttributeProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: attrID}}, &replyPrfl); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: attrID}}, &replyPrfl); err != nil {
 		t.Fatal(err)
 	}
 	replyPrfl.Compile()
@@ -226,7 +226,7 @@ func testFltrRplAttributeProfile(t *testing.T) {
 		t.Error("Unexpected reply returned", result)
 	}
 	if err := fltrRplInternalRPC.Call(utils.APIerSv1GetAttributeProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: attrID}}, &replyPrfl); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: attrID}}, &replyPrfl); err != nil {
 		t.Fatal(err)
 	}
 	replyPrfl.Compile()
@@ -237,7 +237,7 @@ func testFltrRplAttributeProfile(t *testing.T) {
 
 	// use replicator to see if the attribute was changed in the DB
 	if err := fltrRplEngine1RPC.Call(utils.ReplicatorSv1GetAttributeProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: attrID}}, &replyPrfl); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: attrID}}, &replyPrfl); err != nil {
 		t.Fatal(err)
 	}
 	replyPrfl.Compile()
@@ -251,7 +251,7 @@ func testFltrRplAttributeProfile(t *testing.T) {
 	}
 
 	if err := fltrRplInternalRPC.Call(utils.APIerSv1RemoveAttributeProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: attrID}}, &result); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: attrID}}, &result); err != nil {
 		t.Error(err)
 	} else if result != utils.OK {
 		t.Error("Unexpected reply returned", result)
@@ -344,7 +344,7 @@ func testFltrRplFilters(t *testing.T) {
 
 	// use replicator to see if the attribute was changed in the DB
 	if err := fltrRplEngine1RPC.Call(utils.ReplicatorSv1GetFilter,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: fltrID}}, &replyPrfl); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: fltrID}}, &replyPrfl); err != nil {
 		t.Fatal(err)
 	}
 	replyPrfl.Compile()
@@ -358,7 +358,7 @@ func testFltrRplFilters(t *testing.T) {
 	}
 
 	if err := fltrRplInternalRPC.Call(utils.APIerSv1RemoveFilter,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: fltrID}}, &result); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: fltrID}}, &result); err != nil {
 		t.Error(err)
 	} else if result != utils.OK {
 		t.Error("Unexpected reply returned", result)
@@ -393,7 +393,7 @@ func testFltrRplThresholdProfile(t *testing.T) {
 	var rplyIDs []string
 	var replyTh engine.Threshold
 
-	argsTh := &utils.TenantIDWithOpts{
+	argsTh := &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{
 			Tenant: "cgrates.org",
 			ID:     thID,
@@ -482,7 +482,7 @@ func testFltrRplThresholdProfile(t *testing.T) {
 
 	// use replicator to see if the attribute was changed in the DB
 	if err := fltrRplEngine1RPC.Call(utils.ReplicatorSv1GetThresholdProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: thID}}, &replyPrfl); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: thID}}, &replyPrfl); err != nil {
 		t.Fatal(err)
 	}
 	if !reflect.DeepEqual(thPrfl.ThresholdProfile, replyPrfl) {
@@ -521,7 +521,7 @@ func testFltrRplThresholdProfile(t *testing.T) {
 	}
 
 	if err := fltrRplInternalRPC.Call(utils.APIerSv1RemoveThresholdProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: thID}}, &result); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: thID}}, &result); err != nil {
 		t.Error(err)
 	} else if result != utils.OK {
 		t.Error("Unexpected reply returned", result)
@@ -577,7 +577,7 @@ func testFltrRplStatQueueProfile(t *testing.T) {
 	var rplyIDs []string
 	var replySq engine.StatQueue
 
-	argsSq := &utils.TenantIDWithOpts{
+	argsSq := &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{
 			Tenant: "cgrates.org",
 			ID:     stID,
@@ -671,7 +671,7 @@ func testFltrRplStatQueueProfile(t *testing.T) {
 
 	// use replicator to see if the attribute was changed in the DB
 	if err := fltrRplEngine1RPC.Call(utils.ReplicatorSv1GetStatQueueProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: stID}}, &replyPrfl); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: stID}}, &replyPrfl); err != nil {
 		t.Fatal(err)
 	}
 	if !reflect.DeepEqual(stPrf.StatQueueProfile, replyPrfl) {
@@ -714,7 +714,7 @@ func testFltrRplStatQueueProfile(t *testing.T) {
 	}
 
 	if err := fltrRplInternalRPC.Call(utils.APIerSv1RemoveStatQueueProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: stID}}, &result); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: stID}}, &result); err != nil {
 		t.Error(err)
 	} else if result != utils.OK {
 		t.Error("Unexpected reply returned", result)
@@ -763,7 +763,7 @@ func testFltrRplResourceProfile(t *testing.T) {
 	var rplyIDs []string
 	var replyRs engine.Resource
 
-	argsRs := &utils.TenantIDWithOpts{
+	argsRs := &utils.TenantIDWithAPIOpts{
 		TenantID: &utils.TenantID{
 			Tenant: "cgrates.org",
 			ID:     resID,
@@ -851,7 +851,7 @@ func testFltrRplResourceProfile(t *testing.T) {
 
 	// use replicator to see if the attribute was changed in the DB
 	if err := fltrRplEngine1RPC.Call(utils.ReplicatorSv1GetResourceProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: resID}}, &replyPrfl); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: resID}}, &replyPrfl); err != nil {
 		t.Fatal(err)
 	}
 	if !reflect.DeepEqual(resPrf.ResourceProfile, replyPrfl) {
@@ -899,7 +899,7 @@ func testFltrRplResourceProfile(t *testing.T) {
 	}
 
 	if err := fltrRplInternalRPC.Call(utils.APIerSv1RemoveResourceProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: resID}}, &result); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: resID}}, &result); err != nil {
 		t.Error(err)
 	} else if result != utils.OK {
 		t.Error("Unexpected reply returned", result)
@@ -1010,7 +1010,7 @@ func testFltrRplRouteProfile(t *testing.T) {
 
 	// use replicator to see if the attribute was changed in the DB
 	if err := fltrRplEngine1RPC.Call(utils.ReplicatorSv1GetRouteProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: rpID}}, &replyPrfl); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: rpID}}, &replyPrfl); err != nil {
 		t.Fatal(err)
 	}
 	replyPrfl.Compile()
@@ -1024,7 +1024,7 @@ func testFltrRplRouteProfile(t *testing.T) {
 	}
 
 	if err := fltrRplInternalRPC.Call(utils.APIerSv1RemoveRouteProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: rpID}}, &result); err != nil {
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: rpID}}, &result); err != nil {
 		t.Error(err)
 	} else if result != utils.OK {
 		t.Error("Unexpected reply returned", result)
@@ -1112,7 +1112,7 @@ func testFltrRplChargerProfile(t *testing.T) {
 
 	// use replicator to see if the attribute was changed in the DB
 	if err := fltrRplEngine1RPC.Call(utils.ReplicatorSv1GetChargerProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: chID}}, &replyPrfl); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: chID}}, &replyPrfl); err != nil {
 		t.Fatal(err)
 	}
 	if !reflect.DeepEqual(chPrf.ChargerProfile, replyPrfl) {
@@ -1125,7 +1125,7 @@ func testFltrRplChargerProfile(t *testing.T) {
 	}
 
 	if err := fltrRplInternalRPC.Call(utils.APIerSv1RemoveChargerProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: chID}}, &result); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: chID}}, &result); err != nil {
 		t.Error(err)
 	} else if result != utils.OK {
 		t.Error("Unexpected reply returned", result)
@@ -1212,7 +1212,7 @@ func testFltrRplDispatcherProfile(t *testing.T) {
 
 	// use replicator to see if the attribute was changed in the DB
 	if err := fltrRplEngine1RPC.Call(utils.ReplicatorSv1GetDispatcherProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: dspID}}, &replyPrfl); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: dspID}}, &replyPrfl); err != nil {
 		t.Fatal(err)
 	}
 	if !reflect.DeepEqual(dspPrf.DispatcherProfile, replyPrfl) {
@@ -1225,7 +1225,7 @@ func testFltrRplDispatcherProfile(t *testing.T) {
 	}
 
 	if err := fltrRplInternalRPC.Call(utils.APIerSv1RemoveDispatcherProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: dspID}}, &result); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: dspID}}, &result); err != nil {
 		t.Error(err)
 	} else if result != utils.OK {
 		t.Error("Unexpected reply returned", result)
@@ -1312,7 +1312,7 @@ func testFltrRplDispatcherHost(t *testing.T) {
 
 	// use replicator to see if the attribute was changed in the DB
 	if err := fltrRplEngine1RPC.Call(utils.ReplicatorSv1GetDispatcherHost,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: dspID}}, &replyPrfl); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: dspID}}, &replyPrfl); err != nil {
 		t.Fatal(err)
 	}
 	if !reflect.DeepEqual(dspPrf.DispatcherHost, replyPrfl) {
@@ -1325,7 +1325,7 @@ func testFltrRplDispatcherHost(t *testing.T) {
 	}
 
 	if err := fltrRplInternalRPC.Call(utils.APIerSv1RemoveDispatcherHost,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: dspID}}, &result); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: dspID}}, &result); err != nil {
 		t.Error(err)
 	} else if result != utils.OK {
 		t.Error("Unexpected reply returned", result)
@@ -1409,7 +1409,7 @@ func testFltrRplRateProfile(t *testing.T) {
 		t.Error("Unexpected reply returned", result)
 	}
 	if err := fltrRplInternalRPC.Call(utils.APIerSv1GetRateProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: rpID}}, &replyPrfl); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: rpID}}, &replyPrfl); err != nil {
 		t.Fatal(err)
 	}
 	if !reflect.DeepEqual(expPrf, replyPrfl) {
@@ -1427,7 +1427,7 @@ func testFltrRplRateProfile(t *testing.T) {
 	}
 
 	if err := fltrRplEngine1RPC.Call(utils.APIerSv1GetRateProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: rpID}}, &replyPrfl); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: rpID}}, &replyPrfl); err != nil {
 		t.Fatal(err)
 	}
 	if !reflect.DeepEqual(expPrf, replyPrfl) {
@@ -1442,7 +1442,7 @@ func testFltrRplRateProfile(t *testing.T) {
 		t.Error("Unexpected reply returned", result)
 	}
 	if err := fltrRplInternalRPC.Call(utils.APIerSv1GetRateProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: rpID}}, &replyPrfl); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: rpID}}, &replyPrfl); err != nil {
 		t.Fatal(err)
 	}
 	if !reflect.DeepEqual(expPrf, replyPrfl) {
@@ -1452,7 +1452,7 @@ func testFltrRplRateProfile(t *testing.T) {
 
 	// use replicator to see if the attribute was changed in the DB
 	if err := fltrRplEngine1RPC.Call(utils.ReplicatorSv1GetRateProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: rpID}}, &replyPrfl); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: rpID}}, &replyPrfl); err != nil {
 		t.Fatal(err)
 	}
 	if !reflect.DeepEqual(expPrf, replyPrfl) {
@@ -1465,7 +1465,7 @@ func testFltrRplRateProfile(t *testing.T) {
 	}
 
 	if err := fltrRplInternalRPC.Call(utils.APIerSv1RemoveRateProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: rpID}}, &result); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: rpID}}, &result); err != nil {
 		t.Error(err)
 	} else if result != utils.OK {
 		t.Error("Unexpected reply returned", result)
@@ -1514,7 +1514,7 @@ func testFltrRplActionProfile(t *testing.T) {
 		t.Error("Unexpected reply returned", result)
 	}
 	if err := fltrRplInternalRPC.Call(utils.APIerSv1GetActionProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: acID}}, &replyPrfl); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: acID}}, &replyPrfl); err != nil {
 		t.Fatal(err)
 	}
 	if !reflect.DeepEqual(acPrf.ActionProfile, replyPrfl) {
@@ -1532,7 +1532,7 @@ func testFltrRplActionProfile(t *testing.T) {
 	}
 
 	if err := fltrRplEngine1RPC.Call(utils.APIerSv1GetActionProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: acID}}, &replyPrfl); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: acID}}, &replyPrfl); err != nil {
 		t.Fatal(err)
 	}
 	if !reflect.DeepEqual(acPrf.ActionProfile, replyPrfl) {
@@ -1546,7 +1546,7 @@ func testFltrRplActionProfile(t *testing.T) {
 		t.Error("Unexpected reply returned", result)
 	}
 	if err := fltrRplInternalRPC.Call(utils.APIerSv1GetActionProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: acID}}, &replyPrfl); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: acID}}, &replyPrfl); err != nil {
 		t.Fatal(err)
 	}
 	if !reflect.DeepEqual(acPrf.ActionProfile, replyPrfl) {
@@ -1556,7 +1556,7 @@ func testFltrRplActionProfile(t *testing.T) {
 
 	// use replicator to see if the attribute was changed in the DB
 	if err := fltrRplEngine1RPC.Call(utils.ReplicatorSv1GetActionProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: acID}}, &replyPrfl); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: acID}}, &replyPrfl); err != nil {
 		t.Fatal(err)
 	}
 	if !reflect.DeepEqual(acPrf.ActionProfile, replyPrfl) {
@@ -1569,7 +1569,7 @@ func testFltrRplActionProfile(t *testing.T) {
 	}
 
 	if err := fltrRplInternalRPC.Call(utils.APIerSv1RemoveActionProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: acID}}, &result); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: acID}}, &result); err != nil {
 		t.Error(err)
 	} else if result != utils.OK {
 		t.Error("Unexpected reply returned", result)
@@ -1632,7 +1632,7 @@ func testFltrRplAccountProfile(t *testing.T) {
 		t.Error("Unexpected reply returned", result)
 	}
 	if err := fltrRplInternalRPC.Call(utils.APIerSv1GetAccountProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: acID}}, &replyPrfl); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: acID}}, &replyPrfl); err != nil {
 		t.Fatal(err)
 	}
 	if !reflect.DeepEqual(expPrf, replyPrfl) {
@@ -1650,7 +1650,7 @@ func testFltrRplAccountProfile(t *testing.T) {
 	}
 
 	if err := fltrRplEngine1RPC.Call(utils.APIerSv1GetAccountProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: acID}}, &replyPrfl); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: acID}}, &replyPrfl); err != nil {
 		t.Fatal(err)
 	}
 	if !reflect.DeepEqual(expPrf, replyPrfl) {
@@ -1667,7 +1667,7 @@ func testFltrRplAccountProfile(t *testing.T) {
 		t.Error("Unexpected reply returned", result)
 	}
 	if err := fltrRplInternalRPC.Call(utils.APIerSv1GetAccountProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: acID}}, &replyPrfl); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: acID}}, &replyPrfl); err != nil {
 		t.Fatal(err)
 	}
 	if !reflect.DeepEqual(expPrf, replyPrfl) {
@@ -1677,7 +1677,7 @@ func testFltrRplAccountProfile(t *testing.T) {
 
 	// use replicator to see if the attribute was changed in the DB
 	if err := fltrRplEngine1RPC.Call(utils.ReplicatorSv1GetAccountProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: acID}}, &replyPrfl); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: acID}}, &replyPrfl); err != nil {
 		t.Fatal(err)
 	}
 	if !reflect.DeepEqual(expPrf, replyPrfl) {
@@ -1690,7 +1690,7 @@ func testFltrRplAccountProfile(t *testing.T) {
 	}
 
 	if err := fltrRplInternalRPC.Call(utils.APIerSv1RemoveAccountProfile,
-		utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: acID}}, &result); err != nil {
+		utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: acID}}, &result); err != nil {
 		t.Error(err)
 	} else if result != utils.OK {
 		t.Error("Unexpected reply returned", result)
diff --git a/general_tests/filters_it_test.go b/general_tests/filters_it_test.go
index c9e37c5da..ab0b75c76 100644
--- a/general_tests/filters_it_test.go
+++ b/general_tests/filters_it_test.go
@@ -704,7 +704,7 @@ func testV1FltrPopulateResourcesAvailableUnits(t *testing.T) {
 func testV1FltrAccounts(t *testing.T) {
 	var resp string
 	if err := fltrRpc.Call(utils.APIerSv1RemoveThresholdProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "THD_ACNT_1001"}}, &resp); err != nil {
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "THD_ACNT_1001"}}, &resp); err != nil {
 		t.Error(err)
 	} else if resp != utils.OK {
 		t.Error("Unexpected reply returned", resp)
@@ -813,7 +813,7 @@ func testV1FltrAccounts(t *testing.T) {
 func testV1FltrAccountsExistsDynamicaly(t *testing.T) {
 	var resp string
 	if err := fltrRpc.Call(utils.APIerSv1RemoveThresholdProfile,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "TH_Account"}}, &resp); err != nil {
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "TH_Account"}}, &resp); err != nil {
 		if err.Error() != utils.ErrNotFound.Error() { // no error if the threshold is already removed
 			t.Error(err)
 		}
diff --git a/general_tests/route_it_test.go b/general_tests/route_it_test.go
index c9e51ff6d..63a993530 100644
--- a/general_tests/route_it_test.go
+++ b/general_tests/route_it_test.go
@@ -592,7 +592,7 @@ func testV1SplSPopulateStats(t *testing.T) {
 		utils.MetaSum + utils.HashtagSep + utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + "LoadReq": "2",
 	}
 	if err := splSv1Rpc.Call(utils.StatSv1GetQueueStringMetrics,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Stat_Supplier1"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Stat_Supplier1"}},
 		&metrics); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(expectedMetrics, metrics) {
@@ -634,7 +634,7 @@ func testV1SplSPopulateStats(t *testing.T) {
 	}
 
 	if err := splSv1Rpc.Call(utils.StatSv1GetQueueStringMetrics,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Stat_Supplier2"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Stat_Supplier2"}},
 		&metrics); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(expectedMetrics, metrics) {
@@ -697,7 +697,7 @@ func testV1SplSPopulateStats(t *testing.T) {
 	}
 
 	if err := splSv1Rpc.Call(utils.StatSv1GetQueueStringMetrics,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Stat_Supplier3"}},
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Stat_Supplier3"}},
 		&metrics); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(expectedMetrics, metrics) {
diff --git a/general_tests/rpccaching_it_test.go b/general_tests/rpccaching_it_test.go
index d738fb5de..574fa7343 100644
--- a/general_tests/rpccaching_it_test.go
+++ b/general_tests/rpccaching_it_test.go
@@ -827,7 +827,7 @@ func testRPCMethodsLoadData(t *testing.T) {
 
 func testRPCMethodsResponderDebit(t *testing.T) {
 	tStart := time.Date(2016, 3, 31, 0, 0, 0, 0, time.UTC)
-	cd := &engine.CallDescriptorWithOpts{
+	cd := &engine.CallDescriptorWithAPIOpts{
 		CallDescriptor: &engine.CallDescriptor{
 			CgrID:         "testRPCMethodsResponderDebit",
 			Category:      "call",
@@ -850,7 +850,7 @@ func testRPCMethodsResponderDebit(t *testing.T) {
 		t.Errorf("Expecting: %+v, \n received: %+v",
 			15, cc.Cost)
 	}
-	cd2 := &engine.CallDescriptorWithOpts{
+	cd2 := &engine.CallDescriptorWithAPIOpts{
 		CallDescriptor: &engine.CallDescriptor{
 			CgrID: "testRPCMethodsResponderDebit",
 		},
@@ -872,7 +872,7 @@ func testRPCMethodsResponderDebit(t *testing.T) {
 
 func testRPCMethodsResponderMaxDebit(t *testing.T) {
 	tStart := time.Date(2016, 3, 31, 0, 0, 0, 0, time.UTC)
-	cd := &engine.CallDescriptorWithOpts{
+	cd := &engine.CallDescriptorWithAPIOpts{
 		CallDescriptor: &engine.CallDescriptor{
 			CgrID:         "testRPCMethodsResponderMaxDebit",
 			Category:      "call",
@@ -896,7 +896,7 @@ func testRPCMethodsResponderMaxDebit(t *testing.T) {
 		t.Errorf("Expecting: %+v, \n received: %+v",
 			0, cc.Cost)
 	}
-	cd2 := &engine.CallDescriptorWithOpts{
+	cd2 := &engine.CallDescriptorWithAPIOpts{
 		CallDescriptor: &engine.CallDescriptor{
 			CgrID: "testRPCMethodsResponderMaxDebit",
 		},
diff --git a/general_tests/session3_it_test.go b/general_tests/session3_it_test.go
index 4ad84c28f..076969cb2 100644
--- a/general_tests/session3_it_test.go
+++ b/general_tests/session3_it_test.go
@@ -205,7 +205,7 @@ func testSes3ItThreshold1002After(t *testing.T) {
 	var td engine.Threshold
 	eTd := engine.Threshold{Tenant: "cgrates.org", ID: "THD_ACNT_1001", Hits: 1}
 	if err := ses3RPC.Call(utils.ThresholdSv1GetThreshold,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "THD_ACNT_1001"}}, &td); err != nil {
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "THD_ACNT_1001"}}, &td); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(eTd.Tenant, td.Tenant) {
 		t.Errorf("expecting: %+v, received: %+v", eTd.Tenant, td.Tenant)
@@ -225,7 +225,7 @@ func testSes3ItStatMetricsAfter(t *testing.T) {
 	}
 
 	if err := ses3RPC.Call(utils.StatSv1GetQueueStringMetrics,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Stat_1"}}, &metrics); err != nil {
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Stat_1"}}, &metrics); err != nil {
 		t.Error(err)
 	}
 	if !reflect.DeepEqual(statMetrics, metrics) {
@@ -237,7 +237,7 @@ func testSes3ItThreshold1002After2(t *testing.T) {
 	var td engine.Threshold
 	eTd := engine.Threshold{Tenant: "cgrates.org", ID: "THD_ACNT_1001", Hits: 2}
 	if err := ses3RPC.Call(utils.ThresholdSv1GetThreshold,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "THD_ACNT_1001"}}, &td); err != nil {
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "THD_ACNT_1001"}}, &td); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(eTd.Tenant, td.Tenant) {
 		t.Errorf("expecting: %+v, received: %+v", eTd.Tenant, td.Tenant)
@@ -257,7 +257,7 @@ func testSes3ItStatMetricsAfter2(t *testing.T) {
 	}
 
 	if err := ses3RPC.Call(utils.StatSv1GetQueueStringMetrics,
-		&utils.TenantIDWithOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Stat_1"}}, &metrics); err != nil {
+		&utils.TenantIDWithAPIOpts{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "Stat_1"}}, &metrics); err != nil {
 		t.Error(err)
 	}
 	if !reflect.DeepEqual(statMetrics, metrics) {
diff --git a/general_tests/tp_it_test.go b/general_tests/tp_it_test.go
index 3418ed074..232cb0713 100644
--- a/general_tests/tp_it_test.go
+++ b/general_tests/tp_it_test.go
@@ -130,7 +130,7 @@ func testTpLoadTariffPlanFromFolder(t *testing.T) {
 
 func testTpBalanceCounter(t *testing.T) {
 	tStart := time.Date(2016, 3, 31, 0, 0, 0, 0, time.UTC)
-	cd := &engine.CallDescriptorWithOpts{
+	cd := &engine.CallDescriptorWithAPIOpts{
 		CallDescriptor: &engine.CallDescriptor{
 			Category:      "call",
 			Tenant:        "cgrates.org",
@@ -214,7 +214,7 @@ func testTpZeroCost(t *testing.T) {
 	}
 	balanceValueBefore := acnt.BalanceMap[utils.MetaMonetary][0].Value
 	tStart := time.Date(2016, 3, 31, 0, 0, 0, 0, time.UTC)
-	cd := &engine.CallDescriptorWithOpts{
+	cd := &engine.CallDescriptorWithAPIOpts{
 		CallDescriptor: &engine.CallDescriptor{
 			Category:      "call",
 			Tenant:        "cgrates.org",
@@ -241,7 +241,7 @@ func testTpZeroCost(t *testing.T) {
 
 func testTpZeroNegativeCost(t *testing.T) {
 	tStart := time.Date(2016, 3, 31, 0, 0, 0, 0, time.UTC)
-	cd := &engine.CallDescriptorWithOpts{
+	cd := &engine.CallDescriptorWithAPIOpts{
 		CallDescriptor: &engine.CallDescriptor{
 			Category:      "call",
 			Tenant:        "cgrates.org",
diff --git a/loaders/loader_it_test.go b/loaders/loader_it_test.go
index aa00ce5fc..8624d4526 100644
--- a/loaders/loader_it_test.go
+++ b/loaders/loader_it_test.go
@@ -218,7 +218,7 @@ func testLoaderCheckAttributes(t *testing.T) {
 	}
 	var reply *engine.AttributeProfile
 	if err := loaderRPC.Call(utils.APIerSv1GetAttributeProfile,
-		&utils.TenantIDWithOpts{
+		&utils.TenantIDWithAPIOpts{
 			TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ALS1"},
 		}, &reply); err != nil {
 		t.Fatal(err)
@@ -396,7 +396,7 @@ func testLoaderCheckForCustomSep(t *testing.T) {
 	}
 	var reply *engine.AttributeProfile
 	if err := loaderRPC.Call(utils.APIerSv1GetAttributeProfile,
-		&utils.TenantIDWithOpts{
+		&utils.TenantIDWithAPIOpts{
 			TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_12012000001"},
 		}, &reply); err != nil {
 		t.Fatal(err)
diff --git a/sessions/sessions.go b/sessions/sessions.go
index ac1eb66ca..44e0349e9 100644
--- a/sessions/sessions.go
+++ b/sessions/sessions.go
@@ -451,9 +451,9 @@ func (sS *SessionS) debitSession(s *Session, sRunIdx int, dur time.Duration,
 	cc := new(engine.CallCost)
 	err = sS.connMgr.Call(sS.cgrCfg.SessionSCfg().RALsConns, nil,
 		utils.ResponderMaxDebit,
-		&engine.CallDescriptorWithOpts{
+		&engine.CallDescriptorWithAPIOpts{
 			CallDescriptor: cd,
-			Opts:           s.OptsStart,
+			APIOpts:        s.OptsStart,
 		}, cc)
 	if err != nil {
 		// verify in case of *dynaprepaid RequestType
@@ -471,9 +471,9 @@ func (sS *SessionS) debitSession(s *Session, sRunIdx int, dur time.Duration,
 			// execute again the MaxDebit operation
 			err = sS.connMgr.Call(sS.cgrCfg.SessionSCfg().RALsConns, nil,
 				utils.ResponderMaxDebit,
-				&engine.CallDescriptorWithOpts{
+				&engine.CallDescriptorWithAPIOpts{
 					CallDescriptor: cd,
-					Opts:           s.OptsStart,
+					APIOpts:        s.OptsStart,
 				}, cc)
 		}
 		if err != nil {
@@ -661,9 +661,9 @@ func (sS *SessionS) refundSession(s *Session, sRunIdx int, rUsage time.Duration)
 	}
 	var acnt engine.Account
 	if err = sS.connMgr.Call(sS.cgrCfg.SessionSCfg().RALsConns, nil, utils.ResponderRefundIncrements,
-		&engine.CallDescriptorWithOpts{
+		&engine.CallDescriptorWithAPIOpts{
 			CallDescriptor: cd,
-			Opts:           s.OptsStart,
+			APIOpts:        s.OptsStart,
 		}, &acnt); err != nil {
 		return
 	}
@@ -727,7 +727,7 @@ func (sS *SessionS) roundCost(s *Session, sRunIdx int) (err error) {
 		var response float64
 		if err = sS.connMgr.Call(sS.cgrCfg.SessionSCfg().RALsConns, nil,
 			utils.ResponderRefundRounding,
-			&engine.CallDescriptorWithOpts{CallDescriptor: cd},
+			&engine.CallDescriptorWithAPIOpts{CallDescriptor: cd},
 			&response); err != nil {
 			return
 		}
@@ -1441,9 +1441,9 @@ func (sS *SessionS) authEvent(cgrEv *utils.CGREvent, forceDuration bool) (usage
 			rplyMaxUsage = eventUsage
 		} else if err = sS.connMgr.Call(sS.cgrCfg.SessionSCfg().RALsConns, nil,
 			utils.ResponderGetMaxSessionTime,
-			&engine.CallDescriptorWithOpts{
+			&engine.CallDescriptorWithAPIOpts{
 				CallDescriptor: sr.CD,
-				Opts:           s.OptsStart,
+				APIOpts:        s.OptsStart,
 			}, &rplyMaxUsage); err != nil {
 			err = utils.NewErrRALs(err)
 			return
@@ -1567,9 +1567,9 @@ func (sS *SessionS) endSession(s *Session, tUsage, lastUsage *time.Duration,
 						sr.CD.DurationIndex += notCharged
 						cc := new(engine.CallCost)
 						if err = sS.connMgr.Call(sS.cgrCfg.SessionSCfg().RALsConns, nil, utils.ResponderDebit,
-							&engine.CallDescriptorWithOpts{
+							&engine.CallDescriptorWithAPIOpts{
 								CallDescriptor: sr.CD,
-								Opts:           s.OptsStart,
+								APIOpts:        s.OptsStart,
 							}, cc); err == nil {
 							sr.EventCost.Merge(
 								engine.NewEventCostFromCallCost(cc, s.CGRID,
@@ -3378,9 +3378,9 @@ func (sS *SessionS) BiRPCv1ProcessEvent(clnt rpcclient.ClientConnector,
 					var cc engine.CallCost
 					if err = sS.connMgr.Call(sS.cgrCfg.SessionSCfg().RALsConns, nil,
 						utils.ResponderGetCost,
-						&engine.CallDescriptorWithOpts{
+						&engine.CallDescriptorWithAPIOpts{
 							CallDescriptor: cd,
-							Opts:           cgrEv.Opts,
+							APIOpts:        cgrEv.Opts,
 						}, &cc); err != nil {
 						return err
 					}
@@ -3584,9 +3584,9 @@ func (sS *SessionS) BiRPCv1GetCost(clnt rpcclient.ClientConnector,
 	var cc engine.CallCost
 	if err = sS.connMgr.Call(sS.cgrCfg.SessionSCfg().RALsConns, nil,
 		utils.ResponderGetCost,
-		&engine.CallDescriptorWithOpts{
+		&engine.CallDescriptorWithAPIOpts{
 			CallDescriptor: cd,
-			Opts:           args.Opts,
+			APIOpts:        args.Opts,
 		}, &cc); err != nil {
 		return
 	}
diff --git a/sessions/sessions_data_it_test.go b/sessions/sessions_data_it_test.go
index 97a83944c..bd4249024 100644
--- a/sessions/sessions_data_it_test.go
+++ b/sessions/sessions_data_it_test.go
@@ -145,7 +145,7 @@ func testSessionsDataLastUsedData(t *testing.T) {
 	}
 	var cc engine.CallCost
 	// Make sure the cost is what we expect to be for 1MB of data
-	if err := sDataRPC.Call(utils.ResponderGetCost, &engine.CallDescriptorWithOpts{CallDescriptor: &cd}, &cc); err != nil {
+	if err := sDataRPC.Call(utils.ResponderGetCost, &engine.CallDescriptorWithAPIOpts{CallDescriptor: &cd}, &cc); err != nil {
 		t.Error("Got error on Responder.GetCost: ", err.Error())
 	} else if cc.Cost != 1024 {
 		t.Errorf("Calling Responder.GetCost got callcost: %v", cc.Cost)
diff --git a/sessions/sessionscover_test.go b/sessions/sessionscover_test.go
index 2d10818c6..f96b67e11 100644
--- a/sessions/sessionscover_test.go
+++ b/sessions/sessionscover_test.go
@@ -1080,7 +1080,7 @@ func TestRefundSession(t *testing.T) {
 	testMock1 := &testMockClients{
 		calls: map[string]func(args interface{}, reply interface{}) error{
 			utils.ResponderRefundIncrements: func(args interface{}, reply interface{}) error {
-				if args.(*engine.CallDescriptorWithOpts).Opts != nil {
+				if args.(*engine.CallDescriptorWithAPIOpts).APIOpts != nil {
 					return utils.ErrNotImplemented
 				}
 				acnt := &engine.Account{
@@ -1802,7 +1802,7 @@ func TestAuthEventMockCall(t *testing.T) {
 	sTestMock := &testMockClients{
 		calls: map[string]func(args interface{}, reply interface{}) error{
 			utils.ResponderGetMaxSessionTime: func(args interface{}, reply interface{}) error {
-				usage := args.(*engine.CallDescriptorWithOpts).Opts[utils.Usage]
+				usage := args.(*engine.CallDescriptorWithAPIOpts).APIOpts[utils.Usage]
 				if usage != 10 {
 					return utils.ErrNoMoreData
 				}
@@ -4034,7 +4034,7 @@ func TestBiRPCv1ProcessEventRals1(t *testing.T) {
 				return nil
 			},
 			utils.ResponderGetCost: func(args interface{}, reply interface{}) error {
-				if args.(*engine.CallDescriptorWithOpts).Tenant == "CHANGED_ID" {
+				if args.(*engine.CallDescriptorWithAPIOpts).Tenant == "CHANGED_ID" {
 					return nil
 				}
 				return utils.ErrNotImplemented
diff --git a/utils/coreutils.go b/utils/coreutils.go
index ae03d6a21..fcb0236af 100644
--- a/utils/coreutils.go
+++ b/utils/coreutils.go
@@ -750,16 +750,16 @@ type TenantID struct {
 	ID     string
 }
 
-type TenantIDWithOpts struct {
+type TenantIDWithAPIOpts struct {
 	*TenantID
-	Opts map[string]interface{}
+	APIOpts map[string]interface{}
 }
 
 func (tID *TenantID) TenantID() string {
 	return ConcatenatedKey(tID.Tenant, tID.ID)
 }
 
-func (tID *TenantIDWithOpts) TenantIDConcatenated() string {
+func (tID *TenantIDWithAPIOpts) TenantIDConcatenated() string {
 	return ConcatenatedKey(tID.Tenant, tID.ID)
 }
 
diff --git a/utils/coreutils_test.go b/utils/coreutils_test.go
index c1a87bc34..078f18cd2 100644
--- a/utils/coreutils_test.go
+++ b/utils/coreutils_test.go
@@ -1258,12 +1258,12 @@ func TestTenantID(t *testing.T) {
 }
 
 func TestTenantIDWithCache(t *testing.T) {
-	tID := &TenantIDWithOpts{TenantID: &TenantID{Tenant: EmptyString, ID: EmptyString}}
+	tID := &TenantIDWithAPIOpts{TenantID: &TenantID{Tenant: EmptyString, ID: EmptyString}}
 	eOut := ":"
 	if rcv := tID.TenantID.TenantID(); rcv != eOut {
 		t.Errorf("Expecting: %q, received: %q", eOut, rcv)
 	}
-	tID = &TenantIDWithOpts{TenantID: &TenantID{Tenant: "cgrates.org", ID: "id"}}
+	tID = &TenantIDWithAPIOpts{TenantID: &TenantID{Tenant: "cgrates.org", ID: "id"}}
 	eOut = "cgrates.org:id"
 	if rcv := tID.TenantID.TenantID(); rcv != eOut {
 		t.Errorf("Expecting: %q, received: %q", eOut, rcv)