Added volume_type support and tests