Added city and address to export.