Enhance (pseudo) PeerService and its queue