More date range directive work