Improved storage interfaces, implemented ContextWalker