Refactor and move some responsibilities to TermRecord