Added NaN and Infinite