Fixed mapping to new data well 2 PIDs in update functions