Remove alias for Model
Refactor Model
Fix finder capabilities