Added first Generics support