Include batch company check too