Error Creating Models From Directory

It seems to be currently impossible to easily upload all models from REC into an ADT resource instance while using the sample at https://github.com/Azure-Samples/digital-twins-samples/tree/master/AdtSampleApp/SampleClientApp.

First of all it seems impossible to upload everything at once due to data limits (which is fine). This is fixable by first uploading the role.json file and then every child directory of /Models/. However, this crashes on the directories /Capability, /Colletion and /Space (not sure why, the CLI says "Validated JSON for all files - now validating DTDL" but then it crashes with "Invalid command. Please type 'help' for more information".

I can then use the CreateModels command to create separate models from these directories, but it crashes when using the LoadModelsFromDirectory command.

Is there any way to overcome this, and if not; will it come in the future?