Implementing PcSetManager and other small changes