Thingworx import/export entities in particular order

Hello,

While importing 'AllEntities.twx' or 'AllEntities.xml'  on Thingworx composer, sometimes I get an error while importing, saying that a particular entity was not found.

As a practice I have tagged all my entities and while exporting I am using that tag to export all the entities.

So probable cause of failing during import, I assume, lies in the fact the order in which the entities are getting imported in a composer environment. I would give an example to better explain my assumption, say I have a "DataTable-A" entity which depends on "DataShape-A", and while importing AllEntities, somehow "DataTable-A" starts to import first, but since the relevant dependency of "DataShape-A" was missing, the import step failed.

So I would like to know, first, if my understanding or assumption is correct, and second, is there a way to prevent this?

One way I figured out was to export the entities individually and then importing them in the right order manually, like importing DataShapes and ThingShapes first, followed by Templates, then things and finally Mashups (just an example). But this becomes too cumbersome at both ends, while import as well as during export.

Any suggestions to overcome this would be appreciated.

Thanks

Aditya Mittal