Support for more network setting fields
A bit of editorial
Introduce more attribute types which better match what we need