Added sorted-list and class order