Add forwarding feature