Added missing xml->yaml conversions