Update controllers due to refactor