Changes to schema, queries and dashboard