Refactored to EDI space.