Refactors to use NetAddr