Added some simple annotations