More generics

Forgot T in some places