Added support for NULL