REfactoring after version bumping