Refactor: Term management is now done in in the TermPrehandler