Added injection of a "mapper" (just a mocky-thing).