More upgrades for PCL