Added fully featured annotations