Changes for making possible to use EC2.