update registry and lock implementation