Add missing generic type parameters
Merge pull request #2899 from federicobond/generics

Add missing generic type parameters