move the annotation type information inside the annotation (currently controlled by annotation controller, should move to service)