[WIP] Add complex enrichments