Eager Loading, improve code for speed