Resolve EDT redirection issue
Merge pull request #355 from rjc123/newmappings

Resolve EDT redirection issue