Add some generics.