Version check refactored