Added set terms extraction