Update mapper to three levels of drilldown