Optimize API calls, don't request data we don't need