Moving addAddresses and removeAddresses to AbstractAddressesModel