Updating Account controller to use new models