Bug 5617: OfOverlay refactoring - Source Mapper