Added support for zero and null values