Added support for date object