Updated mapper and extension data table