Refactoring TempVer