Added support for terminology