Add critical and realPv support