Added variable length terms