Update XIDs and topology