The enrichment methods have been restructured to, hopefully, be faster by reducing redundant SQL calls.