Make Yaml driver for Tree mapping compliant with resolve target entities