Generics capability added