Just move validation in the integration module