More additions to PMFramework