Use optionals instead of an UNSET constant