Update to support PMS_v2