diff --git a/packages/sdk/packages/map/src/types/NetworkLocationAnswerBase.ts b/packages/sdk/packages/map/src/types/NetworkLocationAnswerBase.ts
index 18a574bf49..53d26b65d2 100644
--- a/packages/sdk/packages/map/src/types/NetworkLocationAnswerBase.ts
+++ b/packages/sdk/packages/map/src/types/NetworkLocationAnswerBase.ts
@@ -7,24 +7,17 @@ export interface NetworkLocationAnswerBase<T> {
 
 export const NetworkLocationAnswerSchema = 'network.xyo.location.range.answer'
 export type NetworkLocationAnswerSchema = 'network.xyo.location.range.answer'
-export type NetworkLocationAnswerPayload = NetworkLocationAnswerBase<{ features: Feature<Point>[] }> &
-  Payload<{ schema: NetworkLocationAnswerSchema }>
+export type NetworkLocationAnswerPayload = Payload<NetworkLocationAnswerBase<{ features: Feature<Point>[] }>, NetworkLocationAnswerSchema>
 export const isNetworkLocationAnswer = isPayloadOfSchemaType<NetworkLocationAnswerPayload>(NetworkLocationAnswerSchema)
 
 export const NetworkLocationHeatmapAnswerSchema = 'network.xyo.location.heatmap.answer'
 export type NetworkLocationHeatmapAnswerSchema = 'network.xyo.location.heatmap.answer'
-export type NetworkLocationHeatmapAnswerPayload = Payload<{
-  schema: NetworkLocationHeatmapAnswerSchema & NetworkLocationAnswerBase<{ features: Feature<Polygon>[] }>
-}>
+export type NetworkLocationHeatmapAnswerPayload = Payload<NetworkLocationAnswerBase<{ features: Feature<Polygon>[]  }>, NetworkLocationHeatmapAnswerSchema>
 export const isNetworkLocationHeatmapAnswer = isPayloadOfSchemaType<NetworkLocationHeatmapAnswerPayload>(NetworkLocationHeatmapAnswerSchema)
 
 export const NetworkLocationHeatmapQuadkeyAnswerSchema = 'network.xyo.location.heatmap.quadkey.answer'
 export type NetworkLocationHeatmapQuadkeyAnswerSchema = 'network.xyo.location.heatmap.quadkey.answer'
-export type NetworkLocationHeatmapQuadkeyAnswerPayload = Payload<
-  {
-    schema: NetworkLocationHeatmapQuadkeyAnswerSchema
-  } & NetworkLocationAnswerBase<{ density: number; quadkey: string }[]>
->
+export type NetworkLocationHeatmapQuadkeyAnswerPayload = Payload<NetworkLocationAnswerBase<{ density: number; quadkey: string }[]>, NetworkLocationHeatmapQuadkeyAnswerSchema>
 export const isNetworkLocationHeatmapQuadkeyAnswer = isPayloadOfSchemaType<NetworkLocationHeatmapAnswerPayload>(
   NetworkLocationHeatmapQuadkeyAnswerSchema,
 )