Modifications for EC2"