Update mapping according to latest changes