Add better MVC