diff --git a/interop/storage/storage.go b/interop/storage/storage.go
index de803e87c..8e5c0b6d9 100644
--- a/interop/storage/storage.go
+++ b/interop/storage/storage.go
@@ -1,19 +1,19 @@
 package storage
 
 // Context represents the storage context
-type Context interface{}
+type Context struct{}
 
 // GetContext returns the storage context
-func GetContext() interface{} { return nil }
+func GetContext() Context { return Context{} }
 
 // Put value at given key
-func Put(ctx interface{}, key interface{}, value interface{}) {}
+func Put(ctx Context, key interface{}, value interface{}) {}
 
 // Get value matching given key
-func Get(ctx interface{}, key interface{}) interface{} { return 0 }
+func Get(ctx Context, key interface{}) interface{} { return 0 }
 
 // Delete key value pair from storage
-func Delete(ctx interface{}, key interface{}) {}
+func Delete(ctx Context, key interface{}) {}
 
 // Find values stored on keys partially matching given key
-func Find(ctx interface{}, key interface{}) interface{} { return 0 }
+func Find(ctx Context, key interface{}) interface{} { return 0 }