some changes for populating address data