Changed some generics