diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5422f9af88..eee0c80cc1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 #### [0.8.6] - 2023-8-11
 
+* refactor: combine `Program.hints` and `Program.hints_ranges` into custom collection [#1366](https://github.com/lambdaclass/cairo-vm/pull/1366)
+
 * fix: Handle error in hint `UINT256_MUL_DIV_MOD` when divides by zero [#1367](https://github.com/lambdaclass/cairo-vm/pull/1367)
 
 * Add HintError::SyscallError and VmErrors::HINT_ERROR_STR constant [#1357](https://github.com/lambdaclass/cairo-rs/pull/1357)
diff --git a/vm/src/types/program.rs b/vm/src/types/program.rs
index ea9afb2443..5c3c8959d5 100644
--- a/vm/src/types/program.rs
+++ b/vm/src/types/program.rs
@@ -64,7 +64,7 @@ pub(crate) struct SharedProgramData {
 
 #[cfg(all(feature = "arbitrary", feature = "std"))]
 impl<'a> Arbitrary<'a> for SharedProgramData {
-    /// Create an arbitary [`SharedProgramData`] using `flatten_hints` to generate `hints` and
+    /// Create an arbitary [`SharedProgramData`] using `HintsCollection::new` to generate `hints` and
     /// `hints_ranges`
     fn arbitrary(u: &mut Unstructured<'a>) -> arbitrary::Result<Self> {
         let mut data = Vec::new();
@@ -79,7 +79,7 @@ impl<'a> Arbitrary<'a> for SharedProgramData {
         }
 
         let raw_hints = BTreeMap::<usize, Vec<HintParams>>::arbitrary(u)?;
-        let hints_collection = Program::flatten_hints(&raw_hints, data.len())
+        let hints_collection = HintsCollection::new(&raw_hints, data.len())
             .map_err(|_| arbitrary::Error::IncorrectFormat)?;
         Ok(SharedProgramData {
             data,