Context enrichment now works incrementally when ordering components by depencies