added pm support