Update validation functions, added email