Changed inner workings of conditional-stream-builder