Add support of EC2