improved Generics.