[task] refactored code for new MVS methods