Added TermVector support