Added views and new models