Added three new tables/classes for further classifying metadata