Closed #6 Added support for EBS