refactor and modify some behaviors in Network part