Fix import plus allow batching flavors