added support for date keys