Missed some generics