Improved 'Account' class