KH-203: Extracted DatesChangedHandler to its own file