re-introduce Storage spec