Added multi-term

Change-Id: I2273052cd3386d7ae087e680f9a6643f602dd467