Use internal ID instead of PID in broker registry
Use internal ID instead of PID in broker registry