Enable PM handling #50