Change from factory to manual model instantiating to fix