Adding Expand Addresses feature