Updated version checking to be future proof