added fetching of addresses