added annotation present check