Adding pm support