Support new generic metadata file format