Update metadata classes