diff --git a/core/incremental/compiler.rs b/core/incremental/compiler.rs
index 84f50bfc6..15794068b 100644
--- a/core/incremental/compiler.rs
+++ b/core/incremental/compiler.rs
@@ -2742,6 +2742,8 @@ mod tests {
     // This reads the actual persisted data from the BTree
     #[cfg(test)]
     fn get_current_state(pager: Arc<Pager>, circuit: &DbspCircuit) -> Result<Delta> {
+        use crate::storage::btree::CursorTrait;
+
         let mut delta = Delta::new();
 
         let main_data_root = circuit.main_data_root;
diff --git a/core/incremental/operator.rs b/core/incremental/operator.rs
index f4598e1fb..276249fb3 100644
--- a/core/incremental/operator.rs
+++ b/core/incremental/operator.rs
@@ -254,6 +254,7 @@ mod tests {
     use super::*;
     use crate::incremental::aggregate_operator::{AggregateOperator, AGG_TYPE_REGULAR};
     use crate::incremental::dbsp::HashableRow;
+    use crate::storage::btree::CursorTrait;
     use crate::storage::pager::CreateBTreeFlags;
     use crate::types::Text;
     use crate::util::IOExt;
diff --git a/core/incremental/persistence.rs b/core/incremental/persistence.rs
index 81d0837c2..bba64a282 100644
--- a/core/incremental/persistence.rs
+++ b/core/incremental/persistence.rs
@@ -1,5 +1,5 @@
 use crate::incremental::operator::{AggregateState, DbspStateCursors};
-use crate::storage::btree::{BTreeCursor, BTreeKey};
+use crate::storage::btree::{BTreeCursor, BTreeKey, CursorTrait};
 use crate::types::{IOResult, ImmutableRecord, SeekKey, SeekOp, SeekResult};
 use crate::{return_if_io, LimboError, Result, Value};
 
diff --git a/core/incremental/view.rs b/core/incremental/view.rs
index fc4a8bba6..b95c8a0ca 100644
--- a/core/incremental/view.rs
+++ b/core/incremental/view.rs
@@ -2,7 +2,7 @@ use super::compiler::{DbspCircuit, DbspCompiler, DeltaSet};
 use super::dbsp::Delta;
 use super::operator::ComputationTracker;
 use crate::schema::{BTreeTable, Schema};
-use crate::storage::btree::BTreeCursor;
+use crate::storage::btree::CursorTrait;
 use crate::translate::logical::LogicalPlanBuilder;
 use crate::types::{IOResult, Value};
 use crate::util::{extract_view_columns, ViewColumnSchema};
@@ -1112,7 +1112,7 @@ impl IncrementalView {
         &mut self,
         conn: &std::sync::Arc<crate::Connection>,
         pager: &std::sync::Arc<crate::Pager>,
-        _btree_cursor: &mut BTreeCursor,
+        _btree_cursor: &mut dyn CursorTrait,
     ) -> crate::Result<IOResult<()>> {
         // Assert that this is a materialized view with a root page
         assert!(
diff --git a/core/mvcc/database/mod.rs b/core/mvcc/database/mod.rs
index 95014cbc2..d6275b947 100644
--- a/core/mvcc/database/mod.rs
+++ b/core/mvcc/database/mod.rs
@@ -5,6 +5,7 @@ use crate::state_machine::StateTransition;
 use crate::state_machine::TransitionResult;
 use crate::storage::btree::BTreeCursor;
 use crate::storage::btree::BTreeKey;
+use crate::storage::btree::CursorTrait;
 use crate::storage::btree::CursorValidState;
 use crate::storage::sqlite3_ondisk::DatabaseHeader;
 use crate::storage::wal::TursoRwLock;
diff --git a/core/schema.rs b/core/schema.rs
index f81c8fe2e..0bf9f464c 100644
--- a/core/schema.rs
+++ b/core/schema.rs
@@ -72,7 +72,7 @@ impl Clone for View {
 /// Type alias for regular views collection
 pub type ViewsMap = HashMap<String, Arc<View>>;
 
-use crate::storage::btree::BTreeCursor;
+use crate::storage::btree::{BTreeCursor, CursorTrait};
 use crate::translate::collate::CollationSeq;
 use crate::translate::plan::{SelectPlan, TableReferences};
 use crate::util::{