Add functionality for friendly forwarding