Sorry I was not clear. For the specific issue mentioned in this thread, we only lock WrappedObjectsTable in CreateWrappedObjectImpl, but IndexedConstructors and other collections must also be locked in other functions. Additional locks had to be placed in the C++ implementation too, this was a relatively big change in the end.