Added accountManager to manage accounts.
Merge conflicts