Re-added support for PBOs