Structural changes for easier edits of types