Update to make the PU comparison more modular