Added EC2 support for subscriber