Use generics. Bump version number