Adding support for public ip