Agree that it makes sense to move this to the mapper.