Improve locking
Update version