Add null coalescence in definitions