Lock version refactor