Added BigInt/BigDecimal support