Migration and documentation pass

XML