Add support for NoneType