Added some more validation functions