ParentEditor refactoring,
Parent handling refactoring