Updated views and some static data sources