Switch to new-style metadata