Improved accounts_specs