Added authentication and friendly forwarding