Added EBS Volume Type Support, and correct in-use EBS volume handling