Enhancements to allow tree display in workbench