Another change to the metadata scheme