Optimize so no additional fetches are needed by user.