Reworked how validator messages work