Added AnnotationService + added unit tests