Updated mappings, nested queries.