Added mentions to model and client specs.
Implements highlight specs.
Added highlight mention back.