Add support for sub trees and comments