Updated IP address handling