networker refactor changes