refactor to inject a store, name as the accountId and polishes
revert to accountId
Merge branch 'cvasilak-AGIOS.190.account' into AGIOS.190.account