updated mapper drill to flatten the structure