Added some semantic stuff