Fix bug with find() which was using a scope
Refactoring relations