Add support for Date and BigDecimal