Make more generic
Bump version