Improving term handling