Added some additional validators