Optimized design of the PMC

Summary
Optimized design of the PMC. Related to Task T3.1 and T3.2.