New version supports locks