Rename model locator to factory
rework it