[PVP] Refactoring