More metadata changes