Refactored local PMC to be closer in structure to the original PMC.