Add some generics