Updated date generation