Made changes for Amazon EC2

Made changes for Amazon EC2