Added tonumber conversions