Continued to add Ec2 support