Sushi/changes for ec2 integration