Small changes to Accounts and Agents