Agree.

I wanted to separate the 2 kinds of streams completely before, but in this improvement, UUID may make all the things simple!