Adding feature to pull address information