added support for dates