Enriched query language