Updated views and model