Replaced usage of _address with raw_address()