Feature/tree design