Updated views and models