so we loose the partOf information with your refactoring. that is not relevant? did you test if this change breaks creating new items?