Add extra term and redex validations