Added sort order to class data