Changed the PM behavior and added more to config