Moved distributor checks to Feature