More controller refactor