Renamed Manager to Controller