Add new Metadata classes