Added date generation