feat: Preserve the structure of tree shapes as much as possible

feat: Preserve the structure of tree shapes as much as possible #383