Adding updated ip address handling