diff --git a/src/index.tsx b/src/index.tsx
index 212297e..65808fe 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -2380,20 +2380,46 @@ export type GetShotsWithMetadataQuery = {
   };
 };
 
+export type ShotWithAllFeaturesFragment = {
+  __typename?: "ShotGQL";
+  id: number;
+  videoId: number;
+  startFrame: number;
+  endFrame: number;
+  falsePositiveScore?: number | null;
+  createdAt?: any | null;
+  updatedAt?: any | null;
+  user?: { __typename?: "UserGQL"; id: number } | null;
+  video?: {
+    __typename?: "VideoGQL";
+    id: number;
+    stream?: {
+      __typename?: "UploadStreamGQL";
+      resolution: {
+        __typename?: "VideoResolutionGQL";
+        width?: number | null;
+        height?: number | null;
+      };
+    } | null;
+  } | null;
+  cueObjectFeatures?: {
+    __typename?: "CueObjectFeaturesGQL";
+    cueObjectDistance?: number | null;
+    cueObjectAngle?: number | null;
+    cueBallSpeed?: number | null;
+    shotDirection?: ShotDirectionEnum | null;
+    spinType?: SpinTypeEnum | null;
+  } | null;
+  pocketingIntentionFeatures?: {
+    __typename?: "PocketingIntentionFeaturesGQL";
+    targetPocketDistance?: number | null;
+    make?: boolean | null;
+    intendedPocketType?: PocketEnum | null;
+  } | null;
+};
+
 export type GetShotsByIdsQueryVariables = Exact<{
   ids: Array<Scalars["Int"]["input"]> | Scalars["Int"]["input"];
-  includeCreatedAt?: Scalars["Boolean"]["input"];
-  includeUpdatedAt?: Scalars["Boolean"]["input"];
-  includeCueObjectFeatures?: Scalars["Boolean"]["input"];
-  includePocketingIntentionFeatures?: Scalars["Boolean"]["input"];
-  includeCueObjectDistance?: Scalars["Boolean"]["input"];
-  includeCueObjectAngle?: Scalars["Boolean"]["input"];
-  includeCueBallSpeed?: Scalars["Boolean"]["input"];
-  includeSpinType?: Scalars["Boolean"]["input"];
-  includeShotDirection?: Scalars["Boolean"]["input"];
-  includeTargetPocketDistance?: Scalars["Boolean"]["input"];
-  includeMake?: Scalars["Boolean"]["input"];
-  includeIntendedPocketType?: Scalars["Boolean"]["input"];
 }>;
 
 export type GetShotsByIdsQuery = {
@@ -2410,6 +2436,7 @@ export type GetShotsByIdsQuery = {
     user?: { __typename?: "UserGQL"; id: number } | null;
     video?: {
       __typename?: "VideoGQL";
+      id: number;
       stream?: {
         __typename?: "UploadStreamGQL";
         resolution: {
@@ -2979,6 +3006,41 @@ export type GetUploadStreamsWithDetailsQuery = {
   };
 };
 
+export const ShotWithAllFeaturesFragmentDoc = gql`
+  fragment ShotWithAllFeatures on ShotGQL {
+    id
+    videoId
+    startFrame
+    endFrame
+    falsePositiveScore
+    createdAt
+    updatedAt
+    user {
+      id
+    }
+    video {
+      id
+      stream {
+        resolution {
+          width
+          height
+        }
+      }
+    }
+    cueObjectFeatures {
+      cueObjectDistance
+      cueObjectAngle
+      cueBallSpeed
+      shotDirection
+      spinType
+    }
+    pocketingIntentionFeatures {
+      targetPocketDistance
+      make
+      intendedPocketType
+    }
+  }
+`;
 export const GetAggregatedShotMetricsDocument = gql`
   query GetAggregatedShotMetrics($aggregateInput: AggregateInputGQL!) {
     getAggregatedShotMetrics(aggregateInput: $aggregateInput) {
@@ -3752,55 +3814,12 @@ export type GetShotsWithMetadataQueryResult = Apollo.QueryResult<
   GetShotsWithMetadataQueryVariables
 >;
 export const GetShotsByIdsDocument = gql`
-  query GetShotsByIds(
-    $ids: [Int!]!
-    $includeCreatedAt: Boolean! = false
-    $includeUpdatedAt: Boolean! = false
-    $includeCueObjectFeatures: Boolean! = false
-    $includePocketingIntentionFeatures: Boolean! = false
-    $includeCueObjectDistance: Boolean! = false
-    $includeCueObjectAngle: Boolean! = false
-    $includeCueBallSpeed: Boolean! = false
-    $includeSpinType: Boolean! = false
-    $includeShotDirection: Boolean! = false
-    $includeTargetPocketDistance: Boolean! = false
-    $includeMake: Boolean! = false
-    $includeIntendedPocketType: Boolean! = false
-  ) {
+  query GetShotsByIds($ids: [Int!]!) {
     getShotsByIds(ids: $ids) {
-      id
-      videoId
-      startFrame
-      endFrame
-      user {
-        id
-      }
-      falsePositiveScore
-      video {
-        stream {
-          resolution {
-            width
-            height
-          }
-        }
-      }
-      createdAt @include(if: $includeCreatedAt)
-      updatedAt @include(if: $includeUpdatedAt)
-      cueObjectFeatures @include(if: $includeCueObjectFeatures) {
-        cueObjectDistance @include(if: $includeCueObjectDistance)
-        cueObjectAngle @include(if: $includeCueObjectAngle)
-        cueBallSpeed @include(if: $includeCueBallSpeed)
-        shotDirection @include(if: $includeShotDirection)
-        spinType @include(if: $includeSpinType)
-      }
-      pocketingIntentionFeatures
-        @include(if: $includePocketingIntentionFeatures) {
-        targetPocketDistance @include(if: $includeTargetPocketDistance)
-        make @include(if: $includeMake)
-        intendedPocketType @include(if: $includeIntendedPocketType)
-      }
+      ...ShotWithAllFeatures
     }
   }
+  ${ShotWithAllFeaturesFragmentDoc}
 `;
 
 /**
@@ -3816,18 +3835,6 @@ export const GetShotsByIdsDocument = gql`
  * const { data, loading, error } = useGetShotsByIdsQuery({
  *   variables: {
  *      ids: // value for 'ids'
- *      includeCreatedAt: // value for 'includeCreatedAt'
- *      includeUpdatedAt: // value for 'includeUpdatedAt'
- *      includeCueObjectFeatures: // value for 'includeCueObjectFeatures'
- *      includePocketingIntentionFeatures: // value for 'includePocketingIntentionFeatures'
- *      includeCueObjectDistance: // value for 'includeCueObjectDistance'
- *      includeCueObjectAngle: // value for 'includeCueObjectAngle'
- *      includeCueBallSpeed: // value for 'includeCueBallSpeed'
- *      includeSpinType: // value for 'includeSpinType'
- *      includeShotDirection: // value for 'includeShotDirection'
- *      includeTargetPocketDistance: // value for 'includeTargetPocketDistance'
- *      includeMake: // value for 'includeMake'
- *      includeIntendedPocketType: // value for 'includeIntendedPocketType'
  *   },
  * });
  */
diff --git a/src/operations/shots.gql b/src/operations/shots.gql
index 50b6773..c035ac7 100644
--- a/src/operations/shots.gql
+++ b/src/operations/shots.gql
@@ -140,52 +140,42 @@ query GetShotsWithMetadata(
   }
 }
 
-query GetShotsByIds(
-  $ids: [Int!]!
-  $includeCreatedAt: Boolean! = false
-  $includeUpdatedAt: Boolean! = false
-  $includeCueObjectFeatures: Boolean! = false
-  $includePocketingIntentionFeatures: Boolean! = false
-  $includeCueObjectDistance: Boolean! = false
-  $includeCueObjectAngle: Boolean! = false
-  $includeCueBallSpeed: Boolean! = false
-  $includeSpinType: Boolean! = false
-  $includeShotDirection: Boolean! = false
-  $includeTargetPocketDistance: Boolean! = false
-  $includeMake: Boolean! = false
-  $includeIntendedPocketType: Boolean! = false
-) {
-  getShotsByIds(ids: $ids) {
+fragment ShotWithAllFeatures on ShotGQL {
+  id
+  videoId
+  startFrame
+  endFrame
+  falsePositiveScore
+  createdAt
+  updatedAt
+  user {
     id
-    videoId
-    startFrame
-    endFrame
-    user {
-      id
-    }
-    falsePositiveScore
-    video {
-      stream {
-        resolution {
-          width
-          height
-        }
+  }
+  video {
+    id
+    stream {
+      resolution {
+        width
+        height
       }
     }
-    createdAt @include(if: $includeCreatedAt)
-    updatedAt @include(if: $includeUpdatedAt)
-    cueObjectFeatures @include(if: $includeCueObjectFeatures) {
-      cueObjectDistance @include(if: $includeCueObjectDistance)
-      cueObjectAngle @include(if: $includeCueObjectAngle)
-      cueBallSpeed @include(if: $includeCueBallSpeed)
-      shotDirection @include(if: $includeShotDirection)
-      spinType @include(if: $includeSpinType)
-    }
-    pocketingIntentionFeatures
-      @include(if: $includePocketingIntentionFeatures) {
-      targetPocketDistance @include(if: $includeTargetPocketDistance)
-      make @include(if: $includeMake)
-      intendedPocketType @include(if: $includeIntendedPocketType)
-    }
+  }
+  cueObjectFeatures {
+    cueObjectDistance
+    cueObjectAngle
+    cueBallSpeed
+    shotDirection
+    spinType
+  }
+  pocketingIntentionFeatures {
+    targetPocketDistance
+    make
+    intendedPocketType
+  }
+}
+
+query GetShotsByIds($ids: [Int!]!) {
+  getShotsByIds(ids: $ids) {
+    ...ShotWithAllFeatures
   }
 }