Added support for NULL values