Remove singleton option of the METADATA, add missing packages