Move order of model creation parameters, and tidied up the model inclusion logic