Base: Improve method for version checking