Adding support for Date type