PVM refactoring