Add n+1 optimizations