Removed explicit .datepair class