Version check added