added more validator annotations