#30 moved addAddresses to service