Reworked validation