Changes to support MWP