Enrich output
Fix