MFI-23 changed model definition
fixed model generation -> imports are now included.