Adding metadata classes