diff --git a/aztec/src/state_vars.nr b/aztec/src/state_vars.nr
index d8213bb1..177844f7 100644
--- a/aztec/src/state_vars.nr
+++ b/aztec/src/state_vars.nr
@@ -4,3 +4,4 @@ mod public_state;
 mod set;
 mod singleton;
 mod stable_public_state;
+mod storage;
diff --git a/aztec/src/state_vars/immutable_singleton.nr b/aztec/src/state_vars/immutable_singleton.nr
index 187feca4..9d595081 100644
--- a/aztec/src/state_vars/immutable_singleton.nr
+++ b/aztec/src/state_vars/immutable_singleton.nr
@@ -16,6 +16,7 @@ use crate::note::{
     note_viewer_options::NoteViewerOptions,
 };
 use crate::oracle::notes::check_nullifier_exists;
+use crate::state_vars::storage::Storage;
 
 // docs:start:struct
 struct ImmutableSingleton<Note> {
@@ -24,6 +25,8 @@ struct ImmutableSingleton<Note> {
 }
 // docs:end:struct
 
+impl<T> Storage<T> for ImmutableSingleton<T> {}
+
 impl<Note> ImmutableSingleton<Note> {
     // docs:start:new
     pub fn new(
diff --git a/aztec/src/state_vars/map.nr b/aztec/src/state_vars/map.nr
index fefa84ea..7e38552e 100644
--- a/aztec/src/state_vars/map.nr
+++ b/aztec/src/state_vars/map.nr
@@ -4,6 +4,7 @@ use dep::protocol_types::{
     hash::pedersen_hash,
     traits::{ToField}
 };
+use crate::state_vars::storage::Storage;
 
 // docs:start:map
 struct Map<K, V> {
@@ -13,6 +14,8 @@ struct Map<K, V> {
 }
 // docs:end:map
 
+impl<K, T> Storage<T> for Map<K, T> {}
+
 impl<K, V> Map<K, V> {
     // docs:start:new
     pub fn new(
diff --git a/aztec/src/state_vars/public_state.nr b/aztec/src/state_vars/public_state.nr
index 9309f3d9..081b0d59 100644
--- a/aztec/src/state_vars/public_state.nr
+++ b/aztec/src/state_vars/public_state.nr
@@ -3,6 +3,7 @@ use crate::oracle::storage::storage_read;
 use crate::oracle::storage::storage_write;
 use dep::std::option::Option;
 use dep::protocol_types::traits::{Deserialize, Serialize};
+use crate::state_vars::storage::Storage;
 
 // docs:start:public_state_struct
 struct PublicState<T> {
@@ -11,6 +12,8 @@ struct PublicState<T> {
 }
 // docs:end:public_state_struct
 
+impl<T> Storage<T> for PublicState<T> {}
+
 impl<T> PublicState<T> {
     // docs:start:public_state_struct_new
     pub fn new(
diff --git a/aztec/src/state_vars/set.nr b/aztec/src/state_vars/set.nr
index 03e53b33..6813a9fa 100644
--- a/aztec/src/state_vars/set.nr
+++ b/aztec/src/state_vars/set.nr
@@ -15,6 +15,7 @@ use crate::note::{
     note_viewer_options::NoteViewerOptions,
     utils::compute_note_hash_for_consumption,
 };
+use crate::state_vars::storage::Storage;
 
 // docs:start:struct
 struct Set<Note> {
@@ -23,6 +24,8 @@ struct Set<Note> {
 }
 // docs:end:struct
 
+impl<T> Storage<T> for Set<T> {}
+
 impl<Note> Set<Note> {
     // docs:start:new
     pub fn new(
@@ -36,7 +39,6 @@ impl<Note> Set<Note> {
         }
     }
     // docs:end:new
-
     // docs:start:insert
     pub fn insert<N>(self,
         note: &mut Note,
diff --git a/aztec/src/state_vars/singleton.nr b/aztec/src/state_vars/singleton.nr
index 19b4e91b..47d8aef5 100644
--- a/aztec/src/state_vars/singleton.nr
+++ b/aztec/src/state_vars/singleton.nr
@@ -20,6 +20,7 @@ use crate::oracle::{
     nullifier_key::get_nullifier_secret_key,
     notes::check_nullifier_exists,
 };
+use crate::state_vars::storage::Storage;
 
 // docs:start:struct
 struct Singleton<Note> {
@@ -28,6 +29,8 @@ struct Singleton<Note> {
 }
 // docs:end:struct
 
+impl<T> Storage<T> for Singleton<T> {}
+
 impl<Note> Singleton<Note> {
     // docs:start:new
     pub fn new(
diff --git a/aztec/src/state_vars/stable_public_state.nr b/aztec/src/state_vars/stable_public_state.nr
index 013f059a..af4925f4 100644
--- a/aztec/src/state_vars/stable_public_state.nr
+++ b/aztec/src/state_vars/stable_public_state.nr
@@ -5,12 +5,15 @@ use crate::oracle::{
 use crate::history::public_value_inclusion::prove_public_value_inclusion;
 use dep::std::option::Option;
 use dep::protocol_types::traits::{Deserialize, Serialize};
+use crate::state_vars::storage::Storage;
 
 struct StablePublicState<T>{
     context: Context,
     storage_slot: Field,
 }
 
+impl<T> Storage<T> for StablePublicState<T> {}
+
 impl<T> StablePublicState<T> {
     pub fn new(
         // Note: Passing the contexts to new(...) just to have an interface compatible with a Map.
diff --git a/aztec/src/state_vars/storage.nr b/aztec/src/state_vars/storage.nr
new file mode 100644
index 00000000..5f28b55f
--- /dev/null
+++ b/aztec/src/state_vars/storage.nr
@@ -0,0 +1,8 @@
+use crate::context::{Context};
+use dep::protocol_types::traits::{Deserialize, Serialize};
+
+trait Storage<T> where T: Serialize<N> + Deserialize<N> {
+    fn get_storage_slot(self) -> Field {
+        self.storage_slot
+    }
+}