diff --git a/tsp-typescript-client/src/models/timegraph.ts b/tsp-typescript-client/src/models/timegraph.ts
index 07a21a1..0049065 100644
--- a/tsp-typescript-client/src/models/timegraph.ts
+++ b/tsp-typescript-client/src/models/timegraph.ts
@@ -29,8 +29,9 @@ export interface TimeGraphEntry extends Entry {
 const TimeGraphState = createNormalizer<TimeGraphState>({
     end: BigInt,
     start: BigInt,
+    label: assertNumber,
     tags: assertNumber,
-    style: OutputElementStyle,
+    style: assertNumber,
 });
 
 /**
@@ -50,7 +51,7 @@ export interface TimeGraphState {
     /**
      * Label to apply to the state
      */
-    label?: string;
+    label?: number;
 
     /**
      * Tags for the state, used when the state pass a filter
@@ -60,11 +61,13 @@ export interface TimeGraphState {
     /**
      * Optional information on the style to format this state
      */
-    style?: OutputElementStyle;
+    style?: number;
 }
 
 export const TimeGraphRow = createNormalizer<TimeGraphRow>({
+    styles: array(OutputElementStyle),
     entryId: assertNumber,
+    startTime: BigInt,
     states: array(TimeGraphState),
 });
 
@@ -72,11 +75,26 @@ export const TimeGraphRow = createNormalizer<TimeGraphRow>({
  * Time graph row described by an array of states for a specific entry
  */
 export interface TimeGraphRow {
+    /**
+     * Labels for the row
+     */
+    labels: string[];
+
+    /**
+     * Styles for the row
+     */
+    styles: OutputElementStyle[]
+    
     /**
      * Entry Id associated to the state array
      */
     entryId: number;
 
+    /**
+     * Start time of the row
+     */
+    startTime: bigint;
+
     /**
      * Array of states
      */