diff --git a/apis/account.go b/apis/account.go
new file mode 100644
index 000000000..a820b58ca
--- /dev/null
+++ b/apis/account.go
@@ -0,0 +1,198 @@
+/*
+Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
+Copyright (C) ITsysCOM GmbH
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>
+*/
+
+package apis
+
+import (
+	"time"
+
+	"github.com/cgrates/birpc/context"
+	"github.com/cgrates/cgrates/accounts"
+	"github.com/cgrates/cgrates/utils"
+)
+
+// GetAccount returns an Account
+func (admS *AdminSv1) GetAccount(ctx *context.Context, arg *utils.TenantIDWithAPIOpts, reply *utils.Account) error {
+	if missing := utils.MissingStructFields(arg, []string{utils.ID}); len(missing) != 0 { //Params missing
+		return utils.NewErrMandatoryIeMissing(missing...)
+	}
+	tnt := arg.Tenant
+	if tnt == utils.EmptyString {
+		tnt = admS.cfg.GeneralCfg().DefaultTenant
+	}
+	ap, err := admS.dm.GetAccount(ctx, tnt, arg.ID)
+	if err != nil {
+		if err.Error() != utils.ErrNotFound.Error() {
+			err = utils.NewErrServerError(err)
+		}
+		return err
+	}
+	*reply = *ap
+	return nil
+}
+
+// GetAccountIDs returns list of action profile IDs registered for a tenant
+func (admS *AdminSv1) GetAccountIDs(ctx *context.Context, args *utils.PaginatorWithTenant, actPrfIDs *[]string) error {
+	tnt := args.Tenant
+	if tnt == utils.EmptyString {
+		tnt = admS.cfg.GeneralCfg().DefaultTenant
+	}
+	prfx := utils.AccountPrefix + tnt + utils.ConcatenatedKeySep
+	keys, err := admS.dm.DataDB().GetKeysForPrefix(ctx, prfx)
+	if err != nil {
+		return err
+	}
+	if len(keys) == 0 {
+		return utils.ErrNotFound
+	}
+	retIDs := make([]string, len(keys))
+	for i, key := range keys {
+		retIDs[i] = key[len(prfx):]
+	}
+	*actPrfIDs = args.PaginateStringSlice(retIDs)
+	return nil
+}
+
+// GetAccountIDsCount sets in reply var the total number of AccountIDs registered for a tenant
+// returns ErrNotFound in case of 0 AccountIDs
+func (admS *AdminSv1) GetAccountIDsCount(ctx *context.Context, args *utils.TenantWithAPIOpts, reply *int) (err error) {
+	tnt := args.Tenant
+	if tnt == utils.EmptyString {
+		tnt = admS.cfg.GeneralCfg().DefaultTenant
+	}
+	var keys []string
+	prfx := utils.AccountPrefix + tnt + utils.ConcatenatedKeySep
+	if keys, err = admS.dm.DataDB().GetKeysForPrefix(ctx, prfx); err != nil {
+		return err
+	}
+	if len(keys) == 0 {
+		return utils.ErrNotFound
+	}
+	*reply = len(keys)
+	return
+}
+
+type APIAccountWithAPIOpts struct {
+	*utils.APIAccount
+	APIOpts map[string]interface{}
+}
+
+//SetAccount add/update a new Account
+func (admS *AdminSv1) SetAccount(ctx *context.Context, extAp *APIAccountWithAPIOpts, reply *string) error {
+	if missing := utils.MissingStructFields(extAp.APIAccount, []string{utils.ID}); len(missing) != 0 {
+		return utils.NewErrMandatoryIeMissing(missing...)
+	}
+	if extAp.Tenant == utils.EmptyString {
+		extAp.Tenant = admS.cfg.GeneralCfg().DefaultTenant
+	}
+	ap, err := extAp.AsAccount()
+	if err != nil {
+		return err
+	}
+	if err := admS.dm.SetAccount(ctx, ap, true); err != nil {
+		return utils.APIErrorHandler(err)
+	}
+	//generate a loadID for CacheAccountProfiles and store it in database
+	if err := admS.dm.SetLoadIDs(ctx, map[string]int64{utils.CacheAccounts: time.Now().UnixNano()}); err != nil {
+		return utils.APIErrorHandler(err)
+	}
+	if err := admS.CallCache(ctx, utils.IfaceAsString(extAp.APIOpts[utils.CacheOpt]), ap.Tenant, utils.CacheAccounts,
+		ap.TenantID(), &ap.FilterIDs, nil, extAp.APIOpts); err != nil {
+		return utils.APIErrorHandler(err)
+	}
+	*reply = utils.OK
+	return nil
+}
+
+// RemoveAccount remove a specific Account
+func (admS *AdminSv1) RemoveAccount(ctx *context.Context, arg *utils.TenantIDWithAPIOpts, reply *string) error {
+	if missing := utils.MissingStructFields(arg, []string{utils.ID}); len(missing) != 0 { //Params missing
+		return utils.NewErrMandatoryIeMissing(missing...)
+	}
+	tnt := arg.Tenant
+	if tnt == utils.EmptyString {
+		tnt = admS.cfg.GeneralCfg().DefaultTenant
+	}
+	if err := admS.dm.RemoveAccount(ctx, tnt, arg.ID,
+		utils.NonTransactional, true); err != nil {
+		return utils.APIErrorHandler(err)
+	}
+	//generate a loadID for CacheAccountProfiles and store it in database
+	if err := admS.dm.SetLoadIDs(ctx, map[string]int64{utils.CacheAccounts: time.Now().UnixNano()}); err != nil {
+		return utils.APIErrorHandler(err)
+	}
+	if err := admS.CallCache(ctx, utils.IfaceAsString(arg.APIOpts[utils.CacheOpt]), tnt, utils.CacheAccounts,
+		utils.ConcatenatedKey(tnt, arg.ID), nil, nil, arg.APIOpts); err != nil {
+		return utils.APIErrorHandler(err)
+	}
+	*reply = utils.OK
+	return nil
+}
+
+// NewAccountSv1 initializes AccountSv1
+func NewAccountSv1(aS *accounts.AccountS) *AccountSv1 {
+	return &AccountSv1{aS: aS}
+}
+
+// AccountSv1 exports RPC from RLs
+type AccountSv1 struct {
+	aS *accounts.AccountS
+	ping
+}
+
+// AccountsForEvent returns the matching Account for Event
+func (aSv1 *AccountSv1) AccountsForEvent(ctx *context.Context, args *utils.ArgsAccountsForEvent,
+	aps *[]*utils.Account) (err error) {
+	return aSv1.aS.V1AccountsForEvent(ctx, args, aps)
+}
+
+// MaxAbstracts returns the maximum abstracts for the event, based on matching Account
+func (aSv1 *AccountSv1) MaxAbstracts(ctx *context.Context, args *utils.ArgsAccountsForEvent,
+	eEc *utils.ExtEventCharges) (err error) {
+	return aSv1.aS.V1MaxAbstracts(ctx, args, eEc)
+}
+
+// DebitAbstracts performs debit for the provided event
+func (aSv1 *AccountSv1) DebitAbstracts(ctx *context.Context, args *utils.ArgsAccountsForEvent,
+	eEc *utils.ExtEventCharges) (err error) {
+	return aSv1.aS.V1DebitAbstracts(ctx, args, eEc)
+}
+
+// MaxConcretes returns the maximum concretes for the event, based on the matching Account
+func (aSv1 *AccountSv1) MaxConcretes(ctx *context.Context, args *utils.ArgsAccountsForEvent,
+	eEc *utils.ExtEventCharges) (err error) {
+	return aSv1.aS.V1MaxConcretes(ctx, args, eEc)
+}
+
+// DebitConcretes performs debit of concrete units for the provided event
+func (aSv1 *AccountSv1) DebitConcretes(ctx *context.Context, args *utils.ArgsAccountsForEvent,
+	eEc *utils.ExtEventCharges) (err error) {
+	return aSv1.aS.V1DebitConcretes(ctx, args, eEc)
+}
+
+// ActionSetBalance performs a set balance action
+func (aSv1 *AccountSv1) ActionSetBalance(ctx *context.Context, args *utils.ArgsActSetBalance,
+	eEc *string) (err error) {
+	return aSv1.aS.V1ActionSetBalance(ctx, args, eEc)
+}
+
+// ActionRemoveBalance removes a blance from an account
+func (aSv1 *AccountSv1) ActionRemoveBalance(ctx *context.Context, args *utils.ArgsActRemoveBalances,
+	eEc *string) (err error) {
+	return aSv1.aS.V1ActionRemoveBalance(ctx, args, eEc)
+}
diff --git a/apis/actions.go b/apis/actions.go
index e794248bd..edf27c8c2 100644
--- a/apis/actions.go
+++ b/apis/actions.go
@@ -88,14 +88,6 @@ func (admS *AdminSv1) GetActionProfileIDsCount(ctx *context.Context, args *utils
 	return
 }
 
-/*
-type ActionProfileWithCache struct {
-	*engine.ActionProfileWithAPIOpts
-	Cache *string
-}
-
-*/
-
 //SetActionProfile add/update a new Action Profile
 func (admS *AdminSv1) SetActionProfile(ctx *context.Context, ap *engine.ActionProfileWithAPIOpts, reply *string) error {
 	if missing := utils.MissingStructFields(ap.ActionProfile, []string{utils.ID, utils.Actions}); len(missing) != 0 {
diff --git a/migrator/account_profiles.go b/migrator/accounts.go
similarity index 88%
rename from migrator/account_profiles.go
rename to migrator/accounts.go
index a697b0be7..a50b83dc9 100644
--- a/migrator/account_profiles.go
+++ b/migrator/accounts.go
@@ -39,17 +39,17 @@ func (m *Migrator) migrateCurrentAccounts() (err error) {
 		if len(tntID) < 2 {
 			return fmt.Errorf("Invalid key <%s> when migrating from account ", id)
 		}
-		ap, err := m.dmIN.DataManager().GetAccount(tntID[0], tntID[1])
+		ap, err := m.dmIN.DataManager().GetAccount(context.TODO(), tntID[0], tntID[1])
 		if err != nil {
 			return err
 		}
 		if ap == nil || m.dryRun {
 			continue
 		}
-		if err := m.dmOut.DataManager().SetAccount(ap, true); err != nil {
+		if err := m.dmOut.DataManager().SetAccount(context.TODO(), ap, true); err != nil {
 			return err
 		}
-		if err := m.dmIN.DataManager().RemoveAccount(tntID[0], tntID[1], utils.NonTransactional, false); err != nil {
+		if err := m.dmIN.DataManager().RemoveAccount(context.TODO(), tntID[0], tntID[1], utils.NonTransactional, false); err != nil {
 			return err
 		}
 		m.stats[utils.AccountsString]++