Add ec2 discovery support