Use identity service for PL support
Changed to PL subsystem
Added exception handler