Improved (custom) YAML export