Add support for generic trees and URL matchers