Reworking validation / submission to simplify maintenance