Add methods to avoid N+1 queries for better performance
Change some production config