Changes on Models and views