Improve mp structure