greatly expanded metadata files