Add data state, refactor network name/type lookups