Little changes in class hierarchy for correct MVC.