SMK-7: MVP refactoring