Added optimistic locking version