Updates from EJS identity
Updated to work with PL subsystem master