Added validation of terms