Update to support NAT