Added back in more removed validator functionality.