Updated account tasks to work with new schema

RFC @burden — These are the changes we discussed last night that are necessary to get the Accounts tasks working with the latest schema.