This thesis presents a redesign of the operation-based approach to automating the coupled evolution of graphical data models and their data. In addition to its automated co-evolution support, the redesign also addresses the inherent limitations of the operation-based approach.