Add Datecompartor + IdComparator
Add Test in main