This should solve the issue with accounts model
update