Added validation for names