Refactor
Increase version