MSINM-63 and MSINM-54: Started work on changed MSINM model and refactoring of legacy MSI import