Domain Object Refactor. See Email.