Simpler bundling of mapper template