ADD: mapper is part of the core