BC-2007 #comment TermModel use repo directly..