Add support for forwarder