Added public EC2 IP address support