Add ec2 support