Added bundle_name option