Sorting of ADTs, preSiteDb commit