Improved YAML output