Added NaN and null