CORE-347 improved tree redesign and added missing items