Updated MVC to better reflect model