Added validation for email and url format