Includes designation to remove N+1 queries