Better version checking