added support for date macros