Added sort orders for assignments