Consolidated termsink into one class