StreamComponent additional refactor