Adding fuller functionality for accounts