Update for new validation-page