updated address to be key/value