Bug 5617: ExternalMapper refactoring