Handle nils safely; remove default experimental values