Added support for enrichment queries