Add external id to tables.
Restore initial order of collections tables.