Refactor: Change the way how account is treated
Add: Scopes for account.