Help to kill N+1 queries and unused eager loading
