Better MVC conformity