Refactoring: using repositories instead of queries and removed QueryFactory