Minor changes to the MVC structure