Added support for BigDecimal and BigInteger

Also fixed support for byte and short primitive types