Refactored node enrichment