Changes for ec2 setup