As was Suggested in a pull request. @BenFradet what is your suggestion? Should we follow some similar pattern like stream-enricher?