Code cleanup
Adding full support for optimistic concurrency in the update pipeline