diff --git a/include/villas/sample.hpp b/include/villas/sample.hpp
index e5965e757..8de132db0 100644
--- a/include/villas/sample.hpp
+++ b/include/villas/sample.hpp
@@ -49,8 +49,9 @@ enum class SampleFlags {
       HAS_TS_ORIGIN | HAS_TS_RECEIVED, // Include origin timestamp in output.
   HAS_ALL = (1 << 5) - 1,              // Enable all output options.
 
+  NEW_FRAME = (1 << 16), // This sample is the last of a running simulation case
   NEW_SIMULATION =
-      (1 << 16), // This sample is the first of a new simulation case
+      (1 << 17) | NEW_FRAME // This sample is the first of a new simulation case
 };
 
 struct Sample {
diff --git a/lua/hooks/test.lua b/lua/hooks/test.lua
index d4aa24e15..9a1fcd765 100644
--- a/lua/hooks/test.lua
+++ b/lua/hooks/test.lua
@@ -15,14 +15,16 @@ Reason = {
 }
 
 SampleFlags = {
-	HAS_TS_ORIGIN   = 1,      -- "(1 <<  1)"    Include origin timestamp in output.
-	HAS_TS_RECEIVED = 2,      -- "(1 <<  2)"    Include receive timestamp in output.
-	HAS_OFFSET      = 4,      -- "(1 <<  3)"    Include offset (received - origin timestamp) in output.
-	HAS_SEQUENCE    = 8,      -- "(1 <<  4)"    Include sequence number in output.
-	HAS_DATA        = 16,     -- "(1 <<  5)"    Include values in output.
-	HAS_ALL         = 15,     -- "(1 <<  6) -1" Enable all output options.
+	HAS_TS_ORIGIN   = 1,          -- "(1 <<  1)"    Include origin timestamp in output.
+	HAS_TS_RECEIVED = 2,          -- "(1 <<  2)"    Include receive timestamp in output.
+	HAS_OFFSET      = 4,          -- "(1 <<  3)"    Include offset (received - origin timestamp) in output.
+	HAS_SEQUENCE    = 8,          -- "(1 <<  4)"    Include sequence number in output.
+	HAS_DATA        = 16,         -- "(1 <<  5)"    Include values in output.
 
-	NEW_SIMULATION  = 65536,  -- "(1 << 16)"    This sample is the first of a new simulation case
+	NEW_FRAME       = 65536,      -- "(1 << 16)"    This sample is the first of a new simulation case
+	NEW_SIMULATION  = 131072,     -- "(1 << 16)"    This sample is the first of a new simulation case
+
+	ALL             = 2147483647, -- "INT_MAX"      Enable all output options.
 }