diff --git a/go.mod b/go.mod
index 9b5aa1414..a069cd3a1 100644
--- a/go.mod
+++ b/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/matrix-org/go-http-js-libp2p v0.0.0-20200310180544-7f3fad43b51c
 	github.com/matrix-org/go-sqlite3-js v0.0.0-20200304164012-aa524245b658
 	github.com/matrix-org/gomatrix v0.0.0-20190528120928-7df988a63f26
-	github.com/matrix-org/gomatrixserverlib v0.0.0-20200316163031-36bb5f40ae9b
+	github.com/matrix-org/gomatrixserverlib v0.0.0-20200316173242-f66834855555
 	github.com/matrix-org/naffka v0.0.0-20200127221512-0716baaabaf1
 	github.com/matrix-org/util v0.0.0-20190711121626-527ce5ddefc7
 	github.com/mattn/go-sqlite3 v2.0.2+incompatible
diff --git a/go.sum b/go.sum
index 95d39e5b0..508be5d5b 100644
--- a/go.sum
+++ b/go.sum
@@ -144,6 +144,8 @@ github.com/matrix-org/gomatrixserverlib v0.0.0-20200316144058-cc6847798a3f h1:JX
 github.com/matrix-org/gomatrixserverlib v0.0.0-20200316144058-cc6847798a3f/go.mod h1:FsKa2pWE/bpQql9H7U4boOPXFoJX/QcqaZZ6ijLkaZI=
 github.com/matrix-org/gomatrixserverlib v0.0.0-20200316163031-36bb5f40ae9b h1:DdVa6Ledhi5dqwYMw8e9zG+kZmRlnWMgsYOxb3NaFOU=
 github.com/matrix-org/gomatrixserverlib v0.0.0-20200316163031-36bb5f40ae9b/go.mod h1:FsKa2pWE/bpQql9H7U4boOPXFoJX/QcqaZZ6ijLkaZI=
+github.com/matrix-org/gomatrixserverlib v0.0.0-20200316173242-f66834855555 h1:7M7QwpGbc5fJ6Uxn62ECsagekKkV36hjvnbaDQGJhls=
+github.com/matrix-org/gomatrixserverlib v0.0.0-20200316173242-f66834855555/go.mod h1:FsKa2pWE/bpQql9H7U4boOPXFoJX/QcqaZZ6ijLkaZI=
 github.com/matrix-org/naffka v0.0.0-20200127221512-0716baaabaf1 h1:osLoFdOy+ChQqVUn2PeTDETFftVkl4w9t/OW18g3lnk=
 github.com/matrix-org/naffka v0.0.0-20200127221512-0716baaabaf1/go.mod h1:cXoYQIENbdWIQHt1SyCo6Bl3C3raHwJ0wgVrXHSqf+A=
 github.com/matrix-org/util v0.0.0-20171127121716-2e2df66af2f5 h1:W7l5CP4V7wPyPb4tYE11dbmeAOwtFQBTW0rf4OonOS8=
diff --git a/roomserver/query/query.go b/roomserver/query/query.go
index 7f69699f7..52b678ac3 100644
--- a/roomserver/query/query.go
+++ b/roomserver/query/query.go
@@ -147,12 +147,7 @@ func (r *RoomserverQueryAPI) QueryLatestEventsAndState(
 	}
 
 	for _, event := range stateEvents {
-		response.StateEvents = append(response.StateEvents, gomatrixserverlib.HeaderedEvent{
-			EventHeader: gomatrixserverlib.EventHeader{
-				RoomVersion: roomVersion,
-			},
-			Event: event,
-		})
+		response.StateEvents = append(response.StateEvents, event.Headered(roomVersion))
 	}
 
 	return nil
@@ -209,12 +204,7 @@ func (r *RoomserverQueryAPI) QueryStateAfterEvents(
 	}
 
 	for _, event := range stateEvents {
-		response.StateEvents = append(response.StateEvents, gomatrixserverlib.HeaderedEvent{
-			EventHeader: gomatrixserverlib.EventHeader{
-				RoomVersion: roomVersion,
-			},
-			Event: event,
-		})
+		response.StateEvents = append(response.StateEvents, event.Headered(roomVersion))
 	}
 
 	return nil
@@ -247,12 +237,7 @@ func (r *RoomserverQueryAPI) QueryEventsByID(
 		// TODO: Room version here
 		roomVersion := gomatrixserverlib.RoomVersionV1
 
-		response.Events = append(response.Events, gomatrixserverlib.HeaderedEvent{
-			EventHeader: gomatrixserverlib.EventHeader{
-				RoomVersion: roomVersion,
-			},
-			Event: event,
-		})
+		response.Events = append(response.Events, event.Headered(roomVersion))
 	}
 
 	return nil
@@ -534,12 +519,7 @@ func (r *RoomserverQueryAPI) QueryMissingEvents(
 			// TODO: Room version here
 			roomVersion := gomatrixserverlib.RoomVersionV1
 
-			response.Events = append(response.Events, gomatrixserverlib.HeaderedEvent{
-				EventHeader: gomatrixserverlib.EventHeader{
-					RoomVersion: roomVersion,
-				},
-				Event: event,
-			})
+			response.Events = append(response.Events, event.Headered(roomVersion))
 		}
 	}
 
@@ -585,12 +565,7 @@ func (r *RoomserverQueryAPI) QueryBackfill(
 		// TODO: Room version here
 		roomVersion := gomatrixserverlib.RoomVersionV1
 
-		response.Events = append(response.Events, gomatrixserverlib.HeaderedEvent{
-			EventHeader: gomatrixserverlib.EventHeader{
-				RoomVersion: roomVersion,
-			},
-			Event: event,
-		})
+		response.Events = append(response.Events, event.Headered(roomVersion))
 	}
 
 	return err
@@ -711,24 +686,14 @@ func (r *RoomserverQueryAPI) QueryStateAndAuthChain(
 		// TODO: Room version here
 		roomVersion := gomatrixserverlib.RoomVersionV1
 
-		response.StateEvents = append(response.StateEvents, gomatrixserverlib.HeaderedEvent{
-			EventHeader: gomatrixserverlib.EventHeader{
-				RoomVersion: roomVersion,
-			},
-			Event: event,
-		})
+		response.StateEvents = append(response.StateEvents, event.Headered(roomVersion))
 	}
 
 	for _, event := range authEvents {
 		// TODO: Room version here
 		roomVersion := gomatrixserverlib.RoomVersionV1
 
-		response.AuthChainEvents = append(response.AuthChainEvents, gomatrixserverlib.HeaderedEvent{
-			EventHeader: gomatrixserverlib.EventHeader{
-				RoomVersion: roomVersion,
-			},
-			Event: event,
-		})
+		response.AuthChainEvents = append(response.AuthChainEvents, event.Headered(roomVersion))
 	}
 
 	return err