Add Friendly Forwarding and authorization checks