Update to use Guava sorter