Final metadata changes