Updated address helper function

Updated address helper function