Added basic term recognition