Add PM support