Updated address format