Optimize data receiving

Got rid of some n+1 problems.