adds nil value support