Added storage of keys and addresses.