Add support for date format