Added proper MainController