Storage refactor complete