Update for PM 1.0 compatability

Provide compatibility with PM 1.0