Added support for nil values