Add support for replacing IP