Maybe validator should go to inventory bundle?