Replaced deprecated controller class with the new one