Add support for dates