Add minimal support for multi-term