Add support for NULL