Refactoring because of git-updater changes