VolceneLock refactoring