diff --git a/backend/pkg/handlers/web/clickRage.go b/backend/pkg/handlers/web/clickRage.go
index e22eb6454..6974ee1b0 100644
--- a/backend/pkg/handlers/web/clickRage.go
+++ b/backend/pkg/handlers/web/clickRage.go
@@ -22,6 +22,7 @@ type ClickRageDetector struct {
 	firstInARawTimestamp uint64
 	firstInARawMessageId uint64
 	countsInARow         int
+	url                  string
 }
 
 func (crd *ClickRageDetector) reset() {
@@ -30,6 +31,7 @@ func (crd *ClickRageDetector) reset() {
 	crd.firstInARawTimestamp = 0
 	crd.firstInARawMessageId = 0
 	crd.countsInARow = 0
+	crd.url = ""
 }
 
 func (crd *ClickRageDetector) Build() Message {
@@ -45,6 +47,7 @@ func (crd *ClickRageDetector) Build() Message {
 			Payload:       string(payload),
 			Timestamp:     crd.firstInARawTimestamp,
 			MessageID:     crd.firstInARawMessageId,
+			URL:           crd.url,
 		}
 		return event
 	}
@@ -54,6 +57,9 @@ func (crd *ClickRageDetector) Build() Message {
 func (crd *ClickRageDetector) Handle(message Message, messageID uint64, timestamp uint64) Message {
 	switch msg := message.(type) {
 	case *MouseClick:
+		if crd.url == "" && msg.Url != "" {
+			crd.url = msg.Url
+		}
 		// TODO: check if we it is ok to capture clickRage event without the connected ClickEvent in db.
 		if msg.Label == "" {
 			return crd.Build()
@@ -69,6 +75,9 @@ func (crd *ClickRageDetector) Handle(message Message, messageID uint64, timestam
 		crd.firstInARawTimestamp = timestamp
 		crd.firstInARawMessageId = messageID
 		crd.countsInARow = 1
+		if crd.url == "" && msg.Url != "" {
+			crd.url = msg.Url
+		}
 		return event
 	}
 	return nil
diff --git a/backend/pkg/messages/filters.go b/backend/pkg/messages/filters.go
index 6c96383c9..8041c596e 100644
--- a/backend/pkg/messages/filters.go
+++ b/backend/pkg/messages/filters.go
@@ -2,7 +2,7 @@
 package messages
 
 func IsReplayerType(id int) bool {
-	return 80 != id && 81 != id && 82 != id && 1 != id && 3 != id && 17 != id && 23 != id && 24 != id && 25 != id && 26 != id && 27 != id && 28 != id && 29 != id && 30 != id && 31 != id && 32 != id && 33 != id && 35 != id && 42 != id && 52 != id && 56 != id && 62 != id && 63 != id && 64 != id && 66 != id && 78 != id && 126 != id && 127 != id && 107 != id && 91 != id && 92 != id && 94 != id && 95 != id && 97 != id && 98 != id && 99 != id && 101 != id && 104 != id && 110 != id && 111 != id
+	return 1 != id && 3 != id && 17 != id && 23 != id && 24 != id && 25 != id && 26 != id && 27 != id && 28 != id && 29 != id && 30 != id && 31 != id && 32 != id && 33 != id && 35 != id && 42 != id && 52 != id && 56 != id && 62 != id && 63 != id && 64 != id && 66 != id && 78 != id && 80 != id && 81 != id && 82 != id && 125 != id && 126 != id && 127 != id && 107 != id && 91 != id && 92 != id && 94 != id && 95 != id && 97 != id && 98 != id && 99 != id && 101 != id && 104 != id && 110 != id && 111 != id
 }
 
 func IsIOSType(id int) bool {
@@ -11,4 +11,4 @@ func IsIOSType(id int) bool {
 
 func IsDOMType(id int) bool {
 	return 0 == id || 4 == id || 5 == id || 6 == id || 7 == id || 8 == id || 9 == id || 10 == id || 11 == id || 12 == id || 13 == id || 14 == id || 15 == id || 16 == id || 18 == id || 19 == id || 20 == id || 37 == id || 38 == id || 49 == id || 54 == id || 55 == id || 57 == id || 58 == id || 59 == id || 60 == id || 61 == id || 67 == id || 69 == id || 70 == id || 71 == id || 72 == id || 73 == id || 74 == id || 75 == id || 76 == id || 77 == id || 90 == id || 93 == id || 96 == id || 100 == id || 102 == id || 103 == id || 105 == id
-}
+}
\ No newline at end of file
diff --git a/backend/pkg/messages/legacy-message-transform.go b/backend/pkg/messages/legacy-message-transform.go
index 72757baf4..6d3bb4d54 100644
--- a/backend/pkg/messages/legacy-message-transform.go
+++ b/backend/pkg/messages/legacy-message-transform.go
@@ -25,6 +25,16 @@ func transformDeprecated(msg Message) Message {
 			Timestamp: m.Timestamp,
 			Duration:  m.Duration,
 		}
+	case *IssueEventDeprecated:
+		return &IssueEvent{
+			MessageID:     m.MessageID,
+			Timestamp:     m.Timestamp,
+			Type:          m.Type,
+			ContextString: m.ContextString,
+			Context:       m.Context,
+			Payload:       m.Payload,
+			URL:           "",
+		}
 	}
 	return msg
 }
diff --git a/backend/pkg/messages/messages.go b/backend/pkg/messages/messages.go
index 418d34867..318eafc25 100644
--- a/backend/pkg/messages/messages.go
+++ b/backend/pkg/messages/messages.go
@@ -2,180 +2,105 @@
 package messages
 
 const (
-	MsgBatchMeta                   = 80
-	MsgBatchMetadata               = 81
-	MsgPartitionedMessage          = 82
-	MsgTimestamp                   = 0
-	MsgSessionStart                = 1
-	MsgSessionEndDeprecated        = 3
-	MsgSetPageLocation             = 4
-	MsgSetViewportSize             = 5
-	MsgSetViewportScroll           = 6
-	MsgCreateDocument              = 7
-	MsgCreateElementNode           = 8
-	MsgCreateTextNode              = 9
-	MsgMoveNode                    = 10
-	MsgRemoveNode                  = 11
-	MsgSetNodeAttribute            = 12
-	MsgRemoveNodeAttribute         = 13
-	MsgSetNodeData                 = 14
-	MsgSetCSSData                  = 15
-	MsgSetNodeScroll               = 16
-	MsgSetInputTarget              = 17
-	MsgSetInputValue               = 18
-	MsgSetInputChecked             = 19
-	MsgMouseMove                   = 20
-	MsgNetworkRequest              = 21
-	MsgConsoleLog                  = 22
-	MsgPageLoadTiming              = 23
-	MsgPageRenderTiming            = 24
-	MsgJSExceptionDeprecated       = 25
-	MsgIntegrationEvent            = 26
-	MsgCustomEvent                 = 27
-	MsgUserID                      = 28
-	MsgUserAnonymousID             = 29
-	MsgMetadata                    = 30
-	MsgPageEvent                   = 31
-	MsgInputEvent                  = 32
-	MsgClickEvent                  = 33
-	MsgResourceEvent               = 35
-	MsgCSSInsertRule               = 37
-	MsgCSSDeleteRule               = 38
-	MsgFetch                       = 39
-	MsgProfiler                    = 40
-	MsgOTable                      = 41
-	MsgStateAction                 = 42
-	MsgRedux                       = 44
-	MsgVuex                        = 45
-	MsgMobX                        = 46
-	MsgNgRx                        = 47
-	MsgGraphQL                     = 48
-	MsgPerformanceTrack            = 49
-	MsgDOMDrop                     = 52
-	MsgResourceTiming              = 53
-	MsgConnectionInformation       = 54
-	MsgSetPageVisibility           = 55
-	MsgPerformanceTrackAggr        = 56
-	MsgLoadFontFace                = 57
-	MsgSetNodeFocus                = 58
-	MsgLongTask                    = 59
-	MsgSetNodeAttributeURLBased    = 60
-	MsgSetCSSDataURLBased          = 61
-	MsgIssueEvent                  = 62
-	MsgTechnicalInfo               = 63
-	MsgCustomIssue                 = 64
-	MsgAssetCache                  = 66
-	MsgCSSInsertRuleURLBased       = 67
-	MsgMouseClick                  = 69
-	MsgCreateIFrameDocument        = 70
-	MsgAdoptedSSReplaceURLBased    = 71
-	MsgAdoptedSSReplace            = 72
-	MsgAdoptedSSInsertRuleURLBased = 73
-	MsgAdoptedSSInsertRule         = 74
-	MsgAdoptedSSDeleteRule         = 75
-	MsgAdoptedSSAddOwner           = 76
-	MsgAdoptedSSRemoveOwner        = 77
-	MsgZustand                     = 79
-	MsgJSException                 = 78
-	MsgSessionEnd                  = 126
-	MsgSessionSearch               = 127
-	MsgIOSBatchMeta                = 107
-	MsgIOSSessionStart             = 90
-	MsgIOSSessionEnd               = 91
-	MsgIOSMetadata                 = 92
-	MsgIOSCustomEvent              = 93
-	MsgIOSUserID                   = 94
-	MsgIOSUserAnonymousID          = 95
-	MsgIOSScreenChanges            = 96
-	MsgIOSCrash                    = 97
-	MsgIOSScreenEnter              = 98
-	MsgIOSScreenLeave              = 99
-	MsgIOSClickEvent               = 100
-	MsgIOSInputEvent               = 101
-	MsgIOSPerformanceEvent         = 102
-	MsgIOSLog                      = 103
-	MsgIOSInternalError            = 104
-	MsgIOSNetworkCall              = 105
-	MsgIOSPerformanceAggregated    = 110
-	MsgIOSIssueEvent               = 111
+    MsgTimestamp = 0
+    MsgSessionStart = 1
+    MsgSessionEndDeprecated = 3
+    MsgSetPageLocation = 4
+    MsgSetViewportSize = 5
+    MsgSetViewportScroll = 6
+    MsgCreateDocument = 7
+    MsgCreateElementNode = 8
+    MsgCreateTextNode = 9
+    MsgMoveNode = 10
+    MsgRemoveNode = 11
+    MsgSetNodeAttribute = 12
+    MsgRemoveNodeAttribute = 13
+    MsgSetNodeData = 14
+    MsgSetCSSData = 15
+    MsgSetNodeScroll = 16
+    MsgSetInputTarget = 17
+    MsgSetInputValue = 18
+    MsgSetInputChecked = 19
+    MsgMouseMove = 20
+    MsgNetworkRequest = 21
+    MsgConsoleLog = 22
+    MsgPageLoadTiming = 23
+    MsgPageRenderTiming = 24
+    MsgJSExceptionDeprecated = 25
+    MsgIntegrationEvent = 26
+    MsgCustomEvent = 27
+    MsgUserID = 28
+    MsgUserAnonymousID = 29
+    MsgMetadata = 30
+    MsgPageEvent = 31
+    MsgInputEvent = 32
+    MsgClickEvent = 33
+    MsgResourceEvent = 35
+    MsgCSSInsertRule = 37
+    MsgCSSDeleteRule = 38
+    MsgFetch = 39
+    MsgProfiler = 40
+    MsgOTable = 41
+    MsgStateAction = 42
+    MsgRedux = 44
+    MsgVuex = 45
+    MsgMobX = 46
+    MsgNgRx = 47
+    MsgGraphQL = 48
+    MsgPerformanceTrack = 49
+    MsgDOMDrop = 52
+    MsgResourceTiming = 53
+    MsgConnectionInformation = 54
+    MsgSetPageVisibility = 55
+    MsgPerformanceTrackAggr = 56
+    MsgLoadFontFace = 57
+    MsgSetNodeFocus = 58
+    MsgLongTask = 59
+    MsgSetNodeAttributeURLBased = 60
+    MsgSetCSSDataURLBased = 61
+    MsgIssueEventDeprecated = 62
+    MsgTechnicalInfo = 63
+    MsgCustomIssue = 64
+    MsgAssetCache = 66
+    MsgCSSInsertRuleURLBased = 67
+    MsgMouseClick = 69
+    MsgCreateIFrameDocument = 70
+    MsgAdoptedSSReplaceURLBased = 71
+    MsgAdoptedSSReplace = 72
+    MsgAdoptedSSInsertRuleURLBased = 73
+    MsgAdoptedSSInsertRule = 74
+    MsgAdoptedSSDeleteRule = 75
+    MsgAdoptedSSAddOwner = 76
+    MsgAdoptedSSRemoveOwner = 77
+    MsgZustand = 79
+    MsgJSException = 78
+    MsgBatchMeta = 80
+    MsgBatchMetadata = 81
+    MsgPartitionedMessage = 82
+    MsgIssueEvent = 125
+    MsgSessionEnd = 126
+    MsgSessionSearch = 127
+    MsgIOSBatchMeta = 107
+    MsgIOSSessionStart = 90
+    MsgIOSSessionEnd = 91
+    MsgIOSMetadata = 92
+    MsgIOSCustomEvent = 93
+    MsgIOSUserID = 94
+    MsgIOSUserAnonymousID = 95
+    MsgIOSScreenChanges = 96
+    MsgIOSCrash = 97
+    MsgIOSScreenEnter = 98
+    MsgIOSScreenLeave = 99
+    MsgIOSClickEvent = 100
+    MsgIOSInputEvent = 101
+    MsgIOSPerformanceEvent = 102
+    MsgIOSLog = 103
+    MsgIOSInternalError = 104
+    MsgIOSNetworkCall = 105
+    MsgIOSPerformanceAggregated = 110
+    MsgIOSIssueEvent = 111
 )
 
-type BatchMeta struct {
-	message
-	PageNo     uint64
-	FirstIndex uint64
-	Timestamp  int64
-}
-
-func (msg *BatchMeta) Encode() []byte {
-	buf := make([]byte, 31)
-	buf[0] = 80
-	p := 1
-	p = WriteUint(msg.PageNo, buf, p)
-	p = WriteUint(msg.FirstIndex, buf, p)
-	p = WriteInt(msg.Timestamp, buf, p)
-	return buf[:p]
-}
-
-func (msg *BatchMeta) Decode() Message {
-	return msg
-}
-
-func (msg *BatchMeta) TypeID() int {
-	return 80
-}
-
-type BatchMetadata struct {
-	message
-	Version    uint64
-	PageNo     uint64
-	FirstIndex uint64
-	Timestamp  int64
-	Location   string
-}
-
-func (msg *BatchMetadata) Encode() []byte {
-	buf := make([]byte, 51+len(msg.Location))
-	buf[0] = 81
-	p := 1
-	p = WriteUint(msg.Version, buf, p)
-	p = WriteUint(msg.PageNo, buf, p)
-	p = WriteUint(msg.FirstIndex, buf, p)
-	p = WriteInt(msg.Timestamp, buf, p)
-	p = WriteString(msg.Location, buf, p)
-	return buf[:p]
-}
-
-func (msg *BatchMetadata) Decode() Message {
-	return msg
-}
-
-func (msg *BatchMetadata) TypeID() int {
-	return 81
-}
-
-type PartitionedMessage struct {
-	message
-	PartNo    uint64
-	PartTotal uint64
-}
-
-func (msg *PartitionedMessage) Encode() []byte {
-	buf := make([]byte, 21)
-	buf[0] = 82
-	p := 1
-	p = WriteUint(msg.PartNo, buf, p)
-	p = WriteUint(msg.PartTotal, buf, p)
-	return buf[:p]
-}
-
-func (msg *PartitionedMessage) Decode() Message {
-	return msg
-}
-
-func (msg *PartitionedMessage) TypeID() int {
-	return 82
-}
 
 type Timestamp struct {
 	message
@@ -200,22 +125,22 @@ func (msg *Timestamp) TypeID() int {
 
 type SessionStart struct {
 	message
-	Timestamp            uint64
-	ProjectID            uint64
-	TrackerVersion       string
-	RevID                string
-	UserUUID             string
-	UserAgent            string
-	UserOS               string
-	UserOSVersion        string
-	UserBrowser          string
-	UserBrowserVersion   string
-	UserDevice           string
-	UserDeviceType       string
+	Timestamp uint64
+	ProjectID uint64
+	TrackerVersion string
+	RevID string
+	UserUUID string
+	UserAgent string
+	UserOS string
+	UserOSVersion string
+	UserBrowser string
+	UserBrowserVersion string
+	UserDevice string
+	UserDeviceType string
 	UserDeviceMemorySize uint64
-	UserDeviceHeapSize   uint64
-	UserCountry          string
-	UserID               string
+	UserDeviceHeapSize uint64
+	UserCountry string
+	UserID string
 }
 
 func (msg *SessionStart) Encode() []byte {
@@ -272,8 +197,8 @@ func (msg *SessionEndDeprecated) TypeID() int {
 
 type SetPageLocation struct {
 	message
-	URL             string
-	Referrer        string
+	URL string
+	Referrer string
 	NavigationStart uint64
 }
 
@@ -297,7 +222,7 @@ func (msg *SetPageLocation) TypeID() int {
 
 type SetViewportSize struct {
 	message
-	Width  uint64
+	Width uint64
 	Height uint64
 }
 
@@ -343,6 +268,7 @@ func (msg *SetViewportScroll) TypeID() int {
 
 type CreateDocument struct {
 	message
+
 }
 
 func (msg *CreateDocument) Encode() []byte {
@@ -363,11 +289,11 @@ func (msg *CreateDocument) TypeID() int {
 
 type CreateElementNode struct {
 	message
-	ID       uint64
+	ID uint64
 	ParentID uint64
-	index    uint64
-	Tag      string
-	SVG      bool
+	index uint64
+	Tag string
+	SVG bool
 }
 
 func (msg *CreateElementNode) Encode() []byte {
@@ -392,9 +318,9 @@ func (msg *CreateElementNode) TypeID() int {
 
 type CreateTextNode struct {
 	message
-	ID       uint64
+	ID uint64
 	ParentID uint64
-	Index    uint64
+	Index uint64
 }
 
 func (msg *CreateTextNode) Encode() []byte {
@@ -417,9 +343,9 @@ func (msg *CreateTextNode) TypeID() int {
 
 type MoveNode struct {
 	message
-	ID       uint64
+	ID uint64
 	ParentID uint64
-	Index    uint64
+	Index uint64
 }
 
 func (msg *MoveNode) Encode() []byte {
@@ -463,8 +389,8 @@ func (msg *RemoveNode) TypeID() int {
 
 type SetNodeAttribute struct {
 	message
-	ID    uint64
-	Name  string
+	ID uint64
+	Name string
 	Value string
 }
 
@@ -488,7 +414,7 @@ func (msg *SetNodeAttribute) TypeID() int {
 
 type RemoveNodeAttribute struct {
 	message
-	ID   uint64
+	ID uint64
 	Name string
 }
 
@@ -511,7 +437,7 @@ func (msg *RemoveNodeAttribute) TypeID() int {
 
 type SetNodeData struct {
 	message
-	ID   uint64
+	ID uint64
 	Data string
 }
 
@@ -534,7 +460,7 @@ func (msg *SetNodeData) TypeID() int {
 
 type SetCSSData struct {
 	message
-	ID   uint64
+	ID uint64
 	Data string
 }
 
@@ -558,8 +484,8 @@ func (msg *SetCSSData) TypeID() int {
 type SetNodeScroll struct {
 	message
 	ID uint64
-	X  int64
-	Y  int64
+	X int64
+	Y int64
 }
 
 func (msg *SetNodeScroll) Encode() []byte {
@@ -582,7 +508,7 @@ func (msg *SetNodeScroll) TypeID() int {
 
 type SetInputTarget struct {
 	message
-	ID    uint64
+	ID uint64
 	Label string
 }
 
@@ -605,9 +531,9 @@ func (msg *SetInputTarget) TypeID() int {
 
 type SetInputValue struct {
 	message
-	ID    uint64
+	ID uint64
 	Value string
-	Mask  int64
+	Mask int64
 }
 
 func (msg *SetInputValue) Encode() []byte {
@@ -630,7 +556,7 @@ func (msg *SetInputValue) TypeID() int {
 
 type SetInputChecked struct {
 	message
-	ID      uint64
+	ID uint64
 	Checked bool
 }
 
@@ -676,14 +602,14 @@ func (msg *MouseMove) TypeID() int {
 
 type NetworkRequest struct {
 	message
-	Type      string
-	Method    string
-	URL       string
-	Request   string
-	Response  string
-	Status    uint64
+	Type string
+	Method string
+	URL string
+	Request string
+	Response string
+	Status uint64
 	Timestamp uint64
-	Duration  uint64
+	Duration uint64
 }
 
 func (msg *NetworkRequest) Encode() []byte {
@@ -734,15 +660,15 @@ func (msg *ConsoleLog) TypeID() int {
 
 type PageLoadTiming struct {
 	message
-	RequestStart               uint64
-	ResponseStart              uint64
-	ResponseEnd                uint64
+	RequestStart uint64
+	ResponseStart uint64
+	ResponseEnd uint64
 	DomContentLoadedEventStart uint64
-	DomContentLoadedEventEnd   uint64
-	LoadEventStart             uint64
-	LoadEventEnd               uint64
-	FirstPaint                 uint64
-	FirstContentfulPaint       uint64
+	DomContentLoadedEventEnd uint64
+	LoadEventStart uint64
+	LoadEventEnd uint64
+	FirstPaint uint64
+	FirstContentfulPaint uint64
 }
 
 func (msg *PageLoadTiming) Encode() []byte {
@@ -771,8 +697,8 @@ func (msg *PageLoadTiming) TypeID() int {
 
 type PageRenderTiming struct {
 	message
-	SpeedIndex        uint64
-	VisuallyComplete  uint64
+	SpeedIndex uint64
+	VisuallyComplete uint64
 	TimeToInteractive uint64
 }
 
@@ -796,7 +722,7 @@ func (msg *PageRenderTiming) TypeID() int {
 
 type JSExceptionDeprecated struct {
 	message
-	Name    string
+	Name string
 	Message string
 	Payload string
 }
@@ -822,10 +748,10 @@ func (msg *JSExceptionDeprecated) TypeID() int {
 type IntegrationEvent struct {
 	message
 	Timestamp uint64
-	Source    string
-	Name      string
-	Message   string
-	Payload   string
+	Source string
+	Name string
+	Message string
+	Payload string
 }
 
 func (msg *IntegrationEvent) Encode() []byte {
@@ -850,7 +776,7 @@ func (msg *IntegrationEvent) TypeID() int {
 
 type CustomEvent struct {
 	message
-	Name    string
+	Name string
 	Payload string
 }
 
@@ -915,7 +841,7 @@ func (msg *UserAnonymousID) TypeID() int {
 
 type Metadata struct {
 	message
-	Key   string
+	Key string
 	Value string
 }
 
@@ -938,23 +864,23 @@ func (msg *Metadata) TypeID() int {
 
 type PageEvent struct {
 	message
-	MessageID                  uint64
-	Timestamp                  uint64
-	URL                        string
-	Referrer                   string
-	Loaded                     bool
-	RequestStart               uint64
-	ResponseStart              uint64
-	ResponseEnd                uint64
+	MessageID uint64
+	Timestamp uint64
+	URL string
+	Referrer string
+	Loaded bool
+	RequestStart uint64
+	ResponseStart uint64
+	ResponseEnd uint64
 	DomContentLoadedEventStart uint64
-	DomContentLoadedEventEnd   uint64
-	LoadEventStart             uint64
-	LoadEventEnd               uint64
-	FirstPaint                 uint64
-	FirstContentfulPaint       uint64
-	SpeedIndex                 uint64
-	VisuallyComplete           uint64
-	TimeToInteractive          uint64
+	DomContentLoadedEventEnd uint64
+	LoadEventStart uint64
+	LoadEventEnd uint64
+	FirstPaint uint64
+	FirstContentfulPaint uint64
+	SpeedIndex uint64
+	VisuallyComplete uint64
+	TimeToInteractive uint64
 }
 
 func (msg *PageEvent) Encode() []byte {
@@ -991,11 +917,11 @@ func (msg *PageEvent) TypeID() int {
 
 type InputEvent struct {
 	message
-	MessageID   uint64
-	Timestamp   uint64
-	Value       string
+	MessageID uint64
+	Timestamp uint64
+	Value string
 	ValueMasked bool
-	Label       string
+	Label string
 }
 
 func (msg *InputEvent) Encode() []byte {
@@ -1020,11 +946,11 @@ func (msg *InputEvent) TypeID() int {
 
 type ClickEvent struct {
 	message
-	MessageID      uint64
-	Timestamp      uint64
+	MessageID uint64
+	Timestamp uint64
 	HesitationTime uint64
-	Label          string
-	Selector       string
+	Label string
+	Selector string
 }
 
 func (msg *ClickEvent) Encode() []byte {
@@ -1049,18 +975,18 @@ func (msg *ClickEvent) TypeID() int {
 
 type ResourceEvent struct {
 	message
-	MessageID       uint64
-	Timestamp       uint64
-	Duration        uint64
-	TTFB            uint64
-	HeaderSize      uint64
+	MessageID uint64
+	Timestamp uint64
+	Duration uint64
+	TTFB uint64
+	HeaderSize uint64
 	EncodedBodySize uint64
 	DecodedBodySize uint64
-	URL             string
-	Type            string
-	Success         bool
-	Method          string
-	Status          uint64
+	URL string
+	Type string
+	Success bool
+	Method string
+	Status uint64
 }
 
 func (msg *ResourceEvent) Encode() []byte {
@@ -1092,8 +1018,8 @@ func (msg *ResourceEvent) TypeID() int {
 
 type CSSInsertRule struct {
 	message
-	ID    uint64
-	Rule  string
+	ID uint64
+	Rule string
 	Index uint64
 }
 
@@ -1117,7 +1043,7 @@ func (msg *CSSInsertRule) TypeID() int {
 
 type CSSDeleteRule struct {
 	message
-	ID    uint64
+	ID uint64
 	Index uint64
 }
 
@@ -1140,13 +1066,13 @@ func (msg *CSSDeleteRule) TypeID() int {
 
 type Fetch struct {
 	message
-	Method    string
-	URL       string
-	Request   string
-	Response  string
-	Status    uint64
+	Method string
+	URL string
+	Request string
+	Response string
+	Status uint64
 	Timestamp uint64
-	Duration  uint64
+	Duration uint64
 }
 
 func (msg *Fetch) Encode() []byte {
@@ -1173,10 +1099,10 @@ func (msg *Fetch) TypeID() int {
 
 type Profiler struct {
 	message
-	Name     string
+	Name string
 	Duration uint64
-	Args     string
-	Result   string
+	Args string
+	Result string
 }
 
 func (msg *Profiler) Encode() []byte {
@@ -1200,7 +1126,7 @@ func (msg *Profiler) TypeID() int {
 
 type OTable struct {
 	message
-	Key   string
+	Key string
 	Value string
 }
 
@@ -1244,8 +1170,8 @@ func (msg *StateAction) TypeID() int {
 
 type Redux struct {
 	message
-	Action   string
-	State    string
+	Action string
+	State string
 	Duration uint64
 }
 
@@ -1270,7 +1196,7 @@ func (msg *Redux) TypeID() int {
 type Vuex struct {
 	message
 	Mutation string
-	State    string
+	State string
 }
 
 func (msg *Vuex) Encode() []byte {
@@ -1292,7 +1218,7 @@ func (msg *Vuex) TypeID() int {
 
 type MobX struct {
 	message
-	Type    string
+	Type string
 	Payload string
 }
 
@@ -1315,8 +1241,8 @@ func (msg *MobX) TypeID() int {
 
 type NgRx struct {
 	message
-	Action   string
-	State    string
+	Action string
+	State string
 	Duration uint64
 }
 
@@ -1342,8 +1268,8 @@ type GraphQL struct {
 	message
 	OperationKind string
 	OperationName string
-	Variables     string
-	Response      string
+	Variables string
+	Response string
 }
 
 func (msg *GraphQL) Encode() []byte {
@@ -1367,10 +1293,10 @@ func (msg *GraphQL) TypeID() int {
 
 type PerformanceTrack struct {
 	message
-	Frames          int64
-	Ticks           int64
+	Frames int64
+	Ticks int64
 	TotalJSHeapSize uint64
-	UsedJSHeapSize  uint64
+	UsedJSHeapSize uint64
 }
 
 func (msg *PerformanceTrack) Encode() []byte {
@@ -1415,14 +1341,14 @@ func (msg *DOMDrop) TypeID() int {
 
 type ResourceTiming struct {
 	message
-	Timestamp       uint64
-	Duration        uint64
-	TTFB            uint64
-	HeaderSize      uint64
+	Timestamp uint64
+	Duration uint64
+	TTFB uint64
+	HeaderSize uint64
 	EncodedBodySize uint64
 	DecodedBodySize uint64
-	URL             string
-	Initiator       string
+	URL string
+	Initiator string
 }
 
 func (msg *ResourceTiming) Encode() []byte {
@@ -1451,7 +1377,7 @@ func (msg *ResourceTiming) TypeID() int {
 type ConnectionInformation struct {
 	message
 	Downlink uint64
-	Type     string
+	Type string
 }
 
 func (msg *ConnectionInformation) Encode() []byte {
@@ -1494,20 +1420,20 @@ func (msg *SetPageVisibility) TypeID() int {
 
 type PerformanceTrackAggr struct {
 	message
-	TimestampStart     uint64
-	TimestampEnd       uint64
-	MinFPS             uint64
-	AvgFPS             uint64
-	MaxFPS             uint64
-	MinCPU             uint64
-	AvgCPU             uint64
-	MaxCPU             uint64
+	TimestampStart uint64
+	TimestampEnd uint64
+	MinFPS uint64
+	AvgFPS uint64
+	MaxFPS uint64
+	MinCPU uint64
+	AvgCPU uint64
+	MaxCPU uint64
 	MinTotalJSHeapSize uint64
 	AvgTotalJSHeapSize uint64
 	MaxTotalJSHeapSize uint64
-	MinUsedJSHeapSize  uint64
-	AvgUsedJSHeapSize  uint64
-	MaxUsedJSHeapSize  uint64
+	MinUsedJSHeapSize uint64
+	AvgUsedJSHeapSize uint64
+	MaxUsedJSHeapSize uint64
 }
 
 func (msg *PerformanceTrackAggr) Encode() []byte {
@@ -1541,9 +1467,9 @@ func (msg *PerformanceTrackAggr) TypeID() int {
 
 type LoadFontFace struct {
 	message
-	ParentID    uint64
-	Family      string
-	Source      string
+	ParentID uint64
+	Family string
+	Source string
 	Descriptors string
 }
 
@@ -1589,12 +1515,12 @@ func (msg *SetNodeFocus) TypeID() int {
 
 type LongTask struct {
 	message
-	Timestamp     uint64
-	Duration      uint64
-	Context       uint64
+	Timestamp uint64
+	Duration uint64
+	Context uint64
 	ContainerType uint64
-	ContainerSrc  string
-	ContainerId   string
+	ContainerSrc string
+	ContainerId string
 	ContainerName string
 }
 
@@ -1622,9 +1548,9 @@ func (msg *LongTask) TypeID() int {
 
 type SetNodeAttributeURLBased struct {
 	message
-	ID      uint64
-	Name    string
-	Value   string
+	ID uint64
+	Name string
+	Value string
 	BaseURL string
 }
 
@@ -1649,8 +1575,8 @@ func (msg *SetNodeAttributeURLBased) TypeID() int {
 
 type SetCSSDataURLBased struct {
 	message
-	ID      uint64
-	Data    string
+	ID uint64
+	Data string
 	BaseURL string
 }
 
@@ -1672,17 +1598,17 @@ func (msg *SetCSSDataURLBased) TypeID() int {
 	return 61
 }
 
-type IssueEvent struct {
+type IssueEventDeprecated struct {
 	message
-	MessageID     uint64
-	Timestamp     uint64
-	Type          string
+	MessageID uint64
+	Timestamp uint64
+	Type string
 	ContextString string
-	Context       string
-	Payload       string
+	Context string
+	Payload string
 }
 
-func (msg *IssueEvent) Encode() []byte {
+func (msg *IssueEventDeprecated) Encode() []byte {
 	buf := make([]byte, 61+len(msg.Type)+len(msg.ContextString)+len(msg.Context)+len(msg.Payload))
 	buf[0] = 62
 	p := 1
@@ -1695,17 +1621,17 @@ func (msg *IssueEvent) Encode() []byte {
 	return buf[:p]
 }
 
-func (msg *IssueEvent) Decode() Message {
+func (msg *IssueEventDeprecated) Decode() Message {
 	return msg
 }
 
-func (msg *IssueEvent) TypeID() int {
+func (msg *IssueEventDeprecated) TypeID() int {
 	return 62
 }
 
 type TechnicalInfo struct {
 	message
-	Type  string
+	Type string
 	Value string
 }
 
@@ -1728,7 +1654,7 @@ func (msg *TechnicalInfo) TypeID() int {
 
 type CustomIssue struct {
 	message
-	Name    string
+	Name string
 	Payload string
 }
 
@@ -1772,9 +1698,9 @@ func (msg *AssetCache) TypeID() int {
 
 type CSSInsertRuleURLBased struct {
 	message
-	ID      uint64
-	Rule    string
-	Index   uint64
+	ID uint64
+	Rule string
+	Index uint64
 	BaseURL string
 }
 
@@ -1799,10 +1725,10 @@ func (msg *CSSInsertRuleURLBased) TypeID() int {
 
 type MouseClick struct {
 	message
-	ID             uint64
+	ID uint64
 	HesitationTime uint64
-	Label          string
-	Selector       string
+	Label string
+	Selector string
 }
 
 func (msg *MouseClick) Encode() []byte {
@@ -1827,7 +1753,7 @@ func (msg *MouseClick) TypeID() int {
 type CreateIFrameDocument struct {
 	message
 	FrameID uint64
-	ID      uint64
+	ID uint64
 }
 
 func (msg *CreateIFrameDocument) Encode() []byte {
@@ -1850,7 +1776,7 @@ func (msg *CreateIFrameDocument) TypeID() int {
 type AdoptedSSReplaceURLBased struct {
 	message
 	SheetID uint64
-	Text    string
+	Text string
 	BaseURL string
 }
 
@@ -1875,7 +1801,7 @@ func (msg *AdoptedSSReplaceURLBased) TypeID() int {
 type AdoptedSSReplace struct {
 	message
 	SheetID uint64
-	Text    string
+	Text string
 }
 
 func (msg *AdoptedSSReplace) Encode() []byte {
@@ -1898,8 +1824,8 @@ func (msg *AdoptedSSReplace) TypeID() int {
 type AdoptedSSInsertRuleURLBased struct {
 	message
 	SheetID uint64
-	Rule    string
-	Index   uint64
+	Rule string
+	Index uint64
 	BaseURL string
 }
 
@@ -1925,8 +1851,8 @@ func (msg *AdoptedSSInsertRuleURLBased) TypeID() int {
 type AdoptedSSInsertRule struct {
 	message
 	SheetID uint64
-	Rule    string
-	Index   uint64
+	Rule string
+	Index uint64
 }
 
 func (msg *AdoptedSSInsertRule) Encode() []byte {
@@ -1950,7 +1876,7 @@ func (msg *AdoptedSSInsertRule) TypeID() int {
 type AdoptedSSDeleteRule struct {
 	message
 	SheetID uint64
-	Index   uint64
+	Index uint64
 }
 
 func (msg *AdoptedSSDeleteRule) Encode() []byte {
@@ -1973,7 +1899,7 @@ func (msg *AdoptedSSDeleteRule) TypeID() int {
 type AdoptedSSAddOwner struct {
 	message
 	SheetID uint64
-	ID      uint64
+	ID uint64
 }
 
 func (msg *AdoptedSSAddOwner) Encode() []byte {
@@ -1996,7 +1922,7 @@ func (msg *AdoptedSSAddOwner) TypeID() int {
 type AdoptedSSRemoveOwner struct {
 	message
 	SheetID uint64
-	ID      uint64
+	ID uint64
 }
 
 func (msg *AdoptedSSRemoveOwner) Encode() []byte {
@@ -2019,7 +1945,7 @@ func (msg *AdoptedSSRemoveOwner) TypeID() int {
 type Zustand struct {
 	message
 	Mutation string
-	State    string
+	State string
 }
 
 func (msg *Zustand) Encode() []byte {
@@ -2041,9 +1967,9 @@ func (msg *Zustand) TypeID() int {
 
 type JSException struct {
 	message
-	Name     string
-	Message  string
-	Payload  string
+	Name string
+	Message string
+	Payload string
 	Metadata string
 }
 
@@ -2066,9 +1992,119 @@ func (msg *JSException) TypeID() int {
 	return 78
 }
 
+type BatchMeta struct {
+	message
+	PageNo uint64
+	FirstIndex uint64
+	Timestamp int64
+}
+
+func (msg *BatchMeta) Encode() []byte {
+	buf := make([]byte, 31)
+	buf[0] = 80
+	p := 1
+	p = WriteUint(msg.PageNo, buf, p)
+	p = WriteUint(msg.FirstIndex, buf, p)
+	p = WriteInt(msg.Timestamp, buf, p)
+	return buf[:p]
+}
+
+func (msg *BatchMeta) Decode() Message {
+	return msg
+}
+
+func (msg *BatchMeta) TypeID() int {
+	return 80
+}
+
+type BatchMetadata struct {
+	message
+	Version uint64
+	PageNo uint64
+	FirstIndex uint64
+	Timestamp int64
+	Location string
+}
+
+func (msg *BatchMetadata) Encode() []byte {
+	buf := make([]byte, 51+len(msg.Location))
+	buf[0] = 81
+	p := 1
+	p = WriteUint(msg.Version, buf, p)
+	p = WriteUint(msg.PageNo, buf, p)
+	p = WriteUint(msg.FirstIndex, buf, p)
+	p = WriteInt(msg.Timestamp, buf, p)
+	p = WriteString(msg.Location, buf, p)
+	return buf[:p]
+}
+
+func (msg *BatchMetadata) Decode() Message {
+	return msg
+}
+
+func (msg *BatchMetadata) TypeID() int {
+	return 81
+}
+
+type PartitionedMessage struct {
+	message
+	PartNo uint64
+	PartTotal uint64
+}
+
+func (msg *PartitionedMessage) Encode() []byte {
+	buf := make([]byte, 21)
+	buf[0] = 82
+	p := 1
+	p = WriteUint(msg.PartNo, buf, p)
+	p = WriteUint(msg.PartTotal, buf, p)
+	return buf[:p]
+}
+
+func (msg *PartitionedMessage) Decode() Message {
+	return msg
+}
+
+func (msg *PartitionedMessage) TypeID() int {
+	return 82
+}
+
+type IssueEvent struct {
+	message
+	MessageID uint64
+	Timestamp uint64
+	Type string
+	ContextString string
+	Context string
+	Payload string
+	URL string
+}
+
+func (msg *IssueEvent) Encode() []byte {
+	buf := make([]byte, 71+len(msg.Type)+len(msg.ContextString)+len(msg.Context)+len(msg.Payload)+len(msg.URL))
+	buf[0] = 125
+	p := 1
+	p = WriteUint(msg.MessageID, buf, p)
+	p = WriteUint(msg.Timestamp, buf, p)
+	p = WriteString(msg.Type, buf, p)
+	p = WriteString(msg.ContextString, buf, p)
+	p = WriteString(msg.Context, buf, p)
+	p = WriteString(msg.Payload, buf, p)
+	p = WriteString(msg.URL, buf, p)
+	return buf[:p]
+}
+
+func (msg *IssueEvent) Decode() Message {
+	return msg
+}
+
+func (msg *IssueEvent) TypeID() int {
+	return 125
+}
+
 type SessionEnd struct {
 	message
-	Timestamp     uint64
+	Timestamp uint64
 	EncryptionKey string
 }
 
@@ -2114,8 +2150,8 @@ func (msg *SessionSearch) TypeID() int {
 
 type IOSBatchMeta struct {
 	message
-	Timestamp  uint64
-	Length     uint64
+	Timestamp uint64
+	Length uint64
 	FirstIndex uint64
 }
 
@@ -2139,16 +2175,16 @@ func (msg *IOSBatchMeta) TypeID() int {
 
 type IOSSessionStart struct {
 	message
-	Timestamp      uint64
-	ProjectID      uint64
+	Timestamp uint64
+	ProjectID uint64
 	TrackerVersion string
-	RevID          string
-	UserUUID       string
-	UserOS         string
-	UserOSVersion  string
-	UserDevice     string
+	RevID string
+	UserUUID string
+	UserOS string
+	UserOSVersion string
+	UserDevice string
 	UserDeviceType string
-	UserCountry    string
+	UserCountry string
 }
 
 func (msg *IOSSessionStart) Encode() []byte {
@@ -2200,9 +2236,9 @@ func (msg *IOSSessionEnd) TypeID() int {
 type IOSMetadata struct {
 	message
 	Timestamp uint64
-	Length    uint64
-	Key       string
-	Value     string
+	Length uint64
+	Key string
+	Value string
 }
 
 func (msg *IOSMetadata) Encode() []byte {
@@ -2227,9 +2263,9 @@ func (msg *IOSMetadata) TypeID() int {
 type IOSCustomEvent struct {
 	message
 	Timestamp uint64
-	Length    uint64
-	Name      string
-	Payload   string
+	Length uint64
+	Name string
+	Payload string
 }
 
 func (msg *IOSCustomEvent) Encode() []byte {
@@ -2254,8 +2290,8 @@ func (msg *IOSCustomEvent) TypeID() int {
 type IOSUserID struct {
 	message
 	Timestamp uint64
-	Length    uint64
-	Value     string
+	Length uint64
+	Value string
 }
 
 func (msg *IOSUserID) Encode() []byte {
@@ -2279,8 +2315,8 @@ func (msg *IOSUserID) TypeID() int {
 type IOSUserAnonymousID struct {
 	message
 	Timestamp uint64
-	Length    uint64
-	Value     string
+	Length uint64
+	Value string
 }
 
 func (msg *IOSUserAnonymousID) Encode() []byte {
@@ -2304,11 +2340,11 @@ func (msg *IOSUserAnonymousID) TypeID() int {
 type IOSScreenChanges struct {
 	message
 	Timestamp uint64
-	Length    uint64
-	X         uint64
-	Y         uint64
-	Width     uint64
-	Height    uint64
+	Length uint64
+	X uint64
+	Y uint64
+	Width uint64
+	Height uint64
 }
 
 func (msg *IOSScreenChanges) Encode() []byte {
@@ -2334,10 +2370,10 @@ func (msg *IOSScreenChanges) TypeID() int {
 
 type IOSCrash struct {
 	message
-	Timestamp  uint64
-	Length     uint64
-	Name       string
-	Reason     string
+	Timestamp uint64
+	Length uint64
+	Name string
+	Reason string
 	Stacktrace string
 }
 
@@ -2364,9 +2400,9 @@ func (msg *IOSCrash) TypeID() int {
 type IOSScreenEnter struct {
 	message
 	Timestamp uint64
-	Length    uint64
-	Title     string
-	ViewName  string
+	Length uint64
+	Title string
+	ViewName string
 }
 
 func (msg *IOSScreenEnter) Encode() []byte {
@@ -2391,9 +2427,9 @@ func (msg *IOSScreenEnter) TypeID() int {
 type IOSScreenLeave struct {
 	message
 	Timestamp uint64
-	Length    uint64
-	Title     string
-	ViewName  string
+	Length uint64
+	Title string
+	ViewName string
 }
 
 func (msg *IOSScreenLeave) Encode() []byte {
@@ -2418,10 +2454,10 @@ func (msg *IOSScreenLeave) TypeID() int {
 type IOSClickEvent struct {
 	message
 	Timestamp uint64
-	Length    uint64
-	Label     string
-	X         uint64
-	Y         uint64
+	Length uint64
+	Label string
+	X uint64
+	Y uint64
 }
 
 func (msg *IOSClickEvent) Encode() []byte {
@@ -2446,11 +2482,11 @@ func (msg *IOSClickEvent) TypeID() int {
 
 type IOSInputEvent struct {
 	message
-	Timestamp   uint64
-	Length      uint64
-	Value       string
+	Timestamp uint64
+	Length uint64
+	Value string
 	ValueMasked bool
-	Label       string
+	Label string
 }
 
 func (msg *IOSInputEvent) Encode() []byte {
@@ -2476,9 +2512,9 @@ func (msg *IOSInputEvent) TypeID() int {
 type IOSPerformanceEvent struct {
 	message
 	Timestamp uint64
-	Length    uint64
-	Name      string
-	Value     uint64
+	Length uint64
+	Name string
+	Value uint64
 }
 
 func (msg *IOSPerformanceEvent) Encode() []byte {
@@ -2503,9 +2539,9 @@ func (msg *IOSPerformanceEvent) TypeID() int {
 type IOSLog struct {
 	message
 	Timestamp uint64
-	Length    uint64
-	Severity  string
-	Content   string
+	Length uint64
+	Severity string
+	Content string
 }
 
 func (msg *IOSLog) Encode() []byte {
@@ -2530,8 +2566,8 @@ func (msg *IOSLog) TypeID() int {
 type IOSInternalError struct {
 	message
 	Timestamp uint64
-	Length    uint64
-	Content   string
+	Length uint64
+	Content string
 }
 
 func (msg *IOSInternalError) Encode() []byte {
@@ -2555,14 +2591,14 @@ func (msg *IOSInternalError) TypeID() int {
 type IOSNetworkCall struct {
 	message
 	Timestamp uint64
-	Length    uint64
-	Duration  uint64
-	Headers   string
-	Body      string
-	URL       string
-	Success   bool
-	Method    string
-	Status    uint64
+	Length uint64
+	Duration uint64
+	Headers string
+	Body string
+	URL string
+	Success bool
+	Method string
+	Status uint64
 }
 
 func (msg *IOSNetworkCall) Encode() []byte {
@@ -2592,19 +2628,19 @@ func (msg *IOSNetworkCall) TypeID() int {
 type IOSPerformanceAggregated struct {
 	message
 	TimestampStart uint64
-	TimestampEnd   uint64
-	MinFPS         uint64
-	AvgFPS         uint64
-	MaxFPS         uint64
-	MinCPU         uint64
-	AvgCPU         uint64
-	MaxCPU         uint64
-	MinMemory      uint64
-	AvgMemory      uint64
-	MaxMemory      uint64
-	MinBattery     uint64
-	AvgBattery     uint64
-	MaxBattery     uint64
+	TimestampEnd uint64
+	MinFPS uint64
+	AvgFPS uint64
+	MaxFPS uint64
+	MinCPU uint64
+	AvgCPU uint64
+	MaxCPU uint64
+	MinMemory uint64
+	AvgMemory uint64
+	MaxMemory uint64
+	MinBattery uint64
+	AvgBattery uint64
+	MaxBattery uint64
 }
 
 func (msg *IOSPerformanceAggregated) Encode() []byte {
@@ -2638,11 +2674,11 @@ func (msg *IOSPerformanceAggregated) TypeID() int {
 
 type IOSIssueEvent struct {
 	message
-	Timestamp     uint64
-	Type          string
+	Timestamp uint64
+	Type string
 	ContextString string
-	Context       string
-	Payload       string
+	Context string
+	Payload string
 }
 
 func (msg *IOSIssueEvent) Encode() []byte {
@@ -2664,3 +2700,4 @@ func (msg *IOSIssueEvent) Decode() Message {
 func (msg *IOSIssueEvent) TypeID() int {
 	return 111
 }
+
diff --git a/backend/pkg/messages/read-message.go b/backend/pkg/messages/read-message.go
index 29dddb02f..c65149888 100644
--- a/backend/pkg/messages/read-message.go
+++ b/backend/pkg/messages/read-message.go
@@ -5,1701 +5,1722 @@ import (
 	"fmt"
 )
 
-func DecodeBatchMeta(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &BatchMeta{}
-	if msg.PageNo, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
-	if msg.FirstIndex, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
-	if msg.Timestamp, err = reader.ReadInt(); err != nil {
-		return nil, err
-	}
-	return msg, err
-}
-
-func DecodeBatchMetadata(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &BatchMetadata{}
-	if msg.Version, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
-	if msg.PageNo, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
-	if msg.FirstIndex, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
-	if msg.Timestamp, err = reader.ReadInt(); err != nil {
-		return nil, err
-	}
-	if msg.Location, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
-}
-
-func DecodePartitionedMessage(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &PartitionedMessage{}
-	if msg.PartNo, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
-	if msg.PartTotal, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
-	return msg, err
-}
-
 func DecodeTimestamp(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &Timestamp{}
-	if msg.Timestamp, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
-	return msg, err
+    var err error = nil
+    msg := &Timestamp{}
+    	if msg.Timestamp, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeSessionStart(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &SessionStart{}
-	if msg.Timestamp, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &SessionStart{}
+    	if msg.Timestamp, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.ProjectID, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.TrackerVersion, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.RevID, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.UserUUID, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.UserAgent, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.UserOS, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.UserOSVersion, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.UserBrowser, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.UserBrowserVersion, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.UserDevice, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.UserDeviceType, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.UserDeviceMemorySize, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.UserDeviceHeapSize, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.UserCountry, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.UserID, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeSessionEndDeprecated(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &SessionEndDeprecated{}
-	if msg.Timestamp, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
-	return msg, err
+    var err error = nil
+    msg := &SessionEndDeprecated{}
+    	if msg.Timestamp, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeSetPageLocation(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &SetPageLocation{}
-	if msg.URL, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &SetPageLocation{}
+    	if msg.URL, err = reader.ReadString(); err != nil {
+            return nil, err
+        }
 	if msg.Referrer, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.NavigationStart, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeSetViewportSize(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &SetViewportSize{}
-	if msg.Width, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &SetViewportSize{}
+    	if msg.Width, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Height, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeSetViewportScroll(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &SetViewportScroll{}
-	if msg.X, err = reader.ReadInt(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &SetViewportScroll{}
+    	if msg.X, err = reader.ReadInt(); err != nil {
+            return nil, err
+        }
 	if msg.Y, err = reader.ReadInt(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeCreateDocument(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &CreateDocument{}
-
-	return msg, err
+    var err error = nil
+    msg := &CreateDocument{}
+    
+        return msg, err
 }
 
 func DecodeCreateElementNode(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &CreateElementNode{}
-	if msg.ID, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &CreateElementNode{}
+    	if msg.ID, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.ParentID, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.index, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Tag, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.SVG, err = reader.ReadBoolean(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeCreateTextNode(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &CreateTextNode{}
-	if msg.ID, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &CreateTextNode{}
+    	if msg.ID, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.ParentID, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Index, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeMoveNode(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &MoveNode{}
-	if msg.ID, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &MoveNode{}
+    	if msg.ID, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.ParentID, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Index, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeRemoveNode(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &RemoveNode{}
-	if msg.ID, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
-	return msg, err
+    var err error = nil
+    msg := &RemoveNode{}
+    	if msg.ID, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeSetNodeAttribute(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &SetNodeAttribute{}
-	if msg.ID, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &SetNodeAttribute{}
+    	if msg.ID, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Name, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Value, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeRemoveNodeAttribute(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &RemoveNodeAttribute{}
-	if msg.ID, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &RemoveNodeAttribute{}
+    	if msg.ID, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Name, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeSetNodeData(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &SetNodeData{}
-	if msg.ID, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &SetNodeData{}
+    	if msg.ID, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Data, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeSetCSSData(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &SetCSSData{}
-	if msg.ID, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &SetCSSData{}
+    	if msg.ID, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Data, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeSetNodeScroll(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &SetNodeScroll{}
-	if msg.ID, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &SetNodeScroll{}
+    	if msg.ID, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.X, err = reader.ReadInt(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Y, err = reader.ReadInt(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeSetInputTarget(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &SetInputTarget{}
-	if msg.ID, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &SetInputTarget{}
+    	if msg.ID, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Label, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeSetInputValue(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &SetInputValue{}
-	if msg.ID, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &SetInputValue{}
+    	if msg.ID, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Value, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Mask, err = reader.ReadInt(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeSetInputChecked(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &SetInputChecked{}
-	if msg.ID, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &SetInputChecked{}
+    	if msg.ID, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Checked, err = reader.ReadBoolean(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeMouseMove(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &MouseMove{}
-	if msg.X, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &MouseMove{}
+    	if msg.X, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Y, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeNetworkRequest(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &NetworkRequest{}
-	if msg.Type, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &NetworkRequest{}
+    	if msg.Type, err = reader.ReadString(); err != nil {
+            return nil, err
+        }
 	if msg.Method, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.URL, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Request, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Response, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Status, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Timestamp, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Duration, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeConsoleLog(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &ConsoleLog{}
-	if msg.Level, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &ConsoleLog{}
+    	if msg.Level, err = reader.ReadString(); err != nil {
+            return nil, err
+        }
 	if msg.Value, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodePageLoadTiming(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &PageLoadTiming{}
-	if msg.RequestStart, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &PageLoadTiming{}
+    	if msg.RequestStart, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.ResponseStart, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.ResponseEnd, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.DomContentLoadedEventStart, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.DomContentLoadedEventEnd, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.LoadEventStart, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.LoadEventEnd, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.FirstPaint, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.FirstContentfulPaint, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodePageRenderTiming(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &PageRenderTiming{}
-	if msg.SpeedIndex, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &PageRenderTiming{}
+    	if msg.SpeedIndex, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.VisuallyComplete, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.TimeToInteractive, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeJSExceptionDeprecated(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &JSExceptionDeprecated{}
-	if msg.Name, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &JSExceptionDeprecated{}
+    	if msg.Name, err = reader.ReadString(); err != nil {
+            return nil, err
+        }
 	if msg.Message, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Payload, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeIntegrationEvent(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &IntegrationEvent{}
-	if msg.Timestamp, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &IntegrationEvent{}
+    	if msg.Timestamp, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Source, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Name, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Message, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Payload, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeCustomEvent(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &CustomEvent{}
-	if msg.Name, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &CustomEvent{}
+    	if msg.Name, err = reader.ReadString(); err != nil {
+            return nil, err
+        }
 	if msg.Payload, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeUserID(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &UserID{}
-	if msg.ID, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+    var err error = nil
+    msg := &UserID{}
+    	if msg.ID, err = reader.ReadString(); err != nil {
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeUserAnonymousID(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &UserAnonymousID{}
-	if msg.ID, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+    var err error = nil
+    msg := &UserAnonymousID{}
+    	if msg.ID, err = reader.ReadString(); err != nil {
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeMetadata(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &Metadata{}
-	if msg.Key, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &Metadata{}
+    	if msg.Key, err = reader.ReadString(); err != nil {
+            return nil, err
+        }
 	if msg.Value, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodePageEvent(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &PageEvent{}
-	if msg.MessageID, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &PageEvent{}
+    	if msg.MessageID, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Timestamp, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.URL, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Referrer, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Loaded, err = reader.ReadBoolean(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.RequestStart, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.ResponseStart, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.ResponseEnd, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.DomContentLoadedEventStart, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.DomContentLoadedEventEnd, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.LoadEventStart, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.LoadEventEnd, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.FirstPaint, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.FirstContentfulPaint, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.SpeedIndex, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.VisuallyComplete, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.TimeToInteractive, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeInputEvent(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &InputEvent{}
-	if msg.MessageID, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &InputEvent{}
+    	if msg.MessageID, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Timestamp, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Value, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.ValueMasked, err = reader.ReadBoolean(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Label, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeClickEvent(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &ClickEvent{}
-	if msg.MessageID, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &ClickEvent{}
+    	if msg.MessageID, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Timestamp, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.HesitationTime, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Label, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Selector, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeResourceEvent(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &ResourceEvent{}
-	if msg.MessageID, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &ResourceEvent{}
+    	if msg.MessageID, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Timestamp, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Duration, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.TTFB, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.HeaderSize, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.EncodedBodySize, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.DecodedBodySize, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.URL, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Type, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Success, err = reader.ReadBoolean(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Method, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Status, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeCSSInsertRule(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &CSSInsertRule{}
-	if msg.ID, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &CSSInsertRule{}
+    	if msg.ID, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Rule, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Index, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeCSSDeleteRule(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &CSSDeleteRule{}
-	if msg.ID, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &CSSDeleteRule{}
+    	if msg.ID, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Index, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeFetch(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &Fetch{}
-	if msg.Method, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &Fetch{}
+    	if msg.Method, err = reader.ReadString(); err != nil {
+            return nil, err
+        }
 	if msg.URL, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Request, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Response, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Status, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Timestamp, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Duration, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeProfiler(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &Profiler{}
-	if msg.Name, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &Profiler{}
+    	if msg.Name, err = reader.ReadString(); err != nil {
+            return nil, err
+        }
 	if msg.Duration, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Args, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Result, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeOTable(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &OTable{}
-	if msg.Key, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &OTable{}
+    	if msg.Key, err = reader.ReadString(); err != nil {
+            return nil, err
+        }
 	if msg.Value, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeStateAction(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &StateAction{}
-	if msg.Type, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+    var err error = nil
+    msg := &StateAction{}
+    	if msg.Type, err = reader.ReadString(); err != nil {
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeRedux(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &Redux{}
-	if msg.Action, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &Redux{}
+    	if msg.Action, err = reader.ReadString(); err != nil {
+            return nil, err
+        }
 	if msg.State, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Duration, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeVuex(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &Vuex{}
-	if msg.Mutation, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &Vuex{}
+    	if msg.Mutation, err = reader.ReadString(); err != nil {
+            return nil, err
+        }
 	if msg.State, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeMobX(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &MobX{}
-	if msg.Type, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &MobX{}
+    	if msg.Type, err = reader.ReadString(); err != nil {
+            return nil, err
+        }
 	if msg.Payload, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeNgRx(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &NgRx{}
-	if msg.Action, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &NgRx{}
+    	if msg.Action, err = reader.ReadString(); err != nil {
+            return nil, err
+        }
 	if msg.State, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Duration, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeGraphQL(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &GraphQL{}
-	if msg.OperationKind, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &GraphQL{}
+    	if msg.OperationKind, err = reader.ReadString(); err != nil {
+            return nil, err
+        }
 	if msg.OperationName, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Variables, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Response, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodePerformanceTrack(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &PerformanceTrack{}
-	if msg.Frames, err = reader.ReadInt(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &PerformanceTrack{}
+    	if msg.Frames, err = reader.ReadInt(); err != nil {
+            return nil, err
+        }
 	if msg.Ticks, err = reader.ReadInt(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.TotalJSHeapSize, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.UsedJSHeapSize, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeDOMDrop(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &DOMDrop{}
-	if msg.Timestamp, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
-	return msg, err
+    var err error = nil
+    msg := &DOMDrop{}
+    	if msg.Timestamp, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeResourceTiming(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &ResourceTiming{}
-	if msg.Timestamp, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &ResourceTiming{}
+    	if msg.Timestamp, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Duration, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.TTFB, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.HeaderSize, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.EncodedBodySize, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.DecodedBodySize, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.URL, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Initiator, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeConnectionInformation(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &ConnectionInformation{}
-	if msg.Downlink, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &ConnectionInformation{}
+    	if msg.Downlink, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Type, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeSetPageVisibility(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &SetPageVisibility{}
-	if msg.hidden, err = reader.ReadBoolean(); err != nil {
-		return nil, err
-	}
-	return msg, err
+    var err error = nil
+    msg := &SetPageVisibility{}
+    	if msg.hidden, err = reader.ReadBoolean(); err != nil {
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodePerformanceTrackAggr(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &PerformanceTrackAggr{}
-	if msg.TimestampStart, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &PerformanceTrackAggr{}
+    	if msg.TimestampStart, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.TimestampEnd, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.MinFPS, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.AvgFPS, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.MaxFPS, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.MinCPU, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.AvgCPU, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.MaxCPU, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.MinTotalJSHeapSize, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.AvgTotalJSHeapSize, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.MaxTotalJSHeapSize, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.MinUsedJSHeapSize, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.AvgUsedJSHeapSize, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.MaxUsedJSHeapSize, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeLoadFontFace(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &LoadFontFace{}
-	if msg.ParentID, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &LoadFontFace{}
+    	if msg.ParentID, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Family, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Source, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Descriptors, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeSetNodeFocus(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &SetNodeFocus{}
-	if msg.ID, err = reader.ReadInt(); err != nil {
-		return nil, err
-	}
-	return msg, err
+    var err error = nil
+    msg := &SetNodeFocus{}
+    	if msg.ID, err = reader.ReadInt(); err != nil {
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeLongTask(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &LongTask{}
-	if msg.Timestamp, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &LongTask{}
+    	if msg.Timestamp, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Duration, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Context, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.ContainerType, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.ContainerSrc, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.ContainerId, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.ContainerName, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeSetNodeAttributeURLBased(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &SetNodeAttributeURLBased{}
-	if msg.ID, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &SetNodeAttributeURLBased{}
+    	if msg.ID, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Name, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Value, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.BaseURL, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeSetCSSDataURLBased(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &SetCSSDataURLBased{}
-	if msg.ID, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &SetCSSDataURLBased{}
+    	if msg.ID, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Data, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.BaseURL, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
-func DecodeIssueEvent(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &IssueEvent{}
-	if msg.MessageID, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+func DecodeIssueEventDeprecated(reader BytesReader) (Message, error) {
+    var err error = nil
+    msg := &IssueEventDeprecated{}
+    	if msg.MessageID, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Timestamp, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Type, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.ContextString, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Context, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Payload, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeTechnicalInfo(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &TechnicalInfo{}
-	if msg.Type, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &TechnicalInfo{}
+    	if msg.Type, err = reader.ReadString(); err != nil {
+            return nil, err
+        }
 	if msg.Value, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeCustomIssue(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &CustomIssue{}
-	if msg.Name, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &CustomIssue{}
+    	if msg.Name, err = reader.ReadString(); err != nil {
+            return nil, err
+        }
 	if msg.Payload, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeAssetCache(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &AssetCache{}
-	if msg.URL, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+    var err error = nil
+    msg := &AssetCache{}
+    	if msg.URL, err = reader.ReadString(); err != nil {
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeCSSInsertRuleURLBased(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &CSSInsertRuleURLBased{}
-	if msg.ID, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &CSSInsertRuleURLBased{}
+    	if msg.ID, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Rule, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Index, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.BaseURL, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeMouseClick(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &MouseClick{}
-	if msg.ID, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &MouseClick{}
+    	if msg.ID, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.HesitationTime, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Label, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Selector, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeCreateIFrameDocument(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &CreateIFrameDocument{}
-	if msg.FrameID, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &CreateIFrameDocument{}
+    	if msg.FrameID, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.ID, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeAdoptedSSReplaceURLBased(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &AdoptedSSReplaceURLBased{}
-	if msg.SheetID, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &AdoptedSSReplaceURLBased{}
+    	if msg.SheetID, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Text, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.BaseURL, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeAdoptedSSReplace(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &AdoptedSSReplace{}
-	if msg.SheetID, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &AdoptedSSReplace{}
+    	if msg.SheetID, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Text, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeAdoptedSSInsertRuleURLBased(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &AdoptedSSInsertRuleURLBased{}
-	if msg.SheetID, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &AdoptedSSInsertRuleURLBased{}
+    	if msg.SheetID, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Rule, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Index, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.BaseURL, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeAdoptedSSInsertRule(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &AdoptedSSInsertRule{}
-	if msg.SheetID, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &AdoptedSSInsertRule{}
+    	if msg.SheetID, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Rule, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Index, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeAdoptedSSDeleteRule(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &AdoptedSSDeleteRule{}
-	if msg.SheetID, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &AdoptedSSDeleteRule{}
+    	if msg.SheetID, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Index, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeAdoptedSSAddOwner(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &AdoptedSSAddOwner{}
-	if msg.SheetID, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &AdoptedSSAddOwner{}
+    	if msg.SheetID, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.ID, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeAdoptedSSRemoveOwner(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &AdoptedSSRemoveOwner{}
-	if msg.SheetID, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &AdoptedSSRemoveOwner{}
+    	if msg.SheetID, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.ID, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeZustand(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &Zustand{}
-	if msg.Mutation, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &Zustand{}
+    	if msg.Mutation, err = reader.ReadString(); err != nil {
+            return nil, err
+        }
 	if msg.State, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeJSException(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &JSException{}
-	if msg.Name, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &JSException{}
+    	if msg.Name, err = reader.ReadString(); err != nil {
+            return nil, err
+        }
 	if msg.Message, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Payload, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Metadata, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
+}
+
+func DecodeBatchMeta(reader BytesReader) (Message, error) {
+    var err error = nil
+    msg := &BatchMeta{}
+    	if msg.PageNo, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
+	if msg.FirstIndex, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
+	if msg.Timestamp, err = reader.ReadInt(); err != nil {
+            return nil, err
+        }
+        return msg, err
+}
+
+func DecodeBatchMetadata(reader BytesReader) (Message, error) {
+    var err error = nil
+    msg := &BatchMetadata{}
+    	if msg.Version, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
+	if msg.PageNo, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
+	if msg.FirstIndex, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
+	if msg.Timestamp, err = reader.ReadInt(); err != nil {
+            return nil, err
+        }
+	if msg.Location, err = reader.ReadString(); err != nil {
+            return nil, err
+        }
+        return msg, err
+}
+
+func DecodePartitionedMessage(reader BytesReader) (Message, error) {
+    var err error = nil
+    msg := &PartitionedMessage{}
+    	if msg.PartNo, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
+	if msg.PartTotal, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
+        return msg, err
+}
+
+func DecodeIssueEvent(reader BytesReader) (Message, error) {
+    var err error = nil
+    msg := &IssueEvent{}
+    	if msg.MessageID, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
+	if msg.Timestamp, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
+	if msg.Type, err = reader.ReadString(); err != nil {
+            return nil, err
+        }
+	if msg.ContextString, err = reader.ReadString(); err != nil {
+            return nil, err
+        }
+	if msg.Context, err = reader.ReadString(); err != nil {
+            return nil, err
+        }
+	if msg.Payload, err = reader.ReadString(); err != nil {
+            return nil, err
+        }
+	if msg.URL, err = reader.ReadString(); err != nil {
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeSessionEnd(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &SessionEnd{}
-	if msg.Timestamp, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &SessionEnd{}
+    	if msg.Timestamp, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.EncryptionKey, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeSessionSearch(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &SessionSearch{}
-	if msg.Timestamp, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &SessionSearch{}
+    	if msg.Timestamp, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Partition, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeIOSBatchMeta(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &IOSBatchMeta{}
-	if msg.Timestamp, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &IOSBatchMeta{}
+    	if msg.Timestamp, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Length, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.FirstIndex, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeIOSSessionStart(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &IOSSessionStart{}
-	if msg.Timestamp, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &IOSSessionStart{}
+    	if msg.Timestamp, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.ProjectID, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.TrackerVersion, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.RevID, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.UserUUID, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.UserOS, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.UserOSVersion, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.UserDevice, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.UserDeviceType, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.UserCountry, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeIOSSessionEnd(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &IOSSessionEnd{}
-	if msg.Timestamp, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
-	return msg, err
+    var err error = nil
+    msg := &IOSSessionEnd{}
+    	if msg.Timestamp, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeIOSMetadata(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &IOSMetadata{}
-	if msg.Timestamp, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &IOSMetadata{}
+    	if msg.Timestamp, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Length, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Key, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Value, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeIOSCustomEvent(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &IOSCustomEvent{}
-	if msg.Timestamp, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &IOSCustomEvent{}
+    	if msg.Timestamp, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Length, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Name, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Payload, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeIOSUserID(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &IOSUserID{}
-	if msg.Timestamp, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &IOSUserID{}
+    	if msg.Timestamp, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Length, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Value, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeIOSUserAnonymousID(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &IOSUserAnonymousID{}
-	if msg.Timestamp, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &IOSUserAnonymousID{}
+    	if msg.Timestamp, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Length, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Value, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeIOSScreenChanges(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &IOSScreenChanges{}
-	if msg.Timestamp, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &IOSScreenChanges{}
+    	if msg.Timestamp, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Length, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.X, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Y, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Width, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Height, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeIOSCrash(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &IOSCrash{}
-	if msg.Timestamp, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &IOSCrash{}
+    	if msg.Timestamp, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Length, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Name, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Reason, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Stacktrace, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeIOSScreenEnter(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &IOSScreenEnter{}
-	if msg.Timestamp, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &IOSScreenEnter{}
+    	if msg.Timestamp, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Length, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Title, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.ViewName, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeIOSScreenLeave(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &IOSScreenLeave{}
-	if msg.Timestamp, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &IOSScreenLeave{}
+    	if msg.Timestamp, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Length, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Title, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.ViewName, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeIOSClickEvent(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &IOSClickEvent{}
-	if msg.Timestamp, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &IOSClickEvent{}
+    	if msg.Timestamp, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Length, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Label, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.X, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Y, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeIOSInputEvent(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &IOSInputEvent{}
-	if msg.Timestamp, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &IOSInputEvent{}
+    	if msg.Timestamp, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Length, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Value, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.ValueMasked, err = reader.ReadBoolean(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Label, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeIOSPerformanceEvent(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &IOSPerformanceEvent{}
-	if msg.Timestamp, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &IOSPerformanceEvent{}
+    	if msg.Timestamp, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Length, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Name, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Value, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeIOSLog(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &IOSLog{}
-	if msg.Timestamp, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &IOSLog{}
+    	if msg.Timestamp, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Length, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Severity, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Content, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeIOSInternalError(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &IOSInternalError{}
-	if msg.Timestamp, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &IOSInternalError{}
+    	if msg.Timestamp, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Length, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Content, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeIOSNetworkCall(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &IOSNetworkCall{}
-	if msg.Timestamp, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &IOSNetworkCall{}
+    	if msg.Timestamp, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Length, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Duration, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Headers, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Body, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.URL, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Success, err = reader.ReadBoolean(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Method, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Status, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeIOSPerformanceAggregated(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &IOSPerformanceAggregated{}
-	if msg.TimestampStart, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &IOSPerformanceAggregated{}
+    	if msg.TimestampStart, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.TimestampEnd, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.MinFPS, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.AvgFPS, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.MaxFPS, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.MinCPU, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.AvgCPU, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.MaxCPU, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.MinMemory, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.AvgMemory, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.MaxMemory, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.MinBattery, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.AvgBattery, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.MaxBattery, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func DecodeIOSIssueEvent(reader BytesReader) (Message, error) {
-	var err error = nil
-	msg := &IOSIssueEvent{}
-	if msg.Timestamp, err = reader.ReadUint(); err != nil {
-		return nil, err
-	}
+    var err error = nil
+    msg := &IOSIssueEvent{}
+    	if msg.Timestamp, err = reader.ReadUint(); err != nil {
+            return nil, err
+        }
 	if msg.Type, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.ContextString, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Context, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
+            return nil, err
+        }
 	if msg.Payload, err = reader.ReadString(); err != nil {
-		return nil, err
-	}
-	return msg, err
+            return nil, err
+        }
+        return msg, err
 }
 
 func ReadMessage(t uint64, reader BytesReader) (Message, error) {
 	switch t {
-	case 80:
-		return DecodeBatchMeta(reader)
-	case 81:
-		return DecodeBatchMetadata(reader)
-	case 82:
-		return DecodePartitionedMessage(reader)
 	case 0:
 		return DecodeTimestamp(reader)
 	case 1:
@@ -1813,7 +1834,7 @@ func ReadMessage(t uint64, reader BytesReader) (Message, error) {
 	case 61:
 		return DecodeSetCSSDataURLBased(reader)
 	case 62:
-		return DecodeIssueEvent(reader)
+		return DecodeIssueEventDeprecated(reader)
 	case 63:
 		return DecodeTechnicalInfo(reader)
 	case 64:
@@ -1844,6 +1865,14 @@ func ReadMessage(t uint64, reader BytesReader) (Message, error) {
 		return DecodeZustand(reader)
 	case 78:
 		return DecodeJSException(reader)
+	case 80:
+		return DecodeBatchMeta(reader)
+	case 81:
+		return DecodeBatchMetadata(reader)
+	case 82:
+		return DecodePartitionedMessage(reader)
+	case 125:
+		return DecodeIssueEvent(reader)
 	case 126:
 		return DecodeSessionEnd(reader)
 	case 127:
diff --git a/backend/pkg/messages/session-iterator.go b/backend/pkg/messages/session-iterator.go
index 45daae4b8..eb9f32387 100644
--- a/backend/pkg/messages/session-iterator.go
+++ b/backend/pkg/messages/session-iterator.go
@@ -40,6 +40,13 @@ func SplitMessages(data []byte) ([]*msgInfo, error) {
 			return nil, fmt.Errorf("read message type err: %s", err)
 		}
 
+		if msgType == MsgRedux {
+			log.Printf("redux")
+		}
+		if msgType == MsgFetch {
+			log.Printf("fetch")
+		}
+
 		// Read message body
 		_, err = ReadMessage(msgType, reader)
 		if err != nil {
diff --git a/ee/backend/pkg/db/clickhouse/connector.go b/ee/backend/pkg/db/clickhouse/connector.go
index 20996c073..8762a683c 100644
--- a/ee/backend/pkg/db/clickhouse/connector.go
+++ b/ee/backend/pkg/db/clickhouse/connector.go
@@ -87,7 +87,7 @@ var batches = map[string]string{
 	"requests":      "INSERT INTO experimental.events (session_id, project_id, message_id, datetime, url, request_body, response_body, status, method, duration, success, event_type) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
 	"custom":        "INSERT INTO experimental.events (session_id, project_id, message_id, datetime, name, payload, event_type) VALUES (?, ?, ?, ?, ?, ?, ?)",
 	"graphql":       "INSERT INTO experimental.events (session_id, project_id, message_id, datetime, name, request_body, response_body, event_type) VALUES (?, ?, ?, ?, ?, ?, ?, ?)",
-	"issuesEvents":  "INSERT INTO experimental.events (session_id, project_id, message_id, datetime, issue_id, issue_type, event_type) VALUES (?, ?, ?, ?, ?, ?, ?)",
+	"issuesEvents":  "INSERT INTO experimental.events (session_id, project_id, message_id, datetime, issue_id, issue_type, event_type, url) VALUES (?, ?, ?, ?, ?, ?, ?, ?)",
 	"issues":        "INSERT INTO experimental.issues (project_id, issue_id, type, context_string) VALUES (?, ?, ?, ?)",
 }
 
@@ -132,6 +132,7 @@ func (c *connectorImpl) InsertIssue(session *types.Session, msg *messages.IssueE
 		issueID,
 		msg.Type,
 		"ISSUE",
+		msg.URL,
 	); err != nil {
 		c.checkError("issuesEvents", err)
 		return fmt.Errorf("can't append to issuesEvents batch: %s", err)
diff --git a/ee/connectors/msgcodec/messages.py b/ee/connectors/msgcodec/messages.py
index 313fdf12c..517db5378 100644
--- a/ee/connectors/msgcodec/messages.py
+++ b/ee/connectors/msgcodec/messages.py
@@ -6,34 +6,6 @@ class Message(ABC):
     pass
 
 
-class BatchMeta(Message):
-    __id__ = 80
-
-    def __init__(self, page_no, first_index, timestamp):
-        self.page_no = page_no
-        self.first_index = first_index
-        self.timestamp = timestamp
-
-
-class BatchMetadata(Message):
-    __id__ = 81
-
-    def __init__(self, version, page_no, first_index, timestamp, location):
-        self.version = version
-        self.page_no = page_no
-        self.first_index = first_index
-        self.timestamp = timestamp
-        self.location = location
-
-
-class PartitionedMessage(Message):
-    __id__ = 82
-
-    def __init__(self, part_no, part_total):
-        self.part_no = part_no
-        self.part_total = part_total
-
-
 class Timestamp(Message):
     __id__ = 0
 
@@ -586,7 +558,7 @@ class SetCSSDataURLBased(Message):
         self.base_url = base_url
 
 
-class IssueEvent(Message):
+class IssueEventDeprecated(Message):
     __id__ = 62
 
     def __init__(self, message_id, timestamp, type, context_string, context, payload):
@@ -727,6 +699,47 @@ class JSException(Message):
         self.metadata = metadata
 
 
+class BatchMeta(Message):
+    __id__ = 80
+
+    def __init__(self, page_no, first_index, timestamp):
+        self.page_no = page_no
+        self.first_index = first_index
+        self.timestamp = timestamp
+
+
+class BatchMetadata(Message):
+    __id__ = 81
+
+    def __init__(self, version, page_no, first_index, timestamp, location):
+        self.version = version
+        self.page_no = page_no
+        self.first_index = first_index
+        self.timestamp = timestamp
+        self.location = location
+
+
+class PartitionedMessage(Message):
+    __id__ = 82
+
+    def __init__(self, part_no, part_total):
+        self.part_no = part_no
+        self.part_total = part_total
+
+
+class IssueEvent(Message):
+    __id__ = 125
+
+    def __init__(self, message_id, timestamp, type, context_string, context, payload, url):
+        self.message_id = message_id
+        self.timestamp = timestamp
+        self.type = type
+        self.context_string = context_string
+        self.context = context
+        self.payload = payload
+        self.url = url
+
+
 class SessionEnd(Message):
     __id__ = 126
 
diff --git a/ee/connectors/msgcodec/msgcodec.py b/ee/connectors/msgcodec/msgcodec.py
index dc63ffa79..5ecd0bd81 100644
--- a/ee/connectors/msgcodec/msgcodec.py
+++ b/ee/connectors/msgcodec/msgcodec.py
@@ -76,28 +76,6 @@ class MessageCodec(Codec):
 
     def read_head_message(self, reader: io.BytesIO, message_id) -> Message:
 
-        if message_id == 80:
-            return BatchMeta(
-                page_no=self.read_uint(reader),
-                first_index=self.read_uint(reader),
-                timestamp=self.read_int(reader)
-            )
-
-        if message_id == 81:
-            return BatchMetadata(
-                version=self.read_uint(reader),
-                page_no=self.read_uint(reader),
-                first_index=self.read_uint(reader),
-                timestamp=self.read_int(reader),
-                location=self.read_string(reader)
-            )
-
-        if message_id == 82:
-            return PartitionedMessage(
-                part_no=self.read_uint(reader),
-                part_total=self.read_uint(reader)
-            )
-
         if message_id == 0:
             return Timestamp(
                 timestamp=self.read_uint(reader)
@@ -539,7 +517,7 @@ class MessageCodec(Codec):
             )
 
         if message_id == 62:
-            return IssueEvent(
+            return IssueEventDeprecated(
                 message_id=self.read_uint(reader),
                 timestamp=self.read_uint(reader),
                 type=self.read_string(reader),
@@ -647,6 +625,39 @@ class MessageCodec(Codec):
                 metadata=self.read_string(reader)
             )
 
+        if message_id == 80:
+            return BatchMeta(
+                page_no=self.read_uint(reader),
+                first_index=self.read_uint(reader),
+                timestamp=self.read_int(reader)
+            )
+
+        if message_id == 81:
+            return BatchMetadata(
+                version=self.read_uint(reader),
+                page_no=self.read_uint(reader),
+                first_index=self.read_uint(reader),
+                timestamp=self.read_int(reader),
+                location=self.read_string(reader)
+            )
+
+        if message_id == 82:
+            return PartitionedMessage(
+                part_no=self.read_uint(reader),
+                part_total=self.read_uint(reader)
+            )
+
+        if message_id == 125:
+            return IssueEvent(
+                message_id=self.read_uint(reader),
+                timestamp=self.read_uint(reader),
+                type=self.read_string(reader),
+                context_string=self.read_string(reader),
+                context=self.read_string(reader),
+                payload=self.read_string(reader),
+                url=self.read_string(reader)
+            )
+
         if message_id == 126:
             return SessionEnd(
                 timestamp=self.read_uint(reader),
diff --git a/frontend/app/player/web/messages/tracker.gen.ts b/frontend/app/player/web/messages/tracker.gen.ts
index 0788b85d1..b510f0df1 100644
--- a/frontend/app/player/web/messages/tracker.gen.ts
+++ b/frontend/app/player/web/messages/tracker.gen.ts
@@ -5,21 +5,6 @@ import type { RawMessage } from './raw.gen'
 import { MType } from './raw.gen'
 
 
-type TrBatchMetadata = [
-  type: 81,
-  version: number,
-  pageNo: number,
-  firstIndex: number,
-  timestamp: number,
-  location: string,
-]
-
-type TrPartitionedMessage = [
-  type: 82,
-  partNo: number,
-  partTotal: number,
-]
-
 type TrTimestamp = [
   type: 0,
   timestamp: number,
@@ -423,8 +408,23 @@ type TrJSException = [
   metadata: string,
 ]
 
+type TrBatchMetadata = [
+  type: 81,
+  version: number,
+  pageNo: number,
+  firstIndex: number,
+  timestamp: number,
+  location: string,
+]
 
-export type TrackerMessage = TrBatchMetadata | TrPartitionedMessage | TrTimestamp | TrSetPageLocation | TrSetViewportSize | TrSetViewportScroll | TrCreateDocument | TrCreateElementNode | TrCreateTextNode | TrMoveNode | TrRemoveNode | TrSetNodeAttribute | TrRemoveNodeAttribute | TrSetNodeData | TrSetNodeScroll | TrSetInputTarget | TrSetInputValue | TrSetInputChecked | TrMouseMove | TrNetworkRequest | TrConsoleLog | TrPageLoadTiming | TrPageRenderTiming | TrJSExceptionDeprecated | TrCustomEvent | TrUserID | TrUserAnonymousID | TrMetadata | TrCSSInsertRule | TrCSSDeleteRule | TrFetch | TrProfiler | TrOTable | TrStateAction | TrRedux | TrVuex | TrMobX | TrNgRx | TrGraphQL | TrPerformanceTrack | TrResourceTiming | TrConnectionInformation | TrSetPageVisibility | TrLoadFontFace | TrSetNodeFocus | TrLongTask | TrSetNodeAttributeURLBased | TrSetCSSDataURLBased | TrTechnicalInfo | TrCustomIssue | TrCSSInsertRuleURLBased | TrMouseClick | TrCreateIFrameDocument | TrAdoptedSSReplaceURLBased | TrAdoptedSSInsertRuleURLBased | TrAdoptedSSDeleteRule | TrAdoptedSSAddOwner | TrAdoptedSSRemoveOwner | TrZustand | TrJSException
+type TrPartitionedMessage = [
+  type: 82,
+  partNo: number,
+  partTotal: number,
+]
+
+
+export type TrackerMessage = TrTimestamp | TrSetPageLocation | TrSetViewportSize | TrSetViewportScroll | TrCreateDocument | TrCreateElementNode | TrCreateTextNode | TrMoveNode | TrRemoveNode | TrSetNodeAttribute | TrRemoveNodeAttribute | TrSetNodeData | TrSetNodeScroll | TrSetInputTarget | TrSetInputValue | TrSetInputChecked | TrMouseMove | TrNetworkRequest | TrConsoleLog | TrPageLoadTiming | TrPageRenderTiming | TrJSExceptionDeprecated | TrCustomEvent | TrUserID | TrUserAnonymousID | TrMetadata | TrCSSInsertRule | TrCSSDeleteRule | TrFetch | TrProfiler | TrOTable | TrStateAction | TrRedux | TrVuex | TrMobX | TrNgRx | TrGraphQL | TrPerformanceTrack | TrResourceTiming | TrConnectionInformation | TrSetPageVisibility | TrLoadFontFace | TrSetNodeFocus | TrLongTask | TrSetNodeAttributeURLBased | TrSetCSSDataURLBased | TrTechnicalInfo | TrCustomIssue | TrCSSInsertRuleURLBased | TrMouseClick | TrCreateIFrameDocument | TrAdoptedSSReplaceURLBased | TrAdoptedSSInsertRuleURLBased | TrAdoptedSSDeleteRule | TrAdoptedSSAddOwner | TrAdoptedSSRemoveOwner | TrZustand | TrJSException | TrBatchMetadata | TrPartitionedMessage
 
 export default function translate(tMsg: TrackerMessage): RawMessage | null {
   switch(tMsg[0]) {
diff --git a/mobs/messages.rb b/mobs/messages.rb
index 7090aaeb1..47d24c800 100644
--- a/mobs/messages.rb
+++ b/mobs/messages.rb
@@ -1,27 +1,4 @@
-# Special one for Batch Metadata. Message id could define the version
-
-# Deprecated since tracker 3.6.0 in favor of BatchMetadata
-message 80, 'BatchMeta', :replayer => false, :tracker => false do
-  uint 'PageNo'
-  uint 'FirstIndex'
-  int 'Timestamp'
-end
-
-# since tracker 3.6.0   TODO: for webworker only
-message 81, 'BatchMetadata', :replayer => false do
-  uint 'Version'
-  uint 'PageNo'
-  uint 'FirstIndex'
-  int 'Timestamp'
-  string 'Location'
-end
-
-# since tracker 3.6.0
-message 82, 'PartitionedMessage', :replayer => false do
-  uint 'PartNo'
-  uint 'PartTotal'
-end
-
+# OpenReplay messages definition
 
 message 0, 'Timestamp' do
   uint 'Timestamp'
@@ -408,7 +385,7 @@ message 61, 'SetCSSDataURLBased' do
   string 'Data'
   string 'BaseURL'
 end
-message 62, 'IssueEvent', :replayer => false, :tracker => false do
+message 62, 'IssueEventDeprecated', :replayer => false, :tracker => false do
   uint 'MessageID'
   uint 'Timestamp'
   string 'Type'
@@ -493,15 +470,48 @@ message 78, 'JSException', :replayer => false do
   string 'Metadata'
 end
 
+# 80 -- 90 reserved
+
+# Special one for Batch Metadata. Message id could define the version
+
+# Deprecated since tracker 3.6.0 in favor of BatchMetadata
+message 80, 'BatchMeta', :replayer => false, :tracker => false do
+  uint 'PageNo'
+  uint 'FirstIndex'
+  int 'Timestamp'
+end
+
+# since tracker 3.6.0   TODO: for webworker only
+message 81, 'BatchMetadata', :replayer => false do
+  uint 'Version'
+  uint 'PageNo'
+  uint 'FirstIndex'
+  int 'Timestamp'
+  string 'Location'
+end
+
+# since tracker 3.6.0
+message 82, 'PartitionedMessage', :replayer => false do
+  uint 'PartNo'
+  uint 'PartTotal'
+end
+
+message 125, 'IssueEvent', :replayer => false, :tracker => false do
+  uint 'MessageID'
+  uint 'Timestamp'
+  string 'Type'
+  string 'ContextString'
+  string 'Context'
+  string 'Payload'
+  string 'URL'
+end
 
 message 126, 'SessionEnd', :tracker => false, :replayer => false do
   uint 'Timestamp'
   string 'EncryptionKey'
 end
+
 message 127, 'SessionSearch', :tracker => false, :replayer => false  do
   uint 'Timestamp'
   uint 'Partition'
 end
-
-
-# 80 -- 90 reserved
diff --git a/tracker/tracker/src/common/messages.gen.ts b/tracker/tracker/src/common/messages.gen.ts
index 2d6624b5e..a712f87e0 100644
--- a/tracker/tracker/src/common/messages.gen.ts
+++ b/tracker/tracker/src/common/messages.gen.ts
@@ -2,8 +2,6 @@
 /* eslint-disable */
 
 export declare const enum Type {
-  BatchMetadata = 81,
-  PartitionedMessage = 82,
   Timestamp = 0,
   SetPageLocation = 4,
   SetViewportSize = 5,
@@ -62,24 +60,11 @@ export declare const enum Type {
   AdoptedSSRemoveOwner = 77,
   Zustand = 79,
   JSException = 78,
+  BatchMetadata = 81,
+  PartitionedMessage = 82,
 }
 
 
-export type BatchMetadata = [
-  /*type:*/ Type.BatchMetadata,
-  /*version:*/ number,
-  /*pageNo:*/ number,
-  /*firstIndex:*/ number,
-  /*timestamp:*/ number,
-  /*location:*/ string,
-]
-
-export type PartitionedMessage = [
-  /*type:*/ Type.PartitionedMessage,
-  /*partNo:*/ number,
-  /*partTotal:*/ number,
-]
-
 export type Timestamp = [
   /*type:*/ Type.Timestamp,
   /*timestamp:*/ number,
@@ -483,6 +468,21 @@ export type JSException = [
   /*metadata:*/ string,
 ]
 
+export type BatchMetadata = [
+  /*type:*/ Type.BatchMetadata,
+  /*version:*/ number,
+  /*pageNo:*/ number,
+  /*firstIndex:*/ number,
+  /*timestamp:*/ number,
+  /*location:*/ string,
+]
 
-type Message =  BatchMetadata | PartitionedMessage | Timestamp | SetPageLocation | SetViewportSize | SetViewportScroll | CreateDocument | CreateElementNode | CreateTextNode | MoveNode | RemoveNode | SetNodeAttribute | RemoveNodeAttribute | SetNodeData | SetNodeScroll | SetInputTarget | SetInputValue | SetInputChecked | MouseMove | NetworkRequest | ConsoleLog | PageLoadTiming | PageRenderTiming | JSExceptionDeprecated | CustomEvent | UserID | UserAnonymousID | Metadata | CSSInsertRule | CSSDeleteRule | Fetch | Profiler | OTable | StateAction | Redux | Vuex | MobX | NgRx | GraphQL | PerformanceTrack | ResourceTiming | ConnectionInformation | SetPageVisibility | LoadFontFace | SetNodeFocus | LongTask | SetNodeAttributeURLBased | SetCSSDataURLBased | TechnicalInfo | CustomIssue | CSSInsertRuleURLBased | MouseClick | CreateIFrameDocument | AdoptedSSReplaceURLBased | AdoptedSSInsertRuleURLBased | AdoptedSSDeleteRule | AdoptedSSAddOwner | AdoptedSSRemoveOwner | Zustand | JSException
+export type PartitionedMessage = [
+  /*type:*/ Type.PartitionedMessage,
+  /*partNo:*/ number,
+  /*partTotal:*/ number,
+]
+
+
+type Message =  Timestamp | SetPageLocation | SetViewportSize | SetViewportScroll | CreateDocument | CreateElementNode | CreateTextNode | MoveNode | RemoveNode | SetNodeAttribute | RemoveNodeAttribute | SetNodeData | SetNodeScroll | SetInputTarget | SetInputValue | SetInputChecked | MouseMove | NetworkRequest | ConsoleLog | PageLoadTiming | PageRenderTiming | JSExceptionDeprecated | CustomEvent | UserID | UserAnonymousID | Metadata | CSSInsertRule | CSSDeleteRule | Fetch | Profiler | OTable | StateAction | Redux | Vuex | MobX | NgRx | GraphQL | PerformanceTrack | ResourceTiming | ConnectionInformation | SetPageVisibility | LoadFontFace | SetNodeFocus | LongTask | SetNodeAttributeURLBased | SetCSSDataURLBased | TechnicalInfo | CustomIssue | CSSInsertRuleURLBased | MouseClick | CreateIFrameDocument | AdoptedSSReplaceURLBased | AdoptedSSInsertRuleURLBased | AdoptedSSDeleteRule | AdoptedSSAddOwner | AdoptedSSRemoveOwner | Zustand | JSException | BatchMetadata | PartitionedMessage
 export default Message
diff --git a/tracker/tracker/src/main/app/messages.gen.ts b/tracker/tracker/src/main/app/messages.gen.ts
index 82f106e7d..14446c122 100644
--- a/tracker/tracker/src/main/app/messages.gen.ts
+++ b/tracker/tracker/src/main/app/messages.gen.ts
@@ -5,34 +5,6 @@ import * as Messages from '../../common/messages.gen.js'
 export { default, Type } from '../../common/messages.gen.js'
 
 
-export function BatchMetadata(
-  version: number,
-  pageNo: number,
-  firstIndex: number,
-  timestamp: number,
-  location: string,
-): Messages.BatchMetadata {
-  return [
-    Messages.Type.BatchMetadata,
-    version,
-    pageNo,
-    firstIndex,
-    timestamp,
-    location,
-  ]
-}
-
-export function PartitionedMessage(
-  partNo: number,
-  partTotal: number,
-): Messages.PartitionedMessage {
-  return [
-    Messages.Type.PartitionedMessage,
-    partNo,
-    partTotal,
-  ]
-}
-
 export function Timestamp(
   timestamp: number,
 ): Messages.Timestamp {
@@ -781,3 +753,31 @@ export function JSException(
   ]
 }
 
+export function BatchMetadata(
+  version: number,
+  pageNo: number,
+  firstIndex: number,
+  timestamp: number,
+  location: string,
+): Messages.BatchMetadata {
+  return [
+    Messages.Type.BatchMetadata,
+    version,
+    pageNo,
+    firstIndex,
+    timestamp,
+    location,
+  ]
+}
+
+export function PartitionedMessage(
+  partNo: number,
+  partTotal: number,
+): Messages.PartitionedMessage {
+  return [
+    Messages.Type.PartitionedMessage,
+    partNo,
+    partTotal,
+  ]
+}
+
diff --git a/tracker/tracker/src/webworker/MessageEncoder.gen.ts b/tracker/tracker/src/webworker/MessageEncoder.gen.ts
index d7772d54a..4bb30f036 100644
--- a/tracker/tracker/src/webworker/MessageEncoder.gen.ts
+++ b/tracker/tracker/src/webworker/MessageEncoder.gen.ts
@@ -10,14 +10,6 @@ export default class MessageEncoder extends PrimitiveEncoder {
   encode(msg: Message): boolean {
     switch(msg[0]) {
     
-    case Messages.Type.BatchMetadata:
-      return  this.uint(msg[1]) && this.uint(msg[2]) && this.uint(msg[3]) && this.int(msg[4]) && this.string(msg[5]) 
-    break
-    
-    case Messages.Type.PartitionedMessage:
-      return  this.uint(msg[1]) && this.uint(msg[2]) 
-    break
-    
     case Messages.Type.Timestamp:
       return  this.uint(msg[1]) 
     break
@@ -250,6 +242,14 @@ export default class MessageEncoder extends PrimitiveEncoder {
       return  this.string(msg[1]) && this.string(msg[2]) && this.string(msg[3]) && this.string(msg[4]) 
     break
     
+    case Messages.Type.BatchMetadata:
+      return  this.uint(msg[1]) && this.uint(msg[2]) && this.uint(msg[3]) && this.int(msg[4]) && this.string(msg[5]) 
+    break
+    
+    case Messages.Type.PartitionedMessage:
+      return  this.uint(msg[1]) && this.uint(msg[2]) 
+    break
+    
     }
   }