Improved Numeric contracts