updated mapper imports