Reworked validation.