Add support for yml tree