Added additional validators