Adapt pandata mapping