Refactoring and solution for MPRT