Refactor to allow loading of model files without model creation
merged