Add SetAddress and AddAddress