Fix xml export/import;Update save method