Improved the YAML code