Add metadata classes