Added PM support