diff --git a/tests/FilesT.cpp b/tests/FilesT.cpp
index 4dd43c8f..f332186c 100644
--- a/tests/FilesT.cpp
+++ b/tests/FilesT.cpp
@@ -19,7 +19,7 @@ TEST_CASE("[Files] Single region (regions_one.sfz)")
     sfz::Synth synth;
     synth.loadSfzFile(fs::current_path() / "tests/TestFiles/Regions/regions_one.sfz");
     REQUIRE(synth.getNumRegions() == 1);
-    REQUIRE(synth.getRegionView(0)->sample == "dummy.wav");
+    REQUIRE(synth.getRegionView(0)->sampleId.filename == "dummy.wav");
 }
 
 
@@ -28,9 +28,9 @@ TEST_CASE("[Files] Multiple regions (regions_many.sfz)")
     sfz::Synth synth;
     synth.loadSfzFile(fs::current_path() / "tests/TestFiles/Regions/regions_many.sfz");
     REQUIRE(synth.getNumRegions() == 3);
-    REQUIRE(synth.getRegionView(0)->sample == "dummy.wav");
-    REQUIRE(synth.getRegionView(1)->sample == "dummy.1.wav");
-    REQUIRE(synth.getRegionView(2)->sample == "dummy.2.wav");
+    REQUIRE(synth.getRegionView(0)->sampleId.filename == "dummy.wav");
+    REQUIRE(synth.getRegionView(1)->sampleId.filename == "dummy.1.wav");
+    REQUIRE(synth.getRegionView(2)->sampleId.filename == "dummy.2.wav");
 }
 
 TEST_CASE("[Files] Basic opcodes (regions_opcodes.sfz)")
@@ -54,8 +54,8 @@ TEST_CASE("[Files] (regions_bad.sfz)")
     sfz::Synth synth;
     synth.loadSfzFile(fs::current_path() / "tests/TestFiles/Regions/regions_bad.sfz");
     REQUIRE(synth.getNumRegions() == 2);
-    REQUIRE(synth.getRegionView(0)->sample == "dummy.wav");
-    REQUIRE(synth.getRegionView(1)->sample == "dummy.wav");
+    REQUIRE(synth.getRegionView(0)->sampleId.filename == "dummy.wav");
+    REQUIRE(synth.getRegionView(1)->sampleId.filename == "dummy.wav");
 }
 
 TEST_CASE("[Files] Local include")
@@ -63,7 +63,7 @@ TEST_CASE("[Files] Local include")
     sfz::Synth synth;
     synth.loadSfzFile(fs::current_path() / "tests/TestFiles/Includes/root_local.sfz");
     REQUIRE(synth.getNumRegions() == 1);
-    REQUIRE(synth.getRegionView(0)->sample == "dummy.wav");
+    REQUIRE(synth.getRegionView(0)->sampleId.filename == "dummy.wav");
 }
 
 TEST_CASE("[Files] Multiple includes")
@@ -71,8 +71,8 @@ TEST_CASE("[Files] Multiple includes")
     sfz::Synth synth;
     synth.loadSfzFile(fs::current_path() / "tests/TestFiles/Includes/multiple_includes.sfz");
     REQUIRE(synth.getNumRegions() == 2);
-    REQUIRE(synth.getRegionView(0)->sample == "dummy.wav");
-    REQUIRE(synth.getRegionView(1)->sample == "dummy2.wav");
+    REQUIRE(synth.getRegionView(0)->sampleId.filename == "dummy.wav");
+    REQUIRE(synth.getRegionView(1)->sampleId.filename == "dummy2.wav");
 }
 
 TEST_CASE("[Files] Multiple includes with comments")
@@ -80,8 +80,8 @@ TEST_CASE("[Files] Multiple includes with comments")
     sfz::Synth synth;
     synth.loadSfzFile(fs::current_path() / "tests/TestFiles/Includes/multiple_includes_with_comments.sfz");
     REQUIRE(synth.getNumRegions() == 2);
-    REQUIRE(synth.getRegionView(0)->sample == "dummy.wav");
-    REQUIRE(synth.getRegionView(1)->sample == "dummy2.wav");
+    REQUIRE(synth.getRegionView(0)->sampleId.filename == "dummy.wav");
+    REQUIRE(synth.getRegionView(1)->sampleId.filename == "dummy2.wav");
 }
 
 TEST_CASE("[Files] Subdir include")
@@ -89,7 +89,7 @@ TEST_CASE("[Files] Subdir include")
     sfz::Synth synth;
     synth.loadSfzFile(fs::current_path() / "tests/TestFiles/Includes/root_subdir.sfz");
     REQUIRE(synth.getNumRegions() == 1);
-    REQUIRE(synth.getRegionView(0)->sample == "dummy_subdir.wav");
+    REQUIRE(synth.getRegionView(0)->sampleId.filename == "dummy_subdir.wav");
 }
 
 TEST_CASE("[Files] Subdir include Win")
@@ -97,7 +97,7 @@ TEST_CASE("[Files] Subdir include Win")
     sfz::Synth synth;
     synth.loadSfzFile(fs::current_path() / "tests/TestFiles/Includes/root_subdir_win.sfz");
     REQUIRE(synth.getNumRegions() == 1);
-    REQUIRE(synth.getRegionView(0)->sample == "dummy_subdir.wav");
+    REQUIRE(synth.getRegionView(0)->sampleId.filename == "dummy_subdir.wav");
 }
 
 TEST_CASE("[Files] Recursive include (with include guard)")
@@ -107,8 +107,8 @@ TEST_CASE("[Files] Recursive include (with include guard)")
     parser.setRecursiveIncludeGuardEnabled(true);
     synth.loadSfzFile(fs::current_path() / "tests/TestFiles/Includes/root_recursive.sfz");
     REQUIRE(synth.getNumRegions() == 2);
-    REQUIRE(synth.getRegionView(0)->sample == "dummy_recursive2.wav");
-    REQUIRE(synth.getRegionView(1)->sample == "dummy_recursive1.wav");
+    REQUIRE(synth.getRegionView(0)->sampleId.filename == "dummy_recursive2.wav");
+    REQUIRE(synth.getRegionView(1)->sampleId.filename == "dummy_recursive1.wav");
 }
 
 TEST_CASE("[Files] Include loops (with include guard)")
@@ -118,8 +118,8 @@ TEST_CASE("[Files] Include loops (with include guard)")
     parser.setRecursiveIncludeGuardEnabled(true);
     synth.loadSfzFile(fs::current_path() / "tests/TestFiles/Includes/root_loop.sfz");
     REQUIRE(synth.getNumRegions() == 2);
-    REQUIRE(synth.getRegionView(0)->sample == "dummy_loop2.wav");
-    REQUIRE(synth.getRegionView(1)->sample == "dummy_loop1.wav");
+    REQUIRE(synth.getRegionView(0)->sampleId.filename == "dummy_loop2.wav");
+    REQUIRE(synth.getRegionView(1)->sampleId.filename == "dummy_loop1.wav");
 }
 
 TEST_CASE("[Files] Define test")
@@ -205,28 +205,28 @@ TEST_CASE("[Files] Full hierarchy with antislashes")
         sfz::Synth synth;
         synth.loadSfzFile(fs::current_path() / "tests/TestFiles/basic_hierarchy.sfz");
         REQUIRE(synth.getNumRegions() == 8);
-        REQUIRE(synth.getRegionView(0)->sample == "Regions/dummy.wav");
-        REQUIRE(synth.getRegionView(1)->sample == "Regions/dummy.1.wav");
-        REQUIRE(synth.getRegionView(2)->sample == "Regions/dummy.wav");
-        REQUIRE(synth.getRegionView(3)->sample == "Regions/dummy.1.wav");
-        REQUIRE(synth.getRegionView(4)->sample == "Regions/dummy.wav");
-        REQUIRE(synth.getRegionView(5)->sample == "Regions/dummy.1.wav");
-        REQUIRE(synth.getRegionView(6)->sample == "Regions/dummy.wav");
-        REQUIRE(synth.getRegionView(7)->sample == "Regions/dummy.1.wav");
+        REQUIRE(synth.getRegionView(0)->sampleId.filename == "Regions/dummy.wav");
+        REQUIRE(synth.getRegionView(1)->sampleId.filename == "Regions/dummy.1.wav");
+        REQUIRE(synth.getRegionView(2)->sampleId.filename == "Regions/dummy.wav");
+        REQUIRE(synth.getRegionView(3)->sampleId.filename == "Regions/dummy.1.wav");
+        REQUIRE(synth.getRegionView(4)->sampleId.filename == "Regions/dummy.wav");
+        REQUIRE(synth.getRegionView(5)->sampleId.filename == "Regions/dummy.1.wav");
+        REQUIRE(synth.getRegionView(6)->sampleId.filename == "Regions/dummy.wav");
+        REQUIRE(synth.getRegionView(7)->sampleId.filename == "Regions/dummy.1.wav");
     }
 
     {
         sfz::Synth synth;
         synth.loadSfzFile(fs::current_path() / "tests/TestFiles/basic_hierarchy_antislash.sfz");
         REQUIRE(synth.getNumRegions() == 8);
-        REQUIRE(synth.getRegionView(0)->sample == "Regions/dummy.wav");
-        REQUIRE(synth.getRegionView(1)->sample == "Regions/dummy.1.wav");
-        REQUIRE(synth.getRegionView(2)->sample == "Regions/dummy.wav");
-        REQUIRE(synth.getRegionView(3)->sample == "Regions/dummy.1.wav");
-        REQUIRE(synth.getRegionView(4)->sample == "Regions/dummy.wav");
-        REQUIRE(synth.getRegionView(5)->sample == "Regions/dummy.1.wav");
-        REQUIRE(synth.getRegionView(6)->sample == "Regions/dummy.wav");
-        REQUIRE(synth.getRegionView(7)->sample == "Regions/dummy.1.wav");
+        REQUIRE(synth.getRegionView(0)->sampleId.filename == "Regions/dummy.wav");
+        REQUIRE(synth.getRegionView(1)->sampleId.filename == "Regions/dummy.1.wav");
+        REQUIRE(synth.getRegionView(2)->sampleId.filename == "Regions/dummy.wav");
+        REQUIRE(synth.getRegionView(3)->sampleId.filename == "Regions/dummy.1.wav");
+        REQUIRE(synth.getRegionView(4)->sampleId.filename == "Regions/dummy.wav");
+        REQUIRE(synth.getRegionView(5)->sampleId.filename == "Regions/dummy.1.wav");
+        REQUIRE(synth.getRegionView(6)->sampleId.filename == "Regions/dummy.wav");
+        REQUIRE(synth.getRegionView(7)->sampleId.filename == "Regions/dummy.1.wav");
     }
 }
 
@@ -245,10 +245,10 @@ TEST_CASE("[Files] Pizz basic")
     REQUIRE(synth.getRegionView(1)->randRange == sfz::Range<float>(0.25, 0.5));
     REQUIRE(synth.getRegionView(2)->randRange == sfz::Range<float>(0.5, 0.75));
     REQUIRE(synth.getRegionView(3)->randRange == sfz::Range<float>(0.75, 1.0));
-    REQUIRE(synth.getRegionView(0)->sample == R"(../Samples/pizz/a0_vl4_rr1.wav)");
-    REQUIRE(synth.getRegionView(1)->sample == R"(../Samples/pizz/a0_vl4_rr2.wav)");
-    REQUIRE(synth.getRegionView(2)->sample == R"(../Samples/pizz/a0_vl4_rr3.wav)");
-    REQUIRE(synth.getRegionView(3)->sample == R"(../Samples/pizz/a0_vl4_rr4.wav)");
+    REQUIRE(synth.getRegionView(0)->sampleId.filename == R"(../Samples/pizz/a0_vl4_rr1.wav)");
+    REQUIRE(synth.getRegionView(1)->sampleId.filename == R"(../Samples/pizz/a0_vl4_rr2.wav)");
+    REQUIRE(synth.getRegionView(2)->sampleId.filename == R"(../Samples/pizz/a0_vl4_rr3.wav)");
+    REQUIRE(synth.getRegionView(3)->sampleId.filename == R"(../Samples/pizz/a0_vl4_rr4.wav)");
 }
 
 TEST_CASE("[Files] Channels (channels.sfz)")
@@ -256,9 +256,9 @@ TEST_CASE("[Files] Channels (channels.sfz)")
     sfz::Synth synth;
     synth.loadSfzFile(fs::current_path() / "tests/TestFiles/channels.sfz");
     REQUIRE(synth.getNumRegions() == 2);
-    REQUIRE(synth.getRegionView(0)->sample == "mono_sample.wav");
+    REQUIRE(synth.getRegionView(0)->sampleId.filename == "mono_sample.wav");
     REQUIRE(!synth.getRegionView(0)->isStereo());
-    REQUIRE(synth.getRegionView(1)->sample == "stereo_sample.wav");
+    REQUIRE(synth.getRegionView(1)->sampleId.filename == "stereo_sample.wav");
     REQUIRE(synth.getRegionView(1)->isStereo());
 }
 
@@ -268,32 +268,32 @@ TEST_CASE("[Files] Channels (channels_multi.sfz)")
     synth.loadSfzFile(fs::current_path() / "tests/TestFiles/channels_multi.sfz");
     REQUIRE(synth.getNumRegions() == 6);
 
-    REQUIRE(synth.getRegionView(0)->sample == "*sine");
+    REQUIRE(synth.getRegionView(0)->sampleId.filename == "*sine");
     REQUIRE(!synth.getRegionView(0)->isStereo());
     REQUIRE(synth.getRegionView(0)->isGenerator());
     REQUIRE(!synth.getRegionView(0)->oscillator);
 
-    REQUIRE(synth.getRegionView(1)->sample == "*sine");
+    REQUIRE(synth.getRegionView(1)->sampleId.filename == "*sine");
     REQUIRE(synth.getRegionView(1)->isStereo());
     REQUIRE(synth.getRegionView(1)->isGenerator());
     REQUIRE(!synth.getRegionView(1)->oscillator);
 
-    REQUIRE(synth.getRegionView(2)->sample == "ramp_wave.wav");
+    REQUIRE(synth.getRegionView(2)->sampleId.filename == "ramp_wave.wav");
     REQUIRE(!synth.getRegionView(2)->isStereo());
     REQUIRE(!synth.getRegionView(2)->isGenerator());
     REQUIRE(synth.getRegionView(2)->oscillator);
 
-    REQUIRE(synth.getRegionView(3)->sample == "ramp_wave.wav");
+    REQUIRE(synth.getRegionView(3)->sampleId.filename == "ramp_wave.wav");
     REQUIRE(synth.getRegionView(3)->isStereo());
     REQUIRE(!synth.getRegionView(3)->isGenerator());
     REQUIRE(synth.getRegionView(3)->oscillator);
 
-    REQUIRE(synth.getRegionView(4)->sample == "*sine");
+    REQUIRE(synth.getRegionView(4)->sampleId.filename == "*sine");
     REQUIRE(!synth.getRegionView(4)->isStereo());
     REQUIRE(synth.getRegionView(4)->isGenerator());
     REQUIRE(!synth.getRegionView(4)->oscillator);
 
-    REQUIRE(synth.getRegionView(5)->sample == "*sine");
+    REQUIRE(synth.getRegionView(5)->sampleId.filename == "*sine");
     REQUIRE(!synth.getRegionView(5)->isStereo());
     REQUIRE(synth.getRegionView(5)->isGenerator());
     REQUIRE(!synth.getRegionView(5)->oscillator);
@@ -359,7 +359,7 @@ TEST_CASE("[Files] Specific bug: relative path with backslashes")
     sfz::Synth synth;
     synth.loadSfzFile(fs::current_path() / "tests/TestFiles/SpecificBugs/win_backslashes.sfz");
     REQUIRE(synth.getNumRegions() == 1);
-    REQUIRE(synth.getRegionView(0)->sample == R"(Xylo/Subfolder/closedhat.wav)");
+    REQUIRE(synth.getRegionView(0)->sampleId.filename == R"(Xylo/Subfolder/closedhat.wav)");
 }
 
 TEST_CASE("[Files] Default path")
@@ -367,10 +367,10 @@ TEST_CASE("[Files] Default path")
     sfz::Synth synth;
     synth.loadSfzFile(fs::current_path() / "tests/TestFiles/default_path.sfz");
     REQUIRE(synth.getNumRegions() == 4);
-    REQUIRE(synth.getRegionView(0)->sample == R"(DefaultPath/SubPath1/sample1.wav)");
-    REQUIRE(synth.getRegionView(1)->sample == R"(DefaultPath/SubPath2/sample2.wav)");
-    REQUIRE(synth.getRegionView(2)->sample == R"(DefaultPath/SubPath1/sample1.wav)");
-    REQUIRE(synth.getRegionView(3)->sample == R"(DefaultPath/SubPath2/sample2.wav)");
+    REQUIRE(synth.getRegionView(0)->sampleId.filename == R"(DefaultPath/SubPath1/sample1.wav)");
+    REQUIRE(synth.getRegionView(1)->sampleId.filename == R"(DefaultPath/SubPath2/sample2.wav)");
+    REQUIRE(synth.getRegionView(2)->sampleId.filename == R"(DefaultPath/SubPath1/sample1.wav)");
+    REQUIRE(synth.getRegionView(3)->sampleId.filename == R"(DefaultPath/SubPath2/sample2.wav)");
 }
 
 TEST_CASE("[Files] Default path reset when calling loadSfzFile again")
@@ -380,7 +380,7 @@ TEST_CASE("[Files] Default path reset when calling loadSfzFile again")
     REQUIRE(synth.getNumRegions() == 4);
     synth.loadSfzFile(fs::current_path() / "tests/TestFiles/default_path_reset.sfz");
     REQUIRE(synth.getNumRegions() == 1);
-    REQUIRE(synth.getRegionView(0)->sample == R"(DefaultPath/SubPath2/sample2.wav)");
+    REQUIRE(synth.getRegionView(0)->sampleId.filename == R"(DefaultPath/SubPath2/sample2.wav)");
 }
 
 TEST_CASE("[Files] Default path is ignored for generators")
@@ -388,7 +388,7 @@ TEST_CASE("[Files] Default path is ignored for generators")
     sfz::Synth synth;
     synth.loadSfzFile(fs::current_path() / "tests/TestFiles/default_path_generator.sfz");
     REQUIRE(synth.getNumRegions() == 1);
-    REQUIRE(synth.getRegionView(0)->sample == R"(*sine)");
+    REQUIRE(synth.getRegionView(0)->sampleId.filename == R"(*sine)");
 }
 
 TEST_CASE("[Files] Set CC applies properly")
@@ -547,10 +547,10 @@ TEST_CASE("[Files] Case sentitiveness")
         sfz::Synth synth;
         synth.loadSfzFile(sfzFilePath);
         REQUIRE(synth.getNumRegions() == 4);
-        REQUIRE(synth.getRegionView(0)->sample == "dummy1.wav");
-        REQUIRE(synth.getRegionView(1)->sample == "Regions/dummy.wav");
-        REQUIRE(synth.getRegionView(2)->sample == "Regions/dummy.wav");
-        REQUIRE(synth.getRegionView(3)->sample == "Regions/dummy.wav");
+        REQUIRE(synth.getRegionView(0)->sampleId.filename == "dummy1.wav");
+        REQUIRE(synth.getRegionView(1)->sampleId.filename == "Regions/dummy.wav");
+        REQUIRE(synth.getRegionView(2)->sampleId.filename == "Regions/dummy.wav");
+        REQUIRE(synth.getRegionView(3)->sampleId.filename == "Regions/dummy.wav");
     }
 }
 
diff --git a/tests/RegionT.cpp b/tests/RegionT.cpp
index 12c764ba..7cc2864d 100644
--- a/tests/RegionT.cpp
+++ b/tests/RegionT.cpp
@@ -18,9 +18,9 @@ TEST_CASE("[Region] Parsing opcodes")
 
     SECTION("sample")
     {
-        REQUIRE(region.sample == "");
+        REQUIRE(region.sampleId.filename == "");
         region.parseOpcode({ "sample", "dummy.wav" });
-        REQUIRE(region.sample == "dummy.wav");
+        REQUIRE(region.sampleId.filename == "dummy.wav");
     }
 
     SECTION("direction")