Improved MVC structure