Diagram: Some refactorings in the definition language