Added some missing generics