Added Live Sorting support