Added some semantics