Updated primivie metadata classes.