Add support for multi-term