Add Email constraint and Repeated type