Changes for using this as a part of EC2 bootstrap