Refactor network assignment
Fix rmagick warnings
Include new fields