Added fixes on models and views