Cleaned up schema with vocabs and labels