#30 moved addAddress to service