These changes improve eager loading and reduce the amount of queries