Middleware WIP
Use storage mixin