Added switch for controlling PVP setting.