Changes to mvc refactoring