Network entity refactor