Modify versioning for coherence and tracing