diff --git a/src/plugins/aorai/aorai_eva_analysis.enabled.ml b/src/plugins/aorai/aorai_eva_analysis.enabled.ml
index 85aaa035683674b2ba9102556cacfb38e5d9b421..39270cf7b64f814c66f0b9e271f2f7e5fa400441 100644
--- a/src/plugins/aorai/aorai_eva_analysis.enabled.ml
+++ b/src/plugins/aorai/aorai_eva_analysis.enabled.ml
@@ -36,5 +36,15 @@ let add_slevel_annotation vi kind =
 let add_slevel_annotations () =
   Aorai_visitors.Aux_funcs.iter add_slevel_annotation
 
+let add_partitioning varname =
+  match Data_for_aorai.get_varinfo_option varname with
+  | None -> ()
+  | Some vi -> Eva.Value_parameters.use_global_value_partitioning vi
+
+let add_state_variables_partitioning () =
+  add_partitioning Data_for_aorai.curState;
+  List.iter add_partitioning (Data_for_aorai.whole_history ())
+
 let setup () =
-  add_slevel_annotations ()
+  add_slevel_annotations ();
+  add_state_variables_partitioning ()