Better version checking support