Changes due to SortLib refactoring