Added support for enrichment queries, improved paramater building.