Merge "Adjust pm-mapper to accept new schema."