Updated, OrderedSarry supports generics