Moved account functionality away from Stack