Changes to mondrian schema and queries