Added annotations to some of the classes