Working on queries for the new schema.