Stabilize the validation architecture