Updated to work with PL subsystem master