Moving MPM generation to user's API