Added support for Date object