Added authorization and friendly forwarding