Configuration Management is required in all software development processes. To support ‘agile’ methodologies, an approach is desirable that allows developers to work as independently as possible and yet be aware of each other’s activities. Optimistic concurrency control provides good support for independent working but is less supportive of communication. This paper looks at the relationship between the optimistic approach and the needs of the agile philosophy. In particular, it examines support facilities provided by the Concurrent Versions System (CVS) and identifies possible improvements in conflict detection to aid communication. The design and construction of a prototype extension to CVS, implementing some of these enhancements, is described.