Add Email validation, and make some validation optional