The existing registry should be replaced by a peer-to-peer registry including:
Moreover, the registry should be externalized to be able to change easily its implementation