Added Waila support and more work on tree generation