Versions refactoring