Modeling and diagram changes