Added handling with a date.