Updated queries for streamlined data model.