CMA prototyping

Do we want to add a version for optimistic locking?