Accounts refactoring 2