Changing the controller to ModelAndView