WIP: PM changes needed for scheduler (based on fe-metrics)