Updating controller base to use new models