Added Multi-Term support