Refactoring PartElement