Added MVC group structure