Switch to new metadata format