metadata structure changes (https://etherpad.mozilla.org/M9suq1Ntys)