Annotate existing components