Add additional properties, add test for Email.