Rewrite the implementation and get rid of session interface. Now storage should be used instead.