@karlenigma Since address records are subrecords now, they should have their own id, maybe you can use that as a reference. If there is no Id, maybe you can use the address label. If I recall correctly, that is a mandatory field when entering addresses.