Updating AddressBuilder and corresponding spec