Added type arguments to some generics