Adding optimistic concurrency support