New version of validator