Last finishing touches
Added some terminology from the semantics domain research