Introduce KeywordTerm and separate Keywords and MetaTerms