refactor ExecutionStorage #18