add forwarder support