Add support for @ReplyTo
fix withStream