Changes for 11
Optimistic locking