Added email and phone number validation