Remove unnecessary comparator, better ID to Snapshot