Add 'id' attribute in annotations