Converted to new address format