PIM-3250 : re-work the PQB factory