METADATA.json now records all X types