Added support for dates