Should be done with the account queries.