Refactoring network information parsing for new API