CORE-347 tree redesign