[WIP] Begin extraction of field enrichment

Prepare work on 'complex' enrichments.