World network: made some refactoring.