Added email validation