Add missing generic type parameters

Ensures more type safety.