Improve worker storage related.