[pmc] Improved WB annotations - p*.pmc