Enrichment framework now saves Corelib Contextual Entities and loads
them directly