diff --git a/management/refactor/mesh/controller.go b/management/refactor/mesh/controller.go
index 751097ca1..5baf241a1 100644
--- a/management/refactor/mesh/controller.go
+++ b/management/refactor/mesh/controller.go
@@ -27,8 +27,8 @@ type DefaultController struct {
 
 func NewDefaultController() *DefaultController {
 	storeStore, _ := store.NewDefaultStore(store.SqliteStoreEngine, "", nil)
-	peersManager := peers.NewDefaultManager(storeStore, nil)
 	settingsManager := settings.NewDefaultManager(storeStore)
+	peersManager := peers.NewDefaultManager(storeStore, settingsManager)
 	usersManager := users.NewDefaultManager(storeStore, peersManager)
 	policiesManager := policies.NewDefaultManager(storeStore, peersManager)
 
@@ -60,7 +60,7 @@ func (c *DefaultController) LoginPeer(login peers.PeerLogin) {
 		}
 	}
 
-	account, err := pm.accountManager.GetAccount(peer.AccountID)
+	account, err := pm.accountManager.GetAccount(peer.GetAccountID())
 	if err != nil {
 		return nil, nil, err
 	}
@@ -117,8 +117,8 @@ func (c *DefaultController) GetPeerNetworkMap(peerID, dnsDomain string) *Network
 
 	aclPeers, firewallRules := c.policiesManager.GetAccessiblePeersAndFirewallRules(peerID)
 	// exclude expired peers
-	var peersToConnect []*peers.Peer
-	var expiredPeers []*peers.Peer
+	var peersToConnect []peers.Peer
+	var expiredPeers []peers.Peer
 	accSettings, _ := c.settingsManager.GetSettings(peer.GetAccountID())
 	for _, p := range aclPeers {
 		expired, _ := p.LoginExpired(accSettings.GetPeerLoginExpiration())
diff --git a/management/refactor/peers/manager.go b/management/refactor/peers/manager.go
index 2a641d122..5094a5181 100644
--- a/management/refactor/peers/manager.go
+++ b/management/refactor/peers/manager.go
@@ -12,11 +12,11 @@ type Manager interface {
 }
 
 type DefaultManager struct {
-	repository      repository
+	repository      Repository
 	settingsManager settings.Manager
 }
 
-func NewDefaultManager(repository repository, settingsManager settings.Manager) *DefaultManager {
+func NewDefaultManager(repository Repository, settingsManager settings.Manager) *DefaultManager {
 	return &DefaultManager{
 		repository:      repository,
 		settingsManager: settingsManager,
diff --git a/management/refactor/peers/repository.go b/management/refactor/peers/repository.go
index ac8d527f5..15dc9bf77 100644
--- a/management/refactor/peers/repository.go
+++ b/management/refactor/peers/repository.go
@@ -1,8 +1,8 @@
 package peers
 
-type repository interface {
-	FindPeerByPubKey(pubKey string) (*Peer, error)
-	FindPeerByID(id string) (*Peer, error)
-	FindAllPeersInAccount(id string) ([]*Peer, error)
+type Repository interface {
+	FindPeerByPubKey(pubKey string) (Peer, error)
+	FindPeerByID(id string) (Peer, error)
+	FindAllPeersInAccount(id string) ([]Peer, error)
 	UpdatePeer(peer Peer) error
 }
diff --git a/management/refactor/policies/repository.go b/management/refactor/policies/repository.go
index d244a84ad..b83855e6c 100644
--- a/management/refactor/policies/repository.go
+++ b/management/refactor/policies/repository.go
@@ -1,4 +1,4 @@
 package policies
 
-type repository interface {
+type Repository interface {
 }
diff --git a/management/refactor/settings/repository.go b/management/refactor/settings/repository.go
index 978eb435a..380ce6153 100644
--- a/management/refactor/settings/repository.go
+++ b/management/refactor/settings/repository.go
@@ -1,5 +1,5 @@
 package settings
 
-type repository interface {
+type Repository interface {
 	FindSettings(accountID string) (Settings, error)
 }
diff --git a/management/refactor/store/postgres_store.go b/management/refactor/store/postgres_store.go
index 78721e6eb..3234db818 100644
--- a/management/refactor/store/postgres_store.go
+++ b/management/refactor/store/postgres_store.go
@@ -12,22 +12,22 @@ const (
 type DefaultPostgresStore struct {
 }
 
-func (s *DefaultPostgresStore) FindSettings(accountID string) (*settings.Settings, error) {
+func (s *DefaultPostgresStore) FindSettings(accountID string) (settings.Settings, error) {
 	// TODO implement me
 	panic("implement me")
 }
 
-func (s *DefaultPostgresStore) FindPeerByPubKey(pubKey string) (*peers.Peer, error) {
+func (s *DefaultPostgresStore) FindPeerByPubKey(pubKey string) (peers.Peer, error) {
 	// TODO implement me
 	panic("implement me")
 }
 
-func (s *DefaultPostgresStore) FindPeerByID(id string) (*peers.Peer, error) {
+func (s *DefaultPostgresStore) FindPeerByID(id string) (peers.Peer, error) {
 	// TODO implement me
 	panic("implement me")
 }
 
-func (s *DefaultPostgresStore) FindAllPeersInAccount(id string) ([]*peers.Peer, error) {
+func (s *DefaultPostgresStore) FindAllPeersInAccount(id string) ([]peers.Peer, error) {
 	// TODO implement me
 	panic("implement me")
 }
diff --git a/management/refactor/store/sqlite_store.go b/management/refactor/store/sqlite_store.go
index 241090535..d54b2a538 100644
--- a/management/refactor/store/sqlite_store.go
+++ b/management/refactor/store/sqlite_store.go
@@ -31,22 +31,22 @@ type DefaultSqliteStore struct {
 	installationPK    int
 }
 
-func (s *DefaultSqliteStore) FindSettings(accountID string) (*settings.Settings, error) {
+func (s *DefaultSqliteStore) FindSettings(accountID string) (settings.Settings, error) {
 	// TODO implement me
 	panic("implement me")
 }
 
-func (s *DefaultSqliteStore) FindPeerByPubKey(pubKey string) (*peers.Peer, error) {
+func (s *DefaultSqliteStore) FindPeerByPubKey(pubKey string) (peers.Peer, error) {
 	// TODO implement me
 	panic("implement me")
 }
 
-func (s *DefaultSqliteStore) FindPeerByID(id string) (*peers.Peer, error) {
+func (s *DefaultSqliteStore) FindPeerByID(id string) (peers.Peer, error) {
 	// TODO implement me
 	panic("implement me")
 }
 
-func (s *DefaultSqliteStore) FindAllPeersInAccount(id string) ([]*peers.Peer, error) {
+func (s *DefaultSqliteStore) FindAllPeersInAccount(id string) ([]peers.Peer, error) {
 	// TODO implement me
 	panic("implement me")
 }
diff --git a/management/refactor/store/store.go b/management/refactor/store/store.go
index c7f10508e..747a326c6 100644
--- a/management/refactor/store/store.go
+++ b/management/refactor/store/store.go
@@ -14,18 +14,18 @@ import (
 
 type Store interface {
 	GetLicense() string
-	FindPeerByPubKey(pubKey string) (*peers.Peer, error)
-	FindPeerByID(id string) (*peers.Peer, error)
-	FindAllPeersInAccount(id string) ([]*peers.Peer, error)
+	FindPeerByPubKey(pubKey string) (peers.Peer, error)
+	FindPeerByID(id string) (peers.Peer, error)
+	FindAllPeersInAccount(id string) ([]peers.Peer, error)
 	UpdatePeer(peer peers.Peer) error
 	FindSettings(accountID string) (settings.Settings, error)
 }
 
 type DefaultStore interface {
 	GetLicense() string
-	FindPeerByPubKey(pubKey string) (*peers.Peer, error)
-	FindPeerByID(id string) (*peers.Peer, error)
-	FindAllPeersInAccount(id string) ([]*peers.Peer, error)
+	FindPeerByPubKey(pubKey string) (peers.Peer, error)
+	FindPeerByID(id string) (peers.Peer, error)
+	FindAllPeersInAccount(id string) ([]peers.Peer, error)
 	UpdatePeer(peer peers.Peer) error
 	FindSettings(accountID string) (settings.Settings, error)
 }
diff --git a/management/refactor/users/repository.go b/management/refactor/users/repository.go
index bb737d0c2..e535a7ccf 100644
--- a/management/refactor/users/repository.go
+++ b/management/refactor/users/repository.go
@@ -1,4 +1,4 @@
 package users
 
-type repository interface {
+type Repository interface {
 }