Added fetching of contact addresses for references