NXP-16052: clean up exceptions
NXP-16200 Make the repository configurable
NXP-16200 Re-Add Constructor that is used by CMF Importer