Add Support for Elastic IPs