Resolved some problems with the MVC model