Mapper adaptations