Refactored MVC classes