Improved templates, new metadata structure