Revision of PMContext