added support for Date