Fixed to support MWP metrics