Converted double quotes to single quotes
Added more cases for YAML output