Adjusted order of generic types