Change AddIPAddress to take network.Address and subnet id
Remove unneeded IPAddressInfo