Some changes in the metadata generation.