Use diamond operator
Add TreeDecorator