Networkclient Refactoring