First round of metadata changes