Add vocab term support