Rely more on mapper