Updated annotation logic to split out injection