Reworked term collector