Build better hierarchy in the YAML.