streamcollector refactor
StreamComponentHelper refactor