Started work on porting the enrichments