Added new views and models