Fixed annotators ref inheritance bug.
Added data category terminology support.