Generation of dates has been reworked