More enhancements to stream builder