Adapted data/order to new private generics syntax.