Upgraded for v1.1.x of the PIM