Renamed and added controller