Made email address optional