Adding forward compatibility for locking.