Adding support for Date and Date-like objects