Added in general purpose typed enrichments