[cleanup] Use methods Mapper::index/subIndex instead of deprecated Mapper::map