Make class parameterized
Bump version