Added Generics.