* Added EmailAddress domain model mapping