Added support for multiple terms