MVC classes reworked