Changes to forwarding unit