This change ensures that generated toml file from packages contain all relevant metadata and handles groups correct.
