Add component implementation

Tweak data streams