Add support for and use the new nullability