Added management of accounts