Version checking refactored