Started working on proper MVC support