StreamComponentHelper refactor