Add replyTo logic