Added date_generator