Revise schema design for Context-MetaTerm refactoring