Adjusted config tree builder