Added logic for event dates