Adding AnnotationTransformer to support SolutionTwo