Added annotation generation