Added macro conversion.
Added support for different stream owner and requesting user.