Modify PL driver to support the new 2.0 namespace