Fixed up annotation and initial plugin support on demand