Some changes for Tree plugin