Replaced MPRest structure with local structure