Change to Mapper

change to mapper