Replace deprecated use of Yaml