Add generics
Bump version