Add QA and CC support to PAP generator for #93 and #195