Add support for timestamp and java.sql.Date