Changes to implement new class of terms