Refactoring. Improving network issues management
Merging