Controller model refactor