Enhanced the mappers to make them always know who is the base mapper