Version refactoring