Improve Account class, although it's still work in progress