added additional annotation support